From nobody Tue Dec 2 00:44:25 2025 Received: from CY3PR05CU001.outbound.protection.outlook.com (mail-westcentralusazon11013004.outbound.protection.outlook.com [40.93.201.4]) (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 9BBBD2FFF9C; Mon, 24 Nov 2025 11:59:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.201.4 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763985582; cv=fail; b=unJN0K/aOaFezlgS2Y8r9qn0ket9oX28pID9pN+XbhH6i3z/nJg9K7YEP5ff5UG5kD/moZJN8vr2HdOJf+PlctbvXQwZdii3D5snXtMGBovKEsktKzjaUPAxNrX9o+/1q650OnaWirVh+O0DWUxCjQR1A89rvASD7pVJYYaB6Mc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763985582; c=relaxed/simple; bh=95Qv+EkeG/AY6SPaQl/+VQnz2b1lVwS4301cxU6kTzc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Lc2RgOi8Zw0Moj3nxfi7/DOsG1Ese0mxGPIsLRAPRZwC7HkUIf8NMhzoBfDtkEE3227PTE9m0YQ1vPBQobJ7qo0/AofmluoPuHabI+VHTYZl2vPZpTmlT0woG8LJnu5qzWwzyZ/MDkQaqnL3HJTd/3VyEXFXHGswFzaN2VcOWwU= 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=AvF29sB8; arc=fail smtp.client-ip=40.93.201.4 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="AvF29sB8" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PTi/+SbskaB4+6vXApjO8kjwzV3e20jBQbdgIrXb+107TzRgSw9BU8/gZS8RbuXe6iD1Bqbuu7aR32KC5e7IRMqcO7WWbPyJMPT/nIAKIduW84o2J9+liBhgwMTvYBbks/PeI6DhlvWyCAYjW4AIp+eJhwbZGgH42hr5Yp11GIfEgSVj1/U/YOPaqtp0tYkstVbJe/otCFjxoc9V+vFfOQqH4Lm+jd6BbWUcdCcgFgk93H+ylEojqGxIt/W8jwuBZBlOQDLb/HPQ19kkOIvhOkzB3t70vhiw7aB8wMr3Qx2SSIfdLYyVHriixFWpBwiyUpNntK9JhSsEVe00z77GXA== 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=a5v3zp0gPekzrmmR9dFwH36IYdB62anj8+hQVyA1kBA=; b=C9AI9sFY0ARF6dLpjc41TXFuGpXfKfsqWw2qmvbj9l6cM/dVmYgAKOKzaKf/bTLqqpU4BxBDA9RsMorwbBTHgXYW6DtDVYw8gTvskbqN3Q5f2zcT7NjIQHUI24/kW/ocy/prMkxOJQwg+cZOB96lBOEMV+4++CrnyHJEEvG8TZaGHxmrLV2MOnrpkbDO9mqR/BvgsdfXAsYJhgZxTziuPPeUz/krNdOelMWWxNxbnrhRuk49Ag+HxK5vNJoovwvkCYrhPMOLbuK6enzfh7HhGWMTOZbmpiEIO1d+sgNCh9CRHpcc8PhWj+Gca2dmI4mBue7S61rQXyW6kvku8eKc7A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=a5v3zp0gPekzrmmR9dFwH36IYdB62anj8+hQVyA1kBA=; b=AvF29sB8cFLy7udziwsglOGaenZn70it+XYD6xOeVaoQGzlv2RJje4n7wx9Y5B7++lxT5/+2bpIHrxZrrBM7+myOfM9Qe13ES0aa+FjM6KHG4sOOay1K2H8j5ejhKdJHC6To3B0H04cXeBgohfqQSSW8mtErPQBOaJRTbJlURwQm1CpCqV2MhQxWBoeyKGNiuJUUIVrTBo8V4XQJEU7d0NvxKX8c6w2HbXxiljsJYkXw9jwr9Uz+XMsbTe7Q6Bhh3oTiFq5GxlZJQOAJX1ABTgz5UR6Xi89uB5cKMHTCz1xfMPxVOa1xckCSb+kIlgSl2FZoMMo4D5LBjuqVi1qigQ== Received: from SJ0PR13CA0047.namprd13.prod.outlook.com (2603:10b6:a03:2c2::22) by SJ0PR12MB5634.namprd12.prod.outlook.com (2603:10b6:a03:429::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.11; Mon, 24 Nov 2025 11:59:36 +0000 Received: from SJ5PEPF000001C9.namprd05.prod.outlook.com (2603:10b6:a03:2c2:cafe::9e) by SJ0PR13CA0047.outlook.office365.com (2603:10b6:a03:2c2::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9366.6 via Frontend Transport; Mon, 24 Nov 2025 11:59:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by SJ5PEPF000001C9.mail.protection.outlook.com (10.167.242.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9366.7 via Frontend Transport; Mon, 24 Nov 2025 11:59:36 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 24 Nov 2025 03:59:28 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 24 Nov 2025 03:59:27 -0800 Received: from gb-nvl-073-compute01.l16.internal032k18.bmc032b17.internal032f11.internal032huang.bmc032l04.bmc (10.127.8.11) by mail.nvidia.com (10.126.190.181) 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, 24 Nov 2025 03:59:27 -0800 From: To: , , , , , , , , CC: , , , , , , , , , , , , , , , , Subject: [PATCH v5 1/7] vfio/nvgrace-gpu: Use faults to map device memory Date: Mon, 24 Nov 2025 11:59:20 +0000 Message-ID: <20251124115926.119027-2-ankita@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251124115926.119027-1-ankita@nvidia.com> References: <20251124115926.119027-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: SJ5PEPF000001C9:EE_|SJ0PR12MB5634:EE_ X-MS-Office365-Filtering-Correlation-Id: 81e433ee-6b73-4b59-6b51-08de2b50f084 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|7416014|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?JbeGtYOU5r8npFVXwZb9KFtxdvnq7ClNO+gKIeUUOtPBKpsQiJ+Mcp7wMHsc?= =?us-ascii?Q?NRxHK1YssBUOIkktgo5u0X9opd2kABgouNns8oh7gKO+q0u4LptQUNBKfO3e?= =?us-ascii?Q?IBVUnq5i/fNnDXYUhnjurN2DxUOWCwpBCgrgtGp/9kwfjOsnOSfVvtB0tc/5?= =?us-ascii?Q?xqcKnBV5GaPIR28KGH7VfPZntGNo4g3rCktBjX+tYNNtFz3MbeaJSRj2kkys?= =?us-ascii?Q?q9KgyMDLOt+lvfNX/B4KmLWa/Xqn+Ck0as0qY0FG8EJfLreNYCbyF/K0sUBB?= =?us-ascii?Q?WPw15Of6ByTfd3BE9J5Zoba99eM5uECAlEDi7qp2bIBF2JZn0UsvZTpTC57r?= =?us-ascii?Q?9nvMqoIXvcc7vvoQbp1fGIiny7kvAsJKlAUSP4OnoSXavNhRVDYCkc+6PbTt?= =?us-ascii?Q?LabYdm+r/iS6PCE17sdBg07yJ+/KPWFUFiQiaPoi15ZwleYbTTbegDZ+3SvS?= =?us-ascii?Q?TADc5suYCGtzh6nUtVCUDNs1t9crwPQBlUFtzxnHBF6uwHFdAnr8Y0/H+C/A?= =?us-ascii?Q?LWdOwk/XqACn0z0/u3zXiVNlqksUCrR0Xbz0MdQUbfrX+h/8qAF4nSb6BSbJ?= =?us-ascii?Q?4TUNRAbddlqM7F7umQ0Z5yTnPGuHVoE461JyorXP90+4wjF0LJTCWsZaOPzS?= =?us-ascii?Q?Kfbblu/qSkWWDh0mHFpMMxWrn1cqVmkJ3d4ZoATpnaUTfxBJnAbyXc1Lz01B?= =?us-ascii?Q?PWG0jRlHf6axBiNLNn02FPpjeEBcL1l1tRGPwXVjAZicNF1WRlkktpih9VBg?= =?us-ascii?Q?J7NE7YzoyE2JFxGphqee0KQJw/a0BnnqayyqDjjdyWRGsMmzHxpl/YV+lN+Y?= =?us-ascii?Q?YVr3PHJ7D+n7yqLAZXbhvO8PknVYuXgFmL3oCj0rqRtnxAa5MBZFdu6AB5xd?= =?us-ascii?Q?uP2pm04Pj33KQq+ndEhI52CImoJpS7yTTo3jJJpK1krziKsVld6Ha6r9ANWK?= =?us-ascii?Q?5vo1iiwlgyznYF9N6EIhtiAE/9P12dF1t5rXPDvg0yLGMyxuwagjaRgv3JC3?= =?us-ascii?Q?efk3TUOAYx7LrMlbZpai14tnO1pnIX8fl7xtNbvKETYclKI5PKjZzxt3Yawq?= =?us-ascii?Q?vN7DTnCjEkOrfJnIu1NXDLXG/PZp8hbjBRJg5YBqYEYcoPpe1L5cI5v5TXxa?= =?us-ascii?Q?ZCRCP4trLmNYzHQqGafqtC6JA1M47FW0xYFOIuNZNxxcMZXQcSc1tUeDPPuu?= =?us-ascii?Q?lT2VhF9+BWAD+cfG67tO/p9QNISFvjbgM5YsfJDh7yUUGPfAXDTbgKFhHRkn?= =?us-ascii?Q?dKh9fNqW9G818U6ofTMg2XE9X1BqdbN3RcIbFUSmcNKXBJm4zR/rpkbBf2Qq?= =?us-ascii?Q?jesCiyOqQWPPexSwkKGoKKecXRtSUGPYHZH20yXQQw1ApY85A4mcXeGVkalg?= =?us-ascii?Q?n9GXTlMrCoiXaQXqB1pWwz8YdnH4DCACLeWG7Tvk0OsEGPt81GQ+Cm6Cf+6+?= =?us-ascii?Q?y+Za7jqPh5nBJ7+qoThua93FPHHOoXymKm1Ck4IW7l4Y2m8ctYsTnW/dhrqz?= =?us-ascii?Q?IT6gUQmBEF2MNP4tjjPUJU2jxzpSzl2WYL+5DdWYi6WGO66hkCMOgJKqnjS9?= =?us-ascii?Q?ABSIrF54A3b4lfBLT3g=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(7416014)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2025 11:59:36.5562 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 81e433ee-6b73-4b59-6b51-08de2b50f084 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001C9.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5634 Content-Type: text/plain; charset="utf-8" From: Ankit Agrawal To make use of the huge pfnmap support and to support zap/remap sequence, fault/huge_fault ops based mapping mechanism needs to be implemented. Currently nvgrace-gpu module relies on remap_pfn_range to do the mapping during VM bootup. Replace it to instead rely on fault and use vmf_insert_pfn to setup the mapping. Signed-off-by: Ankit Agrawal --- drivers/vfio/pci/nvgrace-gpu/main.c | 50 +++++++++++++++++------------ 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/drivers/vfio/pci/nvgrace-gpu/main.c b/drivers/vfio/pci/nvgrace= -gpu/main.c index e346392b72f6..f74f3d8e1ebe 100644 --- a/drivers/vfio/pci/nvgrace-gpu/main.c +++ b/drivers/vfio/pci/nvgrace-gpu/main.c @@ -130,6 +130,32 @@ static void nvgrace_gpu_close_device(struct vfio_devic= e *core_vdev) vfio_pci_core_close_device(core_vdev); } =20 +static vm_fault_t nvgrace_gpu_vfio_pci_fault(struct vm_fault *vmf) +{ + struct vm_area_struct *vma =3D vmf->vma; + struct nvgrace_gpu_pci_core_device *nvdev =3D vma->vm_private_data; + int index =3D vma->vm_pgoff >> (VFIO_PCI_OFFSET_SHIFT - PAGE_SHIFT); + vm_fault_t ret =3D VM_FAULT_SIGBUS; + struct mem_region *memregion; + unsigned long pgoff, pfn; + + memregion =3D nvgrace_gpu_memregion(index, nvdev); + if (!memregion) + return ret; + + pgoff =3D (vmf->address - vma->vm_start) >> PAGE_SHIFT; + pfn =3D PHYS_PFN(memregion->memphys) + pgoff; + + scoped_guard(rwsem_read, &nvdev->core_device.memory_lock) + ret =3D vmf_insert_pfn(vmf->vma, vmf->address, pfn); + + return ret; +} + +static const struct vm_operations_struct nvgrace_gpu_vfio_pci_mmap_ops =3D= { + .fault =3D nvgrace_gpu_vfio_pci_fault, +}; + static int nvgrace_gpu_mmap(struct vfio_device *core_vdev, struct vm_area_struct *vma) { @@ -137,10 +163,8 @@ static int nvgrace_gpu_mmap(struct vfio_device *core_v= dev, container_of(core_vdev, struct nvgrace_gpu_pci_core_device, core_device.vdev); struct mem_region *memregion; - unsigned long start_pfn; u64 req_len, pgoff, end; unsigned int index; - int ret =3D 0; =20 index =3D vma->vm_pgoff >> (VFIO_PCI_OFFSET_SHIFT - PAGE_SHIFT); =20 @@ -157,7 +181,6 @@ static int nvgrace_gpu_mmap(struct vfio_device *core_vd= ev, ((1U << (VFIO_PCI_OFFSET_SHIFT - PAGE_SHIFT)) - 1); =20 if (check_sub_overflow(vma->vm_end, vma->vm_start, &req_len) || - check_add_overflow(PHYS_PFN(memregion->memphys), pgoff, &start_pfn) || check_add_overflow(PFN_PHYS(pgoff), req_len, &end)) return -EOVERFLOW; =20 @@ -168,6 +191,8 @@ static int nvgrace_gpu_mmap(struct vfio_device *core_vd= ev, if (end > memregion->memlength) return -EINVAL; =20 + vm_flags_set(vma, VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP); + /* * The carved out region of the device memory needs the NORMAL_NC * property. Communicate as such to the hypervisor. @@ -184,23 +209,8 @@ static int nvgrace_gpu_mmap(struct vfio_device *core_v= dev, vma->vm_page_prot =3D pgprot_writecombine(vma->vm_page_prot); } =20 - /* - * Perform a PFN map to the memory and back the device BAR by the - * GPU memory. - * - * The available GPU memory size may not be power-of-2 aligned. The - * remainder is only backed by vfio_device_ops read/write handlers. - * - * During device reset, the GPU is safely disconnected to the CPU - * and access to the BAR will be immediately returned preventing - * machine check. - */ - ret =3D remap_pfn_range(vma, vma->vm_start, start_pfn, - req_len, vma->vm_page_prot); - if (ret) - return ret; - - vma->vm_pgoff =3D start_pfn; + vma->vm_ops =3D &nvgrace_gpu_vfio_pci_mmap_ops; + vma->vm_private_data =3D nvdev; =20 return 0; } --=20 2.34.1 From nobody Tue Dec 2 00:44:25 2025 Received: from BL2PR02CU003.outbound.protection.outlook.com (mail-eastusazon11011035.outbound.protection.outlook.com [52.101.52.35]) (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 7D0A53002C1; Mon, 24 Nov 2025 11:59:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.52.35 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763985584; cv=fail; b=I7cMkfvw6SwkXYEcQokEhFIRrBNSA32xnECfskC8UJNFzVP1tbFRVhH0m6mTsSH50graQECujj+mr6H/DMMjvgNUCvDVHG5jJ5WMHOiEg0VyaEF45W1FsaADkXB904dgJ0HuAVafwOf0vosoNZF33k78Nb05ct6t8jrzFK94n5k= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763985584; c=relaxed/simple; bh=D8BFgiLYDvSGI/GkdCLLePGy3RIWkAJphrGhVBpRJ8w=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sEAyaB9sbRNvmPU+iWL/8W2lJlOp15KGDoQmQ+WJShne7Jcxq/qE6dIIE+0kjoOZRgJkPr8huTiO1hspl4kjWFu7ZMVAeLJtggWnO5aXCbC/+RJEBNkZTszPQhz4/nsRhbWUWFRbOp5aafaBwU0AQzTh+rktAINWwoxJFpDLKUM= 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=HVl6RzCF; arc=fail smtp.client-ip=52.101.52.35 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="HVl6RzCF" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=G4+/kOH7JGt+BhuRqzpMN8tm6jTTUSYeTRF0gQ7bskv3mmlb7RbKbpdNkfl34JaHQMgzJiZBtbRWeauvgO6ho9XJD9dNBpN+zXX7ZUhYA6DQaX9krp9dDwxMTY2XZXvhwpg18wI/DGNetiGExf7GsBGAjeXtApLEYK7LW5n4RjuQKPJOo/VPzimKkleoeSOeJBYrHHNe+e7/IxLuAY8rQuQkvDV8ne3kXZtKh33ct4Q81Z8nIX4X8mTgmjyjjrTfsOZvfFJG3hzqZFaerkS4EC6kwuMP8n4fszNB0Na30PoI7bBnTEDGyBgRH4YGonlbZyT0HOWc/da4c4xYO3c0xg== 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=JM9dGDDE5UoYXoyJs4RNmZe3Vew5IfPR1TQllmAxxkw=; b=IGwro0MyrowthgLo1zniq5L9w1+12W28py4DUwWVeumGeVA7bd3HOBLerI8Ut4gTDbHFI32OUxOdz5BMXkO1D6D1Nf4Xazjs7g9NEjobRQzK39ce12tzmhMjhUBeYwovRbMMn9n2yASu7sYcj84bKisqnAkB9iWnyZSEz7eK4Qs5kXumExkV7NTuqBGOqEbntyz3AUItmHzNRbARgbXmQNyUU7Wjex77YCKYRrNm3iM43VNFotvMQonPJA/eFGnD3Wgj9eiOFLPqwEXkfH1q3IU67cJNI7dB10XrKDAtbuX1BZCTl2emB077AHw7PvjCYjfLvC5Z9JDaPnmE/rhTiQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=JM9dGDDE5UoYXoyJs4RNmZe3Vew5IfPR1TQllmAxxkw=; b=HVl6RzCFca1rAY3N8i8UkADQzOiSDEaVLn/39k5K82e1qPD8GToyhI/jhhUz7Y9GE8qCGahB8CkRB6ou9cEkiJVwVwKNxK725QmXdtQooddGH3GaEyVN8x6HNVtvTpp9PHNVimZ3ISMc3oh2ZyxR9tDn9o3G94UWUuSVlDjSNX9DkpZyeopkfoHfYEMhUEky7U6sApGO2EtuRXNsUNLQ+B6/ViTQy4BaKi8Q1xE5DIgqNw40Zjr/F0ftGJ37SMn90vKNjo6SiBJXWBoGgb8hM8/C/vq0bbkxghtIPSMce3SeF89cBfTcrnY+EjQyiXCHSoOpxwn6G4WoSg6IXC/Z+A== Received: from SJ0PR13CA0141.namprd13.prod.outlook.com (2603:10b6:a03:2c6::26) by CY8PR12MB8410.namprd12.prod.outlook.com (2603:10b6:930:6d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.17; Mon, 24 Nov 2025 11:59:38 +0000 Received: from SJ5PEPF000001CF.namprd05.prod.outlook.com (2603:10b6:a03:2c6:cafe::82) by SJ0PR13CA0141.outlook.office365.com (2603:10b6:a03:2c6::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9366.10 via Frontend Transport; Mon, 24 Nov 2025 11:59:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by SJ5PEPF000001CF.mail.protection.outlook.com (10.167.242.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9366.7 via Frontend Transport; Mon, 24 Nov 2025 11:59:38 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 24 Nov 2025 03:59:29 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 24 Nov 2025 03:59:27 -0800 Received: from gb-nvl-073-compute01.l16.internal032k18.bmc032b17.internal032f11.internal032huang.bmc032l04.bmc (10.127.8.11) by mail.nvidia.com (10.126.190.181) 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, 24 Nov 2025 03:59:27 -0800 From: To: , , , , , , , , CC: , , , , , , , , , , , , , , , , Subject: [PATCH v5 2/7] vfio: export function to map the VMA Date: Mon, 24 Nov 2025 11:59:21 +0000 Message-ID: <20251124115926.119027-3-ankita@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251124115926.119027-1-ankita@nvidia.com> References: <20251124115926.119027-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: SJ5PEPF000001CF:EE_|CY8PR12MB8410:EE_ X-MS-Office365-Filtering-Correlation-Id: 6b6d657c-40fe-4d87-8241-08de2b50f189 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|7416014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?0dpCgU9CFYGcn9oRitMOTa9ruFvmu4UPbdG3njzSSM2hV07xKJdKBjjAQQ2Z?= =?us-ascii?Q?LznbxU6Umr03UNx2U20uSLYm20h67v5jiz58ciVGQ8NpznRqRVpl5ZeipyQX?= =?us-ascii?Q?eDcVDwO2CjFpAGazrIQqAaTbKWHYOA7ES4uqGF+tLgHpMYi0+F7gkDMXzMjJ?= =?us-ascii?Q?cNmx9BZ7dcUxSwS1clExVrDnuPKWhBrtkpSIQQi0qSI+AT5UL82VYBioobGk?= =?us-ascii?Q?5x8j/56TDQhGFBEL4vWeyIS6/lTcQ8GpEZkcu6zmVNHT567nufvGpfqdULVW?= =?us-ascii?Q?Q59Oucvv2H2iBxenPhULW5Nh1iduXz6tiTcrUJZKCPFX8kWvZLcudBoE/VXT?= =?us-ascii?Q?1O52BgfmKYlZ2FRE5qdcFnbYpls/MbpiDDPc/yvsg+wmSNsril5xxdBHCm6V?= =?us-ascii?Q?z9KLmd0ECFqgyHrU8RTsRioZqOVsqUAhTG0OMPyINQaxUW96EP9Zrk9mjRO/?= =?us-ascii?Q?hJ35d0Xuiu/RGnMgE4xvPG4gY1m6JSnANiomuQ9NjphCjClZlwE1KhSf0u8C?= =?us-ascii?Q?XhcIugrQ53g2oRfCraE3UQmLUN7B3T8gu51OV5q2IX4lTrjZu6/Vo5SHUHJk?= =?us-ascii?Q?wnkSuDav70uuNi8XSpCR6I0tsafNjkMgf9aWO6PqSWPhRYpFEj3D3me3BOr0?= =?us-ascii?Q?F+4RqinQj8lqSxCpBKySgZek+aotX5NFEYPKafoZ4VV2rXS83WszekZRNnJE?= =?us-ascii?Q?j/h32CfHAvceN0Xw/0e0euhXsUH/CdBC+zY+6RTho1NOg5rIk22Km//pQG1B?= =?us-ascii?Q?g6nSWGtgcjgh5rp0yhEw9y5Q4JJXyq0GT2e+60DOaImq6kFX61H3lsmdkYMA?= =?us-ascii?Q?Kg+UH1PJRQ/LegvWcu4o/gnB4uma407PxtD2lMtG+YI7QjDdQuHW9DH8b28m?= =?us-ascii?Q?61gD9v4QbEWluKs6uyk+mkqrohGcmutY2fp7kouvGJDiOwGZw3ANIfCwRtrq?= =?us-ascii?Q?pl3dpPF2g66on1Qu0zAC3Js1fpGxeJTwoxyCvshHsEBnnhwIwBuN5FWl9hl6?= =?us-ascii?Q?Wju0LPrM4cjIgV0tR3R6+GQGo1SIjbFTo+xdWR4IHsMlNB2eOrhN1YrSX6Yh?= =?us-ascii?Q?Pg5hzZSMkAucaocDyCPOzFcJeWKyW+gX2ikvwnYbMZRnqqd7kM1qjmq9BNyW?= =?us-ascii?Q?N87Ia/8NqTbDVvfHDqU8epllTJDD3Ewdg4ZYTRnqdy7i8+nA5SY9wg4mvNej?= =?us-ascii?Q?BpXmRurwJxgNYS8r81DRATQWSADZSe4SeStPKF6aidpDR1CsJg0Hoc8DKM8X?= =?us-ascii?Q?JwEutO6BOZMXAFHQrTNRc9LIPdd/+bvlRtkeBp8g0YuXDJWLA72fNU9lSvJo?= =?us-ascii?Q?T2Xa9e8eWJ3kuZtHxbdrXZyOhhaukSQ79uX6FXRQSARBeJXPIpWQ+7OKbgkm?= =?us-ascii?Q?yF2Vo0hbHVl08N0wsHObbnsICiahkKI3WHiXw6JUzERS4YGluavukg5I0KyR?= =?us-ascii?Q?pu0VXB7UXio4/iYr6RdmuY0suUGfZO0IKFNv96AtMaPB7m4yCprUcS02B2Vi?= =?us-ascii?Q?yIxRpqFiqpOst69nXWz9ZFY73AicQEA18VwuxRDXaJnfiHvlCjlZGVmFiN0E?= =?us-ascii?Q?gQ8lqqTGz8AwTl1d6zM=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230040)(82310400026)(376014)(7416014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2025 11:59:38.2729 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6b6d657c-40fe-4d87-8241-08de2b50f189 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001CF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8410 Content-Type: text/plain; charset="utf-8" From: Ankit Agrawal Take out the implementation to map the VMA to the PTE/PMD/PUD as a separate function. Export the function to be used by nvgrace-gpu module. Signed-off-by: Ankit Agrawal --- drivers/vfio/pci/vfio_pci_core.c | 46 ++++++++++++++++++++------------ include/linux/vfio_pci_core.h | 2 ++ 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_c= ore.c index 7dcf5439dedc..ede410e0ae1c 100644 --- a/drivers/vfio/pci/vfio_pci_core.c +++ b/drivers/vfio/pci/vfio_pci_core.c @@ -1640,6 +1640,34 @@ static unsigned long vma_to_pfn(struct vm_area_struc= t *vma) return (pci_resource_start(vdev->pdev, index) >> PAGE_SHIFT) + pgoff; } =20 +vm_fault_t vfio_pci_vmf_insert_pfn(struct vm_fault *vmf, + unsigned long pfn, + unsigned int order) +{ + vm_fault_t ret; + + switch (order) { + case 0: + ret =3D vmf_insert_pfn(vmf->vma, vmf->address, pfn); + break; +#ifdef CONFIG_ARCH_SUPPORTS_PMD_PFNMAP + case PMD_ORDER: + ret =3D vmf_insert_pfn_pmd(vmf, pfn, false); + break; +#endif +#ifdef CONFIG_ARCH_SUPPORTS_PUD_PFNMAP + case PUD_ORDER: + ret =3D vmf_insert_pfn_pud(vmf, pfn, false); + break; +#endif + default: + ret =3D VM_FAULT_FALLBACK; + } + + return ret; +} +EXPORT_SYMBOL_GPL(vfio_pci_vmf_insert_pfn); + static vm_fault_t vfio_pci_mmap_huge_fault(struct vm_fault *vmf, unsigned int order) { @@ -1662,23 +1690,7 @@ static vm_fault_t vfio_pci_mmap_huge_fault(struct vm= _fault *vmf, if (vdev->pm_runtime_engaged || !__vfio_pci_memory_enabled(vdev)) goto out_unlock; =20 - switch (order) { - case 0: - ret =3D vmf_insert_pfn(vma, vmf->address, pfn); - break; -#ifdef CONFIG_ARCH_SUPPORTS_PMD_PFNMAP - case PMD_ORDER: - ret =3D vmf_insert_pfn_pmd(vmf, pfn, false); - break; -#endif -#ifdef CONFIG_ARCH_SUPPORTS_PUD_PFNMAP - case PUD_ORDER: - ret =3D vmf_insert_pfn_pud(vmf, pfn, false); - break; -#endif - default: - ret =3D VM_FAULT_FALLBACK; - } + ret =3D vfio_pci_vmf_insert_pfn(vmf, pfn, order); =20 out_unlock: up_read(&vdev->memory_lock); diff --git a/include/linux/vfio_pci_core.h b/include/linux/vfio_pci_core.h index f541044e42a2..970b3775505e 100644 --- a/include/linux/vfio_pci_core.h +++ b/include/linux/vfio_pci_core.h @@ -119,6 +119,8 @@ ssize_t vfio_pci_core_read(struct vfio_device *core_vde= v, char __user *buf, size_t count, loff_t *ppos); ssize_t vfio_pci_core_write(struct vfio_device *core_vdev, const char __us= er *buf, size_t count, loff_t *ppos); +vm_fault_t vfio_pci_vmf_insert_pfn(struct vm_fault *vmf, unsigned long pfn, + unsigned int order); int vfio_pci_core_mmap(struct vfio_device *core_vdev, struct vm_area_struc= t *vma); void vfio_pci_core_request(struct vfio_device *core_vdev, unsigned int cou= nt); int vfio_pci_core_match(struct vfio_device *core_vdev, char *buf); --=20 2.34.1 From nobody Tue Dec 2 00:44:25 2025 Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazon11012041.outbound.protection.outlook.com [52.101.43.41]) (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 B3339303A07; Mon, 24 Nov 2025 11:59:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.43.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763985590; cv=fail; b=GS6cHCe+O478dFCa+jQFXN5r5f7JXYAO8L8nGOg0lmCwC3AA0/zmTYMZxPfQqznMllTvFIWe1Ld/7TpiGRgh52zx2+gBdcanttKjSWDg+I0w0da4+5jdMARovgwRlztydbuTERHBSQwxVqSblZXjW6uQGcBmY3P2gxzBgu9CBvQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763985590; c=relaxed/simple; bh=xP6ILGF7urCKTOZA36PMHRLHZhll0y9MnJ4hrmR5Kjk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=l9562WCMLUCUwuqeWrDozzmKx6wVhOR/yWqPgzBtMgvveBUerLmhk7DHq2gbwRIRiTM8YWrxEjbQ1eppd/Fwinn8dOUITNZXxBFyycydQShgGgUW8ogE6kFMWJyvxZeIQLBSUt9ZXbidruMPmDh9DjLYa/jhs8yu9nScQ26fkJ0= 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=OMwZteUV; arc=fail smtp.client-ip=52.101.43.41 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="OMwZteUV" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rWds2kZI0ar29A07mNvkaO+JaioB01r8oiPlBUuCKFWev71FEFAAFcBa4rGONvtkc67PyPYnoHOOXIOMTGeJCnm4i6mMfEQ4QGIuaQHgUrHXe/ovoWJaIoAmeMqjyi0HUor/WBGoRgFVW+PVnHr9Wqnmv+wjJnK3zTsrUslAp28oyG+BhslG5HeSkcIHbKUHqFMQAEscQNp5ssFeeisZ5WWjRLSWhPvEyUcixljWUvw0LyhhZguyEiD2YhwJ+GribVN0MRKBavbcaLABaHCS5TmuTPL2vVjYCeFl/wsSRsJXYAPhN9/pX5VDZxCN2GEk7cemsqmf6HTR6oLWfWL2rw== 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=NtYfWSJ+wwbimaPsqImpTuPLi8Es28DgqYKGYT8fHuc=; b=oGD1xK2RQO4y9XYcpLET9EIiMrEGynz4YZzydXQkHDK06GpCJW1i/hmbjRJM6NzVLuZdJCz/hhCAfT/6WX7IShvbdRzlWEimhJL8IDfQRhejt20aJYZHmzlfKzRtShwipOMC1CgtTDBSk9Sc9emYTaoG1umv33bWx51xr1zvjcHxcdg445snowePcPRw4axpm2LCQnhMLpLwVshw56N0E2sJkRVIW43bLjmMM2hp3I8QpXW4b565NYW0EKTQRmTUmqG6xHffqMh6vc2M3N3b5hct/JgSaAxfZSVytlEPXaLc7oUFgTfDZrxv8QXE9ZBlFmB8osVYjAlXN4Srw072BA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) 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=NtYfWSJ+wwbimaPsqImpTuPLi8Es28DgqYKGYT8fHuc=; b=OMwZteUV+7uuNSyKawERbM3c1/0s4y+UkTU3KQcVkJkoVPJPrDtqENRrhlgp6i4nmEvcEgcKRqCiD79928KyUL4CNyE+AyfP/rOx0DJaL6reoCDL1g9Vj7nQNjOPBSjMcSgGlPGPhEcTsgKurlFgKxaR4IOuT7yZklBt4J8LtO9iuM8Qcatq3B1olhC8KFp+NDdoEHywHwDZcIyo5LaEFS0tVZBBLrImPy5w8nlEJXBB7e1208AZNnIZWOa3h3qZnd/JJsXiMvQr+UKvEUL7HC87+asTFIV2SEqOiizB/+2VM/kq4p7fzWz00kKL0M/6or/uUpC/ZRXZRltcgyYz2w== Received: from MN2PR08CA0018.namprd08.prod.outlook.com (2603:10b6:208:239::23) by PH7PR12MB6935.namprd12.prod.outlook.com (2603:10b6:510:1b9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.15; Mon, 24 Nov 2025 11:59:44 +0000 Received: from BN3PEPF0000B072.namprd04.prod.outlook.com (2603:10b6:208:239:cafe::e2) by MN2PR08CA0018.outlook.office365.com (2603:10b6:208:239::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9343.17 via Frontend Transport; Mon, 24 Nov 2025 11:59:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by BN3PEPF0000B072.mail.protection.outlook.com (10.167.243.117) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9366.7 via Frontend Transport; Mon, 24 Nov 2025 11:59:44 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 24 Nov 2025 03:59:30 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 24 Nov 2025 03:59:29 -0800 Received: from gb-nvl-073-compute01.l16.internal032k18.bmc032b17.internal032f11.internal032huang.bmc032l04.bmc (10.127.8.11) by mail.nvidia.com (10.126.190.181) 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, 24 Nov 2025 03:59:29 -0800 From: To: , , , , , , , , CC: , , , , , , , , , , , , , , , , Subject: [PATCH v5 3/7] vfio/nvgrace-gpu: Add support for huge pfnmap Date: Mon, 24 Nov 2025 11:59:22 +0000 Message-ID: <20251124115926.119027-4-ankita@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251124115926.119027-1-ankita@nvidia.com> References: <20251124115926.119027-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: BN3PEPF0000B072:EE_|PH7PR12MB6935:EE_ X-MS-Office365-Filtering-Correlation-Id: c537022a-6e82-405e-cd16-08de2b50f50e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|82310400026|1800799024|36860700013|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?B+lr+i2/Y1Z0CZfwIeXRdC3EQ13BSE6+hbK1oD1Id0NhMpIH7+kup3wm6b/s?= =?us-ascii?Q?3x/tAiwz27cheiOB+dCXKAeCK/9GQlZPKsNje0OGzGafoyG+1m7zl0mH9dDG?= =?us-ascii?Q?Re79XL7nhI8AcjECB1WEREKcvo8Apl3b3A7utJfNjhkHx37eir3U8t8Xi2Ne?= =?us-ascii?Q?X+1Ay2alLyAqIo1cSLsMj0H9A42B6qsjXTr2DXGLbNAHRdCDk9luesBe6+3U?= =?us-ascii?Q?oe+Nd0tjrl9kdBL5l9T9kQZOqYb4LhaMtveslMKzNkqCoXyHta8tzZrsvpdk?= =?us-ascii?Q?9+c8NJtQH4W2sWma+cb4nAtE4mZxXGWSmo1vdGUnKIc6roJAR8SOAz/WFY/P?= =?us-ascii?Q?0fVX5Gn88TROUq6E0W5bD3dzFoihPTxdhlw8xGo5mFx+bwi//A0aT9CRTjiv?= =?us-ascii?Q?Wq9vw0QQZ56rtfazpk6TvAtQL94q4IYrdiNoVbX/nDE5FuXJyALb8NblZWoR?= =?us-ascii?Q?Pu2qwHzhB9osAm9BRYtntjqIkafSD8Ad3wjeAl/9jzmdeUjoNKKoNkeLsMWg?= =?us-ascii?Q?l3KC/9+NNKXaOurZrdm0Ogjedmcqna2JMMPlAuFBqI7F2oKN+HlCq8G6f847?= =?us-ascii?Q?wrlMi+MdQKOEzGGaGb5WrW76iGWI1UKXRMepoXC2gLXGhAl2ZiI5kuEQVNcd?= =?us-ascii?Q?3TnphDnACB5ztrEhVPI9Ug30OLo0Y4BcdNd4tbkLZsMrxFQ/PSaOpjL9P5qo?= =?us-ascii?Q?T3v/mlAAF/9baRjw7t0SjAc8pT7x0c5cqhDgY5faeTUumGiS5+ZWrQDZgQqm?= =?us-ascii?Q?7gY3RFSjF/RvYpdkK5PbVU8fenEzTcCYqz4fym5UXyA+OP6qsbQv+G1Ng7RB?= =?us-ascii?Q?0WNj8m3Mp69liZrioepD++YmMMouV3+cTVqekL1VaQgBoUzCFYO6+M4bhCOn?= =?us-ascii?Q?0DjZC80i6aVwtVXDRL39pMOPD6DyHDOdrTtJAfcIMhy7kTUCcpI3DBXUg1hg?= =?us-ascii?Q?2cZ32uCyVYgyk3MvAcraarsNoMyvfukNhM2pwTlj0E8BpZaUgkfR2ZLMmkwj?= =?us-ascii?Q?KYOiUepQTcBOu+u3q7AlAB8XkiapscKfzk0QQ9G7adoBDsDpmHgYL7PaGTFm?= =?us-ascii?Q?nal28Pyj9g+vleel/IDD29suna8H8IgGDko4y6gIGWpvqUd0GwnbTJkwwHud?= =?us-ascii?Q?KbLdTqBcB6xXhOewO6wCvbufPYvA8YjlIZfAgZ9BvV/ngIoM0P4K7bcTJf0k?= =?us-ascii?Q?nELk+ncP1QBLghRjduOCM5geYDpHv4c4YoGPTV3WEPyeVL3UfjqdiLZajev3?= =?us-ascii?Q?1ggDEy2pkhjwJoYwQZrOVUxBzdf15eOuQd6UDYdxL11xu8vDP2lJJoOQWyov?= =?us-ascii?Q?9Y3SC26iaPSDD/9e+gUovWNI7ZiZPsMqoyWLLIGWF1FYxkmhYx915FXx8PfF?= =?us-ascii?Q?iE9XbUyPtTQingz13ziLWKROjj6bc5BXQi4COb9Fj9Paubv/Yn5vi2Xf+8Gm?= =?us-ascii?Q?ArbOwiy9fHpbocIz5PEVD4ZvECLwM0P75fJCLw/yHQdwnD5uRPxTBewUnu7p?= =?us-ascii?Q?rjejheSQMcUf+bBTrCFBE9WFyZssWtC42ZRlZX5RF/VlUHSWnlFuqhFejuWd?= =?us-ascii?Q?sL+GkZxYXOB2ZrzgOig=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.232;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge1.nvidia.com;CAT:NONE;SFS:(13230040)(7416014)(376014)(82310400026)(1800799024)(36860700013)(13003099007);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2025 11:59:44.0270 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c537022a-6e82-405e-cd16-08de2b50f50e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.232];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN3PEPF0000B072.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6935 Content-Type: text/plain; charset="utf-8" From: Ankit Agrawal NVIDIA's Grace based systems have large device memory. The device memory is mapped as VM_PFNMAP in the VMM VMA. The nvgrace-gpu module could make use of the huge PFNMAP support added in mm [1]. To achieve this, nvgrace-gpu module is updated to implement huge_fault ops. The implementation establishes mapping according to the order request. Note that if the PFN or the VMA address is unaligned to the order, the mapping fallbacks to the PTE level. Link: https://lore.kernel.org/all/20240826204353.2228736-1-peterx@redhat.co= m/ [1] cc: Alex Williamson cc: Jason Gunthorpe cc: Vikram Sethi Signed-off-by: Ankit Agrawal --- drivers/vfio/pci/nvgrace-gpu/main.c | 43 +++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/drivers/vfio/pci/nvgrace-gpu/main.c b/drivers/vfio/pci/nvgrace= -gpu/main.c index f74f3d8e1ebe..c84c01954c9e 100644 --- a/drivers/vfio/pci/nvgrace-gpu/main.c +++ b/drivers/vfio/pci/nvgrace-gpu/main.c @@ -130,32 +130,58 @@ static void nvgrace_gpu_close_device(struct vfio_devi= ce *core_vdev) vfio_pci_core_close_device(core_vdev); } =20 -static vm_fault_t nvgrace_gpu_vfio_pci_fault(struct vm_fault *vmf) +static vm_fault_t nvgrace_gpu_vfio_pci_huge_fault(struct vm_fault *vmf, + unsigned int order) { struct vm_area_struct *vma =3D vmf->vma; struct nvgrace_gpu_pci_core_device *nvdev =3D vma->vm_private_data; int index =3D vma->vm_pgoff >> (VFIO_PCI_OFFSET_SHIFT - PAGE_SHIFT); vm_fault_t ret =3D VM_FAULT_SIGBUS; struct mem_region *memregion; - unsigned long pgoff, pfn; + unsigned long pgoff, pfn, addr; =20 memregion =3D nvgrace_gpu_memregion(index, nvdev); if (!memregion) return ret; =20 - pgoff =3D (vmf->address - vma->vm_start) >> PAGE_SHIFT; + addr =3D vmf->address & ~((PAGE_SIZE << order) - 1); + pgoff =3D (addr - vma->vm_start) >> PAGE_SHIFT; pfn =3D PHYS_PFN(memregion->memphys) + pgoff; =20 + if (order && (addr < vma->vm_start || + addr + (PAGE_SIZE << order) > vma->vm_end || + pfn & ((1 << order) - 1))) + return VM_FAULT_FALLBACK; + scoped_guard(rwsem_read, &nvdev->core_device.memory_lock) - ret =3D vmf_insert_pfn(vmf->vma, vmf->address, pfn); + ret =3D vfio_pci_vmf_insert_pfn(vmf, pfn, order); =20 return ret; } =20 +static vm_fault_t nvgrace_gpu_vfio_pci_fault(struct vm_fault *vmf) +{ + return nvgrace_gpu_vfio_pci_huge_fault(vmf, 0); +} + static const struct vm_operations_struct nvgrace_gpu_vfio_pci_mmap_ops =3D= { .fault =3D nvgrace_gpu_vfio_pci_fault, +#ifdef CONFIG_ARCH_SUPPORTS_HUGE_PFNMAP + .huge_fault =3D nvgrace_gpu_vfio_pci_huge_fault, +#endif }; =20 +static size_t nvgrace_gpu_aligned_devmem_size(size_t memlength) +{ +#ifdef CONFIG_ARCH_SUPPORTS_PMD_PFNMAP + return ALIGN(memlength, PMD_SIZE); +#endif +#ifdef CONFIG_ARCH_SUPPORTS_PUD_PFNMAP + return ALIGN(memlength, PUD_SIZE); +#endif + return memlength; +} + static int nvgrace_gpu_mmap(struct vfio_device *core_vdev, struct vm_area_struct *vma) { @@ -185,10 +211,10 @@ static int nvgrace_gpu_mmap(struct vfio_device *core_= vdev, return -EOVERFLOW; =20 /* - * Check that the mapping request does not go beyond available device - * memory size + * Check that the mapping request does not go beyond the exposed + * device memory size. */ - if (end > memregion->memlength) + if (end > nvgrace_gpu_aligned_devmem_size(memregion->memlength)) return -EINVAL; =20 vm_flags_set(vma, VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP); @@ -258,7 +284,8 @@ nvgrace_gpu_ioctl_get_region_info(struct vfio_device *c= ore_vdev, =20 sparse->nr_areas =3D 1; sparse->areas[0].offset =3D 0; - sparse->areas[0].size =3D memregion->memlength; + sparse->areas[0].size =3D + nvgrace_gpu_aligned_devmem_size(memregion->memlength); sparse->header.id =3D VFIO_REGION_INFO_CAP_SPARSE_MMAP; sparse->header.version =3D 1; =20 --=20 2.34.1 From nobody Tue Dec 2 00:44:25 2025 Received: from SN4PR2101CU001.outbound.protection.outlook.com (mail-southcentralusazon11012002.outbound.protection.outlook.com [40.93.195.2]) (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 1943D30171D; Mon, 24 Nov 2025 11:59:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.195.2 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763985586; cv=fail; b=eiVwII0wa9owx3bvamn4atMiecwqwYNOKQgEhTUqF6u05lrrMC7B/jreOgiCPzWGLx5lBAhCufJpITwTT7yb4O0PDYh+VCRJSOB/bI6SYjRuWj7t4Q84T8qaSiVjKV5K1HiOEgpoi0WFbK2CCfifaKl3CjGeJATZwqZYy2vdZ3s= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763985586; c=relaxed/simple; bh=CbaS8YbEYdLu1oTkaefa/YnRYe2+FkdQJFVWHOr4vjc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mcJdkx82g3SUWTjIXiKlxnF9ZDLhnA3XBsYqalmGeunweOXRG0aDUI+jsu9FiTPcA6vnWLTd9mDDOyqN3xd+ufHq7fPZM9xPGvP5LHUViD8710qjz73BYb9nCU+JGd6JEITfcIb7KuqI8gIrJptU1nvCY1w3ZV+qTsbFXI85flY= 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=uKhPr2il; arc=fail smtp.client-ip=40.93.195.2 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="uKhPr2il" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fyme7ME9SXzYGmSJaF/0/g9+pvoEpx8SFSP/YJmz05Mf1T6sDKupfM1Bu2xFSefiLkgEmHpKuut8RLULzxxdzmNHffkvda+nXjkLlG1flFxwYaxYBpfAw4/+9msQEbOa2beFRtzDDyeW3qC90PAayXTZgRVV6pEbxxadbrGWFVMv8qMwFZt9dXfcw93iBVwIgpCCfeoIMvuh+V9sseoW1hu0xihf+rAbTKqYGePsZzCwC123BseelgcwPVyH+hqtzit/AqufjGM47sjb0Ven1mC3QQoiQwZwbYo3ZSHg1kx2ZavH8JXmbYbfqi6/7au8dESKxKq33gbJcQ9kB0ARUA== 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=vo3foNOqJmiqSOyxox6xkIYxbYFUoqq5rNydFqXASIQ=; b=UHYj/JuEY0LBdAa7z1bGBw8/AF0oQYLMNZrYGjnFXjiiEZmvFIFnOhWEwWu5haSJw15B6J33RJdB3Qph36aKB4BF8W1N9uKT0mPB0X2L0qC8SINW6yP9yBd12KZujY1B8zUwbUkWdkqr82baCXK3WVWhDBKLhpJnmzlPepxpwzovxMNxQ78tnviGGkmbxirOgy8ZbuLFZTuj8keXw9JNDOnb6DlWB7HQYZ/SV1oeTMTSTZeRYfyJ3aeTl3n3l10Y/orBE2SQ4zsyRnvjLgfGYVVL1q0E49YjrYasPncNnzky+C+hY/VTYBwu5i4IsHT3pDJYZCM6JpMGDXmlMkTH9A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=vo3foNOqJmiqSOyxox6xkIYxbYFUoqq5rNydFqXASIQ=; b=uKhPr2ilWnMEHdqIyyBXgjWJ4OYs4GV2VGfvUU7AKpnc5BpCxi9Ngx2dKUKnXiebNQNAWmuqcd0FSb5yY55O/9Lb+fUs8oLYJkkLqkjZmSIpH1LFPkMZuQBMQ7K8VIMvhhJvNSTY/83Z7uklOVpBWXNvi+Bh1CamDMUjqV+vUDGwN0BOiiA0IFSLh2iPvJxq60vi8IvDzirSPSLvMW0P/eCRJU621JJ++PORZEduYyYD1aegxUvFqy5qEhRWvy3Y6BP88mRLH434fpR3HBqdwXBxOkmx6fjAeVbYJo1prODRcXRbo+aqPJnczdXcB6AkCh1aAj5qg6gKerEoeOczxg== Received: from SJ0PR13CA0140.namprd13.prod.outlook.com (2603:10b6:a03:2c6::25) by SA3PR12MB9092.namprd12.prod.outlook.com (2603:10b6:806:37f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.17; Mon, 24 Nov 2025 11:59:40 +0000 Received: from SJ5PEPF000001CF.namprd05.prod.outlook.com (2603:10b6:a03:2c6:cafe::7e) by SJ0PR13CA0140.outlook.office365.com (2603:10b6:a03:2c6::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9366.11 via Frontend Transport; Mon, 24 Nov 2025 11:59:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by SJ5PEPF000001CF.mail.protection.outlook.com (10.167.242.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9366.7 via Frontend Transport; Mon, 24 Nov 2025 11:59:40 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 24 Nov 2025 03:59:30 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 24 Nov 2025 03:59:30 -0800 Received: from gb-nvl-073-compute01.l16.internal032k18.bmc032b17.internal032f11.internal032huang.bmc032l04.bmc (10.127.8.11) by mail.nvidia.com (10.126.190.181) 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, 24 Nov 2025 03:59:30 -0800 From: To: , , , , , , , , CC: , , , , , , , , , , , , , , , , Subject: [PATCH v5 4/7] vfio: use vfio_pci_core_setup_barmap to map bar in mmap Date: Mon, 24 Nov 2025 11:59:23 +0000 Message-ID: <20251124115926.119027-5-ankita@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251124115926.119027-1-ankita@nvidia.com> References: <20251124115926.119027-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: SJ5PEPF000001CF:EE_|SA3PR12MB9092:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d1ef8f6-b88a-4778-d156-08de2b50f2b6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|7416014|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?a1NBLopaF6is15vN8mv8qenYKqTbCUY3CVCPBU24W4iQ+UqeRB3OSZ38ZwLT?= =?us-ascii?Q?bZGQ41vnkb06Kg01+8SMHnXisF6eFWEPdiCD9kXHkitFy4SRdVriZhYl8dAl?= =?us-ascii?Q?xhXyqny2gDe3lfYy+rdodFVz5zrQ4R1N0F9svJ29gY1uhAhbx/F2gYZzXsDc?= =?us-ascii?Q?a9+yUs4tUpVhcmUEQdS00olgtw3p50/CrA8vmWt51PdYd4DnIWV9jtbVB98q?= =?us-ascii?Q?i6R6yvgQ0oqTGlWjrH24EsRTwDZHtMh/oTII8gADcLxKHeUyxEwVITBawM0k?= =?us-ascii?Q?eu21iIunDapjERUqG8qqwlm/pCUfskDaKYQxJyTzvozKQ0dEpK3yilgqSV7L?= =?us-ascii?Q?lrfsbmYNr5aMmp7lwAfPv9pOoshvL94zfbJ7jVZDWpgiEsCrXjUChJHfb8L8?= =?us-ascii?Q?mECCG69I6GvqloIiIuCOIJuGqNkkmCL8RfzHCy11qnut3/l6rcickEzpe7iT?= =?us-ascii?Q?BrKUqRMaEUX+GJQslgonUoUUJmPAwNN5KBGTnL9ZLk2ZVD3VVoR228fR61rn?= =?us-ascii?Q?W1BROrDPyP3+Sm/SpN9IjKutuIAhzLF+jPsKwp30vR2dtIMTMOfmP/52IVQQ?= =?us-ascii?Q?AIaMXKLm5wWqDTzuFCheUGfDEyTAaobLjJB0PHo48NJz1LC817VTFPWEY50X?= =?us-ascii?Q?2R81PaGcVXXMAMqsDzqJjb1xyhjCwetZ1qLPk/vMGb2laQQF1KRIDIc6KOHr?= =?us-ascii?Q?BvbqlVsXqKCpeXqr1YZBEF6VnbDbA28BA9Pu0+a5h67juruWHBtWtMnfifxe?= =?us-ascii?Q?7jQ/wY/jmjU5DgG56xwRV3pqJG0oCraq0IewehfXGZL+p9o2nftfefae6oE6?= =?us-ascii?Q?zTI/lJXVPdpUsYUKcBH4g0gvNSBdbDbrcInGFfERBOUyxcEItKLnDKSTO15A?= =?us-ascii?Q?APep6KtdlSJGH+wnaHUpaSJXE+2PEyQ7f3q3Gk+47mKLzV68p6HSyH0DRjDv?= =?us-ascii?Q?5oodsBa+CRcmcBlvLnw48Cw5QRp8m3sKbHtuWTjjsCsoj8dPYqDLbEI+v9HC?= =?us-ascii?Q?cxBJx5/Tb8M0232eQvEQjQUZKO8K2hdb8MzhL2Aamd3seDT5i+B3JHKEBIjz?= =?us-ascii?Q?bDUIU+PHUh0rCFEWLNmtbULUEMIX1q5yU9MW5c93P1+WLBOw3UxPk7USf7hg?= =?us-ascii?Q?n5BgR9/YTqLNX2BkOUhEO4UqNqqSLgzCHFCCqnr4BThp3ve6t7cBV+y7NCv4?= =?us-ascii?Q?obqXax3J1F3N0jhNKn0iUknlyhmB7+nzWYR3nsPFyUFii0LHhpkBGSJrD3/P?= =?us-ascii?Q?kEw/Pq0mmuO8utBfgbynAtDOYJVVrZf8Dxp1BHN9CUBX8JHmA/V/vcc6e5jL?= =?us-ascii?Q?AUHrOzZQzl2YR89GpzBivBuU8s86MbNT4XzXrSVLfn9xLp3Q5TOUV5bxrB6+?= =?us-ascii?Q?z6FwaSkUK8lZjMqYounb/0lhYp30mWg6kvNb7ApB6PI1XwARVKrDByimrQES?= =?us-ascii?Q?D5uF4/24QN3CNP6kGPv+Wfao0P2QqpeVvk3SVlV8vdmy4pVynxEQ3jV5Cmhv?= =?us-ascii?Q?Z2Jyo1i941w53djOJOWbom5sn09aQioNgFwTx3VhFfxThiabTgxH+RAnBuHN?= =?us-ascii?Q?tXILeI0q7bWYXaf+RXc=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(82310400026)(7416014)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2025 11:59:40.2153 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3d1ef8f6-b88a-4778-d156-08de2b50f2b6 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001CF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB9092 Content-Type: text/plain; charset="utf-8" From: Ankit Agrawal Remove code duplication in vfio_pci_core_mmap by calling vfio_pci_core_setup_barmap to perform the bar mapping. cc: Donald Dutile Suggested-by: Alex Williamson Signed-off-by: Ankit Agrawal --- drivers/vfio/pci/vfio_pci_core.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_c= ore.c index ede410e0ae1c..3d21f6a8c279 100644 --- a/drivers/vfio/pci/vfio_pci_core.c +++ b/drivers/vfio/pci/vfio_pci_core.c @@ -1761,18 +1761,9 @@ int vfio_pci_core_mmap(struct vfio_device *core_vdev= , struct vm_area_struct *vma * Even though we don't make use of the barmap for the mmap, * we need to request the region and the barmap tracks that. */ - if (!vdev->barmap[index]) { - ret =3D pci_request_selected_regions(pdev, - 1 << index, "vfio-pci"); - if (ret) - return ret; - - vdev->barmap[index] =3D pci_iomap(pdev, index, 0); - if (!vdev->barmap[index]) { - pci_release_selected_regions(pdev, 1 << index); - return -ENOMEM; - } - } + ret =3D vfio_pci_core_setup_barmap(vdev, index); + if (ret) + return ret; =20 vma->vm_private_data =3D vdev; vma->vm_page_prot =3D pgprot_noncached(vma->vm_page_prot); --=20 2.34.1 From nobody Tue Dec 2 00:44:25 2025 Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazon11012045.outbound.protection.outlook.com [52.101.43.45]) (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 88037302CDE; Mon, 24 Nov 2025 11:59:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.43.45 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763985590; cv=fail; b=hQHxFwP9CFtZP+amDTIt0UKywHUo+mooSBxesPJUL8PvArJGdZzx3cc9zW+idmaX6MSsHi+y+Iy1aP+FCMOa1Fr/lT853pBT42bXGKCkSMBRWKlfacEEHfV5uFDZ/o4l7R6Iv5nipny+Z8QLP/tfQEHQ5IeHR99Gey1zdCJcgok= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763985590; c=relaxed/simple; bh=hsMvkEiZ6HcNIfRpNMUsG6rdy4givnq1Bj6hxFF0dM8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OLdEI756t6cUunfvswoGO1Gwyvy6fhp7awXgWY+vNuMahBO58s01hAaBhzCtcs32Yo39fxFJ0t3l1bbKh8qBPswl+/MVS7Oeco+LXssidxyKp3aolCvGZ9XvZpIg1geM3ipwUTHA8aRaD4sDkYcKKMSlHfSrxsmCc1qzNxP44rg= 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=Ebd8k6iW; arc=fail smtp.client-ip=52.101.43.45 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="Ebd8k6iW" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Mg4U9lfHvEECwa04P4x7HM1MId3/cJ6QFpOZrdMago/MYsMXQA4b6oyjs2obBIZ+6wYbJ+9usHJ3oYZDmCMXul+Pe4H76QdL4RSZ3jtbodUjCy2wP5Wj43t4lzJFjQA/YY9AWu88AI/IA2PXBOSQN7ezXmVI9y0SYzNR8blmOrgvj100BJiFjcWmmdz3zxae5WkZHeo3TNfL9j2aqY1ngYVCFpAe9Q+K73hypiwLcb6hlhSUpYoeF5kdDuMeDyh5Cji5L0FQQrXkY+RF3t1114uphdApRuHY9VKVdnofLLgxeam2UdYF92Nz2P4PnElhmn20T2lw7X1NiATce6JsJQ== 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=2lF9O568PCsBk749MUO+UTq4GK0KrVdMqXo/olGG0Bc=; b=SZbFDC+gd0KXxEJClfystc8Tc9N2dC3VProwm/bdtcJY8isKFqmDTXyQpXnBaS/JOuxMS/nL9GO4esyGLiqQ6Y9ZErNKtcyTVEmVURXiETELQx2GLC4+LB0akS83lEVGxB3hUM0gHI/RBsi1Y0unV6i/xw+j0Rs1U2mLC6JQZCxOkqJpgRMIMNztX+uFG3IFW4+1O1X7HsZUG2gkm5Y0azEu/ys0F65DWRiG0sYaSBiNgnAn+SeC9e3OYP7TxspffXhdC2wScbhIZeCPFbj6bhGhcHkVN49ag/+WKpkRGJ+q2+MOSPC/H1MDtVDV023v95p762z4zBAUKxjLY82GZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) 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=2lF9O568PCsBk749MUO+UTq4GK0KrVdMqXo/olGG0Bc=; b=Ebd8k6iWcAZstD3kUht94ahe61AXvZxSC6PdAF8XPJkIcmrJ09VMkW0h37b4qn7wfTKBcErbURCYYV44PaglZfAcOgUpCWMC+EeDHui2MFDAtVG9baJUz3TzB/akPZywTLsHHbL6Bd+Ec5XMCKj4i0ZRrYEdicJIJs+JBieAqmwl7tF9gtrqLqhljgfA2U+qBPtKmPIN/tbylKzZBkafcFAjJnqs6BlzDyEYnR8o7W+fPTveegzc+8qDUj7W/hh5xpGN3ZhYvA+zABV5dJuT3oyPQEyqnz+HNmNib6MY79nyWT1nEmE+wnFMg90EfiETMhbTaUy9AqPqgAJJbPxVVw== Received: from BN0PR08CA0025.namprd08.prod.outlook.com (2603:10b6:408:142::10) by BL1PR12MB5969.namprd12.prod.outlook.com (2603:10b6:208:398::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.17; Mon, 24 Nov 2025 11:59:44 +0000 Received: from BN3PEPF0000B076.namprd04.prod.outlook.com (2603:10b6:408:142:cafe::b7) by BN0PR08CA0025.outlook.office365.com (2603:10b6:408:142::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9343.17 via Frontend Transport; Mon, 24 Nov 2025 11:59:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by BN3PEPF0000B076.mail.protection.outlook.com (10.167.243.121) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9366.7 via Frontend Transport; Mon, 24 Nov 2025 11:59:44 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 24 Nov 2025 03:59:31 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 24 Nov 2025 03:59:30 -0800 Received: from gb-nvl-073-compute01.l16.internal032k18.bmc032b17.internal032f11.internal032huang.bmc032l04.bmc (10.127.8.11) by mail.nvidia.com (10.126.190.181) 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, 24 Nov 2025 03:59:30 -0800 From: To: , , , , , , , , CC: , , , , , , , , , , , , , , , , Subject: [PATCH v5 5/7] vfio/nvgrace-gpu: split the code to wait for GPU ready Date: Mon, 24 Nov 2025 11:59:24 +0000 Message-ID: <20251124115926.119027-6-ankita@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251124115926.119027-1-ankita@nvidia.com> References: <20251124115926.119027-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: BN3PEPF0000B076:EE_|BL1PR12MB5969:EE_ X-MS-Office365-Filtering-Correlation-Id: 3196303d-6402-4c3a-9f05-08de2b50f569 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|36860700013|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?qNEc/dlv4vgmWlsphnVcX1K46zoZVPGeAgf3bGcHx/awTqMtoMe5rQ6Q2e/8?= =?us-ascii?Q?oA8bFzSSapQ9+HQGvLwWjB9fShhACGSX99toYNln3oArGBB6fZ6w2DGGqnlX?= =?us-ascii?Q?HXTEUHykgVAHmh3gzxec0IbBBF0vpWEirUwG+HZPQgYcepxZHJMnudgWZIYv?= =?us-ascii?Q?WGsvF4K46/f9NV1rW7P/bn+tnl8hq1sNXVawoZJifrU4VaqMl65vXTyz0rfG?= =?us-ascii?Q?FXG0BrYhcFx3oYtGFGsPddLInubgak9mEBzG2c1BkY1PX8frlbQhHWpV3TlV?= =?us-ascii?Q?K07Rizc26JmWrWOLvT9+thNI63o67Io/4RVfcqlx6zAhjlmSpShcdbvPnwao?= =?us-ascii?Q?33TpxRrYr8lpc8Iwt1hTXRRXuKqjuVLE0LN3uwPxB9NcrghFK9xbde86hCOe?= =?us-ascii?Q?Y4ZSD2qEc0e/1spj20WY6kA8MmnU8Wrvz2JL48DsKtaV3FzT8MgernbFvrr7?= =?us-ascii?Q?OQgu1FTO5Xr+Q4gdKNHFWj6JkXD2bjh2y47+biSwocXt96FQFSCagdJz3aTE?= =?us-ascii?Q?B0JWxQMtjaosAZlDsGVHD82EErGu6GQ3Odj+eWFn4gMg6vf6zPV4xnFyw6YK?= =?us-ascii?Q?yBPuQ+T7lsq6CTzc5kxmbCtFlfDWGePF0YcOe0tuvAIW+fMS3IJT3kdT2IuX?= =?us-ascii?Q?UF9XgHJymKCb97arw7xGdhTysREveFQwDtoJj1yqudX3n6jE8Z8MCb0JJufN?= =?us-ascii?Q?IaKHFqix9TkKH5ab4y59jhn81YW6tBU1ddY4e/0fR+o/AS6HzpJtl9Sh4Hy0?= =?us-ascii?Q?TPKFDitPbN3GJ0XLkVA+zriP9mVB2PewusK4PTlZ7HWqlaH4DnsdQS/TyVXL?= =?us-ascii?Q?RuBxTbaWcqzZRgCqC9ZTkC6KHI5pdupvuS3qjwT1j7xojUpOBojKkJ+Alypk?= =?us-ascii?Q?gwzTE9bjnkTGsh89TMDJL4bNweQacCeDtUp0LuqpAH4sYXmDBhEVZ1ip08VO?= =?us-ascii?Q?XJfbNWb8ba8EqyY7RMD5JKBt+mDVF6hSt0v5kbIVWVT8K+y8uPdj80wWJ0kb?= =?us-ascii?Q?v79NJxHaZilrQ8cCnFgYcgvQ2br/7p2vFld+gtm1CbTXszdLrea11xMCX0s9?= =?us-ascii?Q?5PL38lHXLChJcZK4ZtLeuyLoR/vHysXsLdKgRWraCEdcVyM9w13K8fUfvdND?= =?us-ascii?Q?bE/B4C9hmY44rVL0QHAVSerybiDnTey7m7i8zhOGSCQVkb6zIDs69sZDJzN7?= =?us-ascii?Q?J4Eo2KimlgWFIjHwWC6b+nNTpQnQCXZx9xn0lZ7moCTHa3iGpgasn/BSA1Ks?= =?us-ascii?Q?ENTlI1QtndeaQvqceenE+6kBy3DwyDL1T1a6660FkwCQsIKVPAzBym3IluWU?= =?us-ascii?Q?UQgk7Am1khAGcLndI9mrwUcY3+g7Q0SzDH+2qZ34pDZNZ6xhqt/RUARAdeOt?= =?us-ascii?Q?CYMG7hNk1m0Y9fQgYk2Pq7Ys2m5YuAnGokYqbfD44vLDwONWPNAr6N7bWifB?= =?us-ascii?Q?0lBCACowNL0pW6Xh8h00uHCETMRHEBEUfVbJyQzKgXznRSedJz/gVHoVtBSQ?= =?us-ascii?Q?HnoYqgU6MvI6zFXP6oCH+N5gh7I59v3ztX7WFWsT4UyxlycA5N8i0KgPBYfr?= =?us-ascii?Q?ZNd22/OFRDPPXnBpss0=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.232;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge1.nvidia.com;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(36860700013)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2025 11:59:44.5620 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3196303d-6402-4c3a-9f05-08de2b50f569 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.232];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN3PEPF0000B076.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5969 Content-Type: text/plain; charset="utf-8" From: Ankit Agrawal Split the function that check for the GPU device being ready on the probe. Move the code to wait for the GPU to be ready through BAR0 register reads to a separate function. This would help reuse the code. Signed-off-by: Ankit Agrawal --- drivers/vfio/pci/nvgrace-gpu/main.c | 33 ++++++++++++++++++----------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/drivers/vfio/pci/nvgrace-gpu/main.c b/drivers/vfio/pci/nvgrace= -gpu/main.c index c84c01954c9e..3e45b8bd1a89 100644 --- a/drivers/vfio/pci/nvgrace-gpu/main.c +++ b/drivers/vfio/pci/nvgrace-gpu/main.c @@ -130,6 +130,24 @@ static void nvgrace_gpu_close_device(struct vfio_devic= e *core_vdev) vfio_pci_core_close_device(core_vdev); } =20 +static int nvgrace_gpu_wait_device_ready(void __iomem *io) +{ + unsigned long timeout =3D jiffies + msecs_to_jiffies(POLL_TIMEOUT_MS); + int ret =3D -ETIME; + + do { + if ((ioread32(io + C2C_LINK_BAR0_OFFSET) =3D=3D STATUS_READY) && + (ioread32(io + HBM_TRAINING_BAR0_OFFSET) =3D=3D STATUS_READY)) { + ret =3D 0; + goto ready_check_exit; + } + msleep(POLL_QUANTUM_MS); + } while (!time_after(jiffies, timeout)); + +ready_check_exit: + return ret; +} + static vm_fault_t nvgrace_gpu_vfio_pci_huge_fault(struct vm_fault *vmf, unsigned int order) { @@ -930,9 +948,8 @@ static bool nvgrace_gpu_has_mig_hw_bug(struct pci_dev *= pdev) * Ensure that the BAR0 region is enabled before accessing the * registers. */ -static int nvgrace_gpu_wait_device_ready(struct pci_dev *pdev) +static int nvgrace_gpu_probe_check_device_ready(struct pci_dev *pdev) { - unsigned long timeout =3D jiffies + msecs_to_jiffies(POLL_TIMEOUT_MS); void __iomem *io; int ret =3D -ETIME; =20 @@ -950,16 +967,8 @@ static int nvgrace_gpu_wait_device_ready(struct pci_de= v *pdev) goto iomap_exit; } =20 - do { - if ((ioread32(io + C2C_LINK_BAR0_OFFSET) =3D=3D STATUS_READY) && - (ioread32(io + HBM_TRAINING_BAR0_OFFSET) =3D=3D STATUS_READY)) { - ret =3D 0; - goto reg_check_exit; - } - msleep(POLL_QUANTUM_MS); - } while (!time_after(jiffies, timeout)); + ret =3D nvgrace_gpu_wait_device_ready(io); =20 -reg_check_exit: pci_iounmap(pdev, io); iomap_exit: pci_release_selected_regions(pdev, 1 << 0); @@ -976,7 +985,7 @@ static int nvgrace_gpu_probe(struct pci_dev *pdev, u64 memphys, memlength; int ret; =20 - ret =3D nvgrace_gpu_wait_device_ready(pdev); + ret =3D nvgrace_gpu_probe_check_device_ready(pdev); if (ret) return ret; =20 --=20 2.34.1 From nobody Tue Dec 2 00:44:25 2025 Received: from DM5PR21CU001.outbound.protection.outlook.com (mail-centralusazon11011046.outbound.protection.outlook.com [52.101.62.46]) (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 C6D503019D2; Mon, 24 Nov 2025 11:59:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.62.46 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763985587; cv=fail; b=argZBbSZWhWXlZWzvAIndtth5+COdTG6Wd5KzUd71+xiaa9tDemgVBkhgPfxWb92hVo0cZSISpeeQmfpXATMKBLEBLU1dZ7E/4gaKRKqxC7f7I7Jx/kLa7UxrGWC4Tm8JzLqlwIDgHfhtU1uMiEqAcllamvJs1j2e6NnEqByoUo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763985587; c=relaxed/simple; bh=3t4pi7rzHdERHTubBXnRtEoWXTDIusT4AE97Au28WY8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SgVETA+lt7/tbSJ5VbnmWMvs7M8IqhHvFlv13s4YF/yVbn5uEEPBGHbyiHTQz/wuiE4esZlIArm3BEDbUJ4Y5VmIIHnuLrNazYao3QCITlqmMWpd3oJ2oBIUIvqltN64kvQncqxOdSFMIiGi9ZgOFxPnxxqqcofnuOhxQGkE9Qc= 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=Su06Dlf/; arc=fail smtp.client-ip=52.101.62.46 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="Su06Dlf/" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Mp8+YmegmBpgJvIdlovFO42vhXnn0G3ocxUNrC6/w9S980hG4zRPDmXad3wmvpPmoOKQ6P/i4PJRNM0MJi1Hbl6d4kgxyXDylY7y5122tt40i9G8qjCFoGaaJhV+LISWWPP0Pre8EszLL7QFtl+3SjdbrBgEHhg8SR/hLD8qSXCBjjGaPPcJWlbeMyz36X9vIQ9YYiQ35VIwgYcbJ5Pw2Oyioaiq8exz41ucrEmcx5JzhtHmaCLUVaOxGI7F1AlRaUAt10ZDlGljDBdr3UkmIQOImRb3ZUB+Eomks8KWkiM3UZuemYHSKHIZz8HRGjpg0Y8o1hoWaKodywbtGQFIpw== 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=+MCJOEkkzwklZS+x26XZEBa/NkUveUmPVttAnE5TTdc=; b=WFUZzQnpjtjoZHuvd2hB2vFN/b04Mzhx9UFTet/QKIQXxh/5FpBb/gVI/FKSKB4hudHvnNJw0F5K2cKScimNAmxD6R8cofHX0oWqVS6wOljm22GIe4puIW69FoUmcopQ3+CpB11NtVsjAGi39mTMQmZDHVXg06+L4cNiWa6iPELUbx9JoeAxfckAINQe3Pa+Zw58ccFUofRwO1+AAFG4Okql2G8FF2qKUqQc9yIrBTZKIYdIQn5vP98vLkscC78kthNLYq5Woqagk3l6wcczZIgc6/Ss/ifXvxzCEEPPOKKq7fMi1PVmmTO9iyWdGZ8o/SPj8OgKI+CF9/6VV7twkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=+MCJOEkkzwklZS+x26XZEBa/NkUveUmPVttAnE5TTdc=; b=Su06Dlf/oQRHF69BsiINvbtz/0UuVWt67BjT5qELQoNaF8Z5s1GN1djwdLTvgtzzeL0POyJ/eRJmdG1ZhpzMmQ5hCHTYPN7qmNTMrKkyvlmcc1pw8k6MxTUy3jcN8TrasuwtkuI6Gfs3AOGDhQ9fBAqAa8MLQUA+WM1uD+mrIt0oIUio0nuNWVBmSVwnf4qPpXmWWqL+IC8aAUUhNRvLTBd4WKCZBMMAuM5l8upvpIC/pAY4SMuqkRoJVvSle6BSYJ7DT7yj91sOUy8tPvJKWMYmUH7t/OgNnzbPqHXRTUaJVoRstSYhz6OXCgiaRyKlYJDpT/w1HrzHdLd1kGGx0w== Received: from SJ0PR13CA0054.namprd13.prod.outlook.com (2603:10b6:a03:2c2::29) by MN2PR12MB4079.namprd12.prod.outlook.com (2603:10b6:208:1d5::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.17; Mon, 24 Nov 2025 11:59:42 +0000 Received: from SJ5PEPF000001C9.namprd05.prod.outlook.com (2603:10b6:a03:2c2:cafe::2) by SJ0PR13CA0054.outlook.office365.com (2603:10b6:a03:2c2::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9366.9 via Frontend Transport; Mon, 24 Nov 2025 11:59:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by SJ5PEPF000001C9.mail.protection.outlook.com (10.167.242.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9366.7 via Frontend Transport; Mon, 24 Nov 2025 11:59:41 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 24 Nov 2025 03:59:31 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 24 Nov 2025 03:59:31 -0800 Received: from gb-nvl-073-compute01.l16.internal032k18.bmc032b17.internal032f11.internal032huang.bmc032l04.bmc (10.127.8.11) by mail.nvidia.com (10.126.190.181) 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, 24 Nov 2025 03:59:30 -0800 From: To: , , , , , , , , CC: , , , , , , , , , , , , , , , , Subject: [PATCH v5 6/7] vfio/nvgrace-gpu: Inform devmem unmapped after reset Date: Mon, 24 Nov 2025 11:59:25 +0000 Message-ID: <20251124115926.119027-7-ankita@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251124115926.119027-1-ankita@nvidia.com> References: <20251124115926.119027-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: SJ5PEPF000001C9:EE_|MN2PR12MB4079:EE_ X-MS-Office365-Filtering-Correlation-Id: 9782136a-6435-441a-eae9-08de2b50f385 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|7416014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?LKxq1cfuuQ+twKxlBrIQ4FDTFmEphy3LqdcEKaOXaJyeLdsYgPs9q0yduigq?= =?us-ascii?Q?Jxz7Mc2CYwRBPfwz9a5CpnnZjVGltZ/3j0ZDbMaHqGSI19A+kLN+RttPrq9N?= =?us-ascii?Q?Qh0Q6POMIx1FYFp6rGU/at0D5uoQjElBSes9FYDzpt7kDEH8P4G2N0Mjy2sI?= =?us-ascii?Q?dgLGg51qe1V8CMpdVCJnnWtXvnz0vWZOJ7gwVqS9qKj1wzyH8qVp4FINGRqQ?= =?us-ascii?Q?l4fCh6Z0CvBJsE70/jkW5/LifOFNDvS79onfDpoPGsBpSVLLPX99OCBO15fZ?= =?us-ascii?Q?Ss/GPF0h4+ZB+Y2WeE0xq5hqTawJ9g87z60xBOj6neSceebOJdRr9s4fZnGX?= =?us-ascii?Q?sSshH85joND5dFdf7bJMku1yiXZXoGV2SrxRq7rTIO1wJsD1jLz7KnqMYFAx?= =?us-ascii?Q?T7aoz5KIT2yLWNZrlO9DCt8hOKmnjM4diypXQo9m0yVR+Oels4XYqXHGzflp?= =?us-ascii?Q?KlM9rEpbq1miP0N21yyxB6sVCfpvZEFPg0Ga7yZ+pK6gV359Rh9+RBYHf0FM?= =?us-ascii?Q?ObzWZ/zNmQb8+3VZFnaOL4rE7PdJywkDej+8gdYftLFdm+VszRqGDpN5SXhw?= =?us-ascii?Q?ueFpKptfn6yzEKxRXth0bGU/YKOGArBdPEosJsSzdCqdlFSVjyM4/EgiQlSn?= =?us-ascii?Q?8ZW7G4jhQwYZh3vkBktMma0MvQjNSQaAWRTxC/8Uo8Hr9Cq2/A+Inrd3mBKw?= =?us-ascii?Q?yk/hK2Gne2F836v9d9eNaoUqJsp23QLVwA6XtefoqPwGdG8SGS9Os/iV/3LO?= =?us-ascii?Q?BE3NnO+ay2ezNUO+dTTJ7OsK4gpBcmAI/ZHEYsC6lfTpuVpLsMlWrImynMZJ?= =?us-ascii?Q?MjUZGXtkCl7qJViORCtiHQBRkpnEAEukfydNQFxw8/dEJr0QDOS+oYBs7rMq?= =?us-ascii?Q?DS5H6herU5Qm20S8kUnpLG/TEGJhIn7wfwePo1fU0NcPDKzyLu+1rXLFVCXc?= =?us-ascii?Q?ngdh4UTWveLL2YOq8Hf9bIXHXbNXt4iRB6Etn3XI1l7MSMKZA6E/muihFMpY?= =?us-ascii?Q?ZQJBj96OIk0RncfTQNI4A0nw1JwhxAFXpsiuc3Z07DCpDyUNYczNIMpfSp1X?= =?us-ascii?Q?Qd1PmHxfpKFWf0XMfy1ReaF0biqJ80EPksIXzYn3LPvVF6aJnqI7l6UHAYfT?= =?us-ascii?Q?93HFiSIili8QF6XXTcVbdHvV1jlQ4Z8wygU8twXjo5GAzEmmhjtttT3wd0v/?= =?us-ascii?Q?aug8FydKHwjXm145RuPHAGqP48pZce08zU+z7E50kl06wBqY3tSB1y1iHlYm?= =?us-ascii?Q?y0NUvEHbH0PBI31lMahyXBefEQqjHNwRr3v8kCbRnpRtJAIGh7a7S7sigvsd?= =?us-ascii?Q?7DuJpPG/56ctrQzhNFzKBFhkAgOSuIW+t4zVGNE9GqkBdvQB8K4XgOWLaJqY?= =?us-ascii?Q?kLzuWewvk/kc5DSqxQJ+mXyHdqY4jOkKal1yjKsNIOaIBZ/2pywIRZOyCtrz?= =?us-ascii?Q?n1YEQMtI2p0L6V8YFnt6350rfq5R6z3lBWYah+IIoG67GlsuoXzrwkT5zWQa?= =?us-ascii?Q?o3ok7pl2jvMOgR2xDkwzjcW2x9k/Imw1hnetjRXBpR1rSeVbqK4531mXbiF+?= =?us-ascii?Q?oNYo3y5Ml0ZX4CnY8pg=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(376014)(7416014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2025 11:59:41.6032 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9782136a-6435-441a-eae9-08de2b50f385 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001C9.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4079 Content-Type: text/plain; charset="utf-8" From: Ankit Agrawal Introduce a new flag reset_done to notify that the GPU has just been reset and the mapping to the GPU memory is zapped. Implement the reset_done handler to set this new variable. It will be used later in the patches to wait for the GPU memory to be ready before doing any mapping or access. Suggested-by: Alex Williamson Signed-off-by: Ankit Agrawal --- drivers/vfio/pci/nvgrace-gpu/main.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/vfio/pci/nvgrace-gpu/main.c b/drivers/vfio/pci/nvgrace= -gpu/main.c index 3e45b8bd1a89..bef9f25bf8f3 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; + /* GPU has just been reset */ + bool reset_done; }; =20 static void nvgrace_gpu_init_fake_bar_emu_regs(struct vfio_device *core_vd= ev) @@ -1048,12 +1050,29 @@ static const struct pci_device_id nvgrace_gpu_vfio_= pci_table[] =3D { =20 MODULE_DEVICE_TABLE(pci, nvgrace_gpu_vfio_pci_table); =20 +static void nvgrace_gpu_vfio_pci_reset_done(struct pci_dev *pdev) +{ + struct vfio_pci_core_device *core_device =3D dev_get_drvdata(&pdev->dev); + struct nvgrace_gpu_pci_core_device *nvdev =3D + container_of(core_device, struct nvgrace_gpu_pci_core_device, + core_device); + + lockdep_assert_held_write(&core_device->memory_lock); + + nvdev->reset_done =3D true; +} + +static const struct pci_error_handlers nvgrace_gpu_vfio_pci_err_handlers = =3D { + .reset_done =3D nvgrace_gpu_vfio_pci_reset_done, + .error_detected =3D vfio_pci_core_aer_err_detected, +}; + static struct pci_driver nvgrace_gpu_vfio_pci_driver =3D { .name =3D KBUILD_MODNAME, .id_table =3D nvgrace_gpu_vfio_pci_table, .probe =3D nvgrace_gpu_probe, .remove =3D nvgrace_gpu_remove, - .err_handler =3D &vfio_pci_core_err_handlers, + .err_handler =3D &nvgrace_gpu_vfio_pci_err_handlers, .driver_managed_dma =3D true, }; =20 --=20 2.34.1 From nobody Tue Dec 2 00:44:25 2025 Received: from SN4PR2101CU001.outbound.protection.outlook.com (mail-southcentralusazon11012029.outbound.protection.outlook.com [40.93.195.29]) (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 B50A6303CBD; Mon, 24 Nov 2025 11:59:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.195.29 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763985592; cv=fail; b=nEcCVPFvQWFM00ZtmTBZ4DSto0T5zH5PClFWG8V5YLA0oxJKlEKxE5fTAQrXm0bKmIsK5qAf5bzT7WhMh+ftzMShuHR8X6Ygna2tSXJ5L5maAijZawxm7vFjRcRRVfs1gTyPsiWEb0doYG7+Lav21WPJJc5+tmlz4A8m6LckV3U= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763985592; c=relaxed/simple; bh=zDfUpyKQzVLdASLpke6+BoRVUhvItJMfJGYXl5XBPIo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Jhpko7GXVX+Q99Pxv1s+o0tSstSHLjqRskZmOZQl+87fCzlpj2ZmiAIsQadgycG/h7/APHoAGdbUgmQ8iqrelqkSt26EqZD/HsMi6FgbHp8iEqAHfUPiiD/U3oiId1AwMal5L8qwQmUVqV4/BQdGZubKOY/IZcUWW2nPtmRDbCI= 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=J0x1ECGe; arc=fail smtp.client-ip=40.93.195.29 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="J0x1ECGe" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=iGfNKbRNROWlMVqZljDjqJ1F8XPR0UhQlLqwuR2a8WcHO52BzRhPSos+cDAX6YJTaWKps4OEfpqQK8JqIzamXQK1mPjRR/a5LY/da6fDrFMZU6C4a3u8UORcFQylyz4OXt2dAcdhfqT/rbl5MZTfYYDHWdqs8p7fkB+swp55URRdkpbLLSuKXLumT6Gor3HpJ+OqUNddm6pbYgxDG6NIrrztAJ25mt0xHsceaz9DXudLottHTJyc8mWvnu/awGEQ0M+iPmSOn3SSrcTqwQNhRgYgeKeJfc4HG5Q1vF+WYhMx1D4Wz1QGcFdOZLEepWloQPLilSm49SzTQ4Z1gqZJxA== 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=ny3ddmRRQjk2t8UZk7vftuDpDkChe6nFIH5m/4F9Bdk=; b=e55GQ62c3FW4qpaPmNartP159tLghU7RXunvSmvcBPdar4p7aIczVO9nAskhwBn6wZH+jmKCDpRs1XJzHzKy8MBMrMCvXcFz/AsHbRypGnf6MSCyKP/wu65dSP05yTDIqMLAQzcIbUikQyK4tB1das0jMtW3KoL39ca3zijFCymVOE2lGo3xSokCQWJ48eUi+Zdm+Cjh/YlkhcBUrkTX2gXY2RhA68QSTqPceE6GEewdcOXe6j7EayhO9U7ti+WfyoSz40iGMg9rEEYwYwEmHvYipYKZtwwLSWHMYmPfipvEI8QBYru0UooXdtz6U8OmD+y5NN5fG9t2Ml/xjv7LHg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=ny3ddmRRQjk2t8UZk7vftuDpDkChe6nFIH5m/4F9Bdk=; b=J0x1ECGe+FUpv26Z2br9M5IFsDhFOOxV2/sy6eJkc8N8zWV5sZNVPwrjejWSF7O2QVQGIHHjdCDB9X56kK4KTt4v4W2su7btvj7Cm8w/oZyLPjg5yuOhcaChonnalfVURx6eJvSivS/F15W6v/nQGQCDZvpX30CwNgZ6Gu/EY5U7MG7GdMDWD8bxf+Dn08rb/yMlmDJ/oeIsP9Peg1Ij2FBdIi5jgBnSYtg+cMyi0d2GViTQY4ip+HqshKKHHpEv8aBjRnLMPbuNuMpVSqGAp23/Ei1cvN5EaOEJG9Zh3CAh474XbZK+Ryd3BgVCRm8n1023T+tBncZrLiY7aEdXUg== Received: from SJ0PR13CA0053.namprd13.prod.outlook.com (2603:10b6:a03:2c2::28) by DM4PR12MB7575.namprd12.prod.outlook.com (2603:10b6:8:10d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.17; Mon, 24 Nov 2025 11:59:43 +0000 Received: from SJ5PEPF000001C9.namprd05.prod.outlook.com (2603:10b6:a03:2c2:cafe::31) by SJ0PR13CA0053.outlook.office365.com (2603:10b6:a03:2c2::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9366.8 via Frontend Transport; Mon, 24 Nov 2025 11:59:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by SJ5PEPF000001C9.mail.protection.outlook.com (10.167.242.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9366.7 via Frontend Transport; Mon, 24 Nov 2025 11:59:43 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 24 Nov 2025 03:59:32 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Mon, 24 Nov 2025 03:59:31 -0800 Received: from gb-nvl-073-compute01.l16.internal032k18.bmc032b17.internal032f11.internal032huang.bmc032l04.bmc (10.127.8.11) by mail.nvidia.com (10.126.190.181) 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, 24 Nov 2025 03:59:31 -0800 From: To: , , , , , , , , CC: , , , , , , , , , , , , , , , , Subject: [PATCH v5 7/7] vfio/nvgrace-gpu: wait for the GPU mem to be ready Date: Mon, 24 Nov 2025 11:59:26 +0000 Message-ID: <20251124115926.119027-8-ankita@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251124115926.119027-1-ankita@nvidia.com> References: <20251124115926.119027-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: SJ5PEPF000001C9:EE_|DM4PR12MB7575:EE_ X-MS-Office365-Filtering-Correlation-Id: be93d6d8-c89c-4abd-f6b7-08de2b50f47e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|376014|7416014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ETVkwsYJXhqPXWWRM0VKnVQpy8UvD07boCPlqnPUot9hkRzwieANiPKawcWF?= =?us-ascii?Q?3DTwiGjCA9NHKLA9OhleK5scqqKlGAiG7vioC4/I50SmCib8f4yoE4BRpM3n?= =?us-ascii?Q?LrD5hsphmNywcVNShLarUOsF7Ue4J+MSwCs0lsPl8kDPJGI1rsaWGOG48M/2?= =?us-ascii?Q?js+F1GDr6sqRe6DId9y/MN3gJRPqY20EIwgcZEs3Q3BBljN+KWbZm/wmINbg?= =?us-ascii?Q?hKWESgTwso7gGyRqdc1fKJiI3ZXLfJWSlSuvIZJglkg4wJ47NgEsBXFjsGNj?= =?us-ascii?Q?tD3QV7FuhBpdduuYHhq7I5tE+fwY9q8wzwcJz28VZPPFLV06UxntIlknxCAG?= =?us-ascii?Q?katWLbyCSgk1yjjd60y/xWxg2wUKckOmUe4FoVeg9vBo0+UxhGHx2tIcb8/X?= =?us-ascii?Q?hYwhzurJUXHQVt5F6vbo+AXkGsWCU7P2pTeCZXKPv/ThpJD1XnDTkm4ML8fY?= =?us-ascii?Q?rLg/f2AWy4rUTQhpk42vJnXzYOEGkSdytN0Pvrbv/DLpBxOwXHA7O9G5xIzx?= =?us-ascii?Q?YvNelhxzLfEdC/t2qN7MYpN8qvKqKtRCPdZqLfHHPAtXetDTNRB38Xau6B0v?= =?us-ascii?Q?DZn1vrSjDVHJa46zsdZNng2LvJZt/vGSCyvB1LzSeWMReJFHjhw9ucgx9c4b?= =?us-ascii?Q?lQhru3NAZLw7hwVNBjUhTlbUmvXsMGNzVqv7zx2YhhfWLRgPeeUFzhW5JhWV?= =?us-ascii?Q?1ORvmkb0IS9X/YzkBVDb+kVQx+bbHiYgsQPeyqcZ4vM7onSaNfqxhj+beT/l?= =?us-ascii?Q?sMDcATW2XYSU/3zxa7SNy/xgzlnvq09Hljqmf0g8yenJhaXWpgP98HhdO8cj?= =?us-ascii?Q?CGQ6YY0N7RGfyzE/6qasN20SobMS4HXoDbltpHUDG0kPZh5thFz6gSngznfu?= =?us-ascii?Q?uDV9HCGXYaLC6LZfnpKFq5AUqsfq9L2/lXOOgum7sn66lMWi9eSQH/5WQDnB?= =?us-ascii?Q?ytywjRhMsMpL7030i7NvrFbjg779wjyKw/9MKmnIoTYsAKui53RdS8SLXc3n?= =?us-ascii?Q?MMHmH1pGzT6MMej+FOIDEroht54qSiRamLIPkd4OrHEbjNg+AWniK0fLqHYW?= =?us-ascii?Q?eS7kZnNKSCi4G68SZLcgdNHTfxL/jmSHf+2QV6XEnEAip+klr0B/35J6CoHM?= =?us-ascii?Q?Qduo6N+Z7F2irNHFhYe2b1k7Ih6r17ss245XkIeaZl1b397ct/YMhJlMju8u?= =?us-ascii?Q?KTRn1oI/79Shcgkh/NlwlNNvu+XLjrxoFMyRq7HaSEL4MWpl0j27eE/5Klce?= =?us-ascii?Q?kl9gmEccwpIRS298MO/eOSbKIqUnQfboJlScnMA6l1aq6OkO0E5ApXbllYxm?= =?us-ascii?Q?/n1I3EtGyye1RbMp+eji4oYu6+NcCKqeTg+0dwPq4jB4vxSjO1EqjAC+sRtr?= =?us-ascii?Q?hh+Dn7K9Opuf8UJOygjYmlJ8rsHMahMACSOP7aqr0pwi0dAKg1q9EwNBIqFv?= =?us-ascii?Q?t2dPFgqWTogZcYb+/AKkZ3xrHMVMbc+wzMx0eWSpFQey5TjXexE5utZKXiWD?= =?us-ascii?Q?EHG3HabRjRwZAKryTzJeI+9F1s/Ob9vABxfYfgaMPLu+GxGLX+VZpBiS7CuG?= =?us-ascii?Q?j98ORtTI+yYctRvAwp4=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(82310400026)(376014)(7416014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2025 11:59:43.2281 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: be93d6d8-c89c-4abd-f6b7-08de2b50f47e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001C9.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7575 Content-Type: text/plain; charset="utf-8" From: Ankit Agrawal Speculative prefetches from CPU to GPU memory until the GPU is ready after reset can cause harmless corrected RAS events to be logged on Grace systems. It is thus preferred that the mapping not be re-established until the GPU is ready post reset. The GPU readiness can be checked through BAR0 registers similar to the checking at the time of device probe. It can take several seconds for the GPU to be ready. So it is desirable that the time overlaps as much of the VM startup as possible to reduce impact on the VM bootup time. The GPU readiness state is thus checked on the first fault/huge_fault request or read/write access which amortizes the GPU readiness time. The first fault and read/write checks the GPU state when the reset_done flag - which denotes whether the GPU has just been reset. The memory_lock is taken across map/access to avoid races with GPU reset. cc: Alex Williamson cc: Jason Gunthorpe cc: Vikram Sethi Suggested-by: Alex Williamson Signed-off-by: Ankit Agrawal --- drivers/vfio/pci/nvgrace-gpu/main.c | 79 ++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 7 deletions(-) diff --git a/drivers/vfio/pci/nvgrace-gpu/main.c b/drivers/vfio/pci/nvgrace= -gpu/main.c index bef9f25bf8f3..fbc19fe688ca 100644 --- a/drivers/vfio/pci/nvgrace-gpu/main.c +++ b/drivers/vfio/pci/nvgrace-gpu/main.c @@ -104,6 +104,17 @@ static int nvgrace_gpu_open_device(struct vfio_device = *core_vdev) mutex_init(&nvdev->remap_lock); } =20 + /* + * GPU readiness is checked by reading the BAR0 registers. + * + * ioremap BAR0 to ensure that the BAR0 mapping is present before + * register reads on first fault before establishing any GPU + * memory mapping. + */ + ret =3D vfio_pci_core_setup_barmap(vdev, 0); + if (ret) + return ret; + vfio_pci_core_finish_enable(vdev); =20 return 0; @@ -150,6 +161,26 @@ static int nvgrace_gpu_wait_device_ready(void __iomem = *io) return ret; } =20 +static int +nvgrace_gpu_check_device_ready(struct nvgrace_gpu_pci_core_device *nvdev) +{ + struct vfio_pci_core_device *vdev =3D &nvdev->core_device; + int ret; + + lockdep_assert_held_read(&vdev->memory_lock); + + if (!nvdev->reset_done) + return 0; + + ret =3D nvgrace_gpu_wait_device_ready(vdev->barmap[0]); + if (ret) + return ret; + + nvdev->reset_done =3D false; + + return 0; +} + static vm_fault_t nvgrace_gpu_vfio_pci_huge_fault(struct vm_fault *vmf, unsigned int order) { @@ -173,8 +204,18 @@ static vm_fault_t nvgrace_gpu_vfio_pci_huge_fault(stru= ct vm_fault *vmf, pfn & ((1 << order) - 1))) return VM_FAULT_FALLBACK; =20 - scoped_guard(rwsem_read, &nvdev->core_device.memory_lock) + scoped_guard(rwsem_read, &nvdev->core_device.memory_lock) { + /* + * 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 (nvgrace_gpu_check_device_ready(nvdev)) + return ret; + ret =3D vfio_pci_vmf_insert_pfn(vmf, pfn, order); + } =20 return ret; } @@ -593,9 +634,21 @@ nvgrace_gpu_read_mem(struct nvgrace_gpu_pci_core_devic= e *nvdev, else mem_count =3D min(count, memregion->memlength - (size_t)offset); =20 - ret =3D nvgrace_gpu_map_and_read(nvdev, buf, mem_count, ppos); - if (ret) - return ret; + scoped_guard(rwsem_read, &nvdev->core_device.memory_lock) { + /* + * 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. + */ + ret =3D nvgrace_gpu_check_device_ready(nvdev); + if (ret) + return ret; + + ret =3D nvgrace_gpu_map_and_read(nvdev, buf, mem_count, ppos); + if (ret) + return ret; + } =20 /* * Only the device memory present on the hardware is mapped, which may @@ -713,9 +766,21 @@ nvgrace_gpu_write_mem(struct nvgrace_gpu_pci_core_devi= ce *nvdev, */ mem_count =3D min(count, memregion->memlength - (size_t)offset); =20 - ret =3D nvgrace_gpu_map_and_write(nvdev, buf, mem_count, ppos); - if (ret) - return ret; + scoped_guard(rwsem_read, &nvdev->core_device.memory_lock) { + /* + * 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. + */ + ret =3D nvgrace_gpu_check_device_ready(nvdev); + if (ret) + return ret; + + ret =3D nvgrace_gpu_map_and_write(nvdev, buf, mem_count, ppos); + if (ret) + return ret; + } =20 exitfn: *ppos +=3D count; --=20 2.34.1