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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E6F9CC433EF for ; Wed, 6 Apr 2022 19:01:15 +0000 (UTC) Received: from localhost ([::1]:36904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncAu3-0007ea-3W for qemu-devel@archiver.kernel.org; Wed, 06 Apr 2022 15:01:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncAsi-0006BA-0b for qemu-devel@nongnu.org; Wed, 06 Apr 2022 14:59:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:48403) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncAsg-0006cE-0P for qemu-devel@nongnu.org; Wed, 06 Apr 2022 14:59:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649271589; 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=6NnAZDbDB9Sv3xXZwE34DrNuSPQuxJL4Ss3Jr7OcSno=; b=jMI44GNQOVNXcC9ctLwS1GJatcCLWYFwBgQCgZo7cZc9uVBVoD2uwaKf/Y4WNj/yRJqD0F /ki9DlIOU5YdsFjHYwJkLgbWEev9/DL2QDnM7mvO92Hk2qtJ47ngNV3whRWuFWh6sZjxwq McgM/2N3Zpbl/nVw+46mcahSOdNjEmM= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-549-hkJeiZOSOK6Zw6VO3BOIpA-1; Wed, 06 Apr 2022 14:59:48 -0400 X-MC-Unique: hkJeiZOSOK6Zw6VO3BOIpA-1 Received: by mail-wm1-f70.google.com with SMTP id z16-20020a05600c0a1000b0038bebbd8548so3357673wmp.3 for ; Wed, 06 Apr 2022 11:59:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=6NnAZDbDB9Sv3xXZwE34DrNuSPQuxJL4Ss3Jr7OcSno=; b=fvFLFO9NwJlHdhfKNXVNmThmHu3wxNZR/kQ/oKWUQoXy2iyFpKIs/YLsAwGKQmDf1A kOkASuxGQ/ec/JxvzEePCqMr/izoAegSnnQ3s5rvMFez+otKjv8TRYPx5UXOzHCK3H1o 9pu5iXp9ZRTPegWhNjRCIZok5YY4BdAWZBjDwH5YHCa9juRNzcEl4ffDN1dwIh2v9arx Pt6fANQ25oY5FOxJx0olceVDjLWHmURHeKpyFUd8620LmPQNYktrfCBjpKZnMB2q1qQg t8OujO38v3IHhd00rw9T+9+4ud5ezWH27VC0Rpw5kf+DlVcb2tQ8v9EoAfjrHBGfPZCr DCsA== X-Gm-Message-State: AOAM533/CFiGONM//FDgnh/6zHfaghhvACyT5AnoQ7EWhBqd40jZyyOD nlgR6f3SU4PzvJU8bpLq6tuzdUxT8NX14I7oUmPCYIyf0YbCo6K/qZuSDfWCoksdGOSGOx0T/Or OHm6cGGI4sZTE23s= X-Received: by 2002:a1c:f219:0:b0:38c:782c:3bb with SMTP id s25-20020a1cf219000000b0038c782c03bbmr8600575wmc.94.1649271587510; Wed, 06 Apr 2022 11:59:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwK4eOQ5Jmc2flitkVYlb4JsYerSjf5KxbNLXvIKnlxBckksqStXqxQyxScCNAAig0rvC6Vlw== X-Received: by 2002:a1c:f219:0:b0:38c:782c:3bb with SMTP id s25-20020a1cf219000000b0038c782c03bbmr8600557wmc.94.1649271587251; Wed, 06 Apr 2022 11:59:47 -0700 (PDT) Received: from work-vm (cpc109025-salf6-2-0-cust480.10-2.cable.virginm.net. [82.30.61.225]) by smtp.gmail.com with ESMTPSA id j16-20020a05600c191000b0038ca3500494sm8679568wmq.27.2022.04.06.11.59.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 11:59:46 -0700 (PDT) Date: Wed, 6 Apr 2022 19:59:44 +0100 From: "Dr. David Alan Gilbert" To: Igor Mammedov Subject: Re: [PATCH v2] acpi: fix acpi_index migration Message-ID: References: <20220406185812.1055724-1-imammedo@redhat.com> MIME-Version: 1.0 In-Reply-To: <20220406185812.1055724-1-imammedo@redhat.com> User-Agent: Mutt/2.1.5 (2021-12-30) Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=170.10.129.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, quintela@redhat.com, mst@redhat.com, qemu-devel@nongnu.org, peterx@redhat.com, alex.williamson@redhat.com, leobras@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Igor Mammedov (imammedo@redhat.com) wrote: > From: "Dr. David Alan Gilbert" > > vmstate_acpi_pcihp_use_acpi_index() was expecting AcpiPciHpState > as state but it actually received PIIX4PMState, because > VMSTATE_PCI_HOTPLUG is a macro and not another struct. > So it ended up accessing random pointer, which resulted > in 'false' return value and acpi_index field wasn't ever > sent. > > However in 7.0 that pointer de-references to value > 0, and > destination QEMU starts to expect the field which isn't > sent in migratioon stream from older QEMU (6.2 and older). > As result migration fails with: > qemu-system-x86_64: Missing section footer for 0000:00:01.3/piix4_pm > qemu-system-x86_64: load of migration failed: Invalid argument > > In addition with QEMU-6.2, destination due to not expected > state, also never expects the acpi_index field in migration > stream. > > Q35 is not affected as it always sends/expects the field as > long as acpi based PCI hotplug is enabled. > > Fix issue by introducing compat knob to never send/expect > acpi_index in migration stream for 6.2 and older PC machine > types and always send it for 7.0 and newer PC machine types. > > Diagnosed-by: Dr. David Alan Gilbert > Fixes: b32bd76 ("pci: introduce acpi-index property for PCI device") > Resolves: https://gitlab.com/qemu-project/qemu/-/issues/932 > Signed-off-by: Igor Mammedov Reviewed-by: Dr. David Alan Gilbert > --- > include/hw/acpi/pcihp.h | 2 -- > hw/acpi/acpi-pci-hotplug-stub.c | 4 ---- > hw/acpi/pcihp.c | 6 ------ > hw/acpi/piix4.c | 15 ++++++++++++++- > hw/core/machine.c | 4 +++- > 5 files changed, 17 insertions(+), 14 deletions(-) > > diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h > index af1a169fc3..7e268c2c9c 100644 > --- a/include/hw/acpi/pcihp.h > +++ b/include/hw/acpi/pcihp.h > @@ -73,8 +73,6 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off); > > extern const VMStateDescription vmstate_acpi_pcihp_pci_status; > > -bool vmstate_acpi_pcihp_use_acpi_index(void *opaque, int version_id); > - > #define VMSTATE_PCI_HOTPLUG(pcihp, state, test_pcihp, test_acpi_index) \ > VMSTATE_UINT32_TEST(pcihp.hotplug_select, state, \ > test_pcihp), \ > diff --git a/hw/acpi/acpi-pci-hotplug-stub.c b/hw/acpi/acpi-pci-hotplug-stub.c > index 734e4c5986..a43f6dafc9 100644 > --- a/hw/acpi/acpi-pci-hotplug-stub.c > +++ b/hw/acpi/acpi-pci-hotplug-stub.c > @@ -41,7 +41,3 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off) > return; > } > > -bool vmstate_acpi_pcihp_use_acpi_index(void *opaque, int version_id) > -{ > - return false; > -} > diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c > index 6351bd3424..bf65bbea49 100644 > --- a/hw/acpi/pcihp.c > +++ b/hw/acpi/pcihp.c > @@ -554,12 +554,6 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus, > OBJ_PROP_FLAG_READ); > } > > -bool vmstate_acpi_pcihp_use_acpi_index(void *opaque, int version_id) > -{ > - AcpiPciHpState *s = opaque; > - return s->acpi_index; > -} > - > const VMStateDescription vmstate_acpi_pcihp_pci_status = { > .name = "acpi_pcihp_pci_status", > .version_id = 1, > diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c > index cc37fa3416..fe5625d07a 100644 > --- a/hw/acpi/piix4.c > +++ b/hw/acpi/piix4.c > @@ -82,6 +82,7 @@ struct PIIX4PMState { > AcpiPciHpState acpi_pci_hotplug; > bool use_acpi_hotplug_bridge; > bool use_acpi_root_pci_hotplug; > + bool not_migrate_acpi_index; > > uint8_t disable_s3; > uint8_t disable_s4; > @@ -267,6 +268,16 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id) > return pm_smbus_vmstate_needed(); > } > > +/* > + * This is a fudge to turn off the acpi_index field, > + * whose test was always broken on piix4 with 6.2 and older machine types. > + */ > +static bool vmstate_test_migrate_acpi_index(void *opaque, int version_id) > +{ > + PIIX4PMState *s = PIIX4_PM(opaque); > + return s->use_acpi_hotplug_bridge && !s->not_migrate_acpi_index; > +} > + > /* qemu-kvm 1.2 uses version 3 but advertised as 2 > * To support incoming qemu-kvm 1.2 migration, change version_id > * and minimum_version_id to 2 below (which breaks migration from > @@ -297,7 +308,7 @@ static const VMStateDescription vmstate_acpi = { > struct AcpiPciHpPciStatus), > VMSTATE_PCI_HOTPLUG(acpi_pci_hotplug, PIIX4PMState, > vmstate_test_use_acpi_hotplug_bridge, > - vmstate_acpi_pcihp_use_acpi_index), > + vmstate_test_migrate_acpi_index), > VMSTATE_END_OF_LIST() > }, > .subsections = (const VMStateDescription*[]) { > @@ -652,6 +663,8 @@ static Property piix4_pm_properties[] = { > DEFINE_PROP_BOOL("memory-hotplug-support", PIIX4PMState, > acpi_memory_hotplug.is_enabled, true), > DEFINE_PROP_BOOL("smm-compat", PIIX4PMState, smm_compat, false), > + DEFINE_PROP_BOOL("x-not-migrate-acpi-index", PIIX4PMState, > + not_migrate_acpi_index, false), > DEFINE_PROP_END_OF_LIST(), > }; > > diff --git a/hw/core/machine.c b/hw/core/machine.c > index d856485cb4..1e23fdc14b 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -37,7 +37,9 @@ > #include "hw/virtio/virtio.h" > #include "hw/virtio/virtio-pci.h" > > -GlobalProperty hw_compat_6_2[] = {}; > +GlobalProperty hw_compat_6_2[] = { > + { "PIIX4_PM", "x-not-migrate-acpi-index", "on"}, > +}; > const size_t hw_compat_6_2_len = G_N_ELEMENTS(hw_compat_6_2); > > GlobalProperty hw_compat_6_1[] = { > -- > 2.31.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK