From patchwork Thu Aug 20 09:21:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 11725973 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8491F1392 for ; Thu, 20 Aug 2020 09:22:40 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 4FF33207DE for ; Thu, 20 Aug 2020 09:22:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=anisinha-ca.20150623.gappssmtp.com header.i=@anisinha-ca.20150623.gappssmtp.com header.b="fEyWb06P" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4FF33207DE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=anisinha.ca Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:38810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8gmN-0006mo-Dn for patchwork-qemu-devel@patchwork.kernel.org; Thu, 20 Aug 2020 05:22:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8glu-0006LC-S4 for qemu-devel@nongnu.org; Thu, 20 Aug 2020 05:22:10 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]:52116) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k8gls-0002rh-LA for qemu-devel@nongnu.org; Thu, 20 Aug 2020 05:22:10 -0400 Received: by mail-pj1-x1033.google.com with SMTP id ds1so714995pjb.1 for ; Thu, 20 Aug 2020 02:22:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anisinha-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=C7qFAS4nSnRrkF27dValuMf/Ze8Gvsck6vINY+1lVpA=; b=fEyWb06PNK62QoQkbZeyM1KeraZTL/VUW4jcPjRjZVR+KoRzsYZ1Xj8VgHShkuT+B9 PgZYDM/127jARVizp34qUFp6mZG1wfJHyJx3qF/HG1QK3hieOSr+FWnsyAshbGoh6mWB ThAhh2cNZxXb3OknpmARnOi4GlH3brSidMKigWw/XAN9QXlDRJKryo/S8TD+quzDW54z Ijgz33Z3Yhl9CrlQqw3gcz9ocz5uFTCyie1rh21Fj2y7UAAtcAshpkL646z9pJkrUZLz dGh1qX5txDb/gtE535jSrBk+IPo5BBATm2IOeOg0SjupdP6Rf2cZr6nhHhgoH+7ZwSAP AshA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=C7qFAS4nSnRrkF27dValuMf/Ze8Gvsck6vINY+1lVpA=; b=dPCaiJ0SfPjA9YWaj0ju4YXPvItDUGd4AtnpGR+mChX+fGz1hHlH7Kpy1y817MWKsi Kg37zq6A4PDMNMYH4SMk1q5HVBoRo5DMRtOB+80/8HRj7Ik0GmDgfl0uUljh5bWvq2q+ s7nxVg3bQyXbBHy1zgvmqiH+PG6ZYJsj5O9uhEHlCX5sO1EaOncxThi+BaU5tedl76ym Dj99SzPP/eYucb5nxSatkUd7vNEi2GHEGSSud7/CcXktxiLBkCXuH4G2xZyuGf1qD37w MjNpQiX2VCYTtprUoatsDf2UP3kbG4e8CeavF/t76R/n3rB+tID4znYUabz4TKHvCGr7 K3qA== X-Gm-Message-State: AOAM5313AzWjhQxqkMQmmEjVi23DkZkmfi4SwFt5H67tJbwn70ODDp49 3+YRffc2MBfvsLu1x/er5vqZoUi10zcy84/n X-Google-Smtp-Source: ABdhPJxbQdLNNp4wHQIGxX9yNG+8FLPfPHr6SUaa+S6V/X4Y2XT1irQXta6ZXesII3lemXj+7fE8vA== X-Received: by 2002:a17:902:9f8a:: with SMTP id g10mr1937783plq.158.1597915326550; Thu, 20 Aug 2020 02:22:06 -0700 (PDT) Received: from localhost.localdomain ([115.96.156.17]) by smtp.googlemail.com with ESMTPSA id z3sm1839446pgk.49.2020.08.20.02.22.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2020 02:22:05 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org Subject: [PATCH V6] Introduce a new flag for i440fx to disable PCI hotplug on the root bus Date: Thu, 20 Aug 2020 14:51:56 +0530 Message-Id: <20200820092157.17792-1-ani@anisinha.ca> X-Mailer: git-send-email 2.17.1 Received-SPF: none client-ip=2607:f8b0:4864:20::1033; envelope-from=ani@anisinha.ca; helo=mail-pj1-x1033.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=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 , "Michael S. Tsirkin" , Aleksandar Markovic , Paolo Bonzini , Ani Sinha , Igor Mammedov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" We introduce a new global flag 'acpi-root-pci-hotplug' for i440fx with which we can turn on or off PCI device hotplug on the root bus. This flag can be used to prevent all PCI devices from getting hotplugged or unplugged from the root PCI bus. This feature is targetted mostly towards Windows VMs. It is useful in cases where some hypervisor admins want to deploy guest VMs in a way so that the users of the guest OSes are not able to hot-eject certain PCI devices from the Windows system tray. Laine has explained the use case here in detail: https://www.redhat.com/archives/libvir-list/2020-February/msg00110.html Julia has resolved this issue for PCIE buses with the following commit: 530a0963184e57e71a5b538 ("pcie_root_port: Add hotplug disabling option") This commit attempts to introduce similar behavior for PCI root buses used in i440fx machine types (although in this case, we do not have a per-slot capability to turn hotplug on or off). Usage: -global PIIX4_PM.acpi-root-pci-hotplug=off By default, this option is enabled which means that hotplug is turned on for the PCI root bus. The previously existing flag 'acpi-pci-hotplug-with-bridge-support' for PCI-PCI bridges remain as is and can be used along with this new flag to control PCI hotplug on PCI bridges. This change has been tested using a Windows 2012R2 server guest image and also with a Windows 2019 server guest image on a Ubuntu 18.04 host using the latest master qemu from upstream (v5.1.0 tag). Signed-off-by: Ani Sinha --- hw/acpi/piix4.c | 8 ++++++-- hw/i386/acpi-build.c | 26 +++++++++++++++++++------- 2 files changed, 25 insertions(+), 9 deletions(-) Change Log: V5..V6: specified upstream master tag information off which this patch is based off of. diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 26bac4f16c..4f436e5bf3 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -78,6 +78,7 @@ typedef struct PIIX4PMState { AcpiPciHpState acpi_pci_hotplug; bool use_acpi_hotplug_bridge; + bool use_acpi_root_pci_hotplug; uint8_t disable_s3; uint8_t disable_s4; @@ -595,8 +596,9 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, "acpi-gpe0", GPE_LEN); memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe); - acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent, - s->use_acpi_hotplug_bridge); + if (s->use_acpi_hotplug_bridge || s->use_acpi_root_pci_hotplug) + acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent, + s->use_acpi_hotplug_bridge); s->cpu_hotplug_legacy = true; object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy", @@ -635,6 +637,8 @@ static Property piix4_pm_properties[] = { DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_VAL, PIIX4PMState, s4_val, 2), DEFINE_PROP_BOOL("acpi-pci-hotplug-with-bridge-support", PIIX4PMState, use_acpi_hotplug_bridge, true), + DEFINE_PROP_BOOL("acpi-root-pci-hotplug", PIIX4PMState, + use_acpi_root_pci_hotplug, true), DEFINE_PROP_BOOL("memory-hotplug-support", PIIX4PMState, acpi_memory_hotplug.is_enabled, true), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index b7bcbbbb2a..19a1702ad1 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -95,6 +95,7 @@ typedef struct AcpiPmInfo { bool s3_disabled; bool s4_disabled; bool pcihp_bridge_en; + bool pcihp_root_en; uint8_t s4_val; AcpiFadtData fadt; uint16_t cpu_hp_io_base; @@ -245,6 +246,9 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm) pm->pcihp_bridge_en = object_property_get_bool(obj, "acpi-pci-hotplug-with-bridge-support", NULL); + pm->pcihp_root_en = + object_property_get_bool(obj, "acpi-root-pci-hotplug", NULL); + } static void acpi_get_misc_info(AcpiMiscInfo *info) @@ -337,15 +341,18 @@ static void build_append_pcihp_notify_entry(Aml *method, int slot) } static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, - bool pcihp_bridge_en) + bool pcihp_bridge_en, + bool pcihp_root_en) { Aml *dev, *notify_method = NULL, *method; QObject *bsel; PCIBus *sec; int i; + bool root_bus = pci_bus_is_root(bus); + bool root_pcihp_disabled = (root_bus && !pcihp_root_en); bsel = object_property_get_qobject(OBJECT(bus), ACPI_PCIHP_PROP_BSEL, NULL); - if (bsel) { + if (bsel && !root_pcihp_disabled) { uint64_t bsel_val = qnum_get_uint(qobject_to(QNum, bsel)); aml_append(parent_scope, aml_name_decl("BSEL", aml_int(bsel_val))); @@ -361,6 +368,9 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, bool bridge_in_acpi; if (!pdev) { + /* skip if pci hotplug for the root bus is disabled */ + if (root_pcihp_disabled) + continue; if (bsel) { /* add hotplug slots for non present devices */ dev = aml_device("S%.02X", PCI_DEVFN(slot, 0)); aml_append(dev, aml_name_decl("_SUN", aml_int(slot))); @@ -419,7 +429,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, method = aml_method("_S3D", 0, AML_NOTSERIALIZED); aml_append(method, aml_return(aml_int(s3d))); aml_append(dev, method); - } else if (hotplug_enabled_dev) { + } else if (hotplug_enabled_dev && !root_pcihp_disabled) { /* add _SUN/_EJ0 to make slot hotpluggable */ aml_append(dev, aml_name_decl("_SUN", aml_int(slot))); @@ -439,13 +449,14 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, */ PCIBus *sec_bus = pci_bridge_get_sec_bus(PCI_BRIDGE(pdev)); - build_append_pci_bus_devices(dev, sec_bus, pcihp_bridge_en); + build_append_pci_bus_devices(dev, sec_bus, pcihp_bridge_en, + pcihp_root_en); } /* slot descriptor has been composed, add it into parent context */ aml_append(parent_scope, dev); } - if (bsel) { + if (bsel && !root_pcihp_disabled) { aml_append(parent_scope, notify_method); } @@ -455,7 +466,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, method = aml_method("PCNT", 0, AML_NOTSERIALIZED); /* If bus supports hotplug select it and notify about local events */ - if (bsel) { + if (bsel && !root_pcihp_disabled) { uint64_t bsel_val = qnum_get_uint(qobject_to(QNum, bsel)); aml_append(method, aml_store(aml_int(bsel_val), aml_name("BNUM"))); @@ -1818,7 +1829,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, if (bus) { Aml *scope = aml_scope("PCI0"); /* Scan all PCI buses. Generate tables to support hotplug. */ - build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en); + build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en, + pm->pcihp_root_en); if (TPM_IS_TIS_ISA(tpm)) { if (misc->tpm_version == TPM_VERSION_2_0) {