[PATCH 1/2] x86: Make E820_X_MAX unconditionally larger than E820MAX

From	Alex Thorlton <athorlton@sgi.com>
Newsgroups	linux.kernel
Subject	[PATCH 1/2] x86: Make E820_X_MAX unconditionally larger than E820MAX
Date	2016-11-30 04:30 +0100
Message-ID	<sJ3KO-zy-7@gated-at.bofh.it> (permalink)
References	<sDzDH-5Uj-7@gated-at.bofh.it> <sJ3KO-zy-9@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

It's really not necessary to limit E820_X_MAX to 128 in the non-EFI
case.  This commit drops E820_X_MAX's dependency on CONFIG_EFI, so that
E820_X_MAX is always at least slightly larger than E820MAX.

The real motivation behind this is actually to prevent some issues in
the Xen kernel, where the XENMEM_machine_memory_map hypercall can
produce an e820 map larger than 128 entries, even on systems where the
original e820 table was quite a bit smaller than that, depending on how
many IOAPICs are installed on the system.

Signed-off-by: Alex Thorlton <athorlton@sgi.com>
Suggested-by: Ingo Molnar <mingo@redhat.com>
Cc: Russ Anderson <rja@sgi.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: x86@kernel.org
Cc: xen-devel@lists.xenproject.org
---
 arch/x86/include/asm/e820.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
index 476b574..aa00d33 100644
--- a/arch/x86/include/asm/e820.h
+++ b/arch/x86/include/asm/e820.h
@@ -1,13 +1,15 @@
 #ifndef _ASM_X86_E820_H
 #define _ASM_X86_E820_H
 
-#ifdef CONFIG_EFI
+/*
+ * We need to make sure that E820_X_MAX is defined
+ * before we include uapi/asm/e820.h
+ */
 #include <linux/numa.h>
 #define E820_X_MAX (E820MAX + 3 * MAX_NUMNODES)
-#else	/* ! CONFIG_EFI */
-#define E820_X_MAX E820MAX
-#endif
+
 #include <uapi/asm/e820.h>
+
 #ifndef __ASSEMBLY__
 /* see comment in arch/x86/kernel/e820.c */
 extern struct e820map *e820;
-- 
1.8.5.6

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

Thread

[PATCH 1/2] x86: Make E820_X_MAX unconditionally larger than E820MAX Alex Thorlton <athorlton@sgi.com> - 2016-11-30 04:30 +0100
  Re: [PATCH 1/2] x86: Make E820_X_MAX unconditionally larger than  E820MAX Ingo Molnar <mingo@kernel.org> - 2016-11-30 07:30 +0100
    Re: [PATCH 1/2] x86: Make E820_X_MAX unconditionally larger than  E820MAX Alex Thorlton <athorlton@sgi.com> - 2016-12-01 19:40 +0100

csiph-web