From: Matthew Rosato <mjrosato@linux.ibm.com>
To: qemu-s390x@nongnu.org
Cc: farman@linux.ibm.com, thuth@redhat.com, clg@redhat.com,
pasic@linux.ibm.com, borntraeger@linux.ibm.com,
richard.henderson@linaro.org, david@redhat.com,
iii@linux.ibm.com, qemu-devel@nongnu.org
Subject: [PATCH 1/2] s390x/pci: bypass vfio DMA counting when using cdev
Date: Thu, 9 Nov 2023 17:53:01 -0500 [thread overview]
Message-ID: <20231109225302.401344-2-mjrosato@linux.ibm.com> (raw)
In-Reply-To: <20231109225302.401344-1-mjrosato@linux.ibm.com>
The current code assumes that there is always a vfio group, but
that's no longer guaranteed with the iommufd backend when using
cdev. In this case, we don't need to track the vfio dma limit
anyway.
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
---
hw/s390x/s390-pci-vfio.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c
index 59a2e03873..7218583883 100644
--- a/hw/s390x/s390-pci-vfio.c
+++ b/hw/s390x/s390-pci-vfio.c
@@ -66,7 +66,11 @@ S390PCIDMACount *s390_pci_start_dma_count(S390pciState *s,
assert(vpdev);
- id = vpdev->vbasedev.group->container->fd;
+ if (vpdev->vbasedev.group) {
+ id = vpdev->vbasedev.group->container->fd;
+ } else {
+ return NULL;
+ }
if (!s390_pci_update_dma_avail(id, &avail)) {
return NULL;
--
2.41.0
next prev parent reply other threads:[~2023-11-09 22:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-09 22:53 [PATCH 0/2] s390x/pci: small set of fixes Matthew Rosato
2023-11-09 22:53 ` Matthew Rosato [this message]
2023-11-10 5:21 ` [PATCH 1/2] s390x/pci: bypass vfio DMA counting when using cdev Philippe Mathieu-Daudé
2023-11-10 5:22 ` Philippe Mathieu-Daudé
2023-11-09 22:53 ` [PATCH 2/2] s390x/pci: only limit DMA aperture if vfio DMA limit reported Matthew Rosato
2023-11-10 6:20 ` Thomas Huth
2023-11-10 7:40 ` [PATCH 0/2] s390x/pci: small set of fixes Cédric Le Goater
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=20231109225302.401344-2-mjrosato@linux.ibm.com \
--to=mjrosato@linux.ibm.com \
--cc=borntraeger@linux.ibm.com \
--cc=clg@redhat.com \
--cc=david@redhat.com \
--cc=farman@linux.ibm.com \
--cc=iii@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@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).