lkml.org 
[lkml]   [2017]   [Sep]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] mm/memory_hotplug: fix wrong casting for __remove_section()
From
Date
__remove_section() calls __remove_zone() to shrink zone and pgdat.
But due to wrong castings, __remvoe_zone() cannot shrink zone
and pgdat correctly if pfn is over 0xffffffff.

So the patch fixes the following 3 wrong castings.

1. find_smallest_section_pfn() returns 0 or start_pfn which defined
as unsigned long. But the function always returns 32bit value
since the function is defined as int.

2. find_biggest_section_pfn() returns 0 or pfn which defined as
unsigned long. the function always returns 32bit value
since the function is defined as int.

3. __remove_section() calculates start_pfn using section_nr_to_pfn()
and scn_nr. section_nr_to_pfn() just shifts scn_nr by
PFN_SECTION_SHIFT bit. But since scn_nr is defined as int,
section_nr_to_pfn() always return 32 bit value.

The patch fixes the wrong castings.

Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
---
mm/memory_hotplug.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 73bf17d..3514ef2 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -331,7 +331,7 @@ int __ref __add_pages(int nid, unsigned long phys_start_pfn,

#ifdef CONFIG_MEMORY_HOTREMOVE
/* find the smallest valid pfn in the range [start_pfn, end_pfn) */
-static int find_smallest_section_pfn(int nid, struct zone *zone,
+static unsigned long find_smallest_section_pfn(int nid, struct zone *zone,
unsigned long start_pfn,
unsigned long end_pfn)
{
@@ -356,7 +356,7 @@ static int find_smallest_section_pfn(int nid, struct zone *zone,
}

/* find the biggest valid pfn in the range [start_pfn, end_pfn). */
-static int find_biggest_section_pfn(int nid, struct zone *zone,
+static unsigned long find_biggest_section_pfn(int nid, struct zone *zone,
unsigned long start_pfn,
unsigned long end_pfn)
{
@@ -544,7 +544,7 @@ static int __remove_section(struct zone *zone, struct mem_section *ms,
return ret;

scn_nr = __section_nr(ms);
- start_pfn = section_nr_to_pfn(scn_nr);
+ start_pfn = section_nr_to_pfn((unsigned long)scn_nr);
__remove_zone(zone, start_pfn);

sparse_remove_one_section(zone, ms, map_offset);
--
1.8.3.1
\
 
 \ /
  Last update: 2017-09-08 22:43    [W:0.062 / U:2.140 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site