From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794590515; b=ijQH0QMg3bd+voTUd/jfstLMyQPxe7E79IQzaVhf4J5aFTZjSQ6XDBaA3MVoqk0WOwt4 hDih6wyIPjFKTjBXvhYNblvuB8b/9aw9eqiltPP7qAZw3Sb3fNE/3JfQxlmLXlDZue6kN dCuWywcJDgpc1dGWWpqjjrhweY6Zrd5FfH6lyTecT4ZEFr15xcwxa82jbCyRzME/YdnN/ +j06anFg0wEWQrNZH6Kic5T68getLa2bDmvWubDigCY0VRwl4fntCmaJkOrfOqIMDnYCU buaEsLx41nIB+0ZtMn6mUI2rRnB8oVstFOjHkqYLaErO2LbQxa5caWa1f6UHOPHljNA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794590515; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=fd2jJwCF8TTy6FIWm9dQf114T3fqF49bcsgkhHXaBwU=; b=Zz3vYAYcrJkuEz+WrbIMTY59bgiBQiCppvAWp2nr+FzYevON7IXAJiPXpPgzEK/mfDSX DaflNjB0lOpQiZpxIObdvfOUoeMpjxBhWEVmWs9ypqtpFgTihHEy8vZPcIHFac2b9GCdR i6fznWH/U+LISRKN1c2gjkoFcads1XoxeU3/+J39CG5iRNR6WY1605WEVSF61LNfrw4K4 aXx5CQ2w98aWEDcBhthtcJn6qupgjSYULVL5OaxtUL0fGKU+t3Ra2njHUBrkcWfVHKbQX bEtY7lolELsZjLsRF5kKdJ+PS8ZHGHk0BODjLWYiAT/8tIhx9AGn9mikWVOU2PC4X+w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=CFfLVsro; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E7950606A8A7; Fri, 13 Nov 2026 17:21:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=CFfLVsro Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9615C1F000C4; Fri, 13 Nov 2026 17:21:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794590514; bh=fd2jJwCF8TTy6FIWm9dQf114T3fqF49bcsgkhHXaBwU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CFfLVsroVBeq88nuXvxEyByVneBsOXQhY6ZJpRkuq6xt6hH4QQZ0el1i6cP1wW8ko 3E4Gc9LA3eQ0H/szW+1GE/ZYBfrvzYCJ96O/JU4q6YqWmBRorGeSMqYQ1VUdkrHgg1 UYQJ1xEowLENg7MVz69sQI+svCg/uZG/vHY1uSYY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Christian=20K=C3=B6nig?= , Jesse Zhang , Alex Deucher , Sasha Levin Subject: [PATCH 6.18 417/686] drm/amdgpu: dont drop the gang dependency fence twice Date: Fri, 13 Nov 2026 10:49:10 -0500 Message-ID: <20261113153835.095040857@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153820.902362109@linuxfoundation.org> References: <20261113153820.902362109@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jesse Zhang [ Upstream commit 6d1f901a83603a7d314e4a756b416b11d8dc7e35 ] drm_sched_job_add_dependency() drops the fence reference when it fails, but amdgpu_cs_submit() drops it again, so the scheduled fence of a gang member loses a reference it still needs. A GFX+COMPUTE gang waiting for another context, with the xarray node allocation for the leader's dependency failed through failslab: WARNING: drivers/dma-buf/dma-fence.c:589 at dma_fence_release+0x34d/0x730, CPU#1: amd_uapi_regres/2993 drm_sched_job_cleanup+0x2c2/0x340 [gpu_sched] amdgpu_job_free+0xcb/0x3e0 [amdgpu] amdgpu_cs_parser_fini+0x435/0x710 [amdgpu] amdgpu_cs_ioctl+0xcd2/0x7a60 [amdgpu] Oops: general protection fault, probably for non-canonical address 0xdffffc0000000001: 0000 [#1] SMP KASAN NOPTI KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f] RIP: 0010:dma_fence_signal_timestamp_locked+0x1b8/0x610 Fixes: ed21f6c3fe42 ("drm/amdgpu: fix another missing fence reference in the CS code") Reviewed-by: Christian König Signed-off-by: Jesse Zhang Signed-off-by: Alex Deucher (cherry picked from commit 5aa070a83c8378810b906cc8bfc650ce69822a7c) Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 946c6bfe1f7f4..0f6505d4c958b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -1333,10 +1333,8 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, fence = &p->jobs[i]->base.s_fence->scheduled; dma_fence_get(fence); r = drm_sched_job_add_dependency(&leader->base, fence); - if (r) { - dma_fence_put(fence); + if (r) return r; - } } if (p->gang_size > 1) { -- 2.53.0