qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org
Cc: mst@redhat.com, Jason Wang <jasowang@redhat.com>,
	Wei.Huang2@amd.com, dgilbert@redhat.com, peterx@redhat.com,
	Sriyash.Caculo@amd.com, pbonzini@redhat.com, chao.gao@intel.com
Subject: [PATCH 2/3] virtio-pci: implement iommu_enabled()
Date: Wed,  4 Aug 2021 11:48:02 +0800	[thread overview]
Message-ID: <20210804034803.1644-3-jasowang@redhat.com> (raw)
In-Reply-To: <20210804034803.1644-1-jasowang@redhat.com>

This patch implements the PCI transport version of iommu_enabled. This
is done by comparing the address space returned by
pci_device_iommu_address_space() against address_space_memory.

Note that an ideal approach is to use pci_device_iommu_address_space()
in get_dma_as(), but it might not work well since the IOMMU could be
initialized after the virtio-pci device is initialized.

Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/virtio/virtio-pci.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index b321604d9b..050af2517b 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1110,6 +1110,19 @@ static AddressSpace *virtio_pci_get_dma_as(DeviceState *d)
     return pci_get_address_space(dev);
 }
 
+static bool virtio_pci_iommu_enabled(DeviceState *d)
+{
+    VirtIOPCIProxy *proxy = VIRTIO_PCI(d);
+    PCIDevice *dev = &proxy->pci_dev;
+    AddressSpace *dma_as = pci_device_iommu_address_space(dev);
+
+    if (dma_as == &address_space_memory) {
+        return false;
+    }
+
+    return true;
+}
+
 static bool virtio_pci_queue_enabled(DeviceState *d, int n)
 {
     VirtIOPCIProxy *proxy = VIRTIO_PCI(d);
@@ -2173,6 +2186,7 @@ static void virtio_pci_bus_class_init(ObjectClass *klass, void *data)
     k->ioeventfd_enabled = virtio_pci_ioeventfd_enabled;
     k->ioeventfd_assign = virtio_pci_ioeventfd_assign;
     k->get_dma_as = virtio_pci_get_dma_as;
+    k->iommu_enabled = virtio_pci_iommu_enabled;
     k->queue_enabled = virtio_pci_queue_enabled;
 }
 
-- 
2.25.1



  parent reply	other threads:[~2021-08-04  3:49 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-04  3:48 [PATCH 0/3] Disable vhost device IOTLB is IOMMU is not enabled Jason Wang
2021-08-04  3:48 ` [PATCH 1/3] virtio-bus: introduce iommu_enabled() Jason Wang
2021-08-04  3:48 ` Jason Wang [this message]
2021-08-04  3:48 ` [PATCH 3/3] vhost: correctly detect the enabling IOMMU Jason Wang
2021-08-04  5:57 ` [PATCH 0/3] Disable vhost device IOTLB is IOMMU is not enabled Chao Gao
2021-08-04 16:08 ` Peter Xu
2021-08-05  1:46   ` Jason Wang
2021-08-05  3:08     ` Peter Xu
2021-08-05  7:26       ` Caculo, Sriyash
2021-09-02  5:46 ` Jason Wang

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=20210804034803.1644-3-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=Sriyash.Caculo@amd.com \
    --cc=Wei.Huang2@amd.com \
    --cc=chao.gao@intel.com \
    --cc=dgilbert@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peterx@redhat.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).