From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azon11010015.outbound.protection.outlook.com [52.101.56.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 12C6039A045 for ; Mon, 20 Apr 2026 12:15:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.56.15 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776687314; cv=fail; b=Haxrs+OZWGYEGQ0wKW1AaJPzaOoIeE3weQ6+kDR8k3+PGAP/MHsdImNS+x8kxocSSLyRE457GzUXdCXEvRAuA2inFzDfXeSElRnO30GHMznSbbgBGZzfLZGe/7Q9wnhylk/L5a52Tw4vZ5KtHA/bbUHgWvZRSr8O6qTWjKh/MSE= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776687314; c=relaxed/simple; bh=kOYoHEtkgY9aMwXowm6oPrZV80CDgAqjzv51rJeJ7sM=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=hnUZzvgROtXo/JBRmi5BekbXlM5fqJ6AskDzKvQHSPx2EWwLufrTx2TA2M1X49b4DmuO75YGSHV5xA8v9LAtJOBunTZ+tSc47rFMYubAroecSEDXQh5FdacedPMdDR/5GGI0Dy7rOnTrmvy0yPQ92TK7Y8Bh+TFk5EjEhb+AqVI= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=QKukJqbO; arc=fail smtp.client-ip=52.101.56.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="QKukJqbO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZCvRXfUpIEl7Sd/tG18JVZoqb4AIwzWcR5bc7wgAH0mkZCD6MyhyuVjDzlw4P4dTv9ypOCuWC6CKMyebio9MNU1my80rrke+bhozZrPGowE+StSxW6EH+Bt9mP7kPfPw1m+a+ovN7T3uP5QuPqGKFUC9VLg0uEr2Xp/VHBZYTGO2eEoSV+zWCZ2tGHuRCBJc+mhIGw6gZ3Hjs2qpJSpHHZH2IGejTIqPhhUiQk30eR8CUNgqVbbEBW0Lzivj7v2A0d09ZTQ0NJBkqNsCKlqnyQYWBXF3DZzgLGCiLPdNAW8GzBPgJdkdKHPYtgTqqU1Mei2P7Rf+QbP2msx2ry87wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ez/lidpEnOe4uJwHqEnV67J0t/BQ0RidYk/mH92RMJk=; b=CsH+MWpDB4eP6HwYPmsqsSy0drZ3UMc38N4FH1iK9c9BEOaxT1omRdMUpjIj/0T7XFYD9RUyqmMGUT/MTrRUkFhatcazO4I5Z1XfDhLdb/Vg+7NKkDYhHJglKOfNOCo+oiNeuKNoitT3XMcpZbPiCbZzFUVd/ZdvziLPqsRzXnc7EzrszBoniG4EUawMLH5Jom9mXT1mPuGJzZgVIRNPALGeHcFgDq6hIP7XiPTeTrrZ9DWbsBHVdv+ijyb+rI+94n1uqpg2ZSuwqERn30ep+sHyawDNu3wgKOL8BRjIhXiviVblT37ZLFjJhfiPxmR5+gXC+S49c6lfVjHWw4SbMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ez/lidpEnOe4uJwHqEnV67J0t/BQ0RidYk/mH92RMJk=; b=QKukJqbOtMh79gPsr6EYBHUGAs0cGU1wokVl0rrXVX6I2Tt8U5HjvJbJuDTHW40CJxNNQyv2OR+gt1h16fJI7xZY0/qhkRg5D4P8yYMfE3nEiU8LMiFY2qpI4dsKBg8Nnf+w8ZpWHyJXd0MOrzWOtv6oahBS2Npya+KIZhIxOkA= Received: from CH2PR08CA0021.namprd08.prod.outlook.com (2603:10b6:610:5a::31) by SN7PR12MB7978.namprd12.prod.outlook.com (2603:10b6:806:34b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.15; Mon, 20 Apr 2026 12:15:08 +0000 Received: from CH1PEPF0000A34C.namprd04.prod.outlook.com (2603:10b6:610:5a:cafe::b5) by CH2PR08CA0021.outlook.office365.com (2603:10b6:610:5a::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9769.51 via Frontend Transport; Mon, 20 Apr 2026 12:15:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CH1PEPF0000A34C.mail.protection.outlook.com (10.167.244.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9791.48 via Frontend Transport; Mon, 20 Apr 2026 12:15:07 +0000 Received: from FRAPPELLOUX01-WSLPUB.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Mon, 20 Apr 2026 07:15:03 -0500 From: Pierre-Eric Pelloux-Prayer To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , "Pierre-Eric Pelloux-Prayer" CC: , , Subject: [PATCH v2] drm/amdgpu: fix root reservation in amdgpu_vm_handle_fault Date: Mon, 20 Apr 2026 14:14:38 +0200 Message-ID: <20260420121438.1612-1-pierre-eric.pelloux-prayer@amd.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A34C:EE_|SN7PR12MB7978:EE_ X-MS-Office365-Filtering-Correlation-Id: 573cfbf2-46a0-4c14-4abb-08de9ed67638 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700016|376014|1800799024|56012099003|18002099003; X-Microsoft-Antispam-Message-Info: RrQVN1HGpxP5Om4iAHCiFxePRE7BMvKY2x8hkyctHP1K8bnVUjO8pgV7dG4yoZ9s3tXGMhlvotflA6NUp/OJF4NsOXyHRkGLcZZmgw3orSmteL4kEbOYh+ZKtTvRM98SejZE1tWEYAi8q4FVx0Bqzn3XHhhTr591CsYLuptrhP5WTUO7R76YUcYAYteSrJo70f6693dk6Lds+V/Wt9I17wYoy+vMV9iSHsjkYIlmXWMAiL1mP7TVx/sGniGZJAYDs0bSHbkM6y2OzYfT7lQYcknZGkXqTlK5eT+FJJ7SLkXC4lAm5AqDsJIsz2KftgUlbdD+qQa/tEcpet1kA3BHNkYwUpUJZ/S84M2pEZZU79tK0lBrXq6kup7/ThpvqRlF9UDKg8EjO0QBBgPZsYyOg4Ce8E4OK09tF5cbBv669cy5Zuhi7gL+lZoZz60usURx44J5sTrP1vIrIokbH/IHnjWONpFH5NACndn7cm+HhyAC7I6jhJ7EcjzPFQCMoVyek8XMtVyFx2MLzbZLQPKjQIjMWujzWW7UZAPoQAKKVBIUlhXGt/rJS94zYmsZcgweLi9SxPtZd4OrGF7/ZFHRrSVI/CbALzIYzERR1cyp/eBAzKRdoTJR5lBeOz9q6epz9suHo26FPGb8efBPFbUumVhP/WK7CdpXthNy+oq6IvNOga5mLnaFW2I6J/JU5ExwFRsPQ3ZypSSCVZO+5mcHcSrXcZV+pIy9msmpcspbX/Lcgrx7VQnEMtcdpcynwphB4SyiwHDEroB+anWmGvYnFw== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(36860700016)(376014)(1800799024)(56012099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fHFlc4kTgJkIsLeWVIDsMdofKoh4U6Q6Je8BlPmOZmIdwNI5XxGJyNgUvAkhEjvV4C9ks83545Qa7wfio1Ejyt5H2q26UAPqa7xoMnp1VE5PEZZYwEeclodjsdC6E+7H/bAYmHMexLPR8zldWs1S1Ik678LZogqtV5LXbmgqdVesjDwMRyqqokkZ88uzyLAhksP7xIHOtQbMhYBNhxbIuzv7iXqFTyO/M0Z1ZZgOlU4jM2VddyZ7XU13qT7E8hn8fMsVcpMSvnnmTnN7BjaaG7OcsNrKtoqE92mCDi69le2erSPQm6zB58Ajm9NwJEXw+Lzu9di9aM5srCVUhT0ZfhwpYZa6fUqzrJbGO+B4DkydvqZZUoD5b5LstAfxF3sJcQkMJMzrxpupWgK2Mmoob2TAmUdayHjN0NXeq62igbdX0mg/8DfVZQd0AEO1chX2 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2026 12:15:07.6258 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 573cfbf2-46a0-4c14-4abb-08de9ed67638 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000A34C.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7978 svm_range_restore_pages might reserve the root bo so it must be called after unreserving it. --- v2: - don't modify amdgpu_vm_lock_by_pasid - add a TODO --- Fixes: 32b486e8541c ("drm/amdgpu: extract amdgpu_vm_lock_by_pasid from amdgpu_vm_handle_fault") Signed-off-by: Pierre-Eric Pelloux-Prayer --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index 63156289ae7f..799a1803d941 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -3026,11 +3026,22 @@ bool amdgpu_vm_handle_fault(struct amdgpu_device *adev, u32 pasid, is_compute_context = vm->is_compute_context; - if (is_compute_context && !svm_range_restore_pages(adev, pasid, vmid, - node_id, addr >> PAGE_SHIFT, ts, write_fault)) { + if (is_compute_context) { + /* Unreserve root since svm_range_restore_pages might try to reserve it. */ + /* TODO: rework svm_range_restore_pages so that this isn't necessary. */ amdgpu_bo_unreserve(root); + + if (!svm_range_restore_pages(adev, pasid, vmid, + node_id, addr >> PAGE_SHIFT, ts, write_fault)) { + amdgpu_bo_unref(&root); + return true; + } amdgpu_bo_unref(&root); - return true; + + /* Double check that the VM still exists. */ + vm = amdgpu_vm_lock_by_pasid(adev, &root, pasid); + if (!vm) + return false; } addr /= AMDGPU_GPU_PAGE_SIZE; -- 2.43.0