FAILED: patch "[PATCH] drm/amdgpu: free the userptr ranges when a CS fails after" failed to apply to 7.2-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 7.2-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-7.2.y
git checkout FETCH_HEAD
git cherry-pick -x 1b4da805a0ba354a549ce07459c871c17dd94fe0
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026102129-frying-registry-eb6b@gregkh' --subject-prefix 'PATCH 7.2.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 1b4da805a0ba354a549ce07459c871c17dd94fe0 Mon Sep 17 00:00:00 2001
From: Jesse Zhang <[email protected]>
Date: Fri, 9 Oct 2026 16:05:05 +0800
Subject: [PATCH] drm/amdgpu: free the userptr ranges when a CS fails after
parser_bos
amdgpu_cs_parser_bos() allocates an HMM range for every userptr entry of the BO list and looks up the user pages. Those ranges are only freed when amdgpu_cs_parser_bos() itself fails or when amdgpu_cs_submit() checks them under the notifier lock. If amdgpu_cs_patch_jobs(), amdgpu_cs_vm_handling(), amdgpu_cs_sync_rings() or the early part of amdgpu_cs_submit() fails, nothing frees them: neither amdgpu_cs_parser_fini() nor amdgpu_bo_list_free() touch e->range.
Each such CS then leaks the range, its hmm_pfns array (8 bytes per page of the userptr BO) and the BO reference the range holds. An IB on a ring that patches the CS in place (e.g. VCN) with an unmapped va_start fails in amdgpu_cs_patch_ibs() and takes this path.
Free the ranges on those error paths. Ranges amdgpu_cs_submit() already dropped are NULL, so freeing them again is a no-op.
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +11 -4
@@ -1431,6 +1431,7 @@ static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser)int amdgpu_cs_ioctl (struct drm_device *dev,void *data,struct drm_file *filp) {struct amdgpu_device *adev =drm_to_adev (dev); +struct amdgpu_bo_list_entry *e;struct amdgpu_cs_parser parser;int r;
@@ -1465,25 +1466,31 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) r =amdgpu_cs_patch_jobs (&parser);if (r) - goto error_fini; + goto error_free_user_pages; r =amdgpu_cs_vm_handling (&parser);if (r) - goto error_fini; + goto error_free_user_pages; r =amdgpu_cs_sync_rings (&parser);if (r) - goto error_fini; + goto error_free_user_pages;trace_amdgpu_cs_ibs (&parser); r =amdgpu_cs_submit (&parser, data);if (r) - goto error_fini; + goto error_free_user_pages;amdgpu_cs_parser_fini (&parser);return 0 ; +error_free_user_pages: +/* amdgpu_cs_submit() only drops the ranges once it got that far. */ +amdgpu_bo_list_for_each_userptr_entry (e, parser.bo_list) { +amdgpu_hmm_range_free (e->range); + e->range =NULL ; + } error_fini:amdgpu_cs_parser_fini (&parser);return r;
Sasha Levin
maintainerPATCH 1/2 drm/amdgpu: Remove the bo list mutex
From: Tvrtko Ursulin <[email protected]>
[ Upstream commit a300c90f00905632ad9f89ad719537941a88600c ]
The bo list is immutable during command submission since the drm_exec conversion so we can remove the mutex.
Stable-dep-of: 1b4da805a0ba ("drm/amdgpu: free the userptr ranges when a CS fails after parser_bos")
--- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 3 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 4 ---- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 15 ++++----------- 3 files changed, 5 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c +1 -2
@@ -42,7 +42,7 @@ static void amdgpu_bo_list_free_rcu(struct rcu_head *rcu) { struct amdgpu_bo_list *list = container_of(rcu, struct amdgpu_bo_list, rhead); -mutex_destroy (&list->bo_list_mutex); +kvfree (list); }
@@ -134,7 +134,6 @@ int amdgpu_bo_list_create(struct amdgpu_device *adev, struct drm_file *filp,trace_amdgpu_cs_bo_status (list->num_entries, total_size); -mutex_init (&list->bo_list_mutex); *result = list;return 0 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h +0 -4
@@ -51,10 +51,6 @@ struct amdgpu_bo_list {unsigned first_userptr;unsigned num_entries; -/* Protect access during command submission. -*/ -struct mutex bo_list_mutex; - struct amdgpu_bo_list_entry entries[] __counted_by(num_entries); };
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +4 -11
@@ -898,8 +898,6 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,return r; } -mutex_lock (&p->bo_list->bo_list_mutex); -/* Get userptr backing pages. If pages are updated after registered * in amdgpu_gem_userptr_ioctl(), amdgpu_cs_list_validate() will do * amdgpu_ttm_backend_bind() to flush and invalidate new pages
@@ -1016,7 +1014,6 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,amdgpu_hmm_range_free (e->range); e->range =NULL ; } -mutex_unlock (&p->bo_list->bo_list_mutex);return r; }
@@ -1385,7 +1382,6 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,amdgpu_vm_move_to_lru_tail (p->adev, &fpriv->vm);mutex_unlock (&p->adev->notifier_lock); -mutex_unlock (&p->bo_list->bo_list_mutex);return 0 ; }
@@ -1472,28 +1468,25 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) r =amdgpu_cs_patch_jobs (&parser);if (r) - goto error_backoff; + goto error_fini; r =amdgpu_cs_vm_handling (&parser);if (r) - goto error_backoff; + goto error_fini; r =amdgpu_cs_sync_rings (&parser);if (r) - goto error_backoff; + goto error_fini;trace_amdgpu_cs_ibs (&parser); r =amdgpu_cs_submit (&parser, data);if (r) - goto error_backoff; + goto error_fini;amdgpu_cs_parser_fini (&parser);return 0 ; -error_backoff: -mutex_unlock (&parser.bo_list->bo_list_mutex); - error_fini:amdgpu_cs_parser_fini (&parser);return r;
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 drm/amdgpu: free the userptr ranges when a CS fails after parser_bos
From: Jesse Zhang <[email protected]>
[ Upstream commit 1b4da805a0ba354a549ce07459c871c17dd94fe0 ]
amdgpu_cs_parser_bos() allocates an HMM range for every userptr entry of the BO list and looks up the user pages. Those ranges are only freed when amdgpu_cs_parser_bos() itself fails or when amdgpu_cs_submit() checks them under the notifier lock. If amdgpu_cs_patch_jobs(), amdgpu_cs_vm_handling(), amdgpu_cs_sync_rings() or the early part of amdgpu_cs_submit() fails, nothing frees them: neither amdgpu_cs_parser_fini() nor amdgpu_bo_list_free() touch e->range.
Each such CS then leaks the range, its hmm_pfns array (8 bytes per page of the userptr BO) and the BO reference the range holds. An IB on a ring that patches the CS in place (e.g. VCN) with an unmapped va_start fails in amdgpu_cs_patch_ibs() and takes this path.
Free the ranges on those error paths. Ranges amdgpu_cs_submit() already dropped are NULL, so freeing them again is a no-op.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +11 -4
@@ -1434,6 +1434,7 @@ static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser)int amdgpu_cs_ioctl (struct drm_device *dev,void *data,struct drm_file *filp) {struct amdgpu_device *adev =drm_to_adev (dev); +struct amdgpu_bo_list_entry *e;struct amdgpu_cs_parser parser;int r;
@@ -1468,25 +1469,31 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) r =amdgpu_cs_patch_jobs (&parser);if (r) - goto error_fini; + goto error_free_user_pages; r =amdgpu_cs_vm_handling (&parser);if (r) - goto error_fini; + goto error_free_user_pages; r =amdgpu_cs_sync_rings (&parser);if (r) - goto error_fini; + goto error_free_user_pages;trace_amdgpu_cs_ibs (&parser); r =amdgpu_cs_submit (&parser, data);if (r) - goto error_fini; + goto error_free_user_pages;amdgpu_cs_parser_fini (&parser);return 0 ; +error_free_user_pages: +/* amdgpu_cs_submit() only drops the ranges once it got that far. */ +amdgpu_bo_list_for_each_userptr_entry (e, parser.bo_list) { +amdgpu_hmm_range_free (e->range); + e->range =NULL ; + } error_fini:amdgpu_cs_parser_fini (&parser);return r;
Signature · 1 line
2.53.0