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=-3.8 required=3.0 tests=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 E5D08C43331 for ; Wed, 1 Apr 2020 07:46:52 +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 BB5DE20714 for ; Wed, 1 Apr 2020 07:46:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB5DE20714 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJY5L-0001pG-Vc for qemu-devel@archiver.kernel.org; Wed, 01 Apr 2020 03:46:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54154) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJY4O-0001Gf-6k for qemu-devel@nongnu.org; Wed, 01 Apr 2020 03:45:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJY4M-0005e0-Ke for qemu-devel@nongnu.org; Wed, 01 Apr 2020 03:45:52 -0400 Received: from lhrrgout.huawei.com ([185.176.76.210]:2093 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jJY4J-0005U9-5s; Wed, 01 Apr 2020 03:45:47 -0400 Received: from lhreml701-chm.china.huawei.com (unknown [172.18.7.107]) by Forcepoint Email with ESMTP id A4C7C2BA23BF1D9B6319; Wed, 1 Apr 2020 08:45:40 +0100 (IST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by lhreml701-chm.china.huawei.com (10.201.108.50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Wed, 1 Apr 2020 08:45:40 +0100 Received: from lhreml710-chm.china.huawei.com ([169.254.81.184]) by lhreml710-chm.china.huawei.com ([169.254.81.184]) with mapi id 15.01.1713.004; Wed, 1 Apr 2020 08:45:40 +0100 From: Shameerali Kolothum Thodi To: "Dr. David Alan Gilbert" Subject: RE: [PATCH for-5.0 2/3] fw_cfg: Migrate ACPI table mr sizes separately Thread-Topic: [PATCH for-5.0 2/3] fw_cfg: Migrate ACPI table mr sizes separately Thread-Index: AQHWBrNmc/8JhbZhOkGXkACpglv9b6hidOOAgAFv16A= Date: Wed, 1 Apr 2020 07:45:40 +0000 Message-ID: <5d1f524257f446bebda5d27e571abbfe@huawei.com> References: <20200330164909.28324-1-shameerali.kolothum.thodi@huawei.com> <20200330164909.28324-3-shameerali.kolothum.thodi@huawei.com> <20200331104543.GA2942@work-vm> In-Reply-To: <20200331104543.GA2942@work-vm> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.47.88.147] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 185.176.76.210 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@linaro.org" , "xiaoguangrong.eric@gmail.com" , "david@redhat.com" , "shannon.zhaosl@gmail.com" , "mst@redhat.com" , "qemu-devel@nongnu.org" , Linuxarm , "eric.auger@redhat.com" , "qemu-arm@nongnu.org" , "xuwei \(O\)" , "imammedo@redhat.com" , "lersek@redhat.com" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" > -----Original Message----- > From: Dr. David Alan Gilbert [mailto:dgilbert@redhat.com] > Sent: 31 March 2020 11:46 > To: Shameerali Kolothum Thodi > Cc: qemu-devel@nongnu.org; qemu-arm@nongnu.org; > eric.auger@redhat.com; imammedo@redhat.com; peter.maydell@linaro.org; > xiaoguangrong.eric@gmail.com; david@redhat.com; mst@redhat.com; > Linuxarm ; xuwei (O) ; > shannon.zhaosl@gmail.com; lersek@redhat.com > Subject: Re: [PATCH for-5.0 2/3] fw_cfg: Migrate ACPI table mr sizes sepa= rately [...] > > +static const VMStateDescription vmstate_fw_cfg_acpi_mr =3D { > > + .name =3D "fw_cfg/acpi_mr", > > + .version_id =3D 1, > > + .minimum_version_id =3D 1, > > + .needed =3D fw_cfg_acpi_mr_restore, > > + .post_load =3D fw_cfg_acpi_mr_restore_post_load, > > + .fields =3D (VMStateField[]) { > > + VMSTATE_UINT64(table_mr_size, FWCfgState), > > + VMSTATE_UINT64(linker_mr_size, FWCfgState), > > + VMSTATE_UINT64(rsdp_mr_size, FWCfgState), >=20 > The checker found something I also spotted; which is you can't use a > VMSTATE_UINT64 against a field that is size_t - it's not portable; > I suggest the easiest fix is to make your fields in fw_cfg.h uint64's. Thanks for that. Yes, checker also spotted this and I was clueless. Sure, I= will change that. Shameer > Dave >=20 > > + VMSTATE_END_OF_LIST() > > + }, > > +}; > > + > > static const VMStateDescription vmstate_fw_cfg =3D { > > .name =3D "fw_cfg", > > .version_id =3D 2, > > @@ -631,6 +690,7 @@ static const VMStateDescription vmstate_fw_cfg =3D = { > > }, > > .subsections =3D (const VMStateDescription*[]) { > > &vmstate_fw_cfg_dma, > > + &vmstate_fw_cfg_acpi_mr, > > NULL, > > } > > }; > > @@ -815,6 +875,23 @@ static struct { > > #define FW_CFG_ORDER_OVERRIDE_LAST 200 > > }; > > > > +/* > > + * Any sub-page size update to these table MRs will be lost during mig= ration, > > + * as we use aligned size in ram_load_precopy() -> qemu_ram_resize() p= ath. > > + * In order to avoid the inconsistency in sizes save them seperately a= nd > > + * migrate over in vmstate post_load(). > > + */ > > +static void fw_cfg_acpi_mr_save(FWCfgState *s, const char *filename, > size_t len) > > +{ > > + if (!strcmp(filename, ACPI_BUILD_TABLE_FILE)) { > > + s->table_mr_size =3D len; > > + } else if (!strcmp(filename, ACPI_BUILD_LOADER_FILE)) { > > + s->linker_mr_size =3D len; > > + } else if (!strcmp(filename, ACPI_BUILD_RSDP_FILE)) { > > + s->rsdp_mr_size =3D len; > > + } > > +} > > + > > static int get_fw_cfg_order(FWCfgState *s, const char *name) > > { > > int i; > > @@ -914,6 +991,7 @@ void fw_cfg_add_file_callback(FWCfgState *s, > const char *filename, > > trace_fw_cfg_add_file(s, index, s->files->f[index].name, len); > > > > s->files->count =3D cpu_to_be32(count+1); > > + fw_cfg_acpi_mr_save(s, filename, len); > > } > > > > void fw_cfg_add_file(FWCfgState *s, const char *filename, > > @@ -937,6 +1015,7 @@ void *fw_cfg_modify_file(FWCfgState *s, const char > *filename, > > ptr =3D fw_cfg_modify_bytes_read(s, FW_CFG_FILE_FIRST + i, > > data, len); > > s->files->f[i].size =3D cpu_to_be32(len); > > + fw_cfg_acpi_mr_save(s, filename, len); > > return ptr; > > } > > } > > @@ -973,7 +1052,10 @@ static void fw_cfg_machine_ready(struct Notifier > *n, void *data) > > qemu_register_reset(fw_cfg_machine_reset, s); > > } > > > > - > > +static Property fw_cfg_properties[] =3D { > > + DEFINE_PROP_BOOL("acpi-mr-restore", FWCfgState, acpi_mr_restore, > true), > > + DEFINE_PROP_END_OF_LIST(), > > +}; > > > > static void fw_cfg_common_realize(DeviceState *dev, Error **errp) > > { > > @@ -1097,6 +1179,8 @@ static void fw_cfg_class_init(ObjectClass *klass, > void *data) > > > > dc->reset =3D fw_cfg_reset; > > dc->vmsd =3D &vmstate_fw_cfg; > > + > > + device_class_set_props(dc, fw_cfg_properties); > > } > > > > static const TypeInfo fw_cfg_info =3D { > > diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h > > index b5291eefad..457fee7425 100644 > > --- a/include/hw/nvram/fw_cfg.h > > +++ b/include/hw/nvram/fw_cfg.h > > @@ -53,6 +53,12 @@ struct FWCfgState { > > dma_addr_t dma_addr; > > AddressSpace *dma_as; > > MemoryRegion dma_iomem; > > + > > + /* restore during migration */ > > + bool acpi_mr_restore; > > + size_t table_mr_size; > > + size_t linker_mr_size; > > + size_t rsdp_mr_size; > > }; > > > > struct FWCfgIoState { > > -- > > 2.17.1 > > > > > > > -- > Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK