91 lines
3.0 KiB
Diff
91 lines
3.0 KiB
Diff
From 41ea67ec82122d12ed26a98fe32d29e90f8fd282 Mon Sep 17 00:00:00 2001
|
|
From: Alex Williamson <alex.williamson@redhat.com>
|
|
Date: Tue, 22 Oct 2024 14:08:28 -0600
|
|
Subject: [PATCH 1/2] vfio/helpers: Refactor vfio_region_mmap() error handling
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Alex Williamson <None>
|
|
RH-MergeRequest: 468: vfio/helpers: Align mmaps [9.6.z]
|
|
RH-Jira: RHEL-107314
|
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
RH-Commit: [1/2] b91e8d009b8a6ff91bf273211272b101bc1c1146
|
|
|
|
Move error handling code to the end of the function so that it can more
|
|
easily be shared by new mmap failure conditions. No functional change
|
|
intended.
|
|
|
|
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
|
|
Reviewed-by: Peter Xu <peterx@redhat.com>
|
|
Reviewed-by: Cédric Le Goater <clg@redhat.com>
|
|
(cherry picked from commit 49915c0d2c9868e6f25e52e4d839943611b69e98)
|
|
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
|
|
---
|
|
hw/vfio/helpers.c | 34 +++++++++++++++++-----------------
|
|
1 file changed, 17 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/hw/vfio/helpers.c b/hw/vfio/helpers.c
|
|
index ea15c79db0..b9e606e364 100644
|
|
--- a/hw/vfio/helpers.c
|
|
+++ b/hw/vfio/helpers.c
|
|
@@ -395,7 +395,7 @@ static void vfio_subregion_unmap(VFIORegion *region, int index)
|
|
|
|
int vfio_region_mmap(VFIORegion *region)
|
|
{
|
|
- int i, prot = 0;
|
|
+ int i, ret, prot = 0;
|
|
char *name;
|
|
|
|
if (!region->mem) {
|
|
@@ -411,22 +411,8 @@ int vfio_region_mmap(VFIORegion *region)
|
|
region->fd_offset +
|
|
region->mmaps[i].offset);
|
|
if (region->mmaps[i].mmap == MAP_FAILED) {
|
|
- int ret = -errno;
|
|
-
|
|
- trace_vfio_region_mmap_fault(memory_region_name(region->mem), i,
|
|
- region->fd_offset +
|
|
- region->mmaps[i].offset,
|
|
- region->fd_offset +
|
|
- region->mmaps[i].offset +
|
|
- region->mmaps[i].size - 1, ret);
|
|
-
|
|
- region->mmaps[i].mmap = NULL;
|
|
-
|
|
- for (i--; i >= 0; i--) {
|
|
- vfio_subregion_unmap(region, i);
|
|
- }
|
|
-
|
|
- return ret;
|
|
+ ret = -errno;
|
|
+ goto no_mmap;
|
|
}
|
|
|
|
name = g_strdup_printf("%s mmaps[%d]",
|
|
@@ -446,6 +432,20 @@ int vfio_region_mmap(VFIORegion *region)
|
|
}
|
|
|
|
return 0;
|
|
+
|
|
+no_mmap:
|
|
+ trace_vfio_region_mmap_fault(memory_region_name(region->mem), i,
|
|
+ region->fd_offset + region->mmaps[i].offset,
|
|
+ region->fd_offset + region->mmaps[i].offset +
|
|
+ region->mmaps[i].size - 1, ret);
|
|
+
|
|
+ region->mmaps[i].mmap = NULL;
|
|
+
|
|
+ for (i--; i >= 0; i--) {
|
|
+ vfio_subregion_unmap(region, i);
|
|
+ }
|
|
+
|
|
+ return ret;
|
|
}
|
|
|
|
void vfio_region_unmap(VFIORegion *region)
|
|
--
|
|
2.48.1
|
|
|