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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 50594C43461 for ; Tue, 15 Sep 2020 13:43:35 +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 C1E4820936 for ; Tue, 15 Sep 2020 13:43:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GTUnCVJr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C1E4820936 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]:42654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIBF7-0000VU-S5 for qemu-devel@archiver.kernel.org; Tue, 15 Sep 2020 09:43:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIBDx-00083w-33 for qemu-devel@nongnu.org; Tue, 15 Sep 2020 09:42:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:47550) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kIBDt-00042r-TP for qemu-devel@nongnu.org; Tue, 15 Sep 2020 09:42:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600177336; 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=xYaxzbjxcIKIMr2Ws4aYvw8dlMzeraQNFXt7kSkFsCY=; b=GTUnCVJrOBxsXseJPBqobQPiv799kv/njN1H6tIUueUns+933uI4T8toKm0GI2Jy+mgpQa C6QqEuSG5leuXXSVSdkPUv1oHGpXQbUbIyYInfDZtDkALS8fOVDRMG0L2nHtxYX5apvyQw aljYYyHpCBuQgqX4ihJm16qkUw/0WIY= 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-150-631TtujRPY-poqKQkri7Sw-1; Tue, 15 Sep 2020 09:42:14 -0400 X-MC-Unique: 631TtujRPY-poqKQkri7Sw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E1AB110066FA; Tue, 15 Sep 2020 13:42:11 +0000 (UTC) Received: from localhost (unknown [10.43.2.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E9D619D7C; Tue, 15 Sep 2020 13:42:01 +0000 (UTC) Date: Tue, 15 Sep 2020 15:42:00 +0200 From: Igor Mammedov To: Ani Sinha Subject: Re: [PATCH 9/9] piix4: don't reserve hw resources when hotplug is off globally Message-ID: <20200915154200.06a58630@redhat.com> In-Reply-To: References: <20200911180755.28409-1-ani@anisinha.ca> <20200911180755.28409-9-ani@anisinha.ca> <20200914150550.23a91fa2@redhat.com> <20200914160910.66785da8@redhat.com> <20200915135141.585c767d@redhat.com> <20200915144859.4f929784@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0.003 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/15 02:23:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, 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_H5=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 , "Michael S. Tsirkin" , Julia Suvorova , QEMU Developers , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= , Aleksandar Markovic , Paolo Bonzini , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 15 Sep 2020 18:25:55 +0530 Ani Sinha wrote: > On Tue, Sep 15, 2020 at 6:19 PM Igor Mammedov wrote: > > > > On Tue, 15 Sep 2020 17:40:25 +0530 > > Ani Sinha wrote: > > > > > On Tue, Sep 15, 2020 at 5:21 PM Igor Mammedov wrote: > > > > > > > > On Mon, 14 Sep 2020 20:20:21 +0530 > > > > Ani Sinha wrote: > > > > > > > > > On Mon, Sep 14, 2020 at 7:39 PM Igor Mammedov wrote: > > > > > > > > > > > > On Mon, 14 Sep 2020 18:58:19 +0530 > > > > > > Ani Sinha wrote: > > > > > > > > > > > > > On Mon, Sep 14, 2020 at 6:40 PM Ani Sinha wrote: > > > > > > > > > > > > > > > > On Mon, Sep 14, 2020 at 6:36 PM Igor Mammedov wrote: > > > > > > > > > > > > > > > > > > On Fri, 11 Sep 2020 23:37:55 +0530 > > > > > > > > > Ani Sinha wrote: > > > > > > > > > > > > > > > > > > > When acpi hotplug is turned off for both root pci bus as well as for pci > > > > > > > > > > bridges, we should not generate the related amls for DSDT table or initialize > > > > > > > > > > related hw ports or reserve hw resources. This change makes sure all those > > > > > > > > > > operations are turned off in the case acpi pci hotplug is off globally. > > > > > > > > > > > > > > > > > > it still leaves around pure PCI hotplug ACPI code: > > > > > > > > > > > > > > > > > > Method (PCNT, 0, NotSerialized) > > > > > > > > > { > > > > > > > > > } > > > > > > > > > > > > > > > > How do you suggest we fix this? > > > > > > > > > > > > > > One way to fix this would be to do this: > > > > > > > > > > > > > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > > > > > > > index 7e3cf3b57b..2bd0c37143 100644 > > > > > > > --- a/hw/i386/acpi-build.c > > > > > > > +++ b/hw/i386/acpi-build.c > > > > > > > @@ -483,7 +483,8 @@ static void build_append_pci_bus_devices(Aml > > > > > > > *parent_scope, PCIBus *bus, > > > > > > > aml_append(method, aml_name("^S%.02X.PCNT", devfn)); > > > > > > > } > > > > > > > } > > > > > > > - aml_append(parent_scope, method); > > > > > > > + if (bsel) > > > > > > > + aml_append(parent_scope, method); > > > > > > > > and this also introduces mem leak > > > > > > > > > > > > > > > qobject_unref(bsel); > > > > > > > } > > > > > > > > > > > > > > This means that if the hotplug on the root bus is disabled, we also > > > > > > > disable PCNT. This will also need the unit test update as the unit > > > > > > Does bridge hot-plug still work if we disable it only on root bus? > > > > > > > > > > Just did a quick test. Windows seems to eject devices on the bridge > > > > > even when the root bus hot plug is off. > > > > > > > > well I'm not sure it works using ACPI hotplug, > > > > > > > > with > > > > -global PIIX4_PM.acpi-root-pci-hotplug=off > > > > -global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=on > > > > > > > > DSDT ins't what I'd expect when bridge hp is on: > > > > > > > > Scope (\_SB) > > > > { > > > > Scope (PCI0) > > > > { > > > > Device (S00) > > > > { > > > > Name (_ADR, Zero) // _ADR: Address > > > > } > > > > > > > > Device (S08) > > > > > > I think you should look for AMLs for Device (S18) because the bridge > > > goes into slot 3. > > > > as you see, there weren't any here. so maybe something else gone wrong > > in earlier patches > > Can you send the full command line you are passing? You need to attach > a bridge, then the function will recurse into it. all your 9 pathes with this on top: diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 7e3cf3b57b..8339a3538a 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -483,7 +483,8 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, aml_append(method, aml_name("^S%.02X.PCNT", devfn)); } } - aml_append(parent_scope, method); + if (bsel) + aml_append(parent_scope, method); qobject_unref(bsel); } diff --git a/slirp b/slirp --- a/slirp +++ b/slirp @@ -1 +1 @@ -Subproject commit ce94eba2042d52a0ba3d9e252ebce86715e94275 +Subproject commit ce94eba2042d52a0ba3d9e252ebce86715e94275-dirty diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 7632cfe1be..fb56c1eeb0 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -750,7 +750,7 @@ static void test_acpi_piix4_root_hotplug(void) data.required_struct_types = base_required_struct_types; data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); test_acpi_one("-global PIIX4_PM.acpi-root-pci-hotplug=off " - "-device pci-bridge,chassis_nr=1", &data); + "-device pci-bridge,chassis_nr=1 -global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=on", &data); free_test_data(&data); } and run test with: make -j32 && make tests/qtest/bios-tables-test && V=1 QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 QTEST_QEMU_IMG=qemu-img tests/qtest/bios-tables-test > > > > > > > > > > { > > > > Name (_ADR, 0x00010000) // _ADR: Address > > > > Method (_S1D, 0, NotSerialized) // _S1D: S1 Device State > > > > { > > > > Return (Zero) > > > > } > > > > > > > > Method (_S2D, 0, NotSerialized) // _S2D: S2 Device State > > > > { > > > > Return (Zero) > > > > } > > > > > > > > Method (_S3D, 0, NotSerialized) // _S3D: S3 Device State > > > > { > > > > Return (Zero) > > > > } > > > > } > > > > } > > > > } > > > > > > > > > > > > > > > > > > > > > > > > > > test > > > > > > > will fail with : > > > > > > > > > > > > > > @@ -3113,24 +3113,20 @@ > > > > > > > Name (_ADR, 0x00010000) // _ADR: Address > > > > > > > Method (_S1D, 0, NotSerialized) // _S1D: S1 Device State > > > > > > > { > > > > > > > Return (Zero) > > > > > > > } > > > > > > > > > > > > > > Method (_S2D, 0, NotSerialized) // _S2D: S2 Device State > > > > > > > { > > > > > > > Return (Zero) > > > > > > > } > > > > > > > > > > > > > > Method (_S3D, 0, NotSerialized) // _S3D: S3 Device State > > > > > > > { > > > > > > > Return (Zero) > > > > > > > } > > > > > > > } > > > > > > > - > > > > > > > - Method (PCNT, 0, NotSerialized) > > > > > > > - { > > > > > > > - } > > > > > > > } > > > > > > > } > > > > > > > } > > > > > > > > > > > > > > Let's fix this as a separate patch. > > > > > > > > > > > > I'd rather fix up this patch, so it would do what it claims. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Signed-off-by: Ani Sinha > > > > > > > > > > --- > > > > > > > > > > hw/acpi/piix4.c | 6 ++++-- > > > > > > > > > > hw/i386/acpi-build.c | 10 ++++++++-- > > > > > > > > > > 2 files changed, 12 insertions(+), 4 deletions(-) > > > > > > > > > > > > > > > > > > > > diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c > > > > > > > > > > index e6163bb6ce..b70b1f98af 100644 > > > > > > > > > > --- a/hw/acpi/piix4.c > > > > > > > > > > +++ b/hw/acpi/piix4.c > > > > > > > > > > @@ -596,8 +596,10 @@ 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", > > > > > > > > > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > > > > > > > > > > index e079b686f5..7e3cf3b57b 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) > > > > > > > > > > @@ -1504,7 +1508,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > > > > > > > > > > build_hpet_aml(dsdt); > > > > > > > > > > build_piix4_isa_bridge(dsdt); > > > > > > > > > > build_isa_devices_aml(dsdt); > > > > > > > > > > - build_piix4_pci_hotplug(dsdt); > > > > > > > > > > + if (pm->pcihp_bridge_en || pm->pcihp_root_en) { > > > > > > > > > > + build_piix4_pci_hotplug(dsdt); > > > > > > > > > > + } > > > > > > > > > > build_piix4_pci0_int(dsdt); > > > > > > > > > > } else { > > > > > > > > > > sb_scope = aml_scope("_SB"); > > > > > > > > > > @@ -1698,7 +1704,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > > > > > > > > > > crs_range_set_free(&crs_range_set); > > > > > > > > > > > > > > > > > > > > /* reserve PCIHP resources */ > > > > > > > > > > - if (pm->pcihp_io_len) { > > > > > > > > > > + if (pm->pcihp_io_len && (pm->pcihp_bridge_en || pm->pcihp_root_en)) { > > > > > > > > > > dev = aml_device("PHPR"); > > > > > > > > > > aml_append(dev, aml_name_decl("_HID", aml_string("PNP0A06"))); > > > > > > > > > > aml_append(dev, > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >