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=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 55185C4332E for ; Tue, 2 Mar 2021 16:24:27 +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 DC98764EE4 for ; Tue, 2 Mar 2021 16:24:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC98764EE4 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]:42396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lH7ov-0003Yc-Q8 for qemu-devel@archiver.kernel.org; Tue, 02 Mar 2021 11:24:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lH7oF-00030s-LR for qemu-devel@nongnu.org; Tue, 02 Mar 2021 11:23:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:54244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lH7oC-0000qG-Ba for qemu-devel@nongnu.org; Tue, 02 Mar 2021 11:23:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614702219; 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=fAOW4ZIEOKGBdHkFJZZpoIk1h+dZtH9CxaZJptfLmNc=; b=Zv6TgWq2Jh3Azs/cRYyWbB7H48VnTZtNHR8cfu6LIHUVkFXg/yPI3iZ/N1HgGIPPWZHH6n 0/5TrOx/B5KfQe0o422aXGYe4ctVcTR+SmEGl9I4gnaG/5OIW5t4ns/mvLwBgS++nUYxie zeQc+dgYaDop9DLfKwrged0SGVv6VZE= 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-306--J0OBTj4ONaQaYx8xte0og-1; Tue, 02 Mar 2021 11:23:37 -0500 X-MC-Unique: -J0OBTj4ONaQaYx8xte0og-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 956061E565; Tue, 2 Mar 2021 16:23:36 +0000 (UTC) Received: from MiWiFi-RA69-srv (unknown [10.40.208.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9DD5E19D80; Tue, 2 Mar 2021 16:23:25 +0000 (UTC) Date: Tue, 2 Mar 2021 17:23:23 +0100 From: Igor Mammedov To: David Hildenbrand Subject: Re: [PATCH v1] acpi: increase maximum size for "etc/table-loader" blob Message-ID: <20210302172323.6cac394a@MiWiFi-RA69-srv> In-Reply-To: <20210301104833.45580-1-david@redhat.com> References: <20210301104833.45580-1-david@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 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-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 autolearn=unavailable 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 , "Michael S. Tsirkin" , Richard Henderson , qemu-devel@nongnu.org, Alistair Francis , Shannon Zhao , qemu-arm@nongnu.org, Paolo Bonzini , Laszlo Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, 1 Mar 2021 11:48:33 +0100 David Hildenbrand wrote: CCing Laszlo, to make sure there is no complications from firmware side (especially when migration is progress, we've ironed it out for main tables blob but my memory is a bit fussy about issues we had to deal with if there were any) > The resizeable memory region that is created for the cmd blob has a maximum > size of ACPI_BUILD_ALIGN_SIZE - 4k. This used to be sufficient, however, > as we try fitting in additional data (e.g., vmgenid, nvdimm, intel-iommu), > we require more than 4k and can crash QEMU when trying to resize the > resizeable memory region beyond its maximum size: > $ build/qemu-system-x86_64 --enable-kvm \ > -machine q35,nvdimm=on \ > -smp 1 \ > -cpu host \ > -m size=2G,slots=8,maxmem=4G \ > -object memory-backend-file,id=mem0,mem-path=/tmp/nvdimm,size=256M \ > -device nvdimm,label-size=131072,memdev=mem0,id=nvdimm0,slot=1 \ > -nodefaults \ > -device vmgenid \ > -device intel-iommu > > Results in: > Unexpected error in qemu_ram_resize() at ../softmmu/physmem.c:1850: > qemu-system-x86_64: Size too large: /rom@etc/table-loader: > 0x2000 > 0x1000: Invalid argument > > We try growing the resizeable memory region (resizeable RAMBlock) beyond > its maximum size. Let's increase the maximum size from 4k to 64k, which > should be good enough for the near future. > > Migration is not concerned with the maximum size of a RAMBlock, only > with the used size - so existing setups are not affected. Of course, we > cannot migrate a VM that would have crash when started on older QEMU from > new QEMU to older QEMU without failing early on the destination when > synchronizing the RAM state: > qemu-system-x86_64: Size too large: /rom@etc/table-loader: 0x2000 > 0x1000: Invalid argument > qemu-system-x86_64: error while loading state for instance 0x0 of device 'ram' > qemu-system-x86_64: load of migration failed: Invalid argument > > While at it, replace "etc/table-loader" by ACPI_BUILD_LOADER_FILE in > the microvm. > > Note: we could warn for problematic setups that migration might not > always be possible - similar to how we handle the table blob; or we > could disallow setups that would have crashed until now for compat > machines. But I am not sure if the effort (messing compat machine > properties) is worth it as we fail migration in a safe way early. > > Cc: Alistair Francis > Cc: Paolo Bonzini > Cc: "Michael S. Tsirkin" > Cc: Igor Mammedov > Cc: Peter Maydell > Cc: Shannon Zhao > Cc: Marcel Apfelbaum > Cc: Paolo Bonzini > Cc: Richard Henderson > Cc: qemu-arm@nongnu.org > Signed-off-by: David Hildenbrand > --- > hw/arm/virt-acpi-build.c | 3 ++- > hw/i386/acpi-build.c | 3 ++- > hw/i386/acpi-microvm.c | 3 ++- > include/hw/acpi/aml-build.h | 1 + > 4 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index f9c9df916c..a91550de6f 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -865,7 +865,8 @@ void virt_acpi_setup(VirtMachineState *vms) > > build_state->linker_mr = > acpi_add_rom_blob(virt_acpi_build_update, build_state, > - tables.linker->cmd_blob, ACPI_BUILD_LOADER_FILE, 0); > + tables.linker->cmd_blob, ACPI_BUILD_LOADER_FILE, > + ACPI_BUILD_LOADER_MAX_SIZE); > > fw_cfg_add_file(vms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data, > acpi_data_len(tables.tcpalog)); > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 31a5f6f4a5..a75138ea5a 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -2524,7 +2524,8 @@ void acpi_setup(void) > > build_state->linker_mr = > acpi_add_rom_blob(acpi_build_update, build_state, > - tables.linker->cmd_blob, ACPI_BUILD_LOADER_FILE, 0); > + tables.linker->cmd_blob, ACPI_BUILD_LOADER_FILE, > + ACPI_BUILD_LOADER_MAX_SIZE); > > fw_cfg_add_file(x86ms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, > tables.tcpalog->data, acpi_data_len(tables.tcpalog)); > diff --git a/hw/i386/acpi-microvm.c b/hw/i386/acpi-microvm.c > index 54b3af478a..fe8a965fe6 100644 > --- a/hw/i386/acpi-microvm.c > +++ b/hw/i386/acpi-microvm.c > @@ -255,7 +255,8 @@ void acpi_setup_microvm(MicrovmMachineState *mms) > ACPI_BUILD_TABLE_MAX_SIZE); > acpi_add_rom_blob(acpi_build_no_update, NULL, > tables.linker->cmd_blob, > - "etc/table-loader", 0); > + ACPI_BUILD_LOADER_FILE, > + ACPI_BUILD_LOADER_MAX_SIZE); > acpi_add_rom_blob(acpi_build_no_update, NULL, > tables.rsdp, > ACPI_BUILD_RSDP_FILE, 0); > diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h > index 380d3e3924..93cdfd4006 100644 > --- a/include/hw/acpi/aml-build.h > +++ b/include/hw/acpi/aml-build.h > @@ -6,6 +6,7 @@ > > /* Reserve RAM space for tables: add another order of magnitude. */ > #define ACPI_BUILD_TABLE_MAX_SIZE 0x200000 > +#define ACPI_BUILD_LOADER_MAX_SIZE 0x40000 > > #define ACPI_BUILD_APPNAME6 "BOCHS " > #define ACPI_BUILD_APPNAME8 "BXPC "