From patchwork Fri Sep 30 16:10:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= X-Patchwork-Id: 9358595 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 033A5600C8 for ; Fri, 30 Sep 2016 16:11:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E627F2A07E for ; Fri, 30 Sep 2016 16:11:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DAF1D2A0CF; Fri, 30 Sep 2016 16:11:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.9 required=2.0 tests=BAYES_00,HK_RANDOM_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7F8532A07E for ; Fri, 30 Sep 2016 16:11:43 +0000 (UTC) Received: from localhost ([::1]:45702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bq0PW-0001DJ-IB for patchwork-qemu-devel@patchwork.kernel.org; Fri, 30 Sep 2016 12:11:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bq0Ou-00015x-Qi for qemu-devel@nongnu.org; Fri, 30 Sep 2016 12:11:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bq0Ot-0001Xg-KS for qemu-devel@nongnu.org; Fri, 30 Sep 2016 12:11:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32824) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bq0Ot-0001XO-B0 for qemu-devel@nongnu.org; Fri, 30 Sep 2016 12:11:03 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EC53361982; Fri, 30 Sep 2016 16:11:02 +0000 (UTC) Received: from potion (dhcp-1-247.brq.redhat.com [10.34.1.247]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id u8UGB0OD003809; Fri, 30 Sep 2016 12:11:00 -0400 Received: by potion (sSMTP sendmail emulation); Fri, 30 Sep 2016 18:10:59 +0200 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= To: qemu-devel@nongnu.org Date: Fri, 30 Sep 2016 18:10:12 +0200 Message-Id: <20160930161013.9832-8-rkrcmar@redhat.com> In-Reply-To: <20160930161013.9832-1-rkrcmar@redhat.com> References: <20160930161013.9832-1-rkrcmar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 30 Sep 2016 16:11:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 7/8] intel_iommu: keep buggy EIM enabled in 2.7 machine type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , Peter Xu , Paolo Bonzini , Igor Mammedov , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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ář --- v3: shorten the code [Peter] --- hw/i386/intel_iommu.c | 12 +++++++----- hw/i386/pc_q35.c | 2 ++ include/hw/i386/pc.h | 2 ++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index efb018b85544..13a2ac5a8fb9 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -2456,9 +2456,11 @@ static AddressSpace *vtd_host_dma_iommu(PCIBus *bus, void *opaque, int devfn) return &vtd_as->as; } -static bool vtd_decide_config(IntelIOMMUState *s, Error **errp) +static bool vtd_decide_config(IntelIOMMUState *s, PCMachineState *pcms, + Error **errp) { X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(s); + PCMachineClass *pcmc = PC_MACHINE_CLASS(MACHINE_GET_CLASS(pcms)); /* Currently Intel IOMMU IR only support "kernel-irqchip={off|split}" */ if (x86_iommu->intr_supported && kvm_irqchip_in_kernel() && @@ -2473,11 +2475,11 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp) } if (s->intr_eim == ON_OFF_AUTO_AUTO) { - s->intr_eim = x86_iommu->intr_supported && kvm_irqchip_in_kernel() ? + s->intr_eim = (kvm_irqchip_in_kernel() || pcmc->buggy_intel_iommu_eim) + && x86_iommu->intr_supported ? 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_setg(errp, "eim=on requires support on the KVM side" "(X2APIC_API, first shipped in v4.7)"); @@ -2502,7 +2504,7 @@ static void vtd_realize(DeviceState *dev, Error **errp) VTD_DPRINTF(GENERAL, ""); x86_iommu->type = TYPE_INTEL; - if (!vtd_decide_config(s, errp)) { + if (!vtd_decide_config(s, pcms, errp)) { return; } 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"