Skip to content

vfio: handle DMA map/unmap up to the addressable limit

Alex Mastro kvm lkml 6 versions – Applied

Status from this message: Applied to vfio for-linus branch for v6.18. Thanks!

Get series with b4
b4 am [email protected] change-id 20251005-fix-unmap-c3f3e87dabfa

Versions newest first

  1. v6 Latest5 patches 5 repliesApplied
  2. v55 patches 3 repliesSuperseded
  3. v43 patches 23 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v33 patches1 replySuperseded
v23 patches6 repliesSuperseded
v11 patch11 repliesSuperseded

Changes in v6 from the cover letter

- Fix nits in selftests
- Clarify function calls with '()' in commit messages
- Link to v5: https://lore.kernel.org/r/[email protected]

Patches in v6 Applied

#Subject and filesSizeRepliesApplied
1/5vfio/type1: sanitize for overflow using check_*_overflow()drivers/vfio/vfio_iommu_type1.c+63 -230 replies
2/5vfio/type1: move iova increment to unmap_unpin_*() callerdrivers/vfio/vfio_iommu_type1.c+10 -100 replies
3/5vfio/type1: handle DMA map/unmap up to the addressable limitdrivers/vfio/vfio_iommu_type1.c+42 -350 replies
4/5vfio: selftests: update DMA map/unmap helpers to support more test kindstools/testing/selftests/vfio/lib/include/vfio_util.h tools/testing/selftests/vfio/lib/vfio_pci_device.c tools/testing/selftests/vfio/vfio_dma_mapping_test.c+108 -280 replies
5/5vfio: selftests: add end of address space DMA map/unmap teststools/testing/selftests/vfio/vfio_dma_mapping_test.c+90 -00 replies

Reviews trailers per patch

All 5 patches have a Reviewed-by or Acked-by.

PatchAlejandro JimenezJason GunthorpeDavid Matlack
1/5T-b R-b R-b
2/5T-b R-b R-b
3/5T-b R-b R-b
4/5R-b
5/5R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v6 thread

Cover letter [PATCH v6 0/5] vfio: handle DMA map/unmap up to the addressable limit

This patch series aims to fix vfio_iommu_type.c to support VFIO_IOMMU_MAP_DMA and VFIO_IOMMU_UNMAP_DMA operations targeting IOVA ranges which lie against the addressable limit. i.e. ranges where iova_start + iova_size would overflow to exactly zero.

Today, the VFIO UAPI has an inconsistency: The VFIO_IOMMU_TYPE1_INFO_CAP_IOVA_RANGE capability of VFIO_IOMMU_GET_INFO reports that ranges up to the end of the address space are available for use, but are not really due to bugs in handling boundary conditions.

For example:

vfio_find_dma_first_node() is called to find the first dma node to unmap given an unmap range of [iova..iova+size). The check at the end of the function intends to test if the dma result lies beyond the end of the unmap range. The condition is incorrectly satisfied when iova+size overflows to zero, causing the function to return NULL.

The same issue happens inside vfio_dma_do_unmap()'s while loop.

This bug was also reported by Alejandro Jimenez in [1][2].

Of primary concern are locations in the current code which perform comparisons against (iova + size) expressions, where overflow to zero is possible.

The initial list of candidate locations to audit was taken from the following:

$ rg 'iova.*\+.*size' -n drivers/vfio/vfio_iommu_type1.c | rg -v '\- 1'
173:            else if (start >= dma->iova + dma->size)
192:            if (start < dma->iova + dma->size) {
216:            if (new->iova + new->size <= dma->iova)
1060:   dma_addr_t iova = dma->iova, end = dma->iova + dma->size;
1233:   if (dma && dma->iova + dma->size != iova + size)
1380:           if (dma && dma->iova + dma->size != iova + size)
1501:           ret = vfio_iommu_map(iommu, iova + dma->size, pfn, npage,
1504:                   vfio_unpin_pages_remote(dma, iova + dma->size, pfn,
1721:           while (iova < dma->iova + dma->size) {
1743:                           i = iova + size;
1744:                           while (i < dma->iova + dma->size &&
1754:                           size_t n = dma->iova + dma->size - iova;
1785:                   iova += size;
1810:           while (iova < dma->iova + dma->size) {
1823:                   i = iova + size;
1824:                   while (i < dma->iova + dma->size &&
2919:           if (range.iova + range.size < range.iova)

This series spends the first couple commits making mechanical preparations before the fix lands in the third commit. Selftests are added in the last two commits.

[1] https://lore.kernel.org/qemu-devel/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/

---
Changes in v6:
- Fix nits in selftests
- Clarify function calls with '()' in commit messages
- Link to v5: https://lore.kernel.org/r/[email protected]

Changes in v5:
- Add vfio selftests
- Clarify commit message
- Link to v4: https://lore.kernel.org/r/[email protected]

Changes in v4:
- Fix type assigned to iova_end
- Clarify overflow checking, add checks to vfio_iommu_type1_dirty_pages
- Consider npage==0 an error for vfio_iommu_type1_pin_pages
- Link to v3: https://lore.kernel.org/r/[email protected]

Changes in v3:
- Fix handling of unmap_all in vfio_dma_do_unmap
- Fix !range.size to return -EINVAL for VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP
- Dedup !range.size checking
- Return -EOVERFLOW on check_*_overflow
- Link to v2: https://lore.kernel.org/r/[email protected]

Changes in v2:
- Change to patch series rather than single commit
- Expand scope to fix more than just the unmap discovery path
- Link to v1: https://lore.kernel.org/r/[email protected]

---
Alex Mastro (5):
vfio/type1: sanitize for overflow using check_*_overflow() vfio/type1: move iova increment to unmap_unpin_*() caller vfio/type1: handle DMA map/unmap up to the addressable limit
vfio: selftests: update DMA map/unmap helpers to support more test kinds
vfio: selftests: add end of address space DMA map/unmap tests

 drivers/vfio/vfio_iommu_type1.c                    | 173 +++++++++++++--------
 .../testing/selftests/vfio/lib/include/vfio_util.h |  27 +++-
 tools/testing/selftests/vfio/lib/vfio_pci_device.c | 104 ++++++++++---
 .../testing/selftests/vfio/vfio_dma_mapping_test.c |  95 ++++++++++-
 4 files changed, 308 insertions(+), 91 deletions(-)

---
base-commit: 451bb96328981808463405d436bd58de16dd967d
change-id: 20251005-fix-unmap-c3f3e87dabfa

Best regards,

Signature · 1 line
Alex Mastro <[email protected]>