From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a5d:6089:0:0:0:0:0 with SMTP id w9csp2335207wrt; Thu, 29 Nov 2018 05:26:30 -0800 (PST) X-Google-Smtp-Source: AFSGD/WO9gKQw+i489RYPIutiL0X0MvttPKJppu3a5Ea0ExKRr9Yp5z2Xo/QPmNEtkG01/urBrDA X-Received: by 2002:a25:30d5:: with SMTP id w204-v6mr1223702ybw.335.1543497989940; Thu, 29 Nov 2018 05:26:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543497989; cv=none; d=google.com; s=arc-20160816; b=xVVEZpQ+LcwNUuKYQmlyBxM0k7x2Gme3Bdt+5c+QNsE5Dl+pZObeYGqjU5dCQxDaeF xWCdpbPBdT+s8ftfNvRRQCVn/AS9i1ZsglDc2XotdABmEU80Za41PWlBiVm/9yFJlZ0G LRndSbjIiLN8q9hUKDyeWAqXWlmWrbUW8zOyNfGYVYsQWT1dxs+Y16XHY2t/MgkUiBUZ MvHtbzpkHvV2+bOWeSfvvCd5fpTqoaV9sqwIBXAJOh607LTZrjSLa3QLO3NKtmchbRHE q6ciHoigr116vKSzXpo+t9p3caCGySrJNdpjYhq0/jlBi+IGhCW7Zgps0Y1m0c8mABwY sdxw== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=gWxK1Xw55GfTyyVKAcxh6Y6Hwi2eEbmX+L8xg3FuKrQ=; b=zIe/lJR+fmZyLrRzSgwnrZLOtMGwPuk0Xx5BLVSkvbWc3COJKhJfDzFn1sdJGi1WWz ch0QYPzDUX3TQebdniRtU3v7pNzowFK+sjJJGYyDwz6JydWwvVYyiOEqZrkuLGn1zuW7 vM3bwV4vorOADt6QZ2EW9LskbQTvCQJtokYfejvsmeiENyWoQnPpYnB6wrCTy/yYL9Va UxjPR2o0/uJrCogF+uwm1eiioOGiVelqgO91ysIFdGAL1hSdznd25EYcktolWmV/BxYl iIU1DegAFnoOUw/GyPq5QOqKC4KWEGd2/LxE967irFv2mPz9KGz1Y+NoRBaAoq+h8a4c kyog== 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 r6-v6si1163867ywb.345.2018.11.29.05.26.29 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 29 Nov 2018 05:26:29 -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]:54135 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSMKq-0000O6-UN for alex.bennee@linaro.org; Thu, 29 Nov 2018 08:26:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSMJo-0000GL-Jp for qemu-devel@nongnu.org; Thu, 29 Nov 2018 08:25:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gSMJl-0001pS-MN for qemu-devel@nongnu.org; Thu, 29 Nov 2018 08:25:24 -0500 Received: from mga03.intel.com ([134.134.136.65]:30951) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gSMJl-0001hj-B3; Thu, 29 Nov 2018 08:25:21 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Nov 2018 05:25:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,294,1539673200"; d="scan'208";a="97547195" Received: from hharjula-mobl.ger.corp.intel.com (HELO localhost.localdomain) ([10.252.29.114]) by fmsmga008.fm.intel.com with ESMTP; 29 Nov 2018 05:25:16 -0800 From: Samuel Ortiz To: qemu-devel@nongnu.org Date: Thu, 29 Nov 2018 14:24:23 +0100 Message-Id: <20181129132428.333-4-sameo@linux.intel.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181129132428.333-1-sameo@linux.intel.com> References: <20181129132428.333-1-sameo@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.65 Subject: [Qemu-devel] [PATCH v2 3/8] hw: i386: Use correct RSDT length for checksum 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" , Shannon Zhao , qemu-arm@nongnu.org, Igor Mammedov , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: Y/B9tsbx5LYo From: Igor Mammedov AcpiRsdpDescriptor describes revision 2 RSDP table so using sizeof(*rsdp) for checksum calculation isn't correct since we are adding extra 16 bytes. But acpi_data_push() zeroes out table, so just by luck we are summing up exta zeros which still yelds correct checksum. Fix it up by explicitly stating table size instead of using pointer arithmetics on stucture. PS: Extra 16 bytes are still wasted, but droping them will break migration for machines older than 2.3 due to size mismatch, for 2.3 and older it's not an issue since they are using resizable memory regions (a1666142d) for ACPI blobs. So keep wasting memory to avoid breaking old machines. Fixes: 72c194f7e (i386: ACPI table generation code from seabios) Signed-off-by: Igor Mammedov Reviewed-by: Samuel Ortiz Signed-off-by: Samuel Ortiz --- hw/i386/acpi-build.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 35f17d0d91..fb877648ac 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2550,6 +2550,11 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker) 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 = @@ -2567,7 +2572,7 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned 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, sizeof *rsdp, + (char *)rsdp - rsdp_table->data, 20 /* ACPI rev 1.0 RSDP size */, (char *)&rsdp->checksum - rsdp_table->data); } -- 2.19.2