From nobody Mon Feb 9 16:12:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607607082; cv=none; d=zohomail.com; s=zohoarc; b=B8dSSy5NwCUv20Bk1BH7xqf27GwotDvUl8+XT3FoyvHjP/ibyuDsQmMXr/m/xN7YFo59BkRhLePSlUkRQT1sy859DWUGWAfnvYTXhhueq7uNaimH+rBj2mnsS0nlBI3SshCUDV/H4Iu6uBG+a8hS6bgldmmJuVyrF8Vn9ZnEeuA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607607082; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Vsnziv8lsVasLDIsDSb35ijlknBI77YgIERjlDvVxNQ=; b=OMyFrIn1jzdey620MVii/yRIQjc5CRMCoxmPTLe/UKQx+VtANWNyDNhWRW6+69bPBD2ECxg57SqqPWtI+B6TCUBgDHOOe2uCeR7QsiNMoecFP0ywh/u9KKc+/PG0O90k71h9kqKOrq6m8Nh3WWvNFAKl3Zx6j+Bxg/Ql5/VtBrE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607607082176420.7626802351647; Thu, 10 Dec 2020 05:31:22 -0800 (PST) Received: from localhost ([::1]:48980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knM2S-0001by-TM for importer@patchew.org; Thu, 10 Dec 2020 08:31:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knKqB-0003ld-Kl for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39638) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knKq1-0006w4-HN for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:34 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-37-U3NcXLbeNuCPM1zbZkfnmw-1; Thu, 10 Dec 2020 07:14:22 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 88B5318C8C02; Thu, 10 Dec 2020 12:14:21 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id A001F6E41C; Thu, 10 Dec 2020 12:14:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id ECB689D9C; Thu, 10 Dec 2020 13:13:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607602464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Vsnziv8lsVasLDIsDSb35ijlknBI77YgIERjlDvVxNQ=; b=Hr0j0ogN0EnHUs5cOljP5+kmL4eGVeMI686zgG8gzWigVCE1Uy6He7BAMb+YPfx3aqXJzx g4AoL05+Ky5mXsOSnutAXbDnLYK/m+zQcBim2kC23fypTGZRzHPjIMPQUeSAK03kyMLsAq cWVBAlrtzE1lcpSo6rcwHPIPFBw4r38= X-MC-Unique: U3NcXLbeNuCPM1zbZkfnmw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 06/11] microvm: add second ioapic Date: Thu, 10 Dec 2020 13:13:54 +0100 Message-Id: <20201210121359.18320-7-kraxel@redhat.com> In-Reply-To: <20201210121359.18320-1-kraxel@redhat.com> References: <20201210121359.18320-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Richard Henderson , Gerd Hoffmann , Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Create second ioapic, route virtio-mmio IRQs to it, allow more virtio-mmio devices (24 instead of 8). Needs ACPI, enabled by default, can be turned off using -machine ioapic2=3Doff Signed-off-by: Gerd Hoffmann Reviewed-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov Reviewed-by: Sergio Lopez Message-id: 20201203105423.10431-8-kraxel@redhat.com --- include/hw/i386/microvm.h | 2 ++ hw/i386/microvm.c | 56 +++++++++++++++++++++++++++++++--- tests/qtest/bios-tables-test.c | 8 ++--- 3 files changed, 57 insertions(+), 9 deletions(-) diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h index f1e9db059b85..f25f8374413f 100644 --- a/include/hw/i386/microvm.h +++ b/include/hw/i386/microvm.h @@ -72,6 +72,7 @@ #define MICROVM_MACHINE_PIC "pic" #define MICROVM_MACHINE_RTC "rtc" #define MICROVM_MACHINE_PCIE "pcie" +#define MICROVM_MACHINE_IOAPIC2 "ioapic2" #define MICROVM_MACHINE_ISA_SERIAL "isa-serial" #define MICROVM_MACHINE_OPTION_ROMS "x-option-roms" #define MICROVM_MACHINE_AUTO_KERNEL_CMDLINE "auto-kernel-cmdline" @@ -90,6 +91,7 @@ struct MicrovmMachineState { OnOffAuto pit; OnOffAuto rtc; OnOffAuto pcie; + OnOffAuto ioapic2; bool isa_serial; bool option_roms; bool auto_kernel_cmdline; diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 829b376a1278..56886086133c 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -145,32 +145,53 @@ static void create_gpex(MicrovmMachineState *mms) } } =20 +static int microvm_ioapics(MicrovmMachineState *mms) +{ + if (!x86_machine_is_acpi_enabled(X86_MACHINE(mms))) { + return 1; + } + if (mms->ioapic2 =3D=3D ON_OFF_AUTO_OFF) { + return 1; + } + return 2; +} + static void microvm_devices_init(MicrovmMachineState *mms) { X86MachineState *x86ms =3D X86_MACHINE(mms); ISABus *isa_bus; ISADevice *rtc_state; GSIState *gsi_state; + int ioapics; int i; =20 /* Core components */ - + ioapics =3D microvm_ioapics(mms); gsi_state =3D g_malloc0(sizeof(*gsi_state)); - x86ms->gsi =3D qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS= ); + x86ms->gsi =3D qemu_allocate_irqs(gsi_handler, gsi_state, + IOAPIC_NUM_PINS * ioapics); =20 isa_bus =3D isa_bus_new(NULL, get_system_memory(), get_system_io(), &error_abort); isa_bus_irqs(isa_bus, x86ms->gsi); =20 ioapic_init_gsi(gsi_state, "machine"); + if (ioapics > 1) { + x86ms->ioapic2 =3D ioapic_init_secondary(gsi_state); + } =20 kvmclock_create(true); =20 mms->virtio_irq_base =3D 5; mms->virtio_num_transports =3D 8; - if (x86_machine_is_acpi_enabled(x86ms)) { - mms->pcie_irq_base =3D 12; - mms->virtio_irq_base =3D 16; + if (x86ms->ioapic2) { + mms->pcie_irq_base =3D 16; /* 16 -> 19 */ + /* use second ioapic (24 -> 47) for virtio-mmio irq lines */ + mms->virtio_irq_base =3D IO_APIC_SECONDARY_IRQBASE; + mms->virtio_num_transports =3D IOAPIC_NUM_PINS; + } else if (x86_machine_is_acpi_enabled(x86ms)) { + mms->pcie_irq_base =3D 12; /* 12 -> 15 */ + mms->virtio_irq_base =3D 16; /* 16 -> 23 */ } =20 for (i =3D 0; i < mms->virtio_num_transports; i++) { @@ -544,6 +565,23 @@ static void microvm_machine_set_pcie(Object *obj, Visi= tor *v, const char *name, visit_type_OnOffAuto(v, name, &mms->pcie, errp); } =20 +static void microvm_machine_get_ioapic2(Object *obj, Visitor *v, const cha= r *name, + void *opaque, Error **errp) +{ + MicrovmMachineState *mms =3D MICROVM_MACHINE(obj); + OnOffAuto ioapic2 =3D mms->ioapic2; + + visit_type_OnOffAuto(v, name, &ioapic2, errp); +} + +static void microvm_machine_set_ioapic2(Object *obj, Visitor *v, const cha= r *name, + void *opaque, Error **errp) +{ + MicrovmMachineState *mms =3D MICROVM_MACHINE(obj); + + visit_type_OnOffAuto(v, name, &mms->ioapic2, errp); +} + static bool microvm_machine_get_isa_serial(Object *obj, Error **errp) { MicrovmMachineState *mms =3D MICROVM_MACHINE(obj); @@ -620,6 +658,7 @@ static void microvm_machine_initfn(Object *obj) mms->pit =3D ON_OFF_AUTO_AUTO; mms->rtc =3D ON_OFF_AUTO_AUTO; mms->pcie =3D ON_OFF_AUTO_AUTO; + mms->ioapic2 =3D ON_OFF_AUTO_AUTO; mms->isa_serial =3D true; mms->option_roms =3D true; mms->auto_kernel_cmdline =3D true; @@ -693,6 +732,13 @@ static void microvm_class_init(ObjectClass *oc, void *= data) object_class_property_set_description(oc, MICROVM_MACHINE_PCIE, "Enable PCIe"); =20 + object_class_property_add(oc, MICROVM_MACHINE_IOAPIC2, "OnOffAuto", + microvm_machine_get_ioapic2, + microvm_machine_set_ioapic2, + NULL, NULL); + object_class_property_set_description(oc, MICROVM_MACHINE_IOAPIC2, + "Enable second IO-APIC"); + object_class_property_add_bool(oc, MICROVM_MACHINE_ISA_SERIAL, microvm_machine_get_isa_serial, microvm_machine_set_isa_serial); diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 64a9a772eee7..61bf861ac91d 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1124,7 +1124,7 @@ static void test_acpi_microvm_tcg(void) test_data data; =20 test_acpi_microvm_prepare(&data); - test_acpi_one(" -machine microvm,acpi=3Don,rtc=3Doff", + test_acpi_one(" -machine microvm,acpi=3Don,ioapic2=3Doff,rtc=3Doff", &data); free_test_data(&data); } @@ -1135,7 +1135,7 @@ static void test_acpi_microvm_usb_tcg(void) =20 test_acpi_microvm_prepare(&data); data.variant =3D ".usb"; - test_acpi_one(" -machine microvm,acpi=3Don,usb=3Don,rtc=3Doff", + test_acpi_one(" -machine microvm,acpi=3Don,ioapic2=3Doff,usb=3Don,rtc= =3Doff", &data); free_test_data(&data); } @@ -1146,7 +1146,7 @@ static void test_acpi_microvm_rtc_tcg(void) =20 test_acpi_microvm_prepare(&data); data.variant =3D ".rtc"; - test_acpi_one(" -machine microvm,acpi=3Don,rtc=3Don", + test_acpi_one(" -machine microvm,acpi=3Don,ioapic2=3Doff,rtc=3Don", &data); free_test_data(&data); } @@ -1158,7 +1158,7 @@ static void test_acpi_microvm_pcie_tcg(void) test_acpi_microvm_prepare(&data); data.variant =3D ".pcie"; data.tcg_only =3D true; /* need constant host-phys-bits */ - test_acpi_one(" -machine microvm,acpi=3Don,rtc=3Doff,pcie=3Don", + test_acpi_one(" -machine microvm,acpi=3Don,ioapic2=3Doff,rtc=3Doff,pci= e=3Don", &data); free_test_data(&data); } --=20 2.27.0