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=-6.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 9BC6FC433E0 for ; Thu, 23 Jul 2020 12:48:34 +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 64F9E207BB for ; Thu, 23 Jul 2020 12:48:34 +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="eG1V/zdD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 64F9E207BB 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]:44542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyaeH-0000OY-J8 for qemu-devel@archiver.kernel.org; Thu, 23 Jul 2020 08:48:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyadN-0007xE-7R for qemu-devel@nongnu.org; Thu, 23 Jul 2020 08:47:37 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:26067 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 1jyadL-0006XU-Ch for qemu-devel@nongnu.org; Thu, 23 Jul 2020 08:47:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595508454; 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=vAlzZ3x0V6w9Hb5GbY53oE4Ky0Alq8gQ6fxj3iUjJ9k=; b=eG1V/zdD8Wj1R1mD77FQ73I4AAywSnN/ugRj8rar3FSf2ube7ck8Dv5EoKVUZC6dAUtinI pY9WSMGrMBfpj35oratCZfaHAuXI9Dh+qAArJyQ0KqvRfPIqAx7lxlxksA60FW0+0FjwaV H2wWbfwgynQ5tnSmnFK2XptNY5lz8f4= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-349-vdmO7p4CMAi16GTcos8eJg-1; Thu, 23 Jul 2020 08:47:30 -0400 X-MC-Unique: vdmO7p4CMAi16GTcos8eJg-1 Received: by mail-wr1-f69.google.com with SMTP id t12so1381476wrp.0 for ; Thu, 23 Jul 2020 05:47:30 -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=vAlzZ3x0V6w9Hb5GbY53oE4Ky0Alq8gQ6fxj3iUjJ9k=; b=ekT2TG2lHAtiyiTWLlYnTIQM1P2/1majp6zxDlHNY2g4tj7duo6YCl+9LpfTKgif6J 42Pu2vmllcRbkuaYJznJcOOARHMVIuh32LbPP+3xiyUCXKboitB9QT0NrVePmfU86hrp hNB5yL0iAklqt+91oLO8txrDENKg5ruzLtfby6yVcbhFlZCMFzhipHWnY2w0/SFqzL6D 0Oh5I0M0xo9LFjBGBvuJgOt6QEizA63qsB3LVRNCPTxXcbrv3E7YRCT4Tujt4hoDgRwR toyXzJmH3f/Bbm2Oktm7Pm9gkIYNFUJGjby0ADcMGDKhgQmbZv/XIYUsLimLR+icBp2O IobA== X-Gm-Message-State: AOAM531XP7rKpe0FCcTVvlGvjg7nu+8YHNWqoBpCKepLvQxaW9c1n5lk 0TN1In+U8S/NMLpZq5p5V/sXLR58ZQ4TeHwvYAIhTRVsAQqI3bYnv/CGH43vxbETtV2Sh1XXv5+ /kif7DGyy2z8vcdw= X-Received: by 2002:a1c:3b02:: with SMTP id i2mr3940856wma.24.1595508449222; Thu, 23 Jul 2020 05:47:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1LzoqTpKAm7d1geoOPGYFGtkT1E82Iek+cR9QEAsUQkIYZDJm0qxEpfByDQ+yVkHfi5udGw== X-Received: by 2002:a1c:3b02:: with SMTP id i2mr3940847wma.24.1595508448959; Thu, 23 Jul 2020 05:47:28 -0700 (PDT) Received: from redhat.com (bzq-79-179-105-63.red.bezeqint.net. [79.179.105.63]) by smtp.gmail.com with ESMTPSA id j145sm3795909wmj.7.2020.07.23.05.47.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 05:47:28 -0700 (PDT) Date: Thu, 23 Jul 2020 08:47:25 -0400 From: "Michael S. Tsirkin" To: Wang King Subject: Re: [PATCH v2] hw/pci-host: save/restore pci host config register Message-ID: <20200723084702-mutt-send-email-mst@kernel.org> References: <20200723122301.2344-1-king.wang@huawei.com> MIME-Version: 1.0 In-Reply-To: <20200723122301.2344-1-king.wang@huawei.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=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/07/22 22:13:02 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=-1, 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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: wangxinxin.wang@huawei.com, weidong.huang@huawei.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, Jul 23, 2020 at 08:23:01PM +0800, Wang King wrote: > From: Hogan Wang > > The pci host config register is used to save PCI address for > read/write config data. If guest write a value to config register, > and then pause the vcpu to migrate, After the migration, the guest > continue to write pci config data, and the write data will be ignored > because of new qemu process lost the config register state. > > Reproduction steps are: > 1. guest booting in seabios. > 2. guest enable the SMRAM in seabios:piix4_apmc_smm_setup, and then > expect to disable the SMRAM by pci_config_writeb. > 3. after guest write the pci host config register, and then pasued vcpu > to finish migration. > 4. guest write config data(0x0A) fail to disable the SMRAM becasue of > config register state lost. > 5. guest continue to boot and crash in ipxe option ROM due to SMRAM in > enabled state. Could you pls add: changes from v1? Also my comments on v1 still apply ... > --- > hw/pci-host/i440fx.c | 11 +++++++++++ > hw/pci-host/q35.c | 11 +++++++++++ > hw/pci/pci_host.c | 11 +++++++++++ > hw/pci/pcie_host.c | 11 +++++++++++ > include/hw/pci/pci_host.h | 10 ++++++++++ > include/hw/pci/pcie_host.h | 10 ++++++++++ > 6 files changed, 64 insertions(+) > > diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c > index 8ed2417f0c..17705bb025 100644 > --- a/hw/pci-host/i440fx.c > +++ b/hw/pci-host/i440fx.c > @@ -118,6 +118,16 @@ static const VMStateDescription vmstate_i440fx = { > } > }; > > +static const VMStateDescription vmstate_i440fx_pcihost = { > + .name = "I440FX_PCIHost", > + .version_id = 1, > + .minimum_version_id = 1, > + .fields = (VMStateField[]) { > + VMSTATE_PCI_HOST(parent_obj, I440FXState), > + VMSTATE_END_OF_LIST() > + } > +}; > + > static void i440fx_pcihost_get_pci_hole_start(Object *obj, Visitor *v, > const char *name, void *opaque, > Error **errp) > @@ -398,6 +408,7 @@ static void i440fx_pcihost_class_init(ObjectClass *klass, void *data) > hc->root_bus_path = i440fx_pcihost_root_bus_path; > dc->realize = i440fx_pcihost_realize; > dc->fw_name = "pci"; > + dc->vmsd = &vmstate_i440fx_pcihost; > device_class_set_props(dc, i440fx_props); > /* Reason: needs to be wired up by pc_init1 */ > dc->user_creatable = false; > diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c > index b67cb9c29f..5e323be2e3 100644 > --- a/hw/pci-host/q35.c > +++ b/hw/pci-host/q35.c > @@ -165,6 +165,16 @@ static void q35_host_get_pci_hole64_end(Object *obj, Visitor *v, > visit_type_uint64(v, name, &value, errp); > } > > +static const VMStateDescription vmstate_q35_pcihost = { > + .name = "Q35_PCIHost", > + .version_id = 1, > + .minimum_version_id = 1, > + .fields = (VMStateField[]) { > + VMSTATE_PCIE_HOST(parent_obj, Q35PCIHost), > + VMSTATE_END_OF_LIST() > + } > +}; > + > /* > * NOTE: setting defaults for the mch.* fields in this table > * doesn't work, because mch is a separate QOM object that is > @@ -194,6 +204,7 @@ static void q35_host_class_init(ObjectClass *klass, void *data) > > hc->root_bus_path = q35_host_root_bus_path; > dc->realize = q35_host_realize; > + dc->vmsd = &vmstate_q35_pcihost; > device_class_set_props(dc, q35_host_props); > /* Reason: needs to be wired up by pc_q35_init */ > dc->user_creatable = false; > diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c > index ce7bcdb1d5..7cdd5a3ea3 100644 > --- a/hw/pci/pci_host.c > +++ b/hw/pci/pci_host.c > @@ -24,6 +24,7 @@ > #include "hw/pci/pci_host.h" > #include "qemu/module.h" > #include "hw/pci/pci_bus.h" > +#include "migration/vmstate.h" > #include "trace.h" > > /* debug PCI */ > @@ -200,6 +201,16 @@ const MemoryRegionOps pci_host_data_be_ops = { > .endianness = DEVICE_BIG_ENDIAN, > }; > > +const VMStateDescription vmstate_pcihost = { > + .name = "PCIHost", > + .version_id = 1, > + .minimum_version_id = 1, > + .fields = (VMStateField[]) { > + VMSTATE_UINT32(config_reg, PCIHostState), > + VMSTATE_END_OF_LIST() > + } > +}; > + > static const TypeInfo pci_host_type_info = { > .name = TYPE_PCI_HOST_BRIDGE, > .parent = TYPE_SYS_BUS_DEVICE, > diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c > index 3534006f99..a653c39bb7 100644 > --- a/hw/pci/pcie_host.c > +++ b/hw/pci/pcie_host.c > @@ -24,6 +24,7 @@ > #include "hw/pci/pcie_host.h" > #include "qemu/module.h" > #include "exec/address-spaces.h" > +#include "migration/vmstate.h" > > /* a helper function to get a PCIDevice for a given mmconfig address */ > static inline PCIDevice *pcie_dev_find_by_mmcfg_addr(PCIBus *s, > @@ -121,6 +122,16 @@ void pcie_host_mmcfg_update(PCIExpressHost *e, > memory_region_transaction_commit(); > } > > +const VMStateDescription vmstate_pciehost = { > + .name = "PCIEHost", > + .version_id = 1, > + .minimum_version_id = 1, > + .fields = (VMStateField[]) { > + VMSTATE_PCI_HOST(pci, PCIExpressHost), > + VMSTATE_END_OF_LIST() > + } > +}; > + > static const TypeInfo pcie_host_type_info = { > .name = TYPE_PCIE_HOST_BRIDGE, > .parent = TYPE_PCI_HOST_BRIDGE, > diff --git a/include/hw/pci/pci_host.h b/include/hw/pci/pci_host.h > index 9ce088bd13..fc88305e04 100644 > --- a/include/hw/pci/pci_host.h > +++ b/include/hw/pci/pci_host.h > @@ -70,4 +70,14 @@ extern const MemoryRegionOps pci_host_conf_be_ops; > extern const MemoryRegionOps pci_host_data_le_ops; > extern const MemoryRegionOps pci_host_data_be_ops; > > +extern const VMStateDescription vmstate_pcihost; > + > +#define VMSTATE_PCI_HOST(_field, _state) { \ > + .name = (stringify(_field)), \ > + .size = sizeof(PCIHostState), \ > + .vmsd = &vmstate_pcihost, \ > + .flags = VMS_STRUCT, \ > + .offset = vmstate_offset_value(_state, _field, PCIHostState),\ > +} > + > #endif /* PCI_HOST_H */ > diff --git a/include/hw/pci/pcie_host.h b/include/hw/pci/pcie_host.h > index 3f7b9886d1..e8856f03e9 100644 > --- a/include/hw/pci/pcie_host.h > +++ b/include/hw/pci/pcie_host.h > @@ -78,4 +78,14 @@ void pcie_host_mmcfg_update(PCIExpressHost *e, > PCIE_MMCFG_DEVFN_MASK) > #define PCIE_MMCFG_CONFOFFSET(addr) ((addr) & PCIE_MMCFG_CONFOFFSET_MASK) > > +extern const VMStateDescription vmstate_pciehost; > + > +#define VMSTATE_PCIE_HOST(_field, _state) { \ > + .name = (stringify(_field)), \ > + .size = sizeof(PCIExpressHost), \ > + .vmsd = &vmstate_pciehost, \ > + .flags = VMS_STRUCT, \ > + .offset = vmstate_offset_value(_state, _field, PCIExpressHost),\ > +} > + > #endif /* PCIE_HOST_H */ > -- > 2.23.0 >