From patchwork Fri Aug 21 13:51:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 275884 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86826C433E1 for ; Fri, 21 Aug 2020 13:53:02 +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 4B08020656 for ; Fri, 21 Aug 2020 13:53:02 +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="GcDiJw/v" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4B08020656 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k97TZ-0006uc-KG for qemu-devel@archiver.kernel.org; Fri, 21 Aug 2020 09:53:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k97Su-000630-VK for qemu-devel@nongnu.org; Fri, 21 Aug 2020 09:52:20 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]:32862) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k97Sq-0002O3-Ij for qemu-devel@nongnu.org; Fri, 21 Aug 2020 09:52:20 -0400 Received: by mail-pl1-x62a.google.com with SMTP id h2so912966plr.0 for ; Fri, 21 Aug 2020 06:52:16 -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=dBomfi7Ud4DvD+h0PJFT4P7iNgEP8T7pa8cGLitJwIA=; b=GcDiJw/vhndIRV8bJLA4lbHnXx0R9xMmg5Jj4P5vZG+axIz1TkANZ2VACAj5p/Mac1 hCzAj+GNfbGHRLjHjVUJaCdz3zgYJpatrp0OQBMaXIqb7B5bwwYkbayb/ki2DtEtXq30 MglkRlnZMMWXLheSBaISp1lqo0EaucUXeLKzBigNi5cfnjBEyZRMRNJwWhEovqhHhJK8 hsjVK7GlGSAo7wbgGs+gq5inVSzdqT10pFD98eU78NF/D6r3mGJ33cUcSUAhoYY95Sxj 3YdLCl09TIPlnNDqLW+bGfJC+6yRcqY+TeassGlZ9SjFdSAoItLcakyvlXYrLB264IwC PXvw== 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=dBomfi7Ud4DvD+h0PJFT4P7iNgEP8T7pa8cGLitJwIA=; b=XLbhKq6ckisx/ZaPWppoB8V0AW/XOvRMbq6Dw+I2sM+UfGDtnV+ie4boj1k2R1/aHw /xKhyBnsNlBai7ugSj86m0CZWvPp6IOWb5KUhpu8rqp2CSMp19DmybXruLMoe2vAvHj8 Pa2KkKeqHxKR9UIoDO5K/8ya7kBgccfAVBJKUuDQzBI0+JwepONP8VR2GGc7KVX81Oii xjRsVqhSKqXtJ76tHv0gNFA0dzLNqoLjiQPojfXgy0P+dSxdjpvgEDmU5rsguk6T+qDB acpglz6GnONrV75JWPv+uRVP4v+OWEUCwdRhllYpCnZRNSywJB6A0sv2jNAxmkOF5M10 jfNA== X-Gm-Message-State: AOAM532CDlgLVMO6AFmJhrScDfLYAuHrlqy5zVVRKriTNCLoFBlDv4gp VscVFYXVuHCjKcTH6bIZj238j1NIPZxAEFyP X-Google-Smtp-Source: ABdhPJzzMOkG4h5r91i1as5zCfJDEzJ7enYlqMZk+sMQFbhcjZVl8/DasWWMD2xH7IbK+fAIp+8BwQ== X-Received: by 2002:a17:90a:1862:: with SMTP id r89mr2511465pja.59.1598017934281; Fri, 21 Aug 2020 06:52:14 -0700 (PDT) Received: from localhost.localdomain ([115.96.123.214]) by smtp.googlemail.com with ESMTPSA id p20sm2070570pjz.49.2020.08.21.06.52.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2020 06:52:13 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org Subject: [PATCH V7] Introduce a new flag for i440fx to disable PCI hotplug on the root bus Date: Fri, 21 Aug 2020 19:21:29 +0530 Message-Id: <20200821135129.5240-1-ani@anisinha.ca> X-Mailer: git-send-email 2.17.1 Received-SPF: none client-ip=2607:f8b0:4864:20::62a; envelope-from=ani@anisinha.ca; helo=mail-pl1-x62a.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: "Michael S. Tsirkin" , Aleksandar Markovic , Ani Sinha , Igor Mammedov , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.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/pcihp.c | 24 +++++++++++++++++++++++- hw/acpi/piix4.c | 5 ++++- include/hw/acpi/pcihp.h | 2 +- 3 files changed, 28 insertions(+), 3 deletions(-) Change Log: V6..V7: Code reorgs to make use of bsel to indicate whether the root PCI bus is hot pluggable or not. diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index 9e31ab2da4..a686413327 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -104,6 +104,25 @@ static void acpi_set_pci_info(void) } } +static void acpi_pcihp_disable_root_bus(void) +{ + static bool root_hp_disabled; + PCIBus *bus; + + if (root_hp_disabled) { + return; + } + + bus = find_i440fx(); + if (bus) { + /* setting the hotplug handler to NULL makes the bus non-hotpluggable */ + qbus_set_hotplug_handler(BUS(bus), NULL); + } + root_hp_disabled = true; + return; +} + + static void acpi_pcihp_test_hotplug_bus(PCIBus *bus, void *opaque) { AcpiPciHpFind *find = opaque; @@ -209,8 +228,11 @@ static void acpi_pcihp_update(AcpiPciHpState *s) } } -void acpi_pcihp_reset(AcpiPciHpState *s) +void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off) { + if (acpihp_root_off) { + acpi_pcihp_disable_root_bus(); + } acpi_set_pci_info(); acpi_pcihp_update(s); } diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 26bac4f16c..e6163bb6ce 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; @@ -324,7 +325,7 @@ static void piix4_pm_reset(DeviceState *dev) pci_conf[0x5B] = 0x02; } pm_io_space_update(s); - acpi_pcihp_reset(&s->acpi_pci_hotplug); + acpi_pcihp_reset(&s->acpi_pci_hotplug, !s->use_acpi_root_pci_hotplug); } static void piix4_pm_powerdown_req(Notifier *n, void *opaque) @@ -635,6 +636,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/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h index 8bc4a4c01d..02f4665767 100644 --- a/include/hw/acpi/pcihp.h +++ b/include/hw/acpi/pcihp.h @@ -67,7 +67,7 @@ void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev, Error **errp); /* Called on reset */ -void acpi_pcihp_reset(AcpiPciHpState *s); +void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off); extern const VMStateDescription vmstate_acpi_pcihp_pci_status;