Subject: + x86-fix-numa-by-reverting-wrong-memblock-setting.patch added to -mm tree
To: yinghai@xxxxxxxxxx,dave.hansen@xxxxxxxxx,grygorii.strashko@xxxxxx,hpa@xxxxxxxxx,mingo@xxxxxxx,santosh.shilimkar@xxxxxx,tj@xxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 24 Jan 2014 11:17:37 -0800
The patch titled
Subject: x86: fix numa by reverting wrong memblock setting
has been added to the -mm tree. Its filename is
x86-fix-numa-by-reverting-wrong-memblock-setting.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/x86-fix-numa-by-reverting-wrong-memblock-setting.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/x86-fix-numa-by-reverting-wrong-memblock-setting.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Yinghai Lu <yinghai@xxxxxxxxxx>
Subject: x86: fix numa by reverting wrong memblock setting
Dave reported Numa on x86 is broken on system with 1T memory.
It turns out
| commit 5b6e529521d35e1bcaa0fe43456d1bbb335cae5d
| Author: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
| Date: Tue Jan 21 15:50:03 2014 -0800
|
| x86: memblock: set current limit to max low memory address
set limit to low wrongly.
max_low_pfn_mapped is different from max_pfn_mapped.
max_low_pfn_mapped is always under 4G.
That will memblock_alloc_nid all go under 4G.
Revert that offending patch.
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Reported-by: Dave Hansen <dave.hansen@xxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>, Ingo Molnar <mingo@xxxxxxx>
Cc: Grygorii Strashko <grygorii.strashko@xxxxxx>
Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/include/asm/page_types.h | 4 ++--
arch/x86/kernel/setup.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff -puN arch/x86/include/asm/page_types.h~x86-fix-numa-by-reverting-wrong-memblock-setting arch/x86/include/asm/page_types.h
--- a/arch/x86/include/asm/page_types.h~x86-fix-numa-by-reverting-wrong-memblock-setting
+++ a/arch/x86/include/asm/page_types.h
@@ -51,9 +51,9 @@ extern int devmem_is_allowed(unsigned lo
extern unsigned long max_low_pfn_mapped;
extern unsigned long max_pfn_mapped;
-static inline phys_addr_t get_max_low_mapped(void)
+static inline phys_addr_t get_max_mapped(void)
{
- return (phys_addr_t)max_low_pfn_mapped << PAGE_SHIFT;
+ return (phys_addr_t)max_pfn_mapped << PAGE_SHIFT;
}
bool pfn_range_is_mapped(unsigned long start_pfn, unsigned long end_pfn);
diff -puN arch/x86/kernel/setup.c~x86-fix-numa-by-reverting-wrong-memblock-setting arch/x86/kernel/setup.c
--- a/arch/x86/kernel/setup.c~x86-fix-numa-by-reverting-wrong-memblock-setting
+++ a/arch/x86/kernel/setup.c
@@ -1119,7 +1119,7 @@ void __init setup_arch(char **cmdline_p)
setup_real_mode();
- memblock_set_current_limit(get_max_low_mapped());
+ memblock_set_current_limit(get_max_mapped());
dma_contiguous_reserve(0);
/*
_
Patches currently in -mm which might be from yinghai@xxxxxxxxxx are
origin.patch
revert-xxx.patch
x86-fix-numa-by-reverting-wrong-memblock-setting.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
