From: Alex Williamson <alex.williamson@redhat.com>
To: qemu-devel@nongnu.org
Cc: alex.williamson@redhat.com, avihaih@nvidia.com, clg@redhat.com,
joao.m.martins@oracle.com
Subject: [PULL 05/17] vfio/common: Add helper to validate iova/end against hostwin
Date: Tue, 07 Mar 2023 11:52:46 -0700 [thread overview]
Message-ID: <167821516664.619792.9294395366742922512.stgit@omen> (raw)
In-Reply-To: <167821508699.619792.1719671327865445814.stgit@omen>
From: Joao Martins <joao.m.martins@oracle.com>
Move the code that finds the container host DMA window against a iova
range. 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>
Reviewed-by: Avihai Horon <avihaih@nvidia.com>
Link: https://lore.kernel.org/r/20230307125450.62409-6-joao.m.martins@oracle.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
hw/vfio/common.c | 38 ++++++++++++++++++++------------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index cec3de08d2b4..99acb998eb14 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -901,6 +901,22 @@ static void vfio_unregister_ram_discard_listener(VFIOContainer *container,
g_free(vrdl);
}
+static VFIOHostDMAWindow *vfio_find_hostwin(VFIOContainer *container,
+ hwaddr iova, hwaddr end)
+{
+ VFIOHostDMAWindow *hostwin;
+ bool hostwin_found = false;
+
+ QLIST_FOREACH(hostwin, &container->hostwin_list, hostwin_next) {
+ if (hostwin->min_iova <= iova && end <= hostwin->max_iova) {
+ hostwin_found = true;
+ break;
+ }
+ }
+
+ return hostwin_found ? hostwin : NULL;
+}
+
static bool vfio_known_safe_misalignment(MemoryRegionSection *section)
{
MemoryRegion *mr = section->mr;
@@ -926,7 +942,6 @@ static void vfio_listener_region_add(MemoryListener *listener,
void *vaddr;
int ret;
VFIOHostDMAWindow *hostwin;
- bool hostwin_found;
Error *err = NULL;
if (vfio_listener_skipped_section(section)) {
@@ -1027,15 +1042,8 @@ static void vfio_listener_region_add(MemoryListener *listener,
#endif
}
- hostwin_found = false;
- QLIST_FOREACH(hostwin, &container->hostwin_list, hostwin_next) {
- if (hostwin->min_iova <= iova && end <= hostwin->max_iova) {
- hostwin_found = true;
- break;
- }
- }
-
- if (!hostwin_found) {
+ hostwin = vfio_find_hostwin(container, iova, end);
+ if (!hostwin) {
error_setg(&err, "Container %p can't map guest IOVA region"
" 0x%"HWADDR_PRIx"..0x%"HWADDR_PRIx, container, iova, end);
goto fail;
@@ -1237,15 +1245,9 @@ static void vfio_listener_region_del(MemoryListener *listener,
if (memory_region_is_ram_device(section->mr)) {
hwaddr pgmask;
VFIOHostDMAWindow *hostwin;
- bool hostwin_found = false;
- QLIST_FOREACH(hostwin, &container->hostwin_list, hostwin_next) {
- if (hostwin->min_iova <= iova && end <= hostwin->max_iova) {
- hostwin_found = true;
- break;
- }
- }
- assert(hostwin_found); /* or region_add() would have failed */
+ hostwin = vfio_find_hostwin(container, iova, end);
+ assert(hostwin); /* or region_add() would have failed */
pgmask = (1ULL << ctz64(hostwin->iova_pgsizes)) - 1;
try_unmap = !((iova & pgmask) || (int128_get64(llsize) & pgmask));
next prev parent reply other threads:[~2023-03-07 18:53 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-07 18:52 [PULL 00/17] VFIO updates for 8.0 Alex Williamson
2023-03-07 18:52 ` [PULL 01/17] vfio/common: Fix error reporting in vfio_get_dirty_bitmap() Alex Williamson
2023-03-07 18:52 ` [PULL 02/17] vfio/common: Fix wrong %m usages Alex Williamson
2023-03-07 18:52 ` [PULL 03/17] vfio/common: Abort migration if dirty log start/stop/sync fails Alex Williamson
2023-03-07 18:52 ` [PULL 04/17] vfio/common: Add VFIOBitmap and alloc function Alex Williamson
2023-03-07 18:52 ` Alex Williamson [this message]
2023-03-07 18:52 ` [PULL 06/17] vfio/common: Use a single tracepoint for skipped sections Alex Williamson
2023-03-07 18:52 ` [PULL 07/17] vfio/common: Consolidate skip/invalid section into helper Alex Williamson
2023-03-07 18:53 ` [PULL 08/17] vfio/common: Add helper to consolidate iova/end calculation Alex Williamson
2023-03-07 18:53 ` [PULL 09/17] vfio/common: Record DMA mapped IOVA ranges Alex Williamson
2023-03-07 18:53 ` [PULL 10/17] vfio/common: Add device dirty page tracking start/stop Alex Williamson
2023-03-07 18:53 ` [PULL 11/17] vfio/common: Extract code from vfio_get_dirty_bitmap() to new function Alex Williamson
2023-03-07 18:53 ` [PULL 12/17] vfio/common: Add device dirty page bitmap sync Alex Williamson
2023-03-07 18:53 ` [PULL 13/17] vfio/migration: Block migration with vIOMMU Alex Williamson
2023-03-07 18:53 ` [PULL 14/17] vfio/migration: Query device dirty page tracking support Alex Williamson
2023-03-07 18:53 ` [PULL 15/17] docs/devel: Document VFIO device dirty page tracking Alex Williamson
2023-03-07 18:53 ` [PULL 16/17] vfio/migration: Rename entry points Alex Williamson
2023-03-07 18:53 ` [PULL 17/17] vfio: Fix vfio_get_dev_region() trace event Alex Williamson
2023-03-09 16:51 ` [PULL 00/17] VFIO updates for 8.0 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=167821516664.619792.9294395366742922512.stgit@omen \
--to=alex.williamson@redhat.com \
--cc=avihaih@nvidia.com \
--cc=clg@redhat.com \
--cc=joao.m.martins@oracle.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).