qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Eduardo Habkost <eduardo@habkost.net>,
	Peter Maydell <peter.maydell@linaro.org>,
	Jason Wang <jasowang@redhat.com>,
	Richard Henderson <richard.henderson@linaro.org>,
	Peter Xu <peterx@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>
Subject: [PULL 19/45] intel_iommu: support snoop control
Date: Fri, 4 Mar 2022 08:39:47 -0500	[thread overview]
Message-ID: <20220304133556.233983-20-mst@redhat.com> (raw)
In-Reply-To: <20220304133556.233983-1-mst@redhat.com>

From: Jason Wang <jasowang@redhat.com>

SC is required for some kernel features like vhost-vDPA. So this patch
implements basic SC feature. The idea is pretty simple, for software
emulated DMA it would be always coherent. In this case we can simple
advertise ECAP_SC bit. For VFIO and vhost, thing will be more much
complicated, so this patch simply fail the IOMMU notifier
registration.

In the future, we may want to have a dedicated notifiers flag or
similar mechanism to demonstrate the coherency so VFIO could advertise
that if it has VFIO_DMA_CC_IOMMU, for vhost kernel backend we don't
need that since it's a software backend.

Signed-off-by: Jason Wang <jasowang@redhat.com>
Message-Id: <20220214060346.72455-1-jasowang@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/i386/intel_iommu_internal.h |  1 +
 include/hw/i386/intel_iommu.h  |  1 +
 hw/i386/intel_iommu.c          | 14 +++++++++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h
index a6c788049b..1ff13b40f9 100644
--- a/hw/i386/intel_iommu_internal.h
+++ b/hw/i386/intel_iommu_internal.h
@@ -188,6 +188,7 @@
 #define VTD_ECAP_IR                 (1ULL << 3)
 #define VTD_ECAP_EIM                (1ULL << 4)
 #define VTD_ECAP_PT                 (1ULL << 6)
+#define VTD_ECAP_SC                 (1ULL << 7)
 #define VTD_ECAP_MHMV               (15ULL << 20)
 #define VTD_ECAP_SRS                (1ULL << 31)
 #define VTD_ECAP_SMTS               (1ULL << 43)
diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h
index 41783ee46d..3b5ac869db 100644
--- a/include/hw/i386/intel_iommu.h
+++ b/include/hw/i386/intel_iommu.h
@@ -228,6 +228,7 @@ struct IntelIOMMUState {
 
     bool caching_mode;              /* RO - is cap CM enabled? */
     bool scalable_mode;             /* RO - is Scalable Mode supported? */
+    bool snoop_control;             /* RO - is SNP filed supported? */
 
     dma_addr_t root;                /* Current root table pointer */
     bool root_scalable;             /* Type of root table (scalable or not) */
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 4c6c016388..32471a44cb 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -3030,6 +3030,13 @@ static int vtd_iommu_notify_flag_changed(IOMMUMemoryRegion *iommu,
     VTDAddressSpace *vtd_as = container_of(iommu, VTDAddressSpace, iommu);
     IntelIOMMUState *s = vtd_as->iommu_state;
 
+    /* TODO: add support for VFIO and vhost users */
+    if (s->snoop_control) {
+        error_setg_errno(errp, -ENOTSUP,
+                         "Snoop Control with vhost or VFIO is not supported");
+        return -ENOTSUP;
+    }
+
     /* Update per-address-space notifier flags */
     vtd_as->notifier_flags = new;
 
@@ -3113,6 +3120,7 @@ static Property vtd_properties[] = {
                       VTD_HOST_ADDRESS_WIDTH),
     DEFINE_PROP_BOOL("caching-mode", IntelIOMMUState, caching_mode, FALSE),
     DEFINE_PROP_BOOL("x-scalable-mode", IntelIOMMUState, scalable_mode, FALSE),
+    DEFINE_PROP_BOOL("snoop-control", IntelIOMMUState, snoop_control, false),
     DEFINE_PROP_BOOL("dma-drain", IntelIOMMUState, dma_drain, true),
     DEFINE_PROP_END_OF_LIST(),
 };
@@ -3643,7 +3651,7 @@ static void vtd_init(IntelIOMMUState *s)
     vtd_spte_rsvd_large[3] = VTD_SPTE_LPAGE_L3_RSVD_MASK(s->aw_bits,
                                                          x86_iommu->dt_supported);
 
-    if (s->scalable_mode) {
+    if (s->scalable_mode || s->snoop_control) {
         vtd_spte_rsvd[1] &= ~VTD_SPTE_SNP;
         vtd_spte_rsvd_large[2] &= ~VTD_SPTE_SNP;
         vtd_spte_rsvd_large[3] &= ~VTD_SPTE_SNP;
@@ -3674,6 +3682,10 @@ static void vtd_init(IntelIOMMUState *s)
         s->ecap |= VTD_ECAP_SMTS | VTD_ECAP_SRS | VTD_ECAP_SLTS;
     }
 
+    if (s->snoop_control) {
+        s->ecap |= VTD_ECAP_SC;
+    }
+
     vtd_reset_caches(s);
 
     /* Define registers with default values and bit semantics */
-- 
MST



  parent reply	other threads:[~2022-03-04 14:18 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-04 13:36 [PULL 00/45] virtio,pc,pci: features, cleanups, fixes Michael S. Tsirkin
2022-03-04 13:37 ` [PULL 01/45] qom: assert integer does not overflow Michael S. Tsirkin
2022-03-04 13:37 ` [PULL 02/45] ACPI ERST: specification for ERST support Michael S. Tsirkin
2022-03-04 13:37 ` [PULL 03/45] MAINTAINERS: no need to add my name explicitly as a reviewer for VIOT tables Michael S. Tsirkin
2022-03-04 13:37 ` [PULL 04/45] docs/acpi/erst: add device id for ACPI ERST device in pci-ids.txt Michael S. Tsirkin
2022-03-04 13:37 ` [PULL 05/45] hw/acpi/erst: clean up unused IS_UEFI_CPER_RECORD macro Michael S. Tsirkin
2022-03-04 13:37 ` [PULL 06/45] hw/smbios: code cleanup - use macro definitions for table header handles Michael S. Tsirkin
2022-03-04 13:38 ` [PULL 07/45] hw/smbios: fix overlapping table handle numbers with large memory vms Michael S. Tsirkin
2022-03-04 13:38 ` [PULL 08/45] hw/smbios: add assertion to ensure handles of tables 19 and 32 do not collide Michael S. Tsirkin
2022-03-04 13:38 ` [PULL 09/45] vhost-user: remove VirtQ notifier restore Michael S. Tsirkin
2022-03-04 13:38 ` [PULL 10/45] vhost-user: fix VirtQ notifier cleanup Michael S. Tsirkin
2022-03-04 13:38 ` [PULL 11/45] virtio: fix the condition for iommu_platform not supported Michael S. Tsirkin
2022-03-04 13:38 ` [PULL 12/45] hw/vhost-user-i2c: Add support for VIRTIO_I2C_F_ZERO_LENGTH_REQUEST Michael S. Tsirkin
2022-03-04 13:39 ` [PULL 13/45] tests/qtest/libqos/pci: Introduce pio_limit Michael S. Tsirkin
2022-03-04 13:39 ` [PULL 14/45] tests/qtest/libqos: Skip hotplug tests if pci root bus is not hotpluggable Michael S. Tsirkin
2022-03-04 13:39 ` [PULL 15/45] tests/qtest/vhost-user-blk-test: Temporary hack to get tests passing on aarch64 Michael S. Tsirkin
2022-03-04 13:39 ` [PULL 16/45] tests/qtest/libqos: Add generic pci host bridge in arm-virt machine Michael S. Tsirkin
2022-03-07 10:02   ` Michael S. Tsirkin
2022-03-07 11:07     ` Eric Auger
2022-03-04 13:39 ` [PULL 17/45] hw/virtio: vdpa: Fix leak of host-notifier memory-region Michael S. Tsirkin
2022-03-04 13:39 ` [PULL 18/45] vhost-vdpa: make notifiers _init()/_uninit() symmetric Michael S. Tsirkin
2022-03-04 13:39 ` Michael S. Tsirkin [this message]
2022-03-04 13:39 ` [PULL 20/45] hw/i386: Improve bounds checking in OVMF table parsing Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 21/45] hw/i386: Replace magic number with field length calculation Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 22/45] virtio-iommu: Default to bypass during boot Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 23/45] virtio-iommu: Support bypass domain Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 24/45] tests/qtest/virtio-iommu-test: Check bypass config Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 25/45] hw/i386/pc_piix: Mark the machine types from version 1.4 to 1.7 as deprecated Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 26/45] hw/pci-bridge/pxb: Fix missing swizzle Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 27/45] virtio-net: Unlimit tx queue size if peer is vdpa Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 28/45] pcie: Add support for Single Root I/O Virtualization (SR/IOV) Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 29/45] pcie: Add some SR/IOV API documentation in docs/pcie_sriov.txt Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 30/45] pcie: Add a helper to the SR/IOV API Michael S. Tsirkin
2022-03-04 13:41 ` [PULL 31/45] pcie: Add 1.2 version token for the Power Management Capability Michael S. Tsirkin
2022-03-04 13:41 ` [PULL 32/45] pci-bridge/xio3130_upstream: Fix error handling Michael S. Tsirkin
2022-03-04 13:41 ` [PULL 33/45] pci-bridge/xio3130_downstream: " Michael S. Tsirkin
2022-03-04 13:41 ` [PULL 34/45] headers: Add pvpanic.h Michael S. Tsirkin
2022-03-04 13:41 ` [PULL 35/45] hw/misc/pvpanic: Use standard headers instead Michael S. Tsirkin
2022-03-04 13:41 ` [PULL 36/45] pci: show id info when pci BDF conflict Michael S. Tsirkin
2022-03-04 13:42 ` [PULL 37/45] pci: expose TYPE_XIO3130_DOWNSTREAM name Michael S. Tsirkin
2022-03-04 13:42 ` [PULL 38/45] acpi: pcihp: pcie: set power on cap on parent slot Michael S. Tsirkin
2022-03-04 13:42 ` [PULL 39/45] pc: add option to disable PS/2 mouse/keyboard Michael S. Tsirkin
2022-03-04 13:42 ` [PULL 40/45] vhost-vsock: detach the virqueue element in case of error Michael S. Tsirkin
2022-03-04 13:42 ` [PULL 41/45] x86: cleanup unused compat_apic_id_mode Michael S. Tsirkin
2022-03-04 13:42 ` [PULL 42/45] event_notifier: add event_notifier_get_wfd() Michael S. Tsirkin
2022-03-04 13:42 ` [PULL 43/45] vhost: use wfd on functions setting vring call fd Michael S. Tsirkin
2022-03-04 13:42 ` [PULL 44/45] configure, meson: allow enabling vhost-user on all POSIX systems Michael S. Tsirkin
2022-03-04 13:42 ` [PULL 45/45] docs: vhost-user: add subsection for non-Linux platforms Michael S. Tsirkin
2022-03-04 22:13 ` [PULL 00/45] virtio,pc,pci: features, cleanups, fixes Peter Maydell
2022-03-06 10:37   ` Michael S. Tsirkin
2022-03-07 10:48   ` Eric Auger
2022-03-07 11:55     ` 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=20220304133556.233983-20-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=eduardo@habkost.net \
    --cc=jasowang@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.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).