From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpbEc-0005is-56 for qemu-devel@nongnu.org; Thu, 29 Sep 2016 09:18:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpbEX-0006lj-WA for qemu-devel@nongnu.org; Thu, 29 Sep 2016 09:18:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39325) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpbEX-0006kl-Mu for qemu-devel@nongnu.org; Thu, 29 Sep 2016 09:18:41 -0400 References: <20160929112329.2408-1-rkrcmar@redhat.com> <20160929112329.2408-7-rkrcmar@redhat.com> From: Paolo Bonzini Message-ID: Date: Thu, 29 Sep 2016 15:18:36 +0200 MIME-Version: 1.0 In-Reply-To: <20160929112329.2408-7-rkrcmar@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 6/7] intel_iommu: reject broken EIM List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , qemu-devel@nongnu.org Cc: Peter Xu , Igor Mammedov , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" On 29/09/2016 13:23, Radim Kr=C4=8Dm=C3=A1=C5=99 wrote: > Cluster x2APIC cannot work without KVM's x2apic API when the maximal > APIC ID is greater than 8 and only KVM's LAPIC can support x2APIC, so w= e > forbid other APICs and also the old KVM case with less than 9, to > simplify the code. >=20 > There is no point in enabling EIM in forbidden APICs, so we keep it > enabled only for the KVM APIC; unconditionally, because making the > option depend on KVM version would be a maintanance burden. >=20 > Signed-off-by: Radim Kr=C4=8Dm=C3=A1=C5=99 > --- > v2: > * adapt to new intr_eim parameter > * provide first linux version that has x2apic api > * disable QEMU's LAPIC > --- > hw/i386/intel_iommu.c | 16 +++++++++++++++- > target-i386/kvm-stub.c | 5 +++++ > target-i386/kvm.c | 13 +++++++++++++ > target-i386/kvm_i386.h | 1 + > 4 files changed, 34 insertions(+), 1 deletion(-) >=20 > diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c > index 47141cea64f4..b1afe5b133e0 100644 > --- a/hw/i386/intel_iommu.c > +++ b/hw/i386/intel_iommu.c > @@ -32,6 +32,7 @@ > #include "hw/pci-host/q35.h" > #include "sysemu/kvm.h" > #include "hw/i386/apic_internal.h" > +#include "kvm_i386.h" > =20 > /*#define DEBUG_INTEL_IOMMU*/ > #ifdef DEBUG_INTEL_IOMMU > @@ -2481,7 +2482,20 @@ static void vtd_realize(DeviceState *dev, Error = **errp) > s->intr_eim =3D ON_OFF_AUTO_OFF; > } > if (s->intr_eim =3D=3D ON_OFF_AUTO_AUTO) { > - s->intr_eim =3D ON_OFF_AUTO_ON; > + s->intr_eim =3D kvm_irqchip_in_kernel() ? ON_OFF_AUTO_ON > + : ON_OFF_AUTO_OFF; > + } > + if (s->intr_eim =3D=3D ON_OFF_AUTO_ON) { > + if (kvm_irqchip_in_kernel() && !kvm_enable_x2apic()) { > + error_report("intel-iommu,eim=3Don requires support on the= KVM side " > + "(X2APIC_API, first shipped in v4.7)."); > + exit(1); Please use error_setg and return instead (same in patches 4 and 5). Paolo > + } > + if (!kvm_irqchip_in_kernel()) { > + error_report("intel-iommu,eim=3Don requires " > + "accel=3Dkvm,kernel-irqchip=3Dsplit."); > + exit(1); > + } > } > =20 > memset(s->vtd_as_by_bus_num, 0, sizeof(s->vtd_as_by_bus_num)); > diff --git a/target-i386/kvm-stub.c b/target-i386/kvm-stub.c > index cdf15061091d..bda4dc2f0c57 100644 > --- a/target-i386/kvm-stub.c > +++ b/target-i386/kvm-stub.c > @@ -25,6 +25,11 @@ bool kvm_has_smm(void) > return 1; > } > =20 > +bool kvm_enable_x2apic(void) > +{ > + return false; > +} > + > /* This function is only called inside conditionals which we > * rely on the compiler to optimize out when CONFIG_KVM is not > * defined. > diff --git a/target-i386/kvm.c b/target-i386/kvm.c > index ee1f53e56953..0fd664648665 100644 > --- a/target-i386/kvm.c > +++ b/target-i386/kvm.c > @@ -122,6 +122,19 @@ bool kvm_allows_irq0_override(void) > return !kvm_irqchip_in_kernel() || kvm_has_gsi_routing(); > } > =20 > +static bool kvm_x2apic_api_set_flags(uint64_t flags) > +{ > + KVMState *s =3D KVM_STATE(current_machine->accelerator); > + > + return !kvm_vm_enable_cap(s, KVM_CAP_X2APIC_API, 0, flags); > +} > + > +bool kvm_enable_x2apic(void) > +{ > + return kvm_x2apic_api_set_flags(KVM_X2APIC_API_USE_32BIT_IDS | > + KVM_X2APIC_API_DISABLE_BROADCAST_Q= UIRK); > +} > + > static int kvm_get_tsc(CPUState *cs) > { > X86CPU *cpu =3D X86_CPU(cs); > diff --git a/target-i386/kvm_i386.h b/target-i386/kvm_i386.h > index 36407e0a5dc7..5c369b1c5b40 100644 > --- a/target-i386/kvm_i386.h > +++ b/target-i386/kvm_i386.h > @@ -43,4 +43,5 @@ int kvm_device_msix_deassign(KVMState *s, uint32_t de= v_id); > =20 > void kvm_put_apicbase(X86CPU *cpu, uint64_t value); > =20 > +bool kvm_enable_x2apic(void); > #endif >=20