[PATCH v2] mm/sparse: set SECTION_NID_SHIFT to 6

[Naoya Horiguchi]

From: Naoya Horiguchi <naoya.horiguchi@xxxxxxx>

Currently SECTION_NID_SHIFT is set to 3, which is incorrect because
bit 3 and 4 can be overlapped by sub-field for early NID, and can be
unexpectedly set on NUMA systems.  There are a few non-critical issues
related to this:

  - Having SECTION_TAINT_ZONE_DEVICE set for wrong sections forces
    pfn_to_online_page() through the slow path, but doesn't actually
    break the kernel.

  - A kdump generation tool like makedumpfile uses this field to
    calculate the physical address to read.  So wrong bits can make
    the tool access to wrong address and fail to create kdump.
    This can be avoided by the tool, so it's not critical.

To fix it, set SECTION_NID_SHIFT to 6 which is the minimum number of
available bits of section flag field.

Fixes: 1f90a3477df3 ("mm: teach pfn_to_online_page() about ZONE_DEVICE section collisions")
Reported-by: Kazuhito Hagio <k-hagio-ab@xxxxxxx>
Suggested-by: Dan Williams <dan.j.williams@xxxxxxxxx>
Signed-off-by: Naoya Horiguchi <naoya.horiguchi@xxxxxxx>
Acked-by: David Hildenbrand <david@xxxxxxxxxx>
---
 include/linux/mmzone.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git v5.13/include/linux/mmzone.h v5.13_patched/include/linux/mmzone.h
index 0d53eba1c383..a6829b652d79 100644
--- v5.13/include/linux/mmzone.h
+++ v5.13_patched/include/linux/mmzone.h
@@ -1344,7 +1344,7 @@ extern size_t mem_section_usage_size(void);
 #define SECTION_TAINT_ZONE_DEVICE	(1UL<<4)
 #define SECTION_MAP_LAST_BIT		(1UL<<5)
 #define SECTION_MAP_MASK		(~(SECTION_MAP_LAST_BIT-1))
-#define SECTION_NID_SHIFT		3
+#define SECTION_NID_SHIFT		6
 
 static inline struct page *__section_mem_map_addr(struct mem_section *section)
 {
-- 
2.25.1