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=1792594302; b=nSFNt8QS/YjFqYV7W1+l04p8161yKRRNQCgE5AiDfnThbsE8duM0Qgmbr2Km0SSjO7ND aVPAywMZDgNkYAyL+zKN9D3HNUH6axfGGd62mojRY6SuYXsSvciieAfOev2+1STacYher lNAq0FoGy5XXOcD8xqRuKbi5tOijBv4Vo4Pd9SE5tMLLF/a7qVWDT7MRXswi3B7YBh+fV j3DfdIYdyVPmqqwQUiAQ3UPEmq+6MCNofBtdFkygsAAySUCUEDjYahuAuaYonUvj+PQ9i las+okW7COFklLyiI4HZlQ1um/BzVx85VlNSKkg97xYLDMjzZeEFCK+/VMEuZb2wTCA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792594302; h=Received:DKIM-Signature:Subject:To:Cc:From:Date:Message-ID: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=POWXmCEbIBpYC1ykWozcap4CRsnBMEc1ZEoiE94rij4=; b=cWrapf1Rf2MpbLPccDOqGItwTOvbTOYu/F9gebEEgyh+/j2FJmJHo9AajQ+fPUkAvyvp kgxIEXnjIwUEAyKZdkV4IDy6cVV2Oi4oUUNyg8/66EPyFnyDGwLeNf/Q6nnbisQJhNGBV GTTXFoPS+MyLYmYlYX/9/Suaqo8rI4zRHSnRSe19J34Ep+JdAXl3aa+5kx4H+kfQ7V2M1 2fiDrEgid0zOKkhSOa7v9dbJNvI3GtJIbzqNsG5NvaIZBD9uWlhuOUty6mkzQdXt95zAC kXJmyALmZbkYqoCO6K/Mj8G5MrMhg49fpsXkXidE/NiVA729BjovbABQJ+QJa8DbdBQ== 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=dToCP9E3; 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 30D0A606A324 for ; Wed, 21 Oct 2026 14:51:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=dToCP9E3 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7CCDB1F000C1; Wed, 21 Oct 2026 14:51:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1792594302; bh=POWXmCEbIBpYC1ykWozcap4CRsnBMEc1ZEoiE94rij4=; h=Subject:To:Cc:From:Date; b=dToCP9E36XMqQ6GolRwnJIjbhUILNPnbF2n93rltaHhO/ah3xDfftMg4K/t7PmZqT 2zlYnaHoOKN+rSDGtvlPcNTd4wwtpKoYtVST3if6b8EMEeXCXN4nm4JvIZmntpHh/c xZUnxgnjgxHjPIjUvcuFdOh62+R2yLUtjsoArQNk= Subject: FAILED: patch "[PATCH] drm/amdgpu: free the userptr ranges when a CS fails after" failed to apply to 6.6-stable tree To: Jesse.Zhang@amd.com,alexander.deucher@amd.com Cc: From: Date: Wed, 21 Oct 2026 16:46:30 +0200 Message-ID: <2026102130-unworn-juggling-1cdf@gregkh> 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=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-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 . 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-6.6.y git checkout FETCH_HEAD git cherry-pick -x 1b4da805a0ba354a549ce07459c871c17dd94fe0 # git commit -s git send-email --to '' --in-reply-to '2026102130-unworn-juggling-1cdf@gregkh' --subject-prefix 'PATCH 6.6.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 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. Fixes: fec8fdb54e8f ("drm/amdgpu: fix userptr HMM range handling v2") Reviewed-by: Alex Deucher Signed-off-by: Jesse Zhang Signed-off-by: Alex Deucher (cherry picked from commit c52a9542ed7cfd527feb938bd0accada2ac8d267) Cc: stable@vger.kernel.org diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 03b41f803520..ef8a61ce4b1d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -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;