[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/17] vfio/common: Add helper to consolidate iova/end calculation
From: |
Alex Williamson |
Subject: |
[PULL 08/17] vfio/common: Add helper to consolidate iova/end calculation |
Date: |
Tue, 07 Mar 2023 11:53:04 -0700 |
User-agent: |
StGit/1.5.dev2+g9ce680a52bd9 |
From: Joao Martins <joao.m.martins@oracle.com>
In preparation to be used in device dirty tracking, move the code that
calculate a iova/end range from the container/section. This avoids
duplication on the common checks across listener callbacks.
Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Link: 20230307125450.62409-9-joao.m.martins@oracle.com">https://lore.kernel.org/r/20230307125450.62409-9-joao.m.martins@oracle.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
hw/vfio/common.c | 41 +++++++++++++++++++++++++++--------------
1 file changed, 27 insertions(+), 14 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index d38b7c1969b9..63831eab78a1 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -962,6 +962,31 @@ static bool
vfio_listener_valid_section(MemoryRegionSection *section,
return true;
}
+static bool vfio_get_section_iova_range(VFIOContainer *container,
+ MemoryRegionSection *section,
+ hwaddr *out_iova, hwaddr *out_end,
+ Int128 *out_llend)
+{
+ Int128 llend;
+ hwaddr iova;
+
+ iova = REAL_HOST_PAGE_ALIGN(section->offset_within_address_space);
+ llend = int128_make64(section->offset_within_address_space);
+ llend = int128_add(llend, section->size);
+ llend = int128_and(llend, int128_exts64(qemu_real_host_page_mask()));
+
+ if (int128_ge(int128_make64(iova), llend)) {
+ return false;
+ }
+
+ *out_iova = iova;
+ *out_end = int128_get64(int128_sub(llend, int128_one()));
+ if (out_llend) {
+ *out_llend = llend;
+ }
+ return true;
+}
+
static void vfio_listener_region_add(MemoryListener *listener,
MemoryRegionSection *section)
{
@@ -977,12 +1002,7 @@ static void vfio_listener_region_add(MemoryListener
*listener,
return;
}
- iova = REAL_HOST_PAGE_ALIGN(section->offset_within_address_space);
- llend = int128_make64(section->offset_within_address_space);
- llend = int128_add(llend, section->size);
- llend = int128_and(llend, int128_exts64(qemu_real_host_page_mask()));
-
- if (int128_ge(int128_make64(iova), llend)) {
+ if (!vfio_get_section_iova_range(container, section, &iova, &end, &llend))
{
if (memory_region_is_ram_device(section->mr)) {
trace_vfio_listener_region_add_no_dma_map(
memory_region_name(section->mr),
@@ -992,7 +1012,6 @@ static void vfio_listener_region_add(MemoryListener
*listener,
}
return;
}
- end = int128_get64(int128_sub(llend, int128_one()));
if (container->iommu_type == VFIO_SPAPR_TCE_v2_IOMMU) {
hwaddr pgsize = 0;
@@ -1219,15 +1238,9 @@ static void vfio_listener_region_del(MemoryListener
*listener,
*/
}
- iova = REAL_HOST_PAGE_ALIGN(section->offset_within_address_space);
- llend = int128_make64(section->offset_within_address_space);
- llend = int128_add(llend, section->size);
- llend = int128_and(llend, int128_exts64(qemu_real_host_page_mask()));
-
- if (int128_ge(int128_make64(iova), llend)) {
+ if (!vfio_get_section_iova_range(container, section, &iova, &end, &llend))
{
return;
}
- end = int128_get64(int128_sub(llend, int128_one()));
llsize = int128_sub(llend, int128_make64(iova));
- [PULL 00/17] VFIO updates for 8.0, Alex Williamson, 2023/03/07
- [PULL 01/17] vfio/common: Fix error reporting in vfio_get_dirty_bitmap(), Alex Williamson, 2023/03/07
- [PULL 02/17] vfio/common: Fix wrong %m usages, Alex Williamson, 2023/03/07
- [PULL 03/17] vfio/common: Abort migration if dirty log start/stop/sync fails, Alex Williamson, 2023/03/07
- [PULL 04/17] vfio/common: Add VFIOBitmap and alloc function, Alex Williamson, 2023/03/07
- [PULL 05/17] vfio/common: Add helper to validate iova/end against hostwin, Alex Williamson, 2023/03/07
- [PULL 06/17] vfio/common: Use a single tracepoint for skipped sections, Alex Williamson, 2023/03/07
- [PULL 07/17] vfio/common: Consolidate skip/invalid section into helper, Alex Williamson, 2023/03/07
- [PULL 08/17] vfio/common: Add helper to consolidate iova/end calculation,
Alex Williamson <=
- [PULL 09/17] vfio/common: Record DMA mapped IOVA ranges, Alex Williamson, 2023/03/07
- [PULL 10/17] vfio/common: Add device dirty page tracking start/stop, Alex Williamson, 2023/03/07
- [PULL 11/17] vfio/common: Extract code from vfio_get_dirty_bitmap() to new function, Alex Williamson, 2023/03/07
- [PULL 12/17] vfio/common: Add device dirty page bitmap sync, Alex Williamson, 2023/03/07
- [PULL 13/17] vfio/migration: Block migration with vIOMMU, Alex Williamson, 2023/03/07
- [PULL 14/17] vfio/migration: Query device dirty page tracking support, Alex Williamson, 2023/03/07
- [PULL 15/17] docs/devel: Document VFIO device dirty page tracking, Alex Williamson, 2023/03/07
- [PULL 16/17] vfio/migration: Rename entry points, Alex Williamson, 2023/03/07
- [PULL 17/17] vfio: Fix vfio_get_dev_region() trace event, Alex Williamson, 2023/03/07
- Re: [PULL 00/17] VFIO updates for 8.0, Peter Maydell, 2023/03/09