From patchwork Thu Sep 29 11:23:29 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: 9356367 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 EA6866077A for ; Thu, 29 Sep 2016 11:28:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCA0B29960 for ; Thu, 29 Sep 2016 11:28:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D101F29964; Thu, 29 Sep 2016 11:28:56 +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 5473829960 for ; Thu, 29 Sep 2016 11:28:55 +0000 (UTC) Received: from localhost ([::1]:36518 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpZWJ-0005ye-39 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 29 Sep 2016 07:28:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpZSf-0002n9-Ls for qemu-devel@nongnu.org; Thu, 29 Sep 2016 07:25:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpZSe-0003G9-Jg for qemu-devel@nongnu.org; Thu, 29 Sep 2016 07:25:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41936) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpZSe-0003Fi-B7 for qemu-devel@nongnu.org; Thu, 29 Sep 2016 07:25:08 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (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 DB69CE0364; Thu, 29 Sep 2016 11:25:07 +0000 (UTC) Received: from potion (dhcp-1-247.brq.redhat.com [10.34.1.247]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id u8TBP5Fi024777; Thu, 29 Sep 2016 07:25:05 -0400 Received: by potion (sSMTP sendmail emulation); Thu, 29 Sep 2016 13:25:04 +0200 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= To: qemu-devel@nongnu.org Date: Thu, 29 Sep 2016 13:23:29 +0200 Message-Id: <20160929112329.2408-8-rkrcmar@redhat.com> In-Reply-To: <20160929112329.2408-1-rkrcmar@redhat.com> References: <20160929112329.2408-1-rkrcmar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 29 Sep 2016 11:25:07 +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 v2 7/7] 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ář --- 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"