From nobody Tue Dec 2 02:59:11 2025 Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazon11012010.outbound.protection.outlook.com [52.101.43.10]) (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 DE9AF33A007; Mon, 17 Nov 2025 12:42:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.43.10 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763383354; cv=fail; b=J6Os5p9FAHqNno1uP5IKVaCd8ydHzIlNaFsno2Roi6xEv9MIFd4Ir85Z9cWNyYi0N9KYVQ3L3YIHccwjvS3bS1TUdz3pkKUDsEy+Aj2E1D3LuOATfK8ca635husnODLCluXBNx85NCR3N//sG95X88D4XBFeh4qlW0SNCqXZJZ0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763383354; c=relaxed/simple; bh=CBPLWm1tk9sI2GB1hFGH7GgaeEGT+QRGqrnscg+KLwo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=X+5XXtvZV6UCFDLTH2GeKuG2/9zs7pnIbfc+sdyZhpXvvwP824YYF8YrdYL2/j6hnfd0qnWqoalde6tqjSEkE+L/Bql8iLypRe4r8eRpUknPSbs/2JiOuzxJGAet/m3V/4Wxc92m8cQNs9xl+AvGHmmh4rCWC7wIxO32l6vwQcA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=oOeeATie; arc=fail smtp.client-ip=52.101.43.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="oOeeATie" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=K6+ipEKpkMzzTsWvruJYsUQtlFaShG/fHmfSyjsyjo8Xm84sM0LhBl4fP2JQTCl8wz0aRvWzcRQPicNFA2yLej9Zo+eZasRvg9RM+XkS0JJ+4AT3BzjDn6HUNnSNRIKJaXkJRcH66qpHsM96Y1AMgCqNSmlzV5G84a2hJWvo8JHtMwEe4xKxBQPLcOX8Q6//pS7fgUvQpNnIJE42cmGotXV8/rlBXCyqbuHO6sJ+muIJ1KZTFsc9+8dr5mQZvFGUPzyGFN48OUuaJEvr46QSa/CbF4n7NC3JIV/E2X05mr7uVFGd0kU+GrdqnIjhZjT3KUg326bt1CcHB3c+arQ33Q== 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=ObHyqKkEa2CgzjJIHtjuYzRMxjFb7Vz/9+HLxT1ZwwU=; b=RMFEu17cVV0gWbbJSr4JsTFDjyeVJRGZSOWUPG7M3J1oaM4Fjsh9OChfqGuIQ/4anSD4ciphZT44jNxnISX+R+067TotBQs3knF2Ee8C1FKk1ytJufLdku9YekbNhxpvRrx3gQEx4s/iIhTzTn5fk/AI21e7P2Qt2sa4MGMw6/nF/Bvw5pL2MbyC2OfAWT+Rl4OPyRfJ18maYg8ZG8/AhNcNslhadDOjHHkhl7EO3srB1CNhU5X5RBJrMRS5sjml/QEB0nX8ax/1ufiGXTFJKElzo/wWIpbkyiocQ8HET5ZiagZ6ZMUdQGN0fk+wxiSQPUqDdP+ep6xvfu37PRCzuA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ObHyqKkEa2CgzjJIHtjuYzRMxjFb7Vz/9+HLxT1ZwwU=; b=oOeeATieHGbA29QczN6dwFjGADaJs8zy4qBAL7KGiI8WFB21iq0w1m7lJx4fHVvr+1bMmo1vyFhsy4/aVnWfqQsBgh9XPj+qeP159zi+bw4rO8U7F9iCMsRPEcaAKmy1JNUzMNUu8qZ+NWdeFM00RD0YLpTJAkW8umPCQqZKdTUK9661Ib6c06guqh7nLK4x7AutlddGyBRnTEDcIigdVbY9fR6qlXywYPHPysKL8CWAqrMrf9xBD+j+B0ZzOEpowJzXeMTgo0JYeCPS4gszkGxWP19oBIoP/ehc55V85kQbQp9cULe4qWVeueQLd5/ZcVcjtCFMhjOfv/rDd5CxVQ== Received: from MN0P223CA0004.NAMP223.PROD.OUTLOOK.COM (2603:10b6:208:52b::14) by PH8PR12MB7301.namprd12.prod.outlook.com (2603:10b6:510:222::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.21; Mon, 17 Nov 2025 12:42:27 +0000 Received: from MN1PEPF0000ECD4.namprd02.prod.outlook.com (2603:10b6:208:52b:cafe::eb) by MN0P223CA0004.outlook.office365.com (2603:10b6:208:52b::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9320.22 via Frontend Transport; Mon, 17 Nov 2025 12:42:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by MN1PEPF0000ECD4.mail.protection.outlook.com (10.167.242.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.9 via Frontend Transport; Mon, 17 Nov 2025 12:42:27 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 17 Nov 2025 04:42:08 -0800 Received: from rnnvmail202.nvidia.com (10.129.68.7) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 17 Nov 2025 04:42:07 -0800 Received: from gb-nvl-073-compute01.l16.internal032k18.bmc032b17.internal032f11.internal032huang.bmc032l04.bmc (10.127.8.11) by mail.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Mon, 17 Nov 2025 04:42:07 -0800 From: To: , , , , , , , , CC: , , , , , , , , , , , , , , , , Subject: [PATCH v1 6/6] vfio/nvgrace-gpu: vfio/nvgrace-gpu: wait for the GPU mem to be ready Date: Mon, 17 Nov 2025 12:41:59 +0000 Message-ID: <20251117124159.3560-7-ankita@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251117124159.3560-1-ankita@nvidia.com> References: <20251117124159.3560-1-ankita@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000ECD4:EE_|PH8PR12MB7301:EE_ X-MS-Office365-Filtering-Correlation-Id: e3895e0b-3187-4a6c-8a9e-08de25d6c3da X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?POaYUJGiZ2nHrF+r4r+YF5nvV3ESrH9w7gcFxcb++0ErqVgFt+yWEqV6rXdw?= =?us-ascii?Q?2mUHAhgdMjH+YO2nLMO8oMgKBAfUaQMqO4ZOpQzBJjtCNKc9zDHo+gziD1cX?= =?us-ascii?Q?ybHuWwJNEEcOvz779Y0PVmQlc3E2H/ez266px5DrDuOgQ7QiAWHMt5G3aEx0?= =?us-ascii?Q?RJpsHHKQy4mZ29EZybLAvPjhmF7mKGd2Cq44UML+Z9XsFulGa1+PKXLtpZbf?= =?us-ascii?Q?nV+QOQBgY1RHuItcjhOO2no6q7TZ1zHmoPhuxEeP/cVkD2yxnOcJYSus2CiL?= =?us-ascii?Q?Hwc5s5DVXtbcDBmuLgIjzvXXq5Fbfyj5T98n1kqM9KkeyT57usjdsOPaTAgN?= =?us-ascii?Q?WR3fAVQ74qzjVuGHD5dd6J1RJzNjAJ8wato7cufKulspBcaUWx2j8PYOm+y6?= =?us-ascii?Q?TV1RynND2PAYVSHE9Z+u+H1KpJl8uMPA8COtei6YYe1711Xaj6O8berHYREH?= =?us-ascii?Q?rXh5tVMK0H5frzwQxnALa5z2yLMDrPVU3xf9vHXGpRp8ygqU6BuxaNVNRKyh?= =?us-ascii?Q?M6R8Fb7cnnmF1WLPB5eG/Pznk09E2cZcupO6W4O1vDg3oaLa3PuGN0MvFk3x?= =?us-ascii?Q?RPuXgV+aZefYVRxs7CG15X/14dlf8dO6PKmUwGDPeGvziktrNjGFP6A9zJF7?= =?us-ascii?Q?2j1bQGHE7e4HqMGGWELtH1/sXOTS3WEzwtr81PtR0FCI7YfFShLdJ6gIh5tW?= =?us-ascii?Q?KTToqppn/2MWLzSQVbHRZJlAbiKZZAMulrHzucSuYPq2ETFz+kUKr5FHh9Jw?= =?us-ascii?Q?wfjDFajjj5DtRmYOVBrjVP80PkLlUcI14aJhMQb5c/1Io3zv9/ZZSKOhTuxk?= =?us-ascii?Q?ExqbplJpRAiXiYsxG6q0EywURDZIwAyrmL35+2gQJnmbeVaYl2C5JYaFvXau?= =?us-ascii?Q?EkiHPNqzPpwsYK+zGEULptxLR90MGKWOCFiYtkHClJxrLJOPhYu4YestvYpe?= =?us-ascii?Q?sA9BxXraSzNKbKm1t+NLHhDEznLMc8413MIvxKlN23KRbwbiP8ufGUbmupvZ?= =?us-ascii?Q?gD2Cqq6PeKYVydk/h13Nhp9kXlV9NCx/gplq+8lQ/I0+rTTMKhmCwtr1rJzH?= =?us-ascii?Q?2chCp9hHzE9NHaG7rW+jyUFliGnmUKtmaK322ae8an+bmNa4/hXviklL6Mh1?= =?us-ascii?Q?zz0bYVbjAleQEVEzxThRlg7kLyAwmO8rzTakyEo5lXethmzM7Lc/iT9mm8wp?= =?us-ascii?Q?y2E4Fxp6HUDaaCaMIsiniN7gmJ8/WPChkGJQ6xW59wTfDZ0YfnpXUgeYDKq0?= =?us-ascii?Q?WI5ojE+PQENROaBnfEnyFr5vCB8cJVHddyWpjFwzqD5uc+MVXY28gwmK8ifw?= =?us-ascii?Q?mWdOZC/MeWVzDDVT4eKeULzOLo0xCThxWHeLY1tBsCgPgrJz5iCeeVZi5hlP?= =?us-ascii?Q?uTTUUipEI+M3TWg/PN4uTPjpHKqC3+Tc6g5LRJBKafXr9pZEhFX1MtXdJIyG?= =?us-ascii?Q?FrdRrojL1dGnqbzIJfJYLSEJp/ptr8zGMvnS73IqWdTOjAALQ4LtAVf85hMf?= =?us-ascii?Q?8S/3VxW0pVYVm/igIt7oFkBxY6JwuWrhoM61RgYe0kbV3z9XCCdw8iPp+uEm?= =?us-ascii?Q?7pN+GxfApetG4DK3FGE=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(82310400026)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2025 12:42:27.0553 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e3895e0b-3187-4a6c-8a9e-08de25d6c3da X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000ECD4.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7301 Content-Type: text/plain; charset="utf-8" From: Ankit Agrawal Speculative prefetches from CPU to GPU memory until the GPU is not ready after reset can cause harmless corrected RAS events to be logged. It is thus expected that the mapping not be re-established until the GPU is ready post reset. Wait for the GPU to be ready on the first fault before establishing CPU mapping to the GPU memory. The GPU readiness can be checked through BAR0 registers as is already being done at the device probe. The state is checked on the first fault/huge_fault request using a flag. Unset the flag on every reset request. So intercept the following calls to the GPU reset, unset gpu_mem_mapped. Then use it to determine whether to wait before mapping. 1. VFIO_DEVICE_RESET ioctl call 2. FLR through config space. Signed-off-by: Ankit Agrawal --- drivers/vfio/pci/nvgrace-gpu/main.c | 52 +++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/drivers/vfio/pci/nvgrace-gpu/main.c b/drivers/vfio/pci/nvgrace= -gpu/main.c index fc89c381151a..febca4c2d92d 100644 --- a/drivers/vfio/pci/nvgrace-gpu/main.c +++ b/drivers/vfio/pci/nvgrace-gpu/main.c @@ -58,6 +58,8 @@ struct nvgrace_gpu_pci_core_device { /* Lock to control device memory kernel mapping */ struct mutex remap_lock; bool has_mig_hw_bug; + /* Any GPU memory mapped to the VMA */ + bool gpu_mem_mapped; }; =20 static void nvgrace_gpu_init_fake_bar_emu_regs(struct vfio_device *core_vd= ev) @@ -102,6 +104,8 @@ static int nvgrace_gpu_open_device(struct vfio_device *= core_vdev) mutex_init(&nvdev->remap_lock); } =20 + nvdev->gpu_mem_mapped =3D false; + vfio_pci_core_finish_enable(vdev); =20 return 0; @@ -158,6 +162,24 @@ static vm_fault_t nvgrace_gpu_vfio_pci_huge_fault(stru= ct vm_fault *vmf, struct mem_region *memregion; unsigned long pgoff, pfn, addr; =20 + /* + * If the GPU memory is accessed by the CPU while the GPU is + * not ready after reset, it can cause harmless corrected RAS + * events to be logged. Make sure the GPU is ready before + * establishing the mappings. + */ + if (!nvdev->gpu_mem_mapped) { + struct vfio_pci_core_device *vdev =3D &nvdev->core_device; + + if (!vdev->barmap[0]) + return VM_FAULT_SIGBUS; + + if (nvgrace_gpu_wait_device_ready(vdev->barmap[0])) + return VM_FAULT_SIGBUS; + + nvdev->gpu_mem_mapped =3D true; + } + memregion =3D nvgrace_gpu_memregion(index, nvdev); if (!memregion) return ret; @@ -353,7 +375,17 @@ static long nvgrace_gpu_ioctl(struct vfio_device *core= _vdev, case VFIO_DEVICE_IOEVENTFD: return -ENOTTY; case VFIO_DEVICE_RESET: + struct nvgrace_gpu_pci_core_device *nvdev =3D + container_of(core_vdev, struct nvgrace_gpu_pci_core_device, + core_device.vdev); nvgrace_gpu_init_fake_bar_emu_regs(core_vdev); + + /* + * GPU memory is exposed as device BAR2 (region 4,5). + * This would be zapped during GPU reset. Unset + * nvdev->gpu_mem_mapped to reflect just that. + */ + nvdev->gpu_mem_mapped =3D false; fallthrough; default: return vfio_pci_core_ioctl(core_vdev, cmd, arg); @@ -438,11 +470,14 @@ nvgrace_gpu_write_config_emu(struct vfio_device *core= _vdev, struct nvgrace_gpu_pci_core_device *nvdev =3D container_of(core_vdev, struct nvgrace_gpu_pci_core_device, core_device.vdev); + struct vfio_pci_core_device *vdev =3D + container_of(core_vdev, struct vfio_pci_core_device, vdev); u64 pos =3D *ppos & VFIO_PCI_OFFSET_MASK; struct mem_region *memregion =3D NULL; size_t register_offset; loff_t copy_offset; size_t copy_count; + int cap_start =3D vfio_find_cap_start(vdev, pos); =20 if (vfio_pci_core_range_intersect_range(pos, count, PCI_BASE_ADDRESS_2, sizeof(u64), ©_offset, @@ -461,6 +496,23 @@ nvgrace_gpu_write_config_emu(struct vfio_device *core_= vdev, return copy_count; } =20 + if (vfio_pci_core_range_intersect_range(pos, count, cap_start + PCI_EXP_D= EVCTL, + sizeof(u16), ©_offset, + ©_count, ®ister_offset)) { + __le16 val16; + + if (copy_from_user((void *)&val16, buf, copy_count)) + return -EFAULT; + + /* + * GPU memory is exposed as device BAR2 (region 4,5). + * This would be zapped during GPU reset. Unset + * nvdev->gpu_mem_mapped to reflect just that. + */ + if (val16 & cpu_to_le16(PCI_EXP_DEVCTL_BCR_FLR)) + nvdev->gpu_mem_mapped =3D false; + } + return vfio_pci_core_write(core_vdev, buf, count, ppos); } =20 --=20 2.34.1