From patchwork Mon Jun 26 09:14:47 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: 112827 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7359965vqr; Mon, 26 Jun 2023 02:48:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5hrHzzAp92pODau/VX7Y79e9SmrQrZugLFCLSrNZNiK4/EvDRwAHi+GAPHV8U8bAz7WwNa X-Received: by 2002:aa7:c981:0:b0:51b:fcf6:8330 with SMTP id c1-20020aa7c981000000b0051bfcf68330mr6902363edt.7.1687772914524; Mon, 26 Jun 2023 02:48:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687772914; cv=none; d=google.com; s=arc-20160816; b=EPp52LXrPdtoBSRIJjctIUbZkpDE50judhqaUp9SzOhUy9Psj6u/QKBZBCwTCKsF6n hkLG0Bxat2ALqmbX9AGvkN2vmeUym4aOljs9915042XbF2BWClLbjdXoEuVQluoINBvR /O6AwRHiJI4RhghkCIDXnASq58JS3MqqP61GA/+FFJPlWDX+tZT95wVYoLRQ9TRrQGkU eAvl8n5wthO7DgBKnUQAMVqIPKewErtRKtKw+sjzugIsh87Xd74OZFFksbafYbJWjWNT 3zEXDLaq6ibEu87Cn4bYzxwSdF7Kt6vuL/wMivjj9iSbmi+4PV81nHF3uS+MVtAEpcRe 7Epw== 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=; fh=rpr6MNoBxGUz5+q/gN0BnMN7GJG7wmfHoTmn5BgGmmk=; b=URLcH8yxWao+cEfyI5QGn0aH4dx2Nxu4LNYf4NT+6frfyq/E3nS4tV43LpkkXd5o/3 bt1sNxUNlHH7Fe9o/W3JlTMVP3vFagq4GNypjuGjzAmG+DDrWBZ5woqNDrybiIR1h3wM 9+5HUWCvIlJjwpWWsWKWndfntICgef6MCN833T4dqAcYrs/2H+3gs+XIc2Cp0dJxZ/Dc +MCZhgAIuLA7aDWEJPmZKbDygRv6tDYCfF0Fipp01AB6HFCgLpO1PJElasXoBeLKa1zR tMqIHFpryo5WbZsDndM2xS71XXxk+xP6gIoI9C4RlqOXP3OhlSpNG6X2W/SGwn+RqvQl 0EaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="ZcMZON/+"; 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 g18-20020a056402181200b0051d96a5ff44si1303296edy.299.2023.06.26.02.48.11; Mon, 26 Jun 2023 02:48:34 -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="ZcMZON/+"; 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 S230051AbjFZJTn (ORCPT + 99 others); Mon, 26 Jun 2023 05:19:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229574AbjFZJTK (ORCPT ); Mon, 26 Jun 2023 05:19:10 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9E2D2962; Mon, 26 Jun 2023 02:16:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687770992; x=1719306992; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=c8zPgWJY6SC59lOQdr8vPRntj39QqPiFfis3EjYD9Kg=; b=ZcMZON/+qj1pnMFopS7bG7uQmgjjaIGSPjEjo+S3ZEPh0E8JhCsdWQXn Dr5DNtBK7iKJU3/UTuBHTpVWsKvS9d2a38Yxg29YoBoLd+PY5F72w7g/7 a2bC6Gz2lBD2pLsGyzhWBrT+cLNfMowgWbsKRYeO3bi2T3EiVv4XPpybR L9ahOi82wFIR6JyISWS6NHhjd+59wWmmrM8hBYaIPY+Jn+vN4p6LaMrbr YUNv4nTtpQjdjtqhgN096oic3TaXZZ9h68Nt/Rq9wrWHzmljPJJ0jPBAT ntipHYL0gxFX7vyR1UQYjBaMR2vuRwSIYH7vuSWnL6MQiVfOcIS07/MvL w==; X-IronPort-AV: E=McAfee;i="6600,9927,10752"; a="345974083" X-IronPort-AV: E=Sophos;i="6.01,159,1684825200"; d="scan'208";a="345974083" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2023 02:15:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10752"; a="781357733" X-IronPort-AV: E=Sophos;i="6.01,159,1684825200"; d="scan'208";a="781357733" Received: from ettammin-mobl1.ger.corp.intel.com (HELO thellstr-mobl1.intel.com) ([10.249.254.105]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2023 02:15:02 -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, "Andi Shyti" Subject: [PATCH v2 1/4] drm/ttm: Fix ttm_lru_bulk_move_pos_tail() Date: Mon, 26 Jun 2023 11:14:47 +0200 Message-Id: <20230626091450.14757-2-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230626091450.14757-1-thomas.hellstrom@linux.intel.com> References: <20230626091450.14757-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?1769758171732701292?= X-GMAIL-MSGID: =?utf-8?q?1769758171732701292?= 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 Mon Jun 26 09:14:48 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: 112818 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7356302vqr; Mon, 26 Jun 2023 02:39:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6BnLOTJIDZ3R2dI1YVhC7Hnu1bHq9zcM7zXWAUs7/S31ntu/NvQbv+cYMSqa929QNBafv7 X-Received: by 2002:a17:907:980e:b0:98c:e0b5:f0cc with SMTP id ji14-20020a170907980e00b0098ce0b5f0ccmr10521360ejc.75.1687772351052; Mon, 26 Jun 2023 02:39:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687772351; cv=none; d=google.com; s=arc-20160816; b=OSCaAXrm2+x+HsMS5jKW8bOkHB3i7TYigMJVFxh9wIT1YFtj3Xof2ljMuOPkjoJxAk Rd9bIvIkowCznNmor88vJ+hDNNXOEeN391XJ5TjDXBBBo+oDCdlJh5C9xP0n73lIyfTf iKPgylzflNG1DiaBmGG4wv4+FyPdETSGqTntidKuy7UQbPOrqNhV+6vrXKkoyEYAN+5v +Xu/wsUp1sbJ9SjPdntuAyaLw3XqbDGouO1Uvd9hxFyzRxgEqRBU/8O+IHTQMk1RlsZM Af9nXxfQFlBv3OuppOrNkMzOtiBRG5bM5VB+5qIdkvD41E4ip+RjkScPtjHKSHJBpPKY o/QQ== 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=; fh=/8m5jrE18s7zSIDHLxEcBtnkE7/lq4KLyR0Tz1SuJlw=; b=ExQ9tFlJ1bnD5dC450gzFPNcX1rHB3D7fgtnYUhIk7y9G0kSB/vmII85GYnIlya0C1 +D+lgTm7IN3wWWKJCLfG1U8+V8FjouYfYCpX32dPevPwpR2ujtCcsHQVk+qZpfiIIXsk mFBoeb472c40OzMTvglCcTPRhucf+o2iuY6IofvaVYqIwQPGPowLQIwDPF91wH1G/JhN ZDEtwGEI4dVEf+ZY3rk7vBSppgYp1/ucHrmnv7w/6orF4nQ9tHADvZVXx0MjfvakbIny 0XIuPNjQ2lyrfnwXR2WGg000aGE+UHiGRXpSAaJRalrJN8TT1RBDk4jVeZa0/IxLRT+7 fZVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=aLwyWWsX; 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 t16-20020a170906269000b00988f9dddfefsi2666643ejc.156.2023.06.26.02.38.46; Mon, 26 Jun 2023 02:39:11 -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=aLwyWWsX; 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 S229571AbjFZJUO (ORCPT + 99 others); Mon, 26 Jun 2023 05:20:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229684AbjFZJTK (ORCPT ); Mon, 26 Jun 2023 05:19:10 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C60592D4A; Mon, 26 Jun 2023 02:16:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687770993; x=1719306993; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8NHvqn83ZvFUkevP/WNZb8GNDLDy33tL9NNl4xX0eyI=; b=aLwyWWsX615uznWBrBPf7iuNTGpGDJFApLlhktL8YxXs6c+YwpBaLtnh yqQObHa7R6/FYVSYLI5KqgcYYFUkGrTwWVgR/5Micc37PphTt6lgbOgVv JZNSNnbrngYlw6tss+HhbbjCyioMlC7aXVVnky/akpEqkRm++AAIr8HMW 2ovVf0MooA641iw6725vfbQ1hzgGRBRb3xlLdoereYzk4He6erzOg0VPJ QzoSPZGs1rHNGdLZrSckq+Dp+qFD3uu2daxJDa5J602CluME+eqpiJ0v7 +E1dAPuEDg69AQyR73s7BjxRUutqEM9LfTgrGOYtklfwXpAbwjKXvQSzn g==; X-IronPort-AV: E=McAfee;i="6600,9927,10752"; a="345974096" X-IronPort-AV: E=Sophos;i="6.01,159,1684825200"; d="scan'208";a="345974096" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2023 02:15:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10752"; a="781357775" X-IronPort-AV: E=Sophos;i="6.01,159,1684825200"; d="scan'208";a="781357775" Received: from ettammin-mobl1.ger.corp.intel.com (HELO thellstr-mobl1.intel.com) ([10.249.254.105]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2023 02:15:05 -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?= , "Andi Shyti" Subject: [PATCH v2 2/4] drm/ttm: Don't shadow the operation context Date: Mon, 26 Jun 2023 11:14:48 +0200 Message-Id: <20230626091450.14757-3-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230626091450.14757-1-thomas.hellstrom@linux.intel.com> References: <20230626091450.14757-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?1769757581229610323?= X-GMAIL-MSGID: =?utf-8?q?1769757581229610323?= 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 Mon Jun 26 09:14:49 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: 112823 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7357419vqr; Mon, 26 Jun 2023 02:42:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5xZcxxuFZ2q21j1KHexQ/K6nyWDqXsAmS71z+iM/EKpSn3N7FKncxF7IYiEgPGA/DT1dcl X-Received: by 2002:a17:907:a42c:b0:991:bf04:204f with SMTP id sg44-20020a170907a42c00b00991bf04204fmr1823360ejc.60.1687772531132; Mon, 26 Jun 2023 02:42:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687772531; cv=none; d=google.com; s=arc-20160816; b=XSS9zTAnEpsln1yBtQMmw80/eiK5ibLL19ddK1sXT3iv78jvJz7TXV8Vp/70Xwvamn 4LzhtnzYS92BMK03wmmRUyvikn+drAxxHi/dVAlVutpGLCegBh9oPJi+m1K5YXbGBzGu NkBHbTsggX1M+pWsD3AfDBgrjCsVv+5dRWnGo/Kvggoby8yRcIrUHfeRH3oESUwGKboh /EJh+pNvydmM1VqbJL+MVhuQlkLiotiBnk2N6WWSiK6OVIU6Oci/YMSBuzqcAQ1rmPES a90m2j9lKueRtIsGm/gLMYNzZb4Espz3ES4fspt348uNyS7i+invLuN7D0n5PL8pOhKW Zaww== 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=x8w44iVisCnGuGKG5A//wQ13tU6Qvse2fAraC525Qdc=; fh=qd3gWIdUEwhNRA8b72UYkBL7xzCtwpDppznwnho+NWQ=; b=aXnxa0Gz13JvTkVh+jjf3bnNHBAKnH/vOQVAKlv3UD3GTDpeMXvmWj707doRIVLaFV 1Pc7GkpvDqShf2XKHoOhFaWyBMBIEANRxjU8S1mVUAd+K+PDoEZ9uAlxTMzqx61mMo3G 0KzmcLvzH3vu1aXNiF7JnT24z28i0KjOz3LhzfOG4LG0nnCcw4uMekBJcDJLv1Ll+gzb JT27O4R1h3AvFpkNBkzcyXlkSpaLmPdmmwoigep4mmngYg4EPmQ44wBUJgdtdLZ4Ogsg 08TaEjs+NtQEHC0nsfBMwwZp7BTRQP5Mr6jedRhDKkN7CLl9oRP+DkiUOTv4QSfud2NM M27Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=nhqftDRu; 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 ox27-20020a170907101b00b0098847dc1ce3si2607929ejb.952.2023.06.26.02.41.47; Mon, 26 Jun 2023 02:42:11 -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=nhqftDRu; 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 S229698AbjFZJUQ (ORCPT + 99 others); Mon, 26 Jun 2023 05:20:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229781AbjFZJTQ (ORCPT ); Mon, 26 Jun 2023 05:19:16 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98B972D64; Mon, 26 Jun 2023 02:16:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687770997; x=1719306997; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wfgL9qGgPwrycb+pq8eWWsXWs7vH+aYL2R+tvWwCzhA=; b=nhqftDRufdyEpvUJq3phJF8b3Z0bOW6K9tqsFoYeD7fTH3RFkZR++1Wu Jyzp24wH6qsEf+7bZ7UCWy4nZoENM+qTFXp/jIL948ULoWiQFGdT6bnJE DoyeB/mC1PdzJueNw66WRucHfxkjkBSmFZwxDyJ/S4ZzPeDTaT8YZbMiu t1B1HHGnhRUxSwMXqqjHxYtJJtw1vfOEmcVv8yoNo5bbfNJ7mFTXylAQ1 NFth27kydNDb9F1J9G/HxhuAYCSgVhp2ofxI0ARP1Agab7jhgZVFzrarh FMTKMCIkb+lnh9gEYjQiDZ9qNFkTK4zCabXVd0r4Q76ekNFf/Wh/UmLsB g==; X-IronPort-AV: E=McAfee;i="6600,9927,10752"; a="345974121" X-IronPort-AV: E=Sophos;i="6.01,159,1684825200"; d="scan'208";a="345974121" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2023 02:15:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10752"; a="781357795" X-IronPort-AV: E=Sophos;i="6.01,159,1684825200"; d="scan'208";a="781357795" Received: from ettammin-mobl1.ger.corp.intel.com (HELO thellstr-mobl1.intel.com) ([10.249.254.105]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2023 02:15:08 -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, Nirmoy Das , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?utf-8?q?Christian_K=C3=B6nig?= , "Andi Shyti" Subject: [PATCH v2 3/4] drm/ttm: Don't leak a resource on eviction error Date: Mon, 26 Jun 2023 11:14:49 +0200 Message-Id: <20230626091450.14757-4-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230626091450.14757-1-thomas.hellstrom@linux.intel.com> References: <20230626091450.14757-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?1769757769652124025?= X-GMAIL-MSGID: =?utf-8?q?1769757769652124025?= On eviction errors other than -EMULTIHOP we were leaking a resource. Fix. v2: - Avoid yet another goto (Andi Shyti) 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 #v1 Reviewed-by: Andi Shyti Reviewed-by: Christian König --- drivers/gpu/drm/ttm/ttm_bo.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 615d30c4262d..c0e3bbd21d3d 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -458,18 +458,18 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, goto out; } -bounce: - ret = ttm_bo_handle_move_mem(bo, evict_mem, true, ctx, &hop); - if (ret == -EMULTIHOP) { + do { + ret = ttm_bo_handle_move_mem(bo, evict_mem, true, ctx, &hop); + if (ret != -EMULTIHOP) + break; + 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; + } while (!ret); + + if (ret) { + ttm_resource_free(bo, &evict_mem); + if (ret != -ERESTARTSYS && ret != -EINTR) + pr_err("Buffer eviction failed\n"); } out: return ret; From patchwork Mon Jun 26 09:14:50 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: 112829 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7370284vqr; Mon, 26 Jun 2023 03:11:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5dhV6D9z3rK6Id+V/fNVv93tRhAz9Fp+t0Ow9Cm4F7r29JFP0dvnFwlvEL4ZloIKnFFJFn X-Received: by 2002:a17:902:ecca:b0:1ac:7245:ba5a with SMTP id a10-20020a170902ecca00b001ac7245ba5amr2693976plh.61.1687774298600; Mon, 26 Jun 2023 03:11:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687774298; cv=none; d=google.com; s=arc-20160816; b=Gr+VwR3WYtOMgomK0VjyM9yI0O6Kjp65OgVsj7y7WqeS+CfLHzYMHyxolwK6NkoDzb cyXQ6jt9dkTqXJZ1oM7LKfMtqfWAmOrNeiaV9gKJnRf16i2kTcphlxL1Z1YbmSkNCCz7 qlx4T6Odh/5jVCwIqPn4QKbv9U3/j9EJOLmJHKkuhiBaiXp9oimHY1PixwJxEm6t3lNX MqpLcqg7bfODvMumDI1OWnQ+332syimqXxPzPF2Ead/rG80UgMy6fJydI+czttFxSOsV XpTHz4I+UNdp/vy9SzaR91aoLvOmC9ZZaHiLVbqij09GeiKpAD0YUtwtfSV1JVqMNEet NdbA== 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=TArM3Ko4khSy5RhyHM6+G8UV7Jl9cDJVDj9qUdwG0h4=; fh=/VBxUd0WYMkn8ad4RYtzu99JQts7xVVOOzOERKSPMhE=; b=XVP6MMxjRt6KZhTIHgOOMkrI9+NtVgQZnb/Sd4Fb2rt3PcTtWyTiYc6KoMB1PqAwBG AXWH1P8mbU0ka00NYXEwYYBrOIy2WukK1BPtJw0Ye+MNepKzaTlXc8w0mOxIUJJozEhw giqUdmz4hvQiMtNf77gGq0jTt6a3Cenh4yDDNhNsdUGYl34S2UR811eOVt50TL3pkhHi Nzq/YtEDG42EiQBnIg3xJuI8k8FJCqcK1tx4tFcVbJWq3fXeTgtkPRmYG6V/i6EfLD96 WdmBsesCdPVGo6Mi+Gjou5BGpj/vAnfMaRDETFbV9Zj+wqs+lK5+R6bQLkrUNmuLYSw4 avZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=QSk1xxcr; 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 c10-20020a170902b68a00b001b053ea9b8dsi4388653pls.570.2023.06.26.03.11.23; Mon, 26 Jun 2023 03:11:38 -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=QSk1xxcr; 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 S229757AbjFZJUZ (ORCPT + 99 others); Mon, 26 Jun 2023 05:20:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229904AbjFZJTV (ORCPT ); Mon, 26 Jun 2023 05:19:21 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBB5A3C1E; Mon, 26 Jun 2023 02:16: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=1687771002; x=1719307002; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=63Y0TPem7frMMGW3N/FgR3d/cjkXyqdp+LijdVM6QYA=; b=QSk1xxcr2jgUsY9vkBuh/5wj0nYFU5HO9HZ5QCf5OYH/THgNy1QCFxmC ys+fH+YyfbQdF1ZrfpO9FwrToj+l9K9aOTs9v3y5iB/lxajcMo1ImuSh7 nx5QZhw9ndYWQe6YIekKezLlzQlUbR00vvzzOE+5bIl3OaGDdpuvtaK2x D+z5DZsNCfKkOT6TA1g3cyrBqukGD6EVb2+mp6A8kRmNzoYxCYcNceYKa 0MHuOotKKjK+iDSAfjX9Y+IcPKIqvRk43tpUXBG7I4iPRm3eKXdSibx5p HoKwqaO7XeRBZ3UeK6JCZNk3m980qi5wM3yIJpSg8GSiYd0oCdtwKPzTz Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10752"; a="345974135" X-IronPort-AV: E=Sophos;i="6.01,159,1684825200"; d="scan'208";a="345974135" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2023 02:15:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10752"; a="781357838" X-IronPort-AV: E=Sophos;i="6.01,159,1684825200"; d="scan'208";a="781357838" Received: from ettammin-mobl1.ger.corp.intel.com (HELO thellstr-mobl1.intel.com) ([10.249.254.105]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2023 02:15:11 -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, Nirmoy Das , Andi Shyti , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/4] drm/ttm: Don't leak a resource on swapout move error Date: Mon, 26 Jun 2023 11:14:50 +0200 Message-Id: <20230626091450.14757-5-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230626091450.14757-1-thomas.hellstrom@linux.intel.com> References: <20230626091450.14757-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?1769759622680157745?= X-GMAIL-MSGID: =?utf-8?q?1769759622680157745?= 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 Reviewed-by: Christian König --- 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 c0e3bbd21d3d..d9a8f227f310 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; } }