From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a5d:6089:0:0:0:0:0 with SMTP id w9csp2710988wrt; Mon, 17 Dec 2018 08:48:18 -0800 (PST) X-Google-Smtp-Source: AFSGD/WT8RNWd1KgO/mWhS8cGIrnGEIPyHxz9OS4w//iPPt3PeYUOdulxyNNfw6AIzuPYjB7nyDe X-Received: by 2002:ac8:3466:: with SMTP id v35mr13810458qtb.231.1545065298006; Mon, 17 Dec 2018 08:48:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545065298; cv=none; d=google.com; s=arc-20160816; b=wXNwJ9KOH9Z4DDnyvppYYhXNbYi2mzVtvAWYKAIvpUm+8/d1L3RUO1pDzP590WKzLe 7KCjtt0Wr6zNZwoXVXkByAYa/lM1Hy+0clL+Uv/dmYmVprEvIMd9oBZRwU0wrun0+Igr Z5O3iMzedN7Bf+HsECFlY97EBUyiWPuy+bgO2ABzCAo9CHJDNxJKB39Si/kbIsFCYhn2 A3f+mB8IZe0B5di+WoEdB3WJSCC85KdgIMt4Y4/ns+lmgUbIKLnRcBPm3r7OteuncF/O AcR18iA4VGtp0hEIYuoQzisJJsZND2DDVQm6hWzPyV2+hEwD+Du6oP51w+y7MWW/tU/g thNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:user-agent:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:message-id:to:from:date; bh=UPnjzsLlcTkJL40ZFMOb9qwlf7VTBymdxo57SAhj2UA=; b=vh1BptUNx5QOVmuTNiFciiK7AWizjIjT+/+Ftr0AbSZ0e5jxMMlZLb2zbyCO3voYy6 wEqYEMTlzc6yz19Fzwk+yyMfASBbBALy3kQaPHdcWafpE1fQES41STodvNzm/lzcjJjC TGvRiqFPd4jzUoEwEWSwiFTfUHt4Kg4gpKmawgW2eOl/Kh2bJFShD6eRuzMO92L5yzMX ah5aaPfIooR3HW/l8oc/TzR1YPHj+smsTMaI8mtArSPyDDUCGyvQTMNT7owjMhRN9KRI aQs5sKdR4u7/9QAiFJ9ZhI8nf9AMM+0ngixFXmi2sdDkn1/4VpJ59PP0Qa7s3+kTmBrI P1tw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m96si7107783qte.185.2018.12.17.08.48.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 17 Dec 2018 08:48:17 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from localhost ([::1]:47833 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYw41-0001sU-H7 for alex.bennee@linaro.org; Mon, 17 Dec 2018 11:48:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYw3D-0001rG-SW for qemu-devel@nongnu.org; Mon, 17 Dec 2018 11:47:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gYw3C-0004Nm-Nd for qemu-devel@nongnu.org; Mon, 17 Dec 2018 11:47:27 -0500 Received: from mga17.intel.com ([192.55.52.151]:48295) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gYw36-0004Gb-7t; Mon, 17 Dec 2018 11:47:20 -0500 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Dec 2018 08:47:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,366,1539673200"; d="scan'208";a="99395943" Received: from ammantio-mobl.amr.corp.intel.com (HELO caravaggio) ([10.252.16.95]) by orsmga007.jf.intel.com with ESMTP; 17 Dec 2018 08:47:11 -0800 Date: Mon, 17 Dec 2018 17:46:48 +0100 From: Samuel Ortiz To: Igor Mammedov Message-ID: <20181217164648.GG4456@caravaggio> References: <20181217104838.18957-1-sameo@linux.intel.com> <20181217104838.18957-8-sameo@linux.intel.com> <20181217132028.4e387d2d@Igors-MacBook-Pro.local> <20181217134959.GB4456@caravaggio> <20181217163536.034fd13c@Igors-MacBook-Pro.local> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20181217163536.034fd13c@Igors-MacBook-Pro.local> User-Agent: Mutt/1.10.1 (2018-07-13) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.151 Subject: Re: [Qemu-devel] [PATCH v4 7/8] hw: acpi: Export and share the ARM RSDP build X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Peter Maydell , Thomas Huth , Eduardo Habkost , Ben Warren , "Michael S. Tsirkin" , qemu-devel@nongnu.org, Shannon Zhao , qemu-arm@nongnu.org, Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: Z8Xmk6tLk/st On Mon, Dec 17, 2018 at 04:35:36PM +0100, Igor Mammedov wrote: > On Mon, 17 Dec 2018 14:49:59 +0100 > Samuel Ortiz wrote: > > > On Mon, Dec 17, 2018 at 01:20:28PM +0100, Igor Mammedov wrote: > > > On Mon, 17 Dec 2018 11:48:37 +0100 > > > Samuel Ortiz wrote: > > > > > > > Now that build_rsdp() supports building both legacy and current RSDP > > > > tables, we can move it to a generic folder (hw/acpi) and have the i386 > > > > ACPI code reuse it in order to reduce code duplication. > > > > > > > > Signed-off-by: Samuel Ortiz > > > > Reviewed-by: Philippe Mathieu-Daudé > > > > Tested-by: Philippe Mathieu-Daudé > > > > Reviewed-by: Andrew Jones > > > > Reviewed-by: Igor Mammedov > > > for future reference, if one changes patch in a significant way, > > > one is supposed to drop Tested/Reviewed-by tags so that reviewers > > > would look at it again and we by mistake won't merge not actually > > > reviewed changes. > > > > > > [...] > > > > > > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > > > > index fb877648ac..846cb6d755 100644 > > > > --- a/hw/i386/acpi-build.c > > > > +++ b/hw/i386/acpi-build.c > > > > @@ -2547,35 +2547,6 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker) > > > > "IVRS", table_data->len - iommu_start, 1, NULL, NULL); > > > > } > > > > > > > > -static void > > > > -build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset) > > > > -{ > > > > - /* AcpiRsdpDescriptor describes revision 2 RSDP table and as result we > > > > - * allocate extra 16 bytes for pc/q35 RSDP rev1 as well. Keep extra 16 bytes > > > > - * wasted to make sure we won't breake migration for machine types older > > > > - * than 2.3 due to size mismatch. > > > > - */ > > > > - AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp); > > > > - unsigned rsdt_pa_size = sizeof(rsdp->rsdt_physical_address); > > > > - unsigned rsdt_pa_offset = > > > > - (char *)&rsdp->rsdt_physical_address - rsdp_table->data; > > > > - > > > > - bios_linker_loader_alloc(linker, ACPI_BUILD_RSDP_FILE, rsdp_table, 16, > > > > - true /* fseg memory */); > > > > - > > > > - memcpy(&rsdp->signature, "RSD PTR ", 8); > > > > - memcpy(rsdp->oem_id, ACPI_BUILD_APPNAME6, 6); > > > > - /* Address to be filled by Guest linker */ > > > > - bios_linker_loader_add_pointer(linker, > > > > - ACPI_BUILD_RSDP_FILE, rsdt_pa_offset, rsdt_pa_size, > > > > - ACPI_BUILD_TABLE_FILE, rsdt_tbl_offset); > > > > - > > > > - /* Checksum to be filled by Guest linker */ > > > > - bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE, > > > > - (char *)rsdp - rsdp_table->data, 20 /* ACPI rev 1.0 RSDP size */, > > > > - (char *)&rsdp->checksum - rsdp_table->data); > > > > -} > > > > - > > > > typedef > > > > struct AcpiBuildState { > > > > /* Copy of table in RAM (for patching). */ > > > > @@ -2732,7 +2703,25 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) > > > > slic_oem.id, slic_oem.table_id); > > > > > > > > /* RSDP is in FSEG memory, so allocate it separately */ > > > > - build_rsdp(tables->rsdp, tables->linker, rsdt); > > > > + { > > > > + AcpiRsdpData rsdp_data = { > > > > + .revision = 0, > > > > + .oem_id = ACPI_BUILD_APPNAME6, > > > > + .xsdt_tbl_offset = NULL, > > > > + .rsdt_tbl_offset = &rsdt, > > > > + }; > > > > + build_rsdp(tables->rsdp, tables->linker, &rsdp_data); > > > > + if (!pcmc->rsdp_in_ram) { > > > > + /* > > > > + * Legacy machine types (2.2 and older) expect to get a complete > > > > + * revision 2 RSDP table, even though they only look at the > > > not true, rev is set to 0 for pc machines, > > Rev is set to 0 but they effectively expect to get a structure which > > size is the rev 2 one. That's what I meant. > > > > > the point of the original comment was > > > that we allocate extra 16 bytes but not actually using them and why it's bad > > > to drop it suddenly. > > > > > > > + * revision 0 fields (xsdt pointer is not set). So in order to > > > > + * not break migration to those machine types we waste 16 bytes > > > > + * that we amend to the RSDP revision 0 structure. > > > ^^^ added > > > > + */ > > > Perhaps amended original comment would be clearer: > > > > > > /* We used to allocate extra space for RSDP rev 2 but used only space for > > > * legacy RSDP and extra bytes were zeroed out. Keep wasting extra 16 bytes > > > * to make sure we won't breake migration for machine types 2.2 and older > > > * due to RSDP blob size mismatch. > > > */ > > > > > > > + build_append_int_noprefix(tables->rsdp, 0, 16); > Looks like I've haven't noticed, it might work but are you sure? > 0 here is uint64_t and then it's shifted 16 times which is sort of gray area (undefined behavior) AFAIK shifting by N bits when N > width(left operand) is undefined but that's not the case here. build_append_int_noprefix(foo, 0, 16) shift a 64 bits wide unsigned int by 8 bits, for each iterations of a 16 iterations loop. So we're doing 16 iterations of properly defined behaviour. Cheers, Samuel.