From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>,
Matthew Rosato <mjrosato@linux.ibm.com>
Subject: [PULL 03/12] s390x/pci: only limit DMA aperture if vfio DMA limit reported
Date: Mon, 13 Nov 2023 12:07:31 +0100 [thread overview]
Message-ID: <20231113110740.38270-4-thuth@redhat.com> (raw)
In-Reply-To: <20231113110740.38270-1-thuth@redhat.com>
From: Matthew Rosato <mjrosato@linux.ibm.com>
If the host kernel lacks vfio DMA limit reporting, do not attempt
to shrink the guest DMA aperture.
Fixes: df202e3ff3 ("s390x/pci: shrink DMA aperture to be bound by vfio DMA limit")
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
Message-ID: <20231110175108.465851-3-mjrosato@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/s390x/s390-pci-vfio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c
index e28573b593..7dbbc76823 100644
--- a/hw/s390x/s390-pci-vfio.c
+++ b/hw/s390x/s390-pci-vfio.c
@@ -136,7 +136,7 @@ static void s390_pci_read_base(S390PCIBusDevice *pbdev,
* to the guest based upon the vfio DMA limit.
*/
vfio_size = pbdev->iommu->max_dma_limit << TARGET_PAGE_BITS;
- if (vfio_size < (cap->end_dma - cap->start_dma + 1)) {
+ if (vfio_size > 0 && vfio_size < cap->end_dma - cap->start_dma + 1) {
pbdev->zpci_fn.edma = cap->start_dma + vfio_size - 1;
}
}
--
2.41.0
next prev parent reply other threads:[~2023-11-13 11:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-13 11:07 [PULL 00/12] Misc patches for 8.2-rc0 Thomas Huth
2023-11-13 11:07 ` [PULL 01/12] host/include/generic/host/atomic128: Fix compilation problem with Clang 17 Thomas Huth
2023-11-13 11:07 ` [PULL 02/12] s390x/pci: bypass vfio DMA counting when using cdev Thomas Huth
2023-11-13 11:07 ` Thomas Huth [this message]
2023-11-13 11:07 ` [PULL 04/12] MAINTAINERS: Add include/hw/input/pl050.h to the PrimeCell/CMSDK section Thomas Huth
2023-11-13 11:07 ` [PULL 05/12] MAINTAINERS: Add hw/input/ads7846.c to the PXA2XX section Thomas Huth
2023-11-13 11:07 ` [PULL 06/12] MAINTAINERS: Add hw/display/sii9022.c to the Versatile Express section Thomas Huth
2023-11-13 11:07 ` [PULL 07/12] MAINTAINERS: Extend the Stellaris section Thomas Huth
2023-11-13 11:07 ` [PULL 08/12] MAINTAINERS: Add a general architecture section for x86 Thomas Huth
2023-11-13 11:07 ` [PULL 09/12] tests/vm/netbsd: Use Python v3.11 Thomas Huth
2023-11-13 11:07 ` [PULL 10/12] test-resv-mem: Fix CID 1523911 Thomas Huth
2023-11-13 11:07 ` [PULL 11/12] tests/tsan: Rename the file with the entries that should be ignored Thomas Huth
2023-11-13 11:07 ` [PULL 12/12] hw/audio/es1370: Clean up comment Thomas Huth
2023-11-13 19:27 ` [PULL 00/12] Misc patches for 8.2-rc0 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=20231113110740.38270-4-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=mjrosato@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.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).