[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 7/7] intel-iommu: keep buggy EIM enabled in 2
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH v2 7/7] intel-iommu: keep buggy EIM enabled in 2.7 machine type |
Date: |
Thu, 29 Sep 2016 15:19:03 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 |
On 29/09/2016 13:23, Radim Krčmář wrote:
> QEMU 2.7 allowed EIM even in configurations that were forbidden in the
> last patch because they were not working, like old KVM or userspace
> APIC. In order to keep backward compatibility, we again allow guests to
> misbehave in non-obvious ways, and make it the default.
>
> Signed-off-by: Radim Krčmář <address@hidden>
Ugh, I misremembered that VTD_ECAP_EIM was not set in 2.7. :( Perhaps
it's better to drop this patch...
Paolo
> ---
> hw/i386/intel_iommu.c | 6 +++++-
> hw/i386/pc_q35.c | 2 ++
> include/hw/i386/pc.h | 2 ++
> 3 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
> index b1afe5b133e0..d6657a361ff9 100644
> --- a/hw/i386/intel_iommu.c
> +++ b/hw/i386/intel_iommu.c
> @@ -2458,6 +2458,7 @@ static AddressSpace *vtd_host_dma_iommu(PCIBus *bus,
> void *opaque, int devfn)
> static void vtd_realize(DeviceState *dev, Error **errp)
> {
> PCMachineState *pcms = PC_MACHINE(qdev_get_machine());
> + PCMachineClass *pcmc = PC_MACHINE_CLASS(MACHINE_GET_CLASS(pcms));
> PCIBus *bus = pcms->bus;
> IntelIOMMUState *s = INTEL_IOMMU_DEVICE(dev);
> X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);
> @@ -2481,11 +2482,14 @@ static void vtd_realize(DeviceState *dev, Error
> **errp)
> if (s->intr_eim == ON_OFF_AUTO_AUTO && !x86_iommu->intr_supported) {
> s->intr_eim = ON_OFF_AUTO_OFF;
> }
> + if (s->intr_eim == ON_OFF_AUTO_AUTO && pcmc->buggy_intel_iommu_eim) {
> + s->intr_eim = ON_OFF_AUTO_ON;
> + }
> if (s->intr_eim == ON_OFF_AUTO_AUTO) {
> s->intr_eim = kvm_irqchip_in_kernel() ? ON_OFF_AUTO_ON
> : ON_OFF_AUTO_OFF;
> }
> - if (s->intr_eim == ON_OFF_AUTO_ON) {
> + if (s->intr_eim == ON_OFF_AUTO_ON && !pcmc->buggy_intel_iommu_eim) {
> if (kvm_irqchip_in_kernel() && !kvm_enable_x2apic()) {
> error_report("intel-iommu,eim=on requires support on the KVM
> side "
> "(X2APIC_API, first shipped in v4.7).");
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 0b214f24c977..97f419fbf4dd 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -304,8 +304,10 @@ DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL,
>
> static void pc_q35_2_7_machine_options(MachineClass *m)
> {
> + PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> pc_q35_2_8_machine_options(m);
> m->alias = NULL;
> + pcmc->buggy_intel_iommu_eim = true;
> SET_MACHINE_COMPAT(m, PC_COMPAT_2_7);
> }
>
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 47bdf10cfd9b..4bd435f8fa5c 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -143,6 +143,8 @@ struct PCMachineClass {
> bool save_tsc_khz;
> /* generate legacy CPU hotplug AML */
> bool legacy_cpu_hotplug;
> + /* enable buggy Intel-IOMMU EIM by default */
> + bool buggy_intel_iommu_eim;
> };
>
> #define TYPE_PC_MACHINE "generic-pc-machine"
>
- [Qemu-devel] [PATCH v2 0/7] intel_iommu: fix EIM, Radim Krčmář, 2016/09/29
- [Qemu-devel] [PATCH v2 2/7] apic: add send_msi() to APICCommonClass, Radim Krčmář, 2016/09/29
- [Qemu-devel] [PATCH v2 1/7] apic: add global apic_get_class(), Radim Krčmář, 2016/09/29
- [Qemu-devel] [PATCH v2 3/7] intel_iommu: pass whole remapped addresses to apic, Radim Krčmář, 2016/09/29
- [Qemu-devel] [PATCH v2 4/7] intel-iommu: exit on invalid configuraton earlier, Radim Krčmář, 2016/09/29
- [Qemu-devel] [PATCH v2 7/7] intel-iommu: keep buggy EIM enabled in 2.7 machine type, Radim Krčmář, 2016/09/29
- [Qemu-devel] [PATCH v2 5/7] intel-iommu: add OnOffAuto intr_eim as "eim" property, Radim Krčmář, 2016/09/29
- [Qemu-devel] [PATCH v2 6/7] intel_iommu: reject broken EIM, Radim Krčmář, 2016/09/29