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=1795022509; b=hmLRLoDHrbXbrdbYSxvjKGod9QxA2tso6C8yShNGu0zQRGkyHfC8Qt4eRWdqXtMTNsDP 8+nhDMzidy63RvDTIVn0wYw3RBxZvPTm5fqrz6jgWeYkOFdxpuI+Dlcv7pO6WI6g1Im9A 4uHWqxzhVtNg19sWG5lHTp/0bs86GfgWf0ppQL+92gRzdw7JsQEjhjf2eerNtIrYv/2EO Z1YLWGbfV8lNCgf86dUHJv+5qkQZnZdX9G8y65m7UnR9boSvy5jXQvftwPXV4Nj+BXJBK /ZjAZsPp8Br5k5WaAzWClPei8RGb8EKiYJrh6Gxmc6+2bEUPVQvWhNvshtjS/Qr6SjQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795022509; 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=PTFSPUrrPWDWRMWl19X1RcDgPKaVRU+xQdJUa6VU9BY=; b=ks7NbAjZSAmNVfoKXBUSsSr0gCxu+90YFlqZii/+gh0P+4CWW/MGSXNwtebmx/NgRZF5 MSVo5TDfFgHaTn4acmUptx7mDDQrpH0OaMA0RMfH84JlXMaDrDhOiDl+vpozckqSKsyKr ES1K3gUAmsVGaYsD4ekVJq5rbu1xcOpa4z5Pf1qhS586ssX7LuSsiI6Zr6y4v6De6iT8L IXb9TdpD08dfhElsxf4h1hFp5Rt0M4SP0PvRXQpe1BPEqEv6nM0c1n0G/ZBvd9oRU0Szt cRSdapqjI+VVQTzjjO3A21U3XPpbadZiWRZCxORfG2IGebukwoMK9i5Sy+D2Otapz8A== 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=YalCocOA; 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 E5678606A31C; Wed, 18 Nov 2026 17:21:48 +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=YalCocOA Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3FF3B1F000C4; Wed, 18 Nov 2026 17:21:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795022508; bh=PTFSPUrrPWDWRMWl19X1RcDgPKaVRU+xQdJUa6VU9BY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YalCocOARGVzIb574mWGBHgKfiBBbuuV5t+c8AIcXGMwsqPhdntdEpJyVcY9IrCRk MyWw3FIHb6wtyIFonKXhDGYKPGDNTIwKXg0dFcrm65lH7CCcN/5TQyFSvJZtYc5YPl 7GWdhBfxxVTvfw8bszr0r3NnuFa7veombQRyXu18= 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 0037/2151] drm/amdgpu: drop the gang leader reference when freeing gang jobs Date: Wed, 18 Nov 2026 15:29:32 +0100 Message-ID: <20261118150123.043374326@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@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 c1584e10a7deb655438f21867b2b7a356a9aaf9f ] Every job of a gang except the leader holds a reference to the scheduled fence of the leader in job->gang_submit. Only amdgpu_job_free(), used for jobs which never ran, drops it, so for every gang submission which completes the scheduler fence of the leader, and with it its hardware fence, is leaked. amdgpu_job_free() in turn checks for the leader only after drm_sched_job_cleanup() cleared the scheduler fence, so a leader freed there drops a reference it never took. On navi31, 100 submissions of a GFX + COMPUTE gang grow the slab cache drm_sched_fence is merged into by 60 to 180 objects each time, while 100 GFX only submissions don't. Use amdgpu_job_free() for the jobs the scheduler frees too, and check for the gang leader there before drm_sched_job_cleanup() clears the scheduler fence. As the scheduler clears the entity of the jobs it picked up, check for the scheduler fence instead to tell whether the job needs cleaning up. Keep freeing the remaining IBs with amdgpu_job_free_resources() after drm_sched_job_cleanup(), so that it frees them with the hardware fence or right away and not with the scheduler fence, which nobody signals for jobs aborted after drm_sched_job_arm(), like a CS returning -EAGAIN. v2: unify amdgpu_job_free() and amdgpu_job_free_cb() (Christian), don't free the remaining IBs with the scheduler fence v3: drop the comments (Christian) v4: free the IBs with amdgpu_job_free_resources() again (Christian) Fixes: 68ce8b242242 ("drm/amdgpu: add gang submit backend v2") Fixes: f7d66fb2ea43 ("drm/amdgpu: cleanup scheduler job initialization v2") Reviewed-by: Christian König Signed-off-by: Jesse Zhang Signed-off-by: Alex Deucher (cherry picked from commit df4d6d404d44bbc8fc850bc7f9f136a25dabf180) Cc: stable@vger.kernel.org [ sashal: Adjusted amdgpu_job_free_cb() context for embedded hardware fences instead of separately allocated fences. ] Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index ffc720d189007..d013fd68b1b14 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -264,17 +264,7 @@ void amdgpu_job_free_resources(struct amdgpu_job *job) static void amdgpu_job_free_cb(struct drm_sched_job *s_job) { - struct amdgpu_job *job = to_amdgpu_job(s_job); - - drm_sched_job_cleanup(s_job); - - amdgpu_sync_free(&job->explicit_sync); - - /* only put the hw fence if has embedded fence */ - if (!job->hw_fence.base.ops) - kfree(job); - else - dma_fence_put(&job->hw_fence.base); + amdgpu_job_free(to_amdgpu_job(s_job)); } void amdgpu_job_set_gang_leader(struct amdgpu_job *job, @@ -295,13 +285,14 @@ void amdgpu_job_set_gang_leader(struct amdgpu_job *job, void amdgpu_job_free(struct amdgpu_job *job) { - if (job->base.entity) + if (job->gang_submit != &job->base.s_fence->scheduled) + dma_fence_put(job->gang_submit); + + if (job->base.s_fence) drm_sched_job_cleanup(&job->base); amdgpu_job_free_resources(job); amdgpu_sync_free(&job->explicit_sync); - if (job->gang_submit != &job->base.s_fence->scheduled) - dma_fence_put(job->gang_submit); if (!job->hw_fence.base.ops) kfree(job); -- 2.53.0