From nobody Sun Dec 14 22:15:30 2025 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 023621AF0B5 for ; Wed, 26 Mar 2025 12:52:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742993537; cv=none; b=DoL4HJAAblOxYxuEiPZhbYL53saAequhAEefZuLt3F3jKPrIYe7VSTjk6b6spWBHgHC1xxyoU8pHho2Ad/cc34/VD7pdAGnSL4sZH0kGxaL3JmUhsXO6a1Tj/UoBwOKrTwkzvt+8iZZafx/CW8LIAQGFk61HKc2BHaCmQqVoCFU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742993537; c=relaxed/simple; bh=coJzraIUr3q0/sNaWUpvIGWA5orSMcqzDm4nMpzRA5Y=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=WdPwlXZjaFflIcyljy6bcMA3xa5C3EZ0Hgd7KvfnIbCFi26EaZtUicLzInqs1FKNQ4C1ADgojakZb1j4Qr4R9jaRpb6tSS6shO7qxAVbIW0xRNFa/2G67R0n+MqII6v3IjG3Rsm2QuOOh3DIUllJxEi+qtgYPPpnejYl+THc2lI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Bvs15PUe; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Bvs15PUe" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-43d0c18e84eso31021935e9.3 for ; Wed, 26 Mar 2025 05:52:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742993533; x=1743598333; darn=vger.kernel.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=VwyiSIykfOMTFP9Glhet0fsRm/PA8s+JphWFgIm15/U=; b=Bvs15PUexVSjTwYhRAW87aPG7Srqgawosvt0iGu2alKRWpJvvsr3Z68ce/eshfHUMe 3CAN1B/hx7XT/0BKCKhjJkYyI/MxtvzYyIOLQsX7XQPCUxtbd3fP9EEsK3UziKWVt+wl EDA+VR6kiyvj1nLWetW6ZfESGTIap1gHR+c/wGVarQPfFUbKUxMwVemof7TU2lFrYrim DaQkxC5Aj5tH6ULPRrVGxai9LYM5CKxrmNYHfJhcOSVKXrAWOOlnATmXpASaeNisnnjh 2WBsJK75toQ5BZGKdfskbrCztOk8Myf+b0Z8cBy2vEQh/vhEDGHhaElfJUpyCARazccl H+2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742993533; x=1743598333; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VwyiSIykfOMTFP9Glhet0fsRm/PA8s+JphWFgIm15/U=; b=QbKgrG/mjKRerZPrNIOb5OPrje3OlnhaJkxJbQA+r4GWaBn4PucNxVmQRf1TnY3zkQ 1tyvgV43v1pKmgZ1DdocubRPjcmjDGZNG3lB4G9kl7cQceGQaaTs8AgNmEZ8dALYo/90 Oe/IOK9+k/qVRdJLWLsy3e/379i3NiqIA8RWEhNb6M2lqea4Eb+2vIwU1/6XMHqfAjMl kfSpRm78AltTD1A4ULU2t7yK7fPE0PRW7leoWhZCRKHDTarmbqtB3l17wT8QWGXQ9IpP TzRKEolXp3gmwVGamP849SnLwgQwOT0awDDxT2n4r7k1MH2qv5/QHYjZ09vR6Sndkiqf b19g== X-Forwarded-Encrypted: i=1; AJvYcCW5da1c0aQ/S65X5rWXoOkdqSzL/VphaJ/LQfMaJzNq22Q6oMktX0fWAYf8d69w86f/Bcb0R1hywaAQj8Y=@vger.kernel.org X-Gm-Message-State: AOJu0YzezMjQZm29ZzLUiRQYgNHX41sHBEOEYpM7AkxdZZhtCOF4WSG2 DWYLkL083KMgbUDr8g0Z7CZmzKx5AsY3Oj1MXlz9WPRoogdb/YgZ X-Gm-Gg: ASbGncujZJ8xpANt7sXCsywUsvhNDpw4v69ic6vb1Es2GeD05EtKaiheqa23BT3DkbW XDfPbuBXgBTJ+YJ5HveLv88rTqQlRfLwxugdt7NUWe7A+rfuuFEFbhgnzsMSeVpt4q37IlYSoB1 ZZd17tNap+Zr1vXLxu0F4BC/5ugjwXYmnlmHLKa0i+47rcDcbB61maqV3X2v/pc/+kGMQGM/r9w LEB19/Wuz1NLq9AH2Uvzd6O/KP60Myp3sMPX7xfr2jXSS60FKo7jLfZh/N2RbLMaAkSr9wDmFfe NhYF5d5XugMc5LJp+SInhvktJKxS9VSjAC8+qTPD6jwtei/N09ewBK1y X-Google-Smtp-Source: AGHT+IGcTlIycYodg67QYlVQjgNPDS68QFaDqKlEuvleRpjGOkZDEWYNZY5cUwYW2nHxjKcverj1vw== X-Received: by 2002:a05:600c:5488:b0:43d:db5:7af8 with SMTP id 5b1f17b1804b1-43d50a31981mr155787395e9.21.1742993532805; Wed, 26 Mar 2025 05:52:12 -0700 (PDT) Received: from debian.local ([2a0a:ef40:4d4:f101:e41a:977a:f788:910f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d82dedc88sm1252805e9.1.2025.03.26.05.52.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Mar 2025 05:52:12 -0700 (PDT) Date: Wed, 26 Mar 2025 12:52:10 +0000 From: Chris Bainbridge To: Danilo Krummrich Cc: Christian =?iso-8859-1?Q?K=F6nig?= , nouveau@lists.freedesktop.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, lyude@redhat.com, sumit.semwal@linaro.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] drm/nouveau: prime: fix ttm_bo_delayed_delete oops Message-ID: References: <00e4d9c4-ecfc-4784-b603-12db04cda806@amd.com> <1f4a534f-8883-4793-b191-60c2773f6217@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: Content-Type: text/plain; charset="utf-8" Fix an oops in ttm_bo_delayed_delete which results from dererencing a dangling pointer: Oops: general protection fault, probably for non-canonical address 0x6b6b6b= 6b6b6b6b7b: 0000 [#1] PREEMPT SMP CPU: 4 UID: 0 PID: 1082 Comm: kworker/u65:2 Not tainted 6.14.0-rc4-00267-g5= 05460b44513-dirty #216 Hardware name: LENOVO 82N6/LNVNB161216, BIOS GKCN65WW 01/16/2024 Workqueue: ttm ttm_bo_delayed_delete [ttm] RIP: 0010:dma_resv_iter_first_unlocked+0x55/0x290 Code: 31 f6 48 c7 c7 00 2b fa aa e8 97 bd 52 ff e8 a2 c1 53 00 5a 85 c0 74 = 48 e9 88 01 00 00 4c 89 63 20 4d 85 e4 0f 84 30 01 00 00 <41> 8b 44 24 10 c= 6 43 2c 01 48 89 df 89 43 28 e8 97 fd ff ff 4c 8b RSP: 0018:ffffbf9383473d60 EFLAGS: 00010202 RAX: 0000000000000001 RBX: ffffbf9383473d88 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000 RBP: ffffbf9383473d78 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 6b6b6b6b6b6b6b6b R13: ffffa003bbf78580 R14: ffffa003a6728040 R15: 00000000000383cc FS: 0000000000000000(0000) GS:ffffa00991c00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000758348024dd0 CR3: 000000012c259000 CR4: 0000000000f50ef0 PKRU: 55555554 Call Trace: ? __die_body.cold+0x19/0x26 ? die_addr+0x3d/0x70 ? exc_general_protection+0x159/0x460 ? asm_exc_general_protection+0x27/0x30 ? dma_resv_iter_first_unlocked+0x55/0x290 dma_resv_wait_timeout+0x56/0x100 ttm_bo_delayed_delete+0x69/0xb0 [ttm] process_one_work+0x217/0x5c0 worker_thread+0x1c8/0x3d0 ? apply_wqattrs_cleanup.part.0+0xc0/0xc0 kthread+0x10b/0x240 ? kthreads_online_cpu+0x140/0x140 ret_from_fork+0x40/0x70 ? kthreads_online_cpu+0x140/0x140 ret_from_fork_asm+0x11/0x20 The cause of this is: - drm_prime_gem_destroy calls dma_buf_put(dma_buf) which releases the reference to the shared dma_buf. The reference count is 0, so the dma_buf is destroyed, which in turn decrements the corresponding amdgpu_bo reference count to 0, and the amdgpu_bo is destroyed - calling drm_gem_object_release then dma_resv_fini (which destroys the reservation object), then finally freeing the amdgpu_bo. - nouveau_bo obj->bo.base.resv is now a dangling pointer to the memory formerly allocated to the amdgpu_bo. - nouveau_gem_object_del calls ttm_bo_put(&nvbo->bo) which calls ttm_bo_release, which schedules ttm_bo_delayed_delete. - ttm_bo_delayed_delete runs and dereferences the dangling resv pointer, resulting in a general protection fault. Fix this by moving the drm_prime_gem_destroy call from nouveau_gem_object_del to nouveau_bo_del_ttm. This ensures that it will be run after ttm_bo_delayed_delete. Signed-off-by: Chris Bainbridge Suggested-by: Christian K=C3=B6nig Fixes: 22b33e8ed0e3 ("22b33e8ed0e3nouveau: add PRIME support") Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3937 Cc: --- drivers/gpu/drm/nouveau/nouveau_bo.c | 3 +++ drivers/gpu/drm/nouveau/nouveau_gem.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau= /nouveau_bo.c index db961eade225..2016c1e7242f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -144,6 +144,9 @@ nouveau_bo_del_ttm(struct ttm_buffer_object *bo) nouveau_bo_del_io_reserve_lru(bo); nv10_bo_put_tile_region(dev, nvbo->tile, NULL); =20 + if (bo->base.import_attach) + drm_prime_gem_destroy(&bo->base, bo->sg); + /* * If nouveau_bo_new() allocated this buffer, the GEM object was never * initialized, so don't attempt to release it. diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouvea= u/nouveau_gem.c index 9ae2cee1c7c5..67e3c99de73a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -87,9 +87,6 @@ nouveau_gem_object_del(struct drm_gem_object *gem) return; } =20 - if (gem->import_attach) - drm_prime_gem_destroy(gem, nvbo->bo.sg); - ttm_bo_put(&nvbo->bo); =20 pm_runtime_mark_last_busy(dev); --=20 2.47.2