[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v3 13/19] hw/i386: Add a default_bus_bypass_iommu pc machine optio
From: |
Michael S. Tsirkin |
Subject: |
[PULL v3 13/19] hw/i386: Add a default_bus_bypass_iommu pc machine option |
Date: |
Fri, 16 Jul 2021 11:15:32 -0400 |
From: Xingang Wang <wangxingang5@huawei.com>
Add a default_bus_bypass_iommu pc machine option to enable/disable
bypass_iommu for default root bus. The option is disabled by default
and can be enabled with:
$QEMU -machine q35,default_bus_bypass_iommu=true
Signed-off-by: Xingang Wang <wangxingang5@huawei.com>
Message-Id: <1625748919-52456-5-git-send-email-wangxingang5@huawei.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/i386/pc.h | 1 +
hw/i386/pc.c | 20 ++++++++++++++++++++
hw/pci-host/q35.c | 2 ++
3 files changed, 23 insertions(+)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 0775f945d7..88dffe7517 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -44,6 +44,7 @@ typedef struct PCMachineState {
bool sata_enabled;
bool pit_enabled;
bool hpet_enabled;
+ bool default_bus_bypass_iommu;
uint64_t max_fw_size;
/* NUMA information: */
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index f4c7a78362..c2b9d62a35 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1524,6 +1524,21 @@ static void pc_machine_set_hpet(Object *obj, bool value,
Error **errp)
pcms->hpet_enabled = value;
}
+static bool pc_machine_get_default_bus_bypass_iommu(Object *obj, Error **errp)
+{
+ PCMachineState *pcms = PC_MACHINE(obj);
+
+ return pcms->default_bus_bypass_iommu;
+}
+
+static void pc_machine_set_default_bus_bypass_iommu(Object *obj, bool value,
+ Error **errp)
+{
+ PCMachineState *pcms = PC_MACHINE(obj);
+
+ pcms->default_bus_bypass_iommu = value;
+}
+
static void pc_machine_get_max_ram_below_4g(Object *obj, Visitor *v,
const char *name, void *opaque,
Error **errp)
@@ -1623,6 +1638,7 @@ static void pc_machine_initfn(Object *obj)
#ifdef CONFIG_HPET
pcms->hpet_enabled = true;
#endif
+ pcms->default_bus_bypass_iommu = false;
pc_system_flash_create(pcms);
pcms->pcspk = isa_new(TYPE_PC_SPEAKER);
@@ -1747,6 +1763,10 @@ static void pc_machine_class_init(ObjectClass *oc, void
*data)
object_class_property_add_bool(oc, "hpet",
pc_machine_get_hpet, pc_machine_set_hpet);
+ object_class_property_add_bool(oc, "default_bus_bypass_iommu",
+ pc_machine_get_default_bus_bypass_iommu,
+ pc_machine_set_default_bus_bypass_iommu);
+
object_class_property_add(oc, PC_MACHINE_MAX_FW_SIZE, "size",
pc_machine_get_max_fw_size, pc_machine_set_max_fw_size,
NULL, NULL);
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 0f37cf056a..ab5a47aff5 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -65,6 +65,8 @@ static void q35_host_realize(DeviceState *dev, Error **errp)
s->mch.address_space_io,
0, TYPE_PCIE_BUS);
PC_MACHINE(qdev_get_machine())->bus = pci->bus;
+ pci->bypass_iommu =
+ PC_MACHINE(qdev_get_machine())->default_bus_bypass_iommu;
qdev_realize(DEVICE(&s->mch), BUS(pci->bus), &error_fatal);
}
--
MST
- [PULL v3 04/19] bios-tables-test: Allow changes in DSDT ACPI tables, (continued)
- [PULL v3 04/19] bios-tables-test: Allow changes in DSDT ACPI tables, Michael S. Tsirkin, 2021/07/16
- [PULL v3 05/19] hw/acpi/ich9: Set ACPI PCI hot-plug as default on Q35, Michael S. Tsirkin, 2021/07/16
- [PULL v3 07/19] hw/virtio: add boilerplate for vhost-user-i2c device, Michael S. Tsirkin, 2021/07/16
- [PULL v3 09/19] docs: Add '-device intel-iommu' entry, Michael S. Tsirkin, 2021/07/16
- [PULL v3 10/19] hw/pci/pci_host: Allow PCI host to bypass iommu, Michael S. Tsirkin, 2021/07/16
- [PULL v3 06/19] bios-tables-test: Update golden binaries, Michael S. Tsirkin, 2021/07/16
- [PULL v3 08/19] hw/virtio: add vhost-user-i2c-pci boilerplate, Michael S. Tsirkin, 2021/07/16
- [PULL v3 11/19] hw/pxb: Add a bypass iommu property, Michael S. Tsirkin, 2021/07/16
- [PULL v3 12/19] hw/arm/virt: Add default_bus_bypass_iommu machine option, Michael S. Tsirkin, 2021/07/16
- [PULL v3 14/19] hw/pci: Add pci_bus_range() to get PCI bus number range, Michael S. Tsirkin, 2021/07/16
- [PULL v3 13/19] hw/i386: Add a default_bus_bypass_iommu pc machine option,
Michael S. Tsirkin <=
- [PULL v3 15/19] hw/arm/virt-acpi-build: Add IORT support to bypass SMMUv3, Michael S. Tsirkin, 2021/07/16
- [PULL v3 17/19] hw/i386/acpi-build: Add IVRS support to bypass iommu, Michael S. Tsirkin, 2021/07/16
- [PULL v3 18/19] docs: Add documentation for iommu bypass, Michael S. Tsirkin, 2021/07/16
- [PULL v3 19/19] vhost-vsock: SOCK_SEQPACKET feature bit support, Michael S. Tsirkin, 2021/07/16
- [PULL v3 16/19] hw/i386/acpi-build: Add DMAR support to bypass iommu, Michael S. Tsirkin, 2021/07/16
- Re: [PULL v3 00/19] pc,pci,virtio: lots of new features, Peter Maydell, 2021/07/16