[PATCH 11/14] x86/efi: Show actual ending addresses in efi_print_memmap

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Matt Fleming <matt@codeblueprint.co.uk>
Newsgroups	linux.kernel
Subject	[PATCH 11/14] x86/efi: Show actual ending addresses in efi_print_memmap
Date	Mon, 01 Feb 2016 23:10:04 +0100
Message-ID	<qXuPy-WW-23@gated-at.bofh.it> (permalink)
References	<qXuPx-WW-3@gated-at.bofh.it>
X-Original-To	Ingo Molnar <mingo@kernel.org>, "H . Peter Anvin" <hpa@zytor.com>, Thomas Gleixner <tglx@linutronix.de>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeblueprint-co-uk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zVBx24IgRU5b5FpfKwsl97ugEmmw3bOWHnCjNYOggFs=; b=a+kVFBE9tZggasuQAWPxPTLuwtJda3vwCU2KmRWaT9O8OxzSQ+47BY+QoqnQ+65Z+k nVo3QbR0Q/iqUzxwBbgsISjFth/pvBXI79xnb28DEtmvcEQQntR6j7QUlACK920NhlDi PWJ2i17L7N7GyaxKEcmlJi3+78yTKQdGQ7g95Ys24WX2tUBwcSuVBuNOxbAIrH9v7uGI fqYFebUH4dOTfDfOVc1VGxRLTGNQ3RP5gLpq6tGdMuvAPfjZLpJKexgCbPJ+uzzJX3BV TNUwaLG+/BgTj/E2HDD7ttHPH4DefiSkyinxdL4UJ2kLB3WFe4HTbgSAEuCvlOFiS56h +MLQ==
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zVBx24IgRU5b5FpfKwsl97ugEmmw3bOWHnCjNYOggFs=; b=DHHqYal2WftZJXcKQNC6u4RpUid+ek7qm9GGJWU/R94dAUgTDckEQQPC2ou/r7Lj+Q SizaoMNgfsc0i3CbWxWdo7k/LI+VFyZW9Oy7J1/4A/+3Y3HEwtLGqqiMTzCsNcrV7btl tAnbG9ZqNTS5kjeHAiaSaws7jTG98LgzVefLC4d7EXvEiD1wsbU3dl8O6CncINdaumMM w/mOqB88YDnCqx17JLqYcrSTCRjJ7UTRxfGpPMYD3zGAohUa783s52PDUUBYHFoy1W1U YjGtIF/PdSaQBXIAhHfvr3YLxJm4a50B/IoKDp6+btlAZfYQlhldPmm61wqytuHlVreA w0KQ==
X-Gm-Message-State	AG10YORlVoo8kiy+6SrHNFGDzZpLPDWB909wttj0JM4/yYtJpMOactpX1fAzGxlk4qo2Pg==
X-Received	by 10.28.224.212 with SMTP id x203mr14363314wmg.29.1454364449411; Mon, 01 Feb 2016 14:07:29 -0800 (PST)
X-Mailer	git-send-email 2.6.2
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	62
Organization	linux.* mail to news gateway
X-Original-Cc	linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Robert Elliott <elliott@hpe.com>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, Leif Lindholm <leif.lindholm@linaro.org>, Laszlo Ersek <lersek@redhat.com>, Matt Fleming <matt@codeblueprint.co.uk>
X-Original-Date	Mon, 1 Feb 2016 22:07:05 +0000
X-Original-Message-ID	<1454364428-494-12-git-send-email-matt@codeblueprint.co.uk>
X-Original-References	<1454364428-494-1-git-send-email-matt@codeblueprint.co.uk>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1323560

Show key headers only | View raw

From: Robert Elliott <elliott@hpe.com>

Adjust efi_print_memmap to print the real end address of each
range, not 1 byte beyond. This matches other prints like those for
SRAT and nosave memory.

While investigating grub persistent memory corruption issues, it
was helpful to make this table match the ending address convention
used by:
* the kernel's e820 table prints
	BIOS-e820: [mem 0x0000001680000000-0x0000001c7fffffff] reserved
* the kernel's nosave memory prints
	PM: Registered nosave memory: [mem 0x880000000-0xc7fffffff]
* the kernel's ACPI System Resource Affinity Table prints
	SRAT: Node 1 PXM 1 [mem 0x480000000-0x87fffffff]
* grub's lsmmap and lsefimmap commands
	reserved  0000001680000000-0000001c7fffffff 00600000     24GiB UC WC WT WB NV
* the UEFI shell's memmap command
	Reserved   000000007FC00000-000000007FFFFFFF 0000000000000400 0000000000000001

For example, if you grep all the various logs for c7fffffff, you
won't find the kernel's line if it uses c80000000.

Also, change the closing ) to ] to match the opening [.

old:
    efi: mem61: [Persistent Memory  |   |  |  |  |  |  |   |WB|WT|WC|UC] range=[0x0000000880000000-0x0000000c80000000) (16384MB)

new:
    efi: mem61: [Persistent Memory  |   |  |  |  |  |  |   |WB|WT|WC|UC] range=[0x0000000880000000-0x0000000c7fffffff] (16384MB)

Signed-off-by: Robert Elliott <elliott@hpe.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
---
 arch/x86/platform/efi/efi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index bdd9477f937c..e80826e6f3a9 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -235,10 +235,10 @@ void __init efi_print_memmap(void)
 		char buf[64];
 
 		md = p;
-		pr_info("mem%02u: %s range=[0x%016llx-0x%016llx) (%lluMB)\n",
+		pr_info("mem%02u: %s range=[0x%016llx-0x%016llx] (%lluMB)\n",
 			i, efi_md_typeattr_format(buf, sizeof(buf), md),
 			md->phys_addr,
-			md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT),
+			md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1,
 			(md->num_pages >> (20 - EFI_PAGE_SHIFT)));
 	}
 #endif  /*  EFI_DEBUG  */
-- 
2.6.2

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 11/14] x86/efi: Show actual ending addresses in efi_print_memmap Matt Fleming <matt@codeblueprint.co.uk> - 2016-02-01 23:10 +0100
  Re: [PATCH 11/14] x86/efi: Show actual ending addresses in  efi_print_memmap Laszlo Ersek <lersek@redhat.com> - 2016-02-02 09:50 +0100
  [tip:efi/core] x86/efi:   Show actual ending addresses in efi_print_memmap tip-bot for Robert Elliott <tipbot@zytor.com> - 2016-02-03 12:40 +0100

csiph-web