From patchwork Thu Jun 22 10:14:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Hellstr=C3=B6m?= X-Patchwork-Id: 111619 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:7691:b0:132:7a2a:f0f2 with SMTP id e17csp685706rwg; Thu, 22 Jun 2023 04:21:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7S6WVm7uzLLrFCbdnScWwxZKlw2gBgyhm+oAiBSMIjhlE53PbR9JZi62QbwcIMTYYJW3d5 X-Received: by 2002:a17:90a:7641:b0:25b:ca75:8f44 with SMTP id s1-20020a17090a764100b0025bca758f44mr11565843pjl.4.1687432874393; Thu, 22 Jun 2023 04:21:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687432874; cv=none; d=google.com; s=arc-20160816; b=oHB5kaKHDo9YAbkjxktEs+okSO8Ux/rXZvzSOE0dPZrrfVCwCVdmjEtIDnmKqBbeI5 TUSJm1YRsYriRupYpVfSWhrbS5p1+nkfVEV0Z5YMlKlZmXjDqIkVSAWmMZCrYXsPxmYI +vkId39EDTvBE0ARtMFMtM22xfFtA4p+FxkQzxQ6A6KYQStpEeuh7Kt463Ebct+2YeYy G3NzwMrKMFBhdchhwO1GvvNi4ClOIlGXsU1YsBsP/9i0xDLN9jrWN+H6bIiCKZqHDzu+ MhtCSXPaxt/XZMKnLqQ1IcEt4wMdh65gdPTO9oU+UjJFsAovgg9z9w2/vMZHSom/WZm8 7RZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lJ9YzZAPtvNrpOvGcMNi33mVHyp0WxKwa+jGmWWQiaU=; b=uqFiVqOa8vYEJ/xdO5KuCFMwZ/WDKplD9Hhdqo2tOcqlpIppThGmzEQbn6+RGrbXBH ssgzVffKDs7I4Ih5xfDekPQATtmswmYyFcwRVCT4QWTKVpSUYDdYzbrgGxdAJY3HztYf PSvKbERHPN9DqE4tIBuOXRGoSsHgf27L8eM9fFGa5HbpKREafMHNaeUA8bUlFCqEzX2Q 5eQmkzCxZH2DCtxZq6xGOPkYMBI8i2vJi5R6YLXrbx/ax+ERELI3/3pUyn8Se9HQetHH uOTgGTi/z9996a+N3nOVzKpFY8CL1tqulcBGAywI8C5IYZudHq8/B5TLnWSGZP0+b85g LPhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LwMAQKvt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j14-20020a170902da8e00b001b414fae35csi1718087plx.497.2023.06.22.04.21.01; Thu, 22 Jun 2023 04:21:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LwMAQKvt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231285AbjFVKUg (ORCPT + 99 others); Thu, 22 Jun 2023 06:20:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231338AbjFVKUa (ORCPT ); Thu, 22 Jun 2023 06:20:30 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76347129; Thu, 22 Jun 2023 03:20:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687429229; x=1718965229; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=c8zPgWJY6SC59lOQdr8vPRntj39QqPiFfis3EjYD9Kg=; b=LwMAQKvtcZhuDOQH1R2vws66cc4M1XcmYLXMOxT3DEG6/VZa4+ukRVLs 74siwR0iFb616+6wuwKSbFqBaKkvmyWlsSnUSmWN0zv8Ug67X7DA/QerU OH2cgvaCGoIq0n3pdzLjkL0uqijAKUPb2Nt4+qWBzNooc6y0xV/R7i+Ma dJBHaMzM37c0GaVV88tqdvc63r/YgTOH9hT/4CyNe65/lUbsSfa9BVl1l cyfPeYOmbXTdewvUBLdDDIJdM114Awt5sJx9jHHNyDq+garW7vy31Y5aE L7USmQdeAej/8fDXw8QFqTtkgIxcu6JWS3NfcD2hzDzisaX75eiyv0qVF A==; X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="345182171" X-IronPort-AV: E=Sophos;i="6.00,263,1681196400"; d="scan'208";a="345182171" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2023 03:14:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="692193823" X-IronPort-AV: E=Sophos;i="6.00,263,1681196400"; d="scan'208";a="692193823" Received: from shari19x-mobl1.gar.corp.intel.com (HELO thellstr-mobl1.intel.com) ([10.249.254.173]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2023 03:14:42 -0700 From: =?utf-8?q?Thomas_Hellstr=C3=B6m?= To: intel-xe@lists.freedesktop.org Cc: =?utf-8?q?Thomas_Hellstr=C3=B6m?= , =?utf-8?q?Christian_K=C3=B6nig?= , =?utf-8?q?Chri?= =?utf-8?q?stian_K=C3=B6nig?= , Daniel Vetter , dri-devel@lists.freedesktop.org, stable@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] drm/ttm: Fix ttm_lru_bulk_move_pos_tail() Date: Thu, 22 Jun 2023 12:14:09 +0200 Message-Id: <20230622101412.78426-2-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230622101412.78426-1-thomas.hellstrom@linux.intel.com> References: <20230622101412.78426-1-thomas.hellstrom@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769401613428898367?= X-GMAIL-MSGID: =?utf-8?q?1769401613428898367?= The value of pos->first was not updated when the first resource of the range was moved. This could lead to errors like the one below. Fix this by updating pos->first when needed. <3> [218.963342] BUG: KASAN: null-ptr-deref in ttm_lru_bulk_move_del+0xc5/0x180 [ttm] <3> [218.963456] Read of size 8 at addr 0000000000000038 by task xe_evict/1529 <3> [218.963546] <3> [218.963566] CPU: 0 PID: 1529 Comm: xe_evict Not tainted 6.3.0-xe #1 <3> [218.963664] Hardware name: Intel Corporation Tiger Lake Client Platform/TigerLake H DDR4 SODIMM RVP, BIOS TGLSFWI1.R00.4064.A00.2102041619 02/04/2021 <3> [218.963841] Call Trace: <3> [218.963881] <3> [218.963915] dump_stack_lvl+0x64/0xb0 <3> [218.963976] print_report+0x3e5/0x600 <3> [218.964036] ? ttm_lru_bulk_move_del+0xc5/0x180 [ttm] <3> [218.964127] kasan_report+0x96/0xc0 <3> [218.964183] ? ttm_lru_bulk_move_del+0xc5/0x180 [ttm] <3> [218.964276] ttm_lru_bulk_move_del+0xc5/0x180 [ttm] <3> [218.964365] ttm_bo_set_bulk_move+0x92/0x140 [ttm] <3> [218.964454] xe_gem_object_close+0xc8/0x120 [xe] <3> [218.964675] ? __pfx_xe_gem_object_close+0x10/0x10 [xe] <3> [218.964908] ? drm_gem_object_handle_put_unlocked+0xc7/0x170 [drm] <3> [218.965071] drm_gem_object_release_handle+0x45/0x80 [drm] <3> [218.965220] ? __pfx_drm_gem_object_release_handle+0x10/0x10 [drm] <3> [218.965381] idr_for_each+0xc9/0x180 <3> [218.965437] ? __pfx_idr_for_each+0x10/0x10 <3> [218.965504] drm_gem_release+0x20/0x30 [drm] <3> [218.965637] drm_file_free.part.0+0x4cb/0x4f0 [drm] <3> [218.965778] ? drm_close_helper.isra.0+0xb7/0xe0 [drm] <3> [218.965921] drm_release_noglobal+0x49/0x90 [drm] <3> [218.966061] __fput+0x122/0x450 <3> [218.966115] task_work_run+0xfe/0x190 <3> [218.966175] ? __pfx_task_work_run+0x10/0x10 <3> [218.966239] ? do_raw_spin_unlock+0xa7/0x140 <3> [218.966308] do_exit+0x55f/0x1430 <3> [218.966364] ? __pfx_lock_release+0x10/0x10 <3> [218.966431] ? do_raw_spin_lock+0x11d/0x1e0 <3> [218.966498] ? __pfx_do_exit+0x10/0x10 <3> [218.966554] ? __pfx_do_raw_spin_lock+0x10/0x10 <3> [218.966625] ? mark_held_locks+0x24/0x90 <3> [218.966688] ? lockdep_hardirqs_on_prepare+0x136/0x210 <3> [218.966768] do_group_exit+0x68/0x110 <3> [218.966828] __x64_sys_exit_group+0x2c/0x30 <3> [218.966896] do_syscall_64+0x3c/0x90 <3> [218.966955] entry_SYSCALL_64_after_hwframe+0x72/0xdc <3> [218.967035] RIP: 0033:0x7f77b194f146 <3> [218.967094] Code: Unable to access opcode bytes at 0x7f77b194f11c. <3> [218.967174] RSP: 002b:00007ffc64791188 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7 <3> [218.967271] RAX: ffffffffffffffda RBX: 00007f77b1a548a0 RCX: 00007f77b194f146 <3> [218.967364] RDX: 0000000000000062 RSI: 000000000000003c RDI: 0000000000000062 <3> [218.967458] RBP: 0000000000000062 R08: 00000000000000e7 R09: ffffffffffffff78 <3> [218.967553] R10: 0000000000000058 R11: 0000000000000246 R12: 00007f77b1a548a0 <3> [218.967648] R13: 0000000000000003 R14: 00007f77b1a5d2e8 R15: 0000000000000000 <3> [218.967745] Fixes: fee2ede15542 ("drm/ttm: rework bulk move handling v5") Cc: "Christian König" Cc: "Christian König" Cc: Daniel Vetter Cc: dri-devel@lists.freedesktop.org Cc: # v5.19+ Link: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/411 Signed-off-by: Thomas Hellström --- drivers/gpu/drm/ttm/ttm_resource.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/ttm/ttm_resource.c b/drivers/gpu/drm/ttm/ttm_resource.c index 7333f7a87a2f..cb05e0a36576 100644 --- a/drivers/gpu/drm/ttm/ttm_resource.c +++ b/drivers/gpu/drm/ttm/ttm_resource.c @@ -86,6 +86,8 @@ static void ttm_lru_bulk_move_pos_tail(struct ttm_lru_bulk_move_pos *pos, struct ttm_resource *res) { if (pos->last != res) { + if (pos->first == res) + pos->first = list_next_entry(res, lru); list_move(&res->lru, &pos->last->lru); pos->last = res; } From patchwork Thu Jun 22 10:14:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Hellstr=C3=B6m?= X-Patchwork-Id: 111613 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4974537vqr; Thu, 22 Jun 2023 03:56:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6nKcnVBIH/7b7z/Dcoh2jPgQdjhmC8jeS5R/ovp2DREeAc15yLo6+Jua/H25t4fU7cDAOo X-Received: by 2002:a17:902:aa05:b0:1b6:82a5:13d5 with SMTP id be5-20020a170902aa0500b001b682a513d5mr6251747plb.9.1687431399851; Thu, 22 Jun 2023 03:56:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687431399; cv=none; d=google.com; s=arc-20160816; b=X4j5LGrOgsNGzOFLfVHJ1tRvoTH7LZ200stvZ/e2Pbqo+HQuMigUYH4bCYbzxrwiSj QS/v9jEna6vr+40/hWM+zYBkMyPWsZ6WULzSfowlg3IFkFsmuYqlRTSEVEkahAo52pRf CUMkHrQ2MYFmmsB9ZQqBgLwUbKI0qMWF7fLYiwySoji7u5bySORPoizIkUyb0fAzZ1Mw exbVuygI0k5btlclXBZiNDfIawhmkCVNtHngs6GcxpcrbnjA3x7dHA/R/Z9JmBKfLnR0 omKU8Ok6P4RIW2u/n4BtFkGSIWLmdd6h1Tuo6uDhHjYxuyq1tWc///A/DJWIWjFI/TjU OVtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=K5BQAqsI+CyKMqj56ZlQosX2NbPhttKqN4s7ZzMSgFM=; b=rl+WvflxzmrlCFsvjxltfRl4HAP2q5ThSABEK3Eag3AQJBobdurbLGVkyfpo+SV4Bd EXlxIzJ/TRVTkdHr8OcSzIafnOn+GSdTJrM+UBD+GN5vtmG/sYngLWx/DO5lzN7Nsomg eRjlLeyZnvs2PPjB/nVOhtQiZKqSmS7OIaZSICWlkJsbdqLgSx9OvwRz5aLT9fcqxibp QqAZ3lPXmbiG94edyA5ERarzX+06AJI6jefA6hnIfHZXYKp2xkX2S9ZLX2O4hiAzijaz R6L2o/W0pnwRJbyoEV1PiNlNYakhwN962rSVpAnMLCnw0RGotCJ3Ok+mEHVA8UQbhcq0 I2VQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NIdkWd5m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a9-20020a170902ee8900b001b1a2c14a48si5965868pld.141.2023.06.22.03.56.26; Thu, 22 Jun 2023 03:56:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NIdkWd5m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231442AbjFVKVC (ORCPT + 99 others); Thu, 22 Jun 2023 06:21:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231349AbjFVKUs (ORCPT ); Thu, 22 Jun 2023 06:20:48 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88853107; Thu, 22 Jun 2023 03:20:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687429244; x=1718965244; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8NHvqn83ZvFUkevP/WNZb8GNDLDy33tL9NNl4xX0eyI=; b=NIdkWd5mHZL9UY4htMstZhg8nR/Sgl3yH/KItcIy3yiylsK25OblDFTU 3tC4BVBdnqpLBKuHWW/IclNEYdUVe45vgR9hUAE/s2Oyp75T28sjAlJ7L k3E621IYdg1jdUyhirrG+HZsBXMtQSmh5OQowXxU/cgBZRIXsoCQs0Jr/ V7A2mWx1Ifpg39yeE0kNgDWsWCbccQS4zji0plXVoKVmaTMtB2EwzcwvO 4afdJ22qu2k/wRQVAK5L+k9cHg85i7B5lt8wLfhJXHJeJ9z7dIcSRzkdS QnKSDIrylaRtEt4HFVJ5YixW/0t5hHgHhCPB+Ys52vPRjQy7FHXQXpch8 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="345182274" X-IronPort-AV: E=Sophos;i="6.00,263,1681196400"; d="scan'208";a="345182274" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2023 03:14:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="692194052" X-IronPort-AV: E=Sophos;i="6.00,263,1681196400"; d="scan'208";a="692194052" Received: from shari19x-mobl1.gar.corp.intel.com (HELO thellstr-mobl1.intel.com) ([10.249.254.173]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2023 03:14:49 -0700 From: =?utf-8?q?Thomas_Hellstr=C3=B6m?= To: intel-xe@lists.freedesktop.org Cc: =?utf-8?q?Thomas_Hellstr=C3=B6m?= , =?utf-8?q?Christian_K=C3=B6nig?= , Roger He , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, Matthew Brost , linux-kernel@vger.kernel.org, =?utf-8?q?Christian_K=C3=B6nig?= Subject: [PATCH 2/4] drm/ttm: Don't shadow the operation context Date: Thu, 22 Jun 2023 12:14:10 +0200 Message-Id: <20230622101412.78426-3-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230622101412.78426-1-thomas.hellstrom@linux.intel.com> References: <20230622101412.78426-1-thomas.hellstrom@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769400067407673555?= X-GMAIL-MSGID: =?utf-8?q?1769400067407673555?= ttm_bo_swapout() shadows the ttm operation context which may cause major confusion in driver callbacks when swapping out !TTM_PL_SYSTEM memory. Fix this by reusing the operation context argument to ttm_bo_swapout(). Cc: "Christian König" Cc: Roger He Cc: Cc: Cc: # v4.16+ Fixes: dc947770cf34 ("drm/ttm: enable swapout for reserved BOs during allocation") Signed-off-by: Thomas Hellström Acked-by: Matthew Brost --- drivers/gpu/drm/ttm/ttm_bo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index bd5dae4d1624..615d30c4262d 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1154,7 +1154,6 @@ int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx, * Move to system cached */ if (bo->resource->mem_type != TTM_PL_SYSTEM) { - struct ttm_operation_ctx ctx = { false, false }; struct ttm_resource *evict_mem; struct ttm_place hop; @@ -1164,7 +1163,7 @@ int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx, if (unlikely(ret)) goto out; - ret = ttm_bo_handle_move_mem(bo, evict_mem, true, &ctx, &hop); + ret = ttm_bo_handle_move_mem(bo, evict_mem, true, ctx, &hop); if (unlikely(ret != 0)) { WARN(ret == -EMULTIHOP, "Unexpected multihop in swaput - likely driver bug.\n"); goto out; From patchwork Thu Jun 22 10:14:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Hellstr=C3=B6m?= X-Patchwork-Id: 111612 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4974306vqr; Thu, 22 Jun 2023 03:56:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ71RL4CMtMzElnuSjDKtHkCKNXaCNB/I51K/216s7hrV4yzsGFUkhx8WGdKQ+TJ2ATdnwUw X-Received: by 2002:a05:6358:57:b0:132:ce1f:6793 with SMTP id 23-20020a056358005700b00132ce1f6793mr1845710rwx.21.1687431365011; Thu, 22 Jun 2023 03:56:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687431364; cv=none; d=google.com; s=arc-20160816; b=j2ktXC+oZ9DuK836cIfvUM2IGk23sUDJvRHNELzbBK57nxOcse1/ShEHhM7oC6eDHR Icm7qSdsIRSDbKbx+caISw5qZMcrDXQmCkXvB2tU8iklx7A52YSndmJ9qqgAdYsOk50M pnN4zJ02vEG66/jRHel09ELbtN/EnspA3N7ncpqUeKMT5zVVlmRvncQ1IDuNzStxTpGx abgxZTZDLq5a1+34ZVdrwmiwIR8N7Ab2Cf84TNnfOaaeLtoKyvWH0KOTHQacTX4UCS1c uQ5LlSJ2x5hQEwpnrz+HPQkX9IYwvdD6hhmqpSHIhW+RGJgXJ7kjyGlokuVEBm5N2UKF JI4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GMMBu0aP34+bQADVdA4hm+8QHh6m3LblEeOkazTZokA=; b=G7QDQS1BgDGyKwJnCXfegiPGFAIUxkrOfVQh+HIGDpFzOdg+IZLkQiGXkzWCcZT2rE k7M5Nioa4eG68hScaxhPz5LL62bzmUXpr8lOjQDr1CWJrKVpyURgk+bEFvIzZRbYDb76 8263qv3qlTWfcWkKr/QMkQIuKJptJexXbdoYoTWrwRkmf9wRlDDfWXUN5H+lmfDigoxM VCELYGmTn9bi0+gAnLhawYpJlUJK2e1jTbMhBaMyLOpkUrYsqDOIuswA/suAPGQyIFVt lVyvSZ09H+ZQ0ReW6UX5zOV4G2cES+xBTkVEAENV1YYNd/RpSxatbwdj1DUtLUNcyzEj kDwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ilI2v4mb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 85-20020a630058000000b0053fe392ca3esi2523866pga.509.2023.06.22.03.55.38; Thu, 22 Jun 2023 03:56:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ilI2v4mb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231591AbjFVKVe (ORCPT + 99 others); Thu, 22 Jun 2023 06:21:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231480AbjFVKVK (ORCPT ); Thu, 22 Jun 2023 06:21:10 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F7331BFA; Thu, 22 Jun 2023 03:20:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687429260; x=1718965260; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=n9z5G10dFEpvSF9s/7DggC7dqDZF2o/8gaNO2uyYJ5k=; b=ilI2v4mbJns+prEp1eWu4qOZM+yntxQi92RzNyK4P2MtEAb6rakYsKXZ 8nVcIxkxUdY6XMKbK8nQLG94yYE5MIIxL8xub1Mo9XwxfHyFMbZcUrg1j eRyZz/Bt9h8yhZOAEfBQWHw7rXJvAOmhkWj2DzVrRA6OD00Nt3IIxP2QO K3FTVdGwIkWgYBRYz9qFvXiHHb3oVXYOPVByw6DzJDRL3wwW5FP8JP66Q vm8JgGi4m4nB7Wv6IjEn3JQcxJ/iyl7qmaH5sWtuZTk/ZW9RioMcgCWuq 3A6U8ftJBpBxHwyplccG9Rlquy7+I9HFnXUCnxaHHvzc1OOl/HQeb8QDm A==; X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="345182362" X-IronPort-AV: E=Sophos;i="6.00,263,1681196400"; d="scan'208";a="345182362" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2023 03:15:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="692194358" X-IronPort-AV: E=Sophos;i="6.00,263,1681196400"; d="scan'208";a="692194358" Received: from shari19x-mobl1.gar.corp.intel.com (HELO thellstr-mobl1.intel.com) ([10.249.254.173]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2023 03:14:59 -0700 From: =?utf-8?q?Thomas_Hellstr=C3=B6m?= To: intel-xe@lists.freedesktop.org Cc: =?utf-8?q?Thomas_Hellstr=C3=B6m?= , Andrey Grodzovsky , =?utf-8?q?Christian_K=C3=B6n?= =?utf-8?q?ig?= , Huang Rui , dri-devel@lists.freedesktop.org, stable@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?utf-8?q?Ch?= =?utf-8?q?ristian_K=C3=B6nig?= Subject: [PATCH 3/4] drm/ttm: Don't leak a resource on eviction error Date: Thu, 22 Jun 2023 12:14:11 +0200 Message-Id: <20230622101412.78426-4-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230622101412.78426-1-thomas.hellstrom@linux.intel.com> References: <20230622101412.78426-1-thomas.hellstrom@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769400030809047570?= X-GMAIL-MSGID: =?utf-8?q?1769400030809047570?= On eviction errors other than -EMULTIHOP we were leaking a resource. Fix. Fixes: 403797925768 ("drm/ttm: Fix multihop assert on eviction.") Cc: Andrey Grodzovsky Cc: Christian König Cc: Christian Koenig Cc: Huang Rui Cc: dri-devel@lists.freedesktop.org Cc: # v5.15+ Signed-off-by: Thomas Hellström Reviewed-by: Nirmoy Das --- drivers/gpu/drm/ttm/ttm_bo.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 615d30c4262d..89530f2a027f 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -462,14 +462,14 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, ret = ttm_bo_handle_move_mem(bo, evict_mem, true, ctx, &hop); if (ret == -EMULTIHOP) { ret = ttm_bo_bounce_temp_buffer(bo, &evict_mem, ctx, &hop); - if (ret) { - if (ret != -ERESTARTSYS && ret != -EINTR) - pr_err("Buffer eviction failed\n"); - ttm_resource_free(bo, &evict_mem); - goto out; - } - /* try and move to final place now. */ - goto bounce; + if (!ret) + /* try and move to final place now. */ + goto bounce; + } + if (ret) { + ttm_resource_free(bo, &evict_mem); + if (ret != -ERESTARTSYS && ret != -EINTR) + pr_err("Buffer eviction failed\n"); } out: return ret; From patchwork Thu Jun 22 10:14:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Hellstr=C3=B6m?= X-Patchwork-Id: 111607 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4963459vqr; Thu, 22 Jun 2023 03:30:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5zeI2RqCJddERRsAsu7+SmgwqZF5iTlYnuv5EiyZTRXrT+kvqlLuQSWJ9AjvAsHN6VDLWk X-Received: by 2002:a17:90a:b89:b0:260:ba1e:9590 with SMTP id 9-20020a17090a0b8900b00260ba1e9590mr11910432pjr.3.1687429840515; Thu, 22 Jun 2023 03:30:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687429840; cv=none; d=google.com; s=arc-20160816; b=vD/vWX1npztAlnk2iSUmODsoCrRV94NrtOiydoHhnRkYIt/xad5d9skKBeejyEBH5K rrcA7nwoA1IV01P4piQTf07lQz2q7fu2qcVtjO01TyDdK+Jy6c3tkXfGT9n/5Atx360x dDz+GibK3pazjcZxtqTQNjh8b5+1PwCMJtMiA4GNLzccUBfZTE4hK2NzuyGT3AN+LjEJ OK1pH5hEjmJnrribDmOy0HCKE+JBstEYo/eenNtlfvbE5bYcjyyMOxgKk7AnEvZkm87P uikCotfl7HWLriEaLIWgt3M4m0uLg0p5ISez21Mg9wdljsqo80x8ZIg+GpBtuTq/2lnZ +3Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=stnnhuRiGIkf1IdHs3mKNn5iztktXq7SwWqq6PQXHgo=; b=gHJ0Icws1lenM4SGNsEm86VMrarz4WO0eaCBaqnkRZ5MxubUxtgrCNd6bkUx65yduC 1p/VNXGOwEBF21BkGG0bqTy8IgWAHvwTRpxT2wDMtOPQn9r2lh6O2l6tb+gw+NHtiXPd hI1JWZQSUqoOW/nDv6+bqNG1tUdF5iFWP8XC+ttSOq5tyTdbAAc/pd+AC66GyOvo5lzq 9PCnr04sTFdLdD7M0p8ASlmz/kFx5dUMMaMBu/eXeAcoI5j0o1S5G+Vo2lWzFKyIi9t9 HQFfuSs8MEsPVorMtdmrYefvYuox3aKU4ugK5Y5ooNcHrw2H7F90MqC2fNxu0+hsz1u+ Ps9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RuQakajh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id na15-20020a17090b4c0f00b0025bf2858c1dsi6975235pjb.106.2023.06.22.03.30.26; Thu, 22 Jun 2023 03:30:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RuQakajh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231502AbjFVKVr (ORCPT + 99 others); Thu, 22 Jun 2023 06:21:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231492AbjFVKVO (ORCPT ); Thu, 22 Jun 2023 06:21:14 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD5291FDC; Thu, 22 Jun 2023 03:21:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687429262; x=1718965262; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nsBrKyprDyQqXkX1mcuTIRsLusoyhrCBKqlpyi/2hsM=; b=RuQakajhlC/z47dEopc3dERRKZqhayFPutDZOmVx0idhQQPCkAhu3Qs1 3LCjsgR0QokJ//T4U519g12VXVK+B3dkEulJ//boUvxEDZAKwDmad/MNY rR1d4Glt5W8Mwu+nuJM37uZ3WMj4nqssphgHcCIGnAAwDEPahBHIuw97q A9Cl+lhOEibBIN6CQmCF0J06Ra+f1eprH4Sm51y1kD8tCx4mc8ODos1+S yiC1ZjNxwob4aZyMREao9xiZByV6QEnj0qxkR8WXkoG4u+mnghzSst8/D SuQyig1+/R81hwtpiqeUz4ZpBfB1JiBRlog00FzSzZtvi6QJYY+KgsRCn g==; X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="345182396" X-IronPort-AV: E=Sophos;i="6.00,263,1681196400"; d="scan'208";a="345182396" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2023 03:15:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="692194650" X-IronPort-AV: E=Sophos;i="6.00,263,1681196400"; d="scan'208";a="692194650" Received: from shari19x-mobl1.gar.corp.intel.com (HELO thellstr-mobl1.intel.com) ([10.249.254.173]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2023 03:15:07 -0700 From: =?utf-8?q?Thomas_Hellstr=C3=B6m?= To: intel-xe@lists.freedesktop.org Cc: =?utf-8?q?Thomas_Hellstr=C3=B6m?= , =?utf-8?q?Christian_K=C3=B6nig?= , =?utf-8?q?Chri?= =?utf-8?q?stian_K=C3=B6nig?= , dri-devel@lists.freedesktop.org, stable@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] drm/ttm: Don't leak a resource on swapout move error Date: Thu, 22 Jun 2023 12:14:12 +0200 Message-Id: <20230622101412.78426-5-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230622101412.78426-1-thomas.hellstrom@linux.intel.com> References: <20230622101412.78426-1-thomas.hellstrom@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769398432329870865?= X-GMAIL-MSGID: =?utf-8?q?1769398432329870865?= If moving the bo to system for swapout failed, we were leaking a resource. Fix. Fixes: bfa3357ef9ab ("drm/ttm: allocate resource object instead of embedding it v2") Cc: Christian König Cc: "Christian König" Cc: dri-devel@lists.freedesktop.org Cc: # v5.14+ Signed-off-by: Thomas Hellström Reviewed-by: Nirmoy Das Reviewed-by: Andi Shyti --- drivers/gpu/drm/ttm/ttm_bo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 89530f2a027f..d737ddd7f4c0 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1166,6 +1166,7 @@ int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx, ret = ttm_bo_handle_move_mem(bo, evict_mem, true, ctx, &hop); if (unlikely(ret != 0)) { WARN(ret == -EMULTIHOP, "Unexpected multihop in swaput - likely driver bug.\n"); + ttm_resource_free(bo, &evict_mem); goto out; } }