From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 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 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 4AB4BC433E6 for ; Sun, 30 Aug 2020 09:57:20 +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 11674207BB for ; Sun, 30 Aug 2020 09:57:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ML/AonyX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 11674207BB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:55038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCK5P-0003eV-7V for qemu-devel@archiver.kernel.org; Sun, 30 Aug 2020 05:57:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCK4n-0003D6-Il for qemu-devel@nongnu.org; Sun, 30 Aug 2020 05:56:41 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:43470 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCK4k-0003rk-Ui for qemu-devel@nongnu.org; Sun, 30 Aug 2020 05:56:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598781397; 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: in-reply-to:in-reply-to:references:references; bh=QP+aLiCKwhkWMYXLUFBeLfhNQ57NXl3qwwPjLxY4Sag=; b=ML/AonyX0XsEdZw1JVnXFZS/XNRPa5vnV8JK6pN6VF2d9M4QZJCRK+oJa0L1aNahwPYADJ k6/chCMMDKzTNTj9OCyhKIIfxz2ZQpJo9zYyQ7YKhEhPyOxGWdncW2NCk6586lztWxQos6 Ig0b9J61Yg/UFDfFTIUwTF3q4aQMTbY= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-533-6r7UtqtlPcuLmPs-o9hHjg-1; Sun, 30 Aug 2020 05:56:35 -0400 X-MC-Unique: 6r7UtqtlPcuLmPs-o9hHjg-1 Received: by mail-wr1-f70.google.com with SMTP id g6so1487786wrv.3 for ; Sun, 30 Aug 2020 02:56:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=QP+aLiCKwhkWMYXLUFBeLfhNQ57NXl3qwwPjLxY4Sag=; b=O+xlMjvDQBFOTLBvt9mpl62giKbgv2ZkusDKogmiVweJTDAax7lyqeEXDUtzMIq3kx Jga6ubJno98KysiOQvkpR1yiovcXqN+skO28GEJ6ghfzl6X6k0gjr913k5mIXqbRVqTV 7XnymQAJ6fseMvpDp53Sfg81RTlzVSlPHruv21MxqEu1qmQGMCMKWcZndrWDBSZQsbhj hCAADHz0PWb4C8Y9BkDuYbdbINPplk98QIA3RYiEBKWKXEyN2t2RfBRMWnnManoz4lpL xbaSkOQgy24CzBQnFK5/lyuu7BYqkRH+IoV/Q/g+iBZM9gDcSNMTwxU7nHTrKFGMwai6 pidA== X-Gm-Message-State: AOAM531zAQB7Z9PRQcIswENHVHh3YY3BtMLfBCWqM+JNldyMZRx7wpy9 e3pRgvetLasVKT0sBvwJDz2gUL4LQ0YXIlYf3bjX6bRCJzDPSz2DBq9nXUtoFKrTUFJVYHKr7Id 4ziz1N9WBzu/GVtQ= X-Received: by 2002:a7b:c2aa:: with SMTP id c10mr6394512wmk.86.1598781394766; Sun, 30 Aug 2020 02:56:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzC/rfuAAC6iUTxiRViktv/uhSYVwSDE+W4OSfPc0yrXF4i+oDR5lpCUwv5TvcaXehosjobYw== X-Received: by 2002:a7b:c2aa:: with SMTP id c10mr6394496wmk.86.1598781394513; Sun, 30 Aug 2020 02:56:34 -0700 (PDT) Received: from redhat.com (bzq-109-64-136-54.red.bezeqint.net. [109.64.136.54]) by smtp.gmail.com with ESMTPSA id q6sm6631773wma.22.2020.08.30.02.56.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2020 02:56:33 -0700 (PDT) Date: Sun, 30 Aug 2020 05:56:31 -0400 From: "Michael S. Tsirkin" To: Igor Mammedov Subject: Re: [PULL 06/13] Introduce a new flag for i440fx to disable PCI hotplug on the root bus Message-ID: <20200830055519-mutt-send-email-mst@kernel.org> References: <20200827133954.2118749-1-mst@redhat.com> <20200827133954.2118749-7-mst@redhat.com> <20200827194115.673f94de@imammedo-mac> MIME-Version: 1.0 In-Reply-To: <20200827194115.673f94de@imammedo-mac> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=207.211.31.120; envelope-from=mst@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/30 05:44:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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_H2=-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: Peter Maydell , qemu-devel@nongnu.org, Aleksandar Markovic , Ani Sinha , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, Aug 27, 2020 at 07:41:15PM +0200, Igor Mammedov wrote: > On Thu, 27 Aug 2020 09:40:34 -0400 > "Michael S. Tsirkin" wrote: > > > From: Ani Sinha > > > > 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. > > > > Signed-off-by: Ani Sinha > > Message-Id: <20200821165403.26589-1-ani@anisinha.ca> > > Reviewed-by: Michael S. Tsirkin > > Signed-off-by: Michael S. Tsirkin > > > > Tested-by: Igor Mammedov > > Reviewed-by: Igor Mammedov > A glitch in scripts? > I didn't review nor tested this (v8) version I guess I picked the tags from the previous version. Are you ok with this one? > > --- > > include/hw/acpi/pcihp.h | 2 +- > > hw/acpi/pcihp.c | 23 ++++++++++++++++++++++- > > hw/acpi/piix4.c | 5 ++++- > > 3 files changed, 27 insertions(+), 3 deletions(-) > > > > 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; > > > > diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c > > index 9e31ab2da4..39b1f74442 100644 > > --- a/hw/acpi/pcihp.c > > +++ b/hw/acpi/pcihp.c > > @@ -104,6 +104,24 @@ 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 +227,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(),