| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20251125135223.4d932b5b.alex@shazbot.org>
Date: Tue, 25 Nov 2025 13:52:23 -0700
From: Alex Williamson <alex@...zbot.org>
To: <ankita@...dia.com>
Cc: <jgg@...pe.ca>, <yishaih@...dia.com>, <skolothumtho@...dia.com>,
<kevin.tian@...el.com>, <aniketa@...dia.com>, <vsethi@...dia.com>,
<mochs@...dia.com>, <Yunxiang.Li@....com>, <yi.l.liu@...el.com>,
<zhangdongdong@...incomputing.com>, <avihaih@...dia.com>,
<bhelgaas@...gle.com>, <peterx@...hat.com>, <pstanner@...hat.com>,
<apopple@...dia.com>, <kvm@...r.kernel.org>,
<linux-kernel@...r.kernel.org>, <cjia@...dia.com>, <kwankhede@...dia.com>,
<targupta@...dia.com>, <zhiw@...dia.com>, <danw@...dia.com>,
<dnigam@...dia.com>, <kjaju@...dia.com>
Subject: Re: [PATCH v6 2/6] vfio/nvgrace-gpu: Add support for huge pfnmap
On Tue, 25 Nov 2025 17:30:09 +0000
<ankita@...dia.com> wrote:
> From: Ankit Agrawal <ankita@...dia.com>
>
> 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 make use of the huge pfnmap support, 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 vfio_pci_vmf_insert_pfn
> to setup the mapping.
>
> Moreover to enable huge pfnmap, nvgrace-gpu module is updated by
> adding huge_fault ops implementation. 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.com/ [1]
>
> cc: Shameer Kolothum <skolothumtho@...dia.com>
> cc: Alex Williamson <alex@...zbot.org>
> cc: Jason Gunthorpe <jgg@...pe.ca>
> cc: Vikram Sethi <vsethi@...dia.com>
> Signed-off-by: Ankit Agrawal <ankita@...dia.com>
> ---
> drivers/vfio/pci/nvgrace-gpu/main.c | 84 +++++++++++++++++++++--------
> 1 file changed, 62 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/vfio/pci/nvgrace-gpu/main.c b/drivers/vfio/pci/nvgrace-gpu/main.c
> index e346392b72f6..8a982310b188 100644
> --- a/drivers/vfio/pci/nvgrace-gpu/main.c
> +++ b/drivers/vfio/pci/nvgrace-gpu/main.c
> @@ -130,6 +130,62 @@ static void nvgrace_gpu_close_device(struct vfio_device *core_vdev)
> vfio_pci_core_close_device(core_vdev);
> }
>
> +static unsigned long addr_to_pgoff(struct vm_area_struct *vma,
> + unsigned long addr)
> +{
> + u64 pgoff = vma->vm_pgoff &
> + ((1U << (VFIO_PCI_OFFSET_SHIFT - PAGE_SHIFT)) - 1);
> +
> + return ((addr - vma->vm_start) >> PAGE_SHIFT) + pgoff;
> +}
> +
> +static vm_fault_t nvgrace_gpu_vfio_pci_huge_fault(struct vm_fault *vmf,
> + unsigned int order)
> +{
> + struct vm_area_struct *vma = vmf->vma;
> + struct nvgrace_gpu_pci_core_device *nvdev = vma->vm_private_data;
> + struct vfio_pci_core_device *vdev = &nvdev->core_device;
> + unsigned int index =
> + vma->vm_pgoff >> (VFIO_PCI_OFFSET_SHIFT - PAGE_SHIFT);
> + vm_fault_t ret = VM_FAULT_SIGBUS;
> + struct mem_region *memregion;
> + unsigned long pfn, addr;
> +
> + memregion = nvgrace_gpu_memregion(index, nvdev);
> + if (!memregion)
> + return ret;
> +
> + addr = vmf->address & ~((PAGE_SIZE << order) - 1);
> + pfn = PHYS_PFN(memregion->memphys) + addr_to_pgoff(vma, addr);
> +
> + if (order && (addr < vma->vm_start ||
> + addr + (PAGE_SIZE << order) > vma->vm_end ||
> + pfn & ((1 << order) - 1)))
> + return VM_FAULT_FALLBACK;
The dev_dbg misses this fallback this way. Thanks,
Alex
> +
> + scoped_guard(rwsem_read, &vdev->memory_lock)
> + ret = vfio_pci_vmf_insert_pfn(vdev, vmf, pfn, order);
> +
> + dev_dbg_ratelimited(&vdev->pdev->dev,
> + "%s order = %d pfn 0x%lx: 0x%x\n",
> + __func__, order, pfn,
> + (unsigned int)ret);
> +
> + return ret;
> +}
> +
> +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 = {
> + .fault = nvgrace_gpu_vfio_pci_fault,
> +#ifdef CONFIG_ARCH_SUPPORTS_HUGE_PFNMAP
> + .huge_fault = nvgrace_gpu_vfio_pci_huge_fault,
> +#endif
> +};
> +
> static int nvgrace_gpu_mmap(struct vfio_device *core_vdev,
> struct vm_area_struct *vma)
> {
> @@ -137,10 +193,8 @@ static int nvgrace_gpu_mmap(struct vfio_device *core_vdev,
> 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 = 0;
>
> index = vma->vm_pgoff >> (VFIO_PCI_OFFSET_SHIFT - PAGE_SHIFT);
>
> @@ -157,17 +211,18 @@ static int nvgrace_gpu_mmap(struct vfio_device *core_vdev,
> ((1U << (VFIO_PCI_OFFSET_SHIFT - PAGE_SHIFT)) - 1);
>
> 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;
>
> /*
> - * 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)
> return -EINVAL;
>
> + 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 +239,8 @@ static int nvgrace_gpu_mmap(struct vfio_device *core_vdev,
> vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
> }
>
> - /*
> - * 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 = remap_pfn_range(vma, vma->vm_start, start_pfn,
> - req_len, vma->vm_page_prot);
> - if (ret)
> - return ret;
> -
> - vma->vm_pgoff = start_pfn;
> + vma->vm_ops = &nvgrace_gpu_vfio_pci_mmap_ops;
> + vma->vm_private_data = nvdev;
>
> return 0;
> }
Powered by blists - more mailing lists