Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 348EEC433F5 for ; Wed, 12 Jan 2022 01:44:51 +0000 (UTC) Received: from localhost ([::1]:35046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7Sgz-00022W-RX for qemu-devel@archiver.kernel.org; Tue, 11 Jan 2022 20:44:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7Sew-0000AX-L3 for qemu-devel@nongnu.org; Tue, 11 Jan 2022 20:42:45 -0500 Received: from mga12.intel.com ([192.55.52.136]:3943) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7Set-00060s-Tf for qemu-devel@nongnu.org; Tue, 11 Jan 2022 20:42:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641951759; x=1673487759; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=PGnwQKy85/j11QpxCnADQ0UWdbG1a4KqZkNs+hghTs0=; b=IWrNcY+KtJl+xyX4YoDuo83GQwY2Rpr9nS7d7FwtNg4Egq/7VGhdgHzc UopTFtk6DsGOR78dHfTChZinTHRoIUhhIWA7nzUo1HPSyRQUGpPxhhrsV C11v36P22PZ5RxsGXpleUM0i2ALuOIvEDFxF/81Dcyt8Lhi/rKQN4rW+0 W0jqe9OQQ7/3XBejSE6w/ZUuedfNt34ZZnIJfvV4GjbTA6MAGvECO4tyP 8YeCnNxiM0D9VApUn+4IMe0NraP8aewyOPMLGnwrx9i3aCf5pOz+wsXJU eHiDjsfgcL6nvcCIyIGfps8ynKwkqewpjjDxvaGgD8Re8ctlo3q2jkN9m Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="223619512" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="223619512" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jan 2022 17:42:32 -0800 X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="528981522" Received: from xiaoyaol-mobl.ccr.corp.intel.com (HELO [10.249.169.33]) ([10.249.169.33]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jan 2022 17:42:29 -0800 Message-ID: <2b837096-bbc9-294d-3193-fd01fab4efcc@intel.com> Date: Wed, 12 Jan 2022 09:42:28 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0 Thunderbird/91.4.1 Subject: Re: [PATCH v1 2/2] hw/i386: Make pic a property of common x86 base machine type Content-Language: en-US To: Sergio Lopez , "Michael S. Tsirkin" , Marcel Apfelbaum , Richard Henderson , Eduardo Habkost , Paolo Bonzini References: <20220111073528.1771552-1-xiaoyao.li@intel.com> <20220111073528.1771552-3-xiaoyao.li@intel.com> From: Xiaoyao Li In-Reply-To: <20220111073528.1771552-3-xiaoyao.li@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=192.55.52.136; envelope-from=xiaoyao.li@intel.com; helo=mga12.intel.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.595, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HK_RANDOM_ENVFROM=0.998, HK_RANDOM_FROM=0.998, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" + Paolo On 1/11/2022 3:35 PM, Xiaoyao Li wrote: > Legacy PIC (8259) cannot be supported for TDX guests since TDX module > doesn't allow directly interrupt injection. Using posted interrupts > for the PIC is not a viable option as the guest BIOS/kernel will not > do EOI for PIC IRQs, i.e. will leave the vIRR bit set. > > Make PIC the property of common x86 machine type. Hence all x86 > machines, including microvm, can disable it. > > Signed-off-by: Xiaoyao Li > --- > hw/i386/microvm.c | 27 +-------------------------- > hw/i386/pc_piix.c | 4 +++- > hw/i386/pc_q35.c | 4 +++- > hw/i386/x86.c | 25 +++++++++++++++++++++++++ > include/hw/i386/microvm.h | 2 -- > include/hw/i386/x86.h | 2 ++ > 6 files changed, 34 insertions(+), 30 deletions(-) > > diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c > index 89b555a2f584..754f1d0593e5 100644 > --- a/hw/i386/microvm.c > +++ b/hw/i386/microvm.c > @@ -247,7 +247,7 @@ static void microvm_devices_init(MicrovmMachineState *mms) > x86ms->pci_irq_mask = 0; > } > > - if (mms->pic == ON_OFF_AUTO_ON || mms->pic == ON_OFF_AUTO_AUTO) { > + if (x86ms->pic == ON_OFF_AUTO_ON || x86ms->pic == ON_OFF_AUTO_AUTO) { > qemu_irq *i8259; > > i8259 = i8259_init(isa_bus, x86_allocate_cpu_irq()); > @@ -491,23 +491,6 @@ static void microvm_machine_reset(MachineState *machine) > } > } > > -static void microvm_machine_get_pic(Object *obj, Visitor *v, const char *name, > - void *opaque, Error **errp) > -{ > - MicrovmMachineState *mms = MICROVM_MACHINE(obj); > - OnOffAuto pic = mms->pic; > - > - visit_type_OnOffAuto(v, name, &pic, errp); > -} > - > -static void microvm_machine_set_pic(Object *obj, Visitor *v, const char *name, > - void *opaque, Error **errp) > -{ > - MicrovmMachineState *mms = MICROVM_MACHINE(obj); > - > - visit_type_OnOffAuto(v, name, &mms->pic, errp); > -} > - > static void microvm_machine_get_rtc(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > @@ -632,7 +615,6 @@ static void microvm_machine_initfn(Object *obj) > MicrovmMachineState *mms = MICROVM_MACHINE(obj); > > /* Configuration */ > - mms->pic = ON_OFF_AUTO_AUTO; > mms->rtc = ON_OFF_AUTO_AUTO; > mms->pcie = ON_OFF_AUTO_AUTO; > mms->ioapic2 = ON_OFF_AUTO_AUTO; > @@ -684,13 +666,6 @@ static void microvm_class_init(ObjectClass *oc, void *data) > > x86mc->fwcfg_dma_enabled = true; > > - object_class_property_add(oc, MICROVM_MACHINE_PIC, "OnOffAuto", > - microvm_machine_get_pic, > - microvm_machine_set_pic, > - NULL, NULL); > - object_class_property_set_description(oc, MICROVM_MACHINE_PIC, > - "Enable i8259 PIC"); > - > object_class_property_add(oc, MICROVM_MACHINE_RTC, "OnOffAuto", > microvm_machine_get_rtc, > microvm_machine_set_rtc, > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 7c7790a5ce34..d05683cd0d77 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -218,7 +218,9 @@ static void pc_init1(MachineState *machine, > } > isa_bus_irqs(isa_bus, x86ms->gsi); > > - pc_i8259_create(isa_bus, gsi_state->i8259_irq); > + if (x86ms->pic == ON_OFF_AUTO_ON || x86ms->pic == ON_OFF_AUTO_AUTO) { > + pc_i8259_create(isa_bus, gsi_state->i8259_irq); > + } > > if (pcmc->pci_enabled) { > ioapic_init_gsi(gsi_state, "i440fx"); > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 1780f79bc127..58e7e693f9e2 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -265,7 +265,9 @@ static void pc_q35_init(MachineState *machine) > pci_bus_set_route_irq_fn(host_bus, ich9_route_intx_pin_to_irq); > isa_bus = ich9_lpc->isa_bus; > > - pc_i8259_create(isa_bus, gsi_state->i8259_irq); > + if (x86ms->pic == ON_OFF_AUTO_ON || x86ms->pic == ON_OFF_AUTO_AUTO) { > + pc_i8259_create(isa_bus, gsi_state->i8259_irq); > + } > > if (pcmc->pci_enabled) { > ioapic_init_gsi(gsi_state, "q35"); > diff --git a/hw/i386/x86.c b/hw/i386/x86.c > index 744a50937761..d4a4c0ec8f61 100644 > --- a/hw/i386/x86.c > +++ b/hw/i386/x86.c > @@ -1243,6 +1243,23 @@ static void x86_machine_set_pit(Object *obj, Visitor *v, const char *name, > visit_type_OnOffAuto(v, name, &x86ms->pit, errp); > } > > +static void x86_machine_get_pic(Object *obj, Visitor *v, const char *name, > + void *opaque, Error **errp) > +{ > + X86MachineState *x86ms = X86_MACHINE(obj); > + OnOffAuto pic = x86ms->pic; > + > + visit_type_OnOffAuto(v, name, &pic, errp); > +} > + > +static void x86_machine_set_pic(Object *obj, Visitor *v, const char *name, > + void *opaque, Error **errp) > +{ > + X86MachineState *x86ms = X86_MACHINE(obj); > + > + visit_type_OnOffAuto(v, name, &x86ms->pic, errp); > +} > + > static char *x86_machine_get_oem_id(Object *obj, Error **errp) > { > X86MachineState *x86ms = X86_MACHINE(obj); > @@ -1333,6 +1350,7 @@ static void x86_machine_initfn(Object *obj) > x86ms->smm = ON_OFF_AUTO_AUTO; > x86ms->acpi = ON_OFF_AUTO_AUTO; > x86ms->pit = ON_OFF_AUTO_AUTO; > + x86ms->pic = ON_OFF_AUTO_AUTO; > x86ms->pci_irq_mask = ACPI_BUILD_PCI_IRQS; > x86ms->oem_id = g_strndup(ACPI_BUILD_APPNAME6, 6); > x86ms->oem_table_id = g_strndup(ACPI_BUILD_APPNAME8, 8); > @@ -1372,6 +1390,13 @@ static void x86_machine_class_init(ObjectClass *oc, void *data) > object_class_property_set_description(oc, X86_MACHINE_PIT, > "Enable i8254 PIT"); > > + object_class_property_add(oc, X86_MACHINE_PIC, "OnOffAuto", > + x86_machine_get_pic, > + x86_machine_set_pic, > + NULL, NULL); > + object_class_property_set_description(oc, X86_MACHINE_PIC, > + "Enable i8259 PIC"); > + > object_class_property_add_str(oc, X86_MACHINE_OEM_ID, > x86_machine_get_oem_id, > x86_machine_set_oem_id); > diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h > index 83f9ac0b2ad0..fad97a891dcb 100644 > --- a/include/hw/i386/microvm.h > +++ b/include/hw/i386/microvm.h > @@ -67,7 +67,6 @@ > #define PCIE_ECAM_SIZE 0x10000000 > > /* Machine type options */ > -#define MICROVM_MACHINE_PIC "pic" > #define MICROVM_MACHINE_RTC "rtc" > #define MICROVM_MACHINE_PCIE "pcie" > #define MICROVM_MACHINE_IOAPIC2 "ioapic2" > @@ -85,7 +84,6 @@ struct MicrovmMachineState { > X86MachineState parent; > > /* Machine type options */ > - OnOffAuto pic; > OnOffAuto rtc; > OnOffAuto pcie; > OnOffAuto ioapic2; > diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h > index f0168902356d..e4930321c921 100644 > --- a/include/hw/i386/x86.h > +++ b/include/hw/i386/x86.h > @@ -68,6 +68,7 @@ struct X86MachineState { > OnOffAuto smm; > OnOffAuto acpi; > OnOffAuto pit; > + OnOffAuto pic; > > char *oem_id; > char *oem_table_id; > @@ -88,6 +89,7 @@ struct X86MachineState { > #define X86_MACHINE_SMM "smm" > #define X86_MACHINE_ACPI "acpi" > #define X86_MACHINE_PIT "pit" > +#define X86_MACHINE_PIC "pic" > #define X86_MACHINE_OEM_ID "x-oem-id" > #define X86_MACHINE_OEM_TABLE_ID "x-oem-table-id" > #define X86_MACHINE_BUS_LOCK_RATELIMIT "bus-lock-ratelimit"