vfio/nvgrace-gpu: Support huge PFNMAP and wait for GPU ready post reset
Status from this message: Applied to vfio next branch for v6.19. Thanks,
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v9 Latest6 patches 1 replyApplied
- v86 patches 2 repliesSuperseded
- v76 patches 10 repliesSuperseded
Earlier versions · 5
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v6 | 6 patches | 11 replies | Superseded | |
| v5 | 7 patches | 16 replies | Superseded | |
| v3 | 7 patches | 4 replies | Superseded | |
| v2 | 6 patches | 0 replies | Superseded | |
| v1 | 6 patches | 1 reply | Superseded |
Changelog from the cover letter
[v9]
- Check if the memory is enabled before waiting for GPU to be ready in 6/6. (Thanks Alex Williamson)
- Added power management handling in 6/6.
(Thanks Alex Williamson)
otherwise the readiness check would block for 30s.
Patches in v9 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/6 | vfio: refactor vfio_pci_mmap_huge_fault functiondrivers/ include/ | +40 | 0 replies | |
| 2/6 | vfio/nvgrace-gpu: Add support for huge pfnmapdrivers/ | +59 | 0 replies | |
| 3/6 | vfio: use vfio_pci_core_setup_barmap to map bar in mmapdrivers/ | +3 | 0 replies | |
| 4/6 | vfio/nvgrace-gpu: split the code to wait for GPU readydrivers/ | +18 | 0 replies | |
| 5/6 | vfio/nvgrace-gpu: Inform devmem unmapped after resetdrivers/ | +25 | 0 replies | |
| 6/6 | vfio/nvgrace-gpu: wait for the GPU mem to be readydrivers/ drivers/ drivers/ +1 more | +93 | 0 replies |
Reviews trailers per patch
All 6 patches have a Reviewed-by or Acked-by.
| Patch | Shameer Kolothum | Zhi Wang |
|---|---|---|
| 1/6 | R-b | |
| 2/6 | R-b | R-b |
| 3/6 | R-b | R-b |
| 4/6 | R-b | R-b |
| 5/6 | R-b | |
| 6/6 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v9 0/6] vfio/nvgrace-gpu: Support huge PFNMAP and wait for GPU ready post reset
From: Ankit Agrawal <[email protected]>
NVIDIA's Grace based system have large GPU 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.
Secondly, it is expected that the mapping not be re-established until the GPU is ready post reset. Presence of the mappings during that time could potentially leads to harmless corrected RAS events to be logged if the CPU attempts to do speculative reads on the GPU memory on the Grace systems.
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 which amortizes the GPU readiness time. The GPU readiness is checked through BAR0 registers as is done at the device probe.
Patch 1 Refactor vfio_pci_mmap_huge_fault and export the code to map at the various levels.
Patch 2 implements support for huge pfnmap.
Patch 3 vfio_pci_core_mmap cleanup.
Patch 4 split the code to check the device readiness.
Patch 5 reset_done handler implementation
Patch 6 Ensures that the GPU is ready before re-establishing the mapping after reset.
Applied over 6.18-rc6.
Changelog:
[v9]
- Check if the memory is enabled before waiting for GPU to be ready in 6/6. (Thanks Alex Williamson)
- Added power management handling in 6/6.
(Thanks Alex Williamson)
otherwise the readiness check would block for 30s.
- Fix bug to vfio_pci_core_disable on error path in 6/6 (Thanks Shameer Kolothum)
- Code cleanup the huge_fault functions in 1/6, 2/6, 4/6, 6/6 (Thanks Alex Williamson)
- Commit message fix in 5/6, 6/6 (Thanks Alex Williamson)
- Collected Reviewed-by. (Thanks Shameer Kolothum)
- Code cleanup to use ALIGN functions and move the mapping sanity check to the vfio header file. (Thanks Alex Williamson, Zhi Wang)
- Added comments for reset_done implementation. (Thanks Alex Williamson)
- Collected Reviewed-by. (Thanks Zhi Wang)
- Miscellaneous cleanup (Thanks Alex Williamson, Zhi Wang)
- Updated the vfio_pci_vmf_insert_pfn function to add more common code. (Thanks Shameer Kolothum)
- Added missing userspace offset for pgoff calculation for huge pfnmap. (Thanks Shameer Kolothum)
- Removed alignment for GPU memory. (Thanks Jason Gunthorpe)
- Collected Reviewed-by. (Thanks Shameer Kolothum)
- Miscellaneous cleanup, log messages fixup
(Thanks Alex Williamson, Jason Gunthorpe, Shameer Kolothum)
- Updated gpu_mem_mapped with reset_done flag for clearer semantics. (6/7) (Thanks Alex Williamson)
- Renamed vfio_pci_map_pfn to vfio_pci_vmf_insert_pfn. (2/7) (Thanks Alex Williamson)
- Updated to hold memory_lock across the vmf_insert_pfn and the read/write access of the device. (7/7) (Thanks Alex Williamson)
- Used scoped_guard to simplify critical region. (1/7, 7/7) [v4]
- Implemented reset_done handler to set gpu_mem_mapped flag. Cleaned up FLR detection path (Thanks Alex Williamson)
- Moved the premap check of the device readiness to a new function. Added locking to avoid races. (Thanks Alex Williamson)
- vfio_pci_core_mmap cleanup.
- Added ioremap to BAR0 during open.
- Moved the code for BAR mapping to a separate function.
- Added BAR0 mapping during open. Ensures BAR0 is mapped when registers are checked. (Thanks Alex Williamson, Jason Gunthorpe for suggestion)
- Added check for GPU readiness on nvgrace_gpu_map_device_mem. (Thanks Alex Williamson for the suggestion.
- Fixed build kernel warning
- subject text changes
- Rebased to 6.18-rc6.
Ankit Agrawal (6):
vfio: refactor vfio_pci_mmap_huge_fault function vfio/nvgrace-gpu: Add support for huge pfnmap
vfio: use vfio_pci_core_setup_barmap to map bar in mmap vfio/nvgrace-gpu: split the code to wait for GPU ready vfio/nvgrace-gpu: Inform devmem unmapped after reset vfio/nvgrace-gpu: wait for the GPU mem to be ready
drivers/vfio/pci/nvgrace-gpu/main.c | 237 ++++++++++++++++++++++------ drivers/vfio/pci/vfio_pci_config.c | 1 + drivers/vfio/pci/vfio_pci_core.c | 69 ++++---- drivers/vfio/pci/vfio_pci_priv.h | 1 - include/linux/vfio_pci_core.h | 14 ++ 5 files changed, 236 insertions(+), 86 deletions(-)
Signature · 1 line
2.34.1