From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Williamson" <alex.williamson@redhat.com>,
"Cédric Le Goater" <clg@redhat.com>,
"Harsh Prateek Bora" <harshpb@linux.ibm.com>,
"Shivaprasad G Bhat" <sbhat@linux.ibm.com>
Subject: [PULL 12/12] vfio: Remove superfluous error report in vfio_listener_region_add()
Date: Tue, 11 Feb 2025 15:33:40 +0100 [thread overview]
Message-ID: <20250211143340.787996-13-clg@redhat.com> (raw)
In-Reply-To: <20250211143340.787996-1-clg@redhat.com>
For pseries machines, commit 567b5b309abe ("vfio/pci: Relax DMA map
errors for MMIO regions") introduced 2 error reports to notify the
user of MMIO mapping errors. Consolidate both code paths under one.
Cc: Harsh Prateek Bora <harshpb@linux.ibm.com>
Cc: Shivaprasad G Bhat <sbhat@linux.ibm.com>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
Link: https://lore.kernel.org/qemu-devel/20250206131438.1505542-8-clg@redhat.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
hw/vfio/common.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 4fca4c6166f761acceb7b57b52e379603ea53876..abbdc56b6dbb5eed22e7a2d2d55ee5695279661e 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -594,8 +594,9 @@ static void vfio_listener_region_add(MemoryListener *listener,
return;
}
+ /* PPC64/pseries machine only */
if (!vfio_container_add_section_window(bcontainer, section, &err)) {
- goto fail;
+ goto mmio_dma_error;
}
memory_region_ref(section->mr);
@@ -680,6 +681,7 @@ static void vfio_listener_region_add(MemoryListener *listener,
"0x%"HWADDR_PRIx", %p) = %d (%s)",
bcontainer, iova, int128_get64(llsize), vaddr, ret,
strerror(-ret));
+ mmio_dma_error:
if (memory_region_is_ram_device(section->mr)) {
/* Allow unexpected mappings not to be fatal for RAM devices */
VFIODevice *vbasedev =
@@ -694,11 +696,6 @@ static void vfio_listener_region_add(MemoryListener *listener,
return;
fail:
- if (memory_region_is_ram_device(section->mr)) {
- error_reportf_err(err, "PCI p2p may not work: ");
- return;
- }
-
if (!bcontainer->initialized) {
/*
* At machine init time or when the device is attached to the
@@ -806,6 +803,7 @@ static void vfio_listener_region_del(MemoryListener *listener,
memory_region_unref(section->mr);
+ /* PPC64/pseries machine only */
vfio_container_del_section_window(bcontainer, section);
}
--
2.48.1
next prev parent reply other threads:[~2025-02-11 14:35 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-11 14:33 [PULL 00/12] vfio queue Cédric Le Goater
2025-02-11 14:33 ` [PULL 01/12] vfio/igd: Fix potential overflow in igd_gtt_memory_size() Cédric Le Goater
2025-02-11 14:33 ` [PULL 02/12] vfio/pci: declare generic quirks in a new header file Cédric Le Goater
2025-02-11 14:33 ` [PULL 03/12] vfio/pci: introduce config_offset field in VFIOConfigMirrorQuirk Cédric Le Goater
2025-02-11 14:33 ` [PULL 04/12] vfio/igd: use VFIOConfigMirrorQuirk for mirrored registers Cédric Le Goater
2025-02-11 14:33 ` [PULL 05/12] vfio/iommufd: Fix SIGSEV in iommufd_cdev_attach() Cédric Le Goater
2025-02-12 19:12 ` Michael Tokarev
2025-02-13 6:32 ` Cédric Le Goater
2025-02-13 6:42 ` Michael Tokarev
2025-02-13 8:48 ` Cédric Le Goater
2025-02-13 9:30 ` Michael Tokarev
2025-02-11 14:33 ` [PULL 06/12] util/error: Introduce warn_report_err_once() Cédric Le Goater
2025-02-11 14:33 ` [PULL 07/12] vfio/pci: Replace "iommu_device" by "vIOMMU" Cédric Le Goater
2025-02-11 14:33 ` [PULL 08/12] vfio: Rephrase comment in vfio_listener_region_add() error path Cédric Le Goater
2025-02-11 14:33 ` [PULL 09/12] vfio: Introduce vfio_get_vfio_device() Cédric Le Goater
2025-02-11 14:33 ` [PULL 10/12] vfio: Improve error reporting when MMIO region mapping fails Cédric Le Goater
2025-02-11 14:33 ` [PULL 11/12] vfio: Remove reports of DMA mapping errors in backends Cédric Le Goater
2025-02-11 14:33 ` Cédric Le Goater [this message]
2025-02-12 17:38 ` [PULL 00/12] vfio queue Stefan Hajnoczi
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=20250211143340.787996-13-clg@redhat.com \
--to=clg@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=harshpb@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=sbhat@linux.ibm.com \
/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).