[4.19,STABLE] mm/memory_hotplug: use "unsigned long" for PFN in zone_for_pfn_range()

Commit Message

David Hildenbrand Sept. 20, 2021, 11:32 a.m. UTC

commit 7cf209ba8a86410939a24cb1aeb279479a7e0ca6 upstream.

Patch series "mm/memory_hotplug: preparatory patches for new online policy and memory"

These are all cleanups and one fix previously sent as part of [1]:
[PATCH v1 00/12] mm/memory_hotplug: "auto-movable" online policy and memory
groups.

These patches make sense even without the other series, therefore I pulled
them out to make the other series easier to digest.

[1] https://lkml.kernel.org/r/[e-mail]

This patch (of 4):

Checkpatch complained on a follow-up patch that we are using "unsigned"
here, which defaults to "unsigned int" and checkpatch is correct.

As we will search for a fitting zone using the wrong pfn, we might end
up onlining memory to one of the special kernel zones, such as ZONE_DMA,
which can end badly as the onlined memory does not satisfy properties of
these zones.

Use "unsigned long" instead, just as we do in other places when handling
PFNs.  This can bite us once we have physical addresses in the range of
multiple TB.

Link: https://lkml.kernel.org/r/[e-mail]
Fixes: e5e689302633 ("mm, memory_hotplug: display allowed zones in the preferred ordering")
Signed-off-by: David Hildenbrand <[e-mail]>
Reviewed-by: Pankaj Gupta <[e-mail]>
Reviewed-by: Muchun Song <[e-mail]>
Reviewed-by: Oscar Salvador <[e-mail]>
Cc: David Hildenbrand <[e-mail]>
Cc: Vitaly Kuznetsov <[e-mail]>
Cc: "Michael S. Tsirkin" <[e-mail]>
Cc: Jason Wang <[e-mail]>
Cc: Pankaj Gupta <[e-mail]>
Cc: Wei Yang <[e-mail]>
Cc: Michal Hocko <[e-mail]>
Cc: Dan Williams <[e-mail]>
Cc: Anshuman Khandual <[e-mail]>
Cc: Dave Hansen <[e-mail]>
Cc: Vlastimil Babka <[e-mail]>
Cc: Mike Rapoport <[e-mail]>
Cc: "Rafael J. Wysocki" <[e-mail]>
Cc: Len Brown <[e-mail]>
Cc: Pavel Tatashin <[e-mail]>
Cc: Heiko Carstens <[e-mail]>
Cc: Michael Ellerman <[e-mail]>
Cc: Catalin Marinas <[e-mail]>
Cc: [e-mail]
Cc: Andy Lutomirski <[e-mail]>
Cc: "Aneesh Kumar K.V" <[e-mail]>
Cc: Anton Blanchard <[e-mail]>
Cc: Ard Biesheuvel <[e-mail]>
Cc: Baoquan He <[e-mail]>
Cc: Benjamin Herrenschmidt <[e-mail]>
Cc: Borislav Petkov <[e-mail]>
Cc: Christian Borntraeger <[e-mail]>
Cc: Christophe Leroy <[e-mail]>
Cc: Dave Jiang <[e-mail]>
Cc: "H. Peter Anvin" <[e-mail]>
Cc: Ingo Molnar <[e-mail]>
Cc: Jia He <[e-mail]>
Cc: Joe Perches <[e-mail]>
Cc: Kefeng Wang <[e-mail]>
Cc: Laurent Dufour <[e-mail]>
Cc: Michel Lespinasse <[e-mail]>
Cc: Nathan Lynch <[e-mail]>
Cc: Nicholas Piggin <[e-mail]>
Cc: Paul Mackerras <[e-mail]>
Cc: Peter Zijlstra <[e-mail]>
Cc: Pierre Morel <[e-mail]>
Cc: "Rafael J. Wysocki" <[e-mail]>
Cc: Rich Felker <[e-mail]>
Cc: Scott Cheloha <[e-mail]>
Cc: Sergei Trofimovich <[e-mail]>
Cc: Thiago Jung Bauermann <[e-mail]>
Cc: Thomas Gleixner <[e-mail]>
Cc: Vasily Gorbik <[e-mail]>
Cc: Vishal Verma <[e-mail]>
Cc: Will Deacon <[e-mail]>
Cc: Yoshinori Sato <[e-mail]>
Cc: <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
Signed-off-by: Linus Torvalds <[e-mail]>
Signed-off-by: David Hildenbrand <[e-mail]>
---
 include/linux/memory_hotplug.h | 4 ++--
 mm/memory_hotplug.c            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Greg KH Sept. 20, 2021, 12:12 p.m. UTC | #1

On Mon, Sep 20, 2021 at 01:32:24PM +0200, David Hildenbrand wrote:
> commit 7cf209ba8a86410939a24cb1aeb279479a7e0ca6 upstream.
> 

We also need a 5.4.y version if we are going to be able to apply the
4.19.y and 4.14.y versions.

thanks,

greg k-h

David Hildenbrand Sept. 20, 2021, 12:19 p.m. UTC | #2

On 20.09.21 14:12, Greg KH wrote:
> On Mon, Sep 20, 2021 at 01:32:24PM +0200, David Hildenbrand wrote:
>> commit 7cf209ba8a86410939a24cb1aeb279479a7e0ca6 upstream.
>>
> 
> We also need a 5.4.y version if we are going to be able to apply the
> 4.19.y and 4.14.y versions.

On it, still compiling :)

Greg KH Sept. 20, 2021, 1:06 p.m. UTC | #3

On Mon, Sep 20, 2021 at 02:19:53PM +0200, David Hildenbrand wrote:
> On 20.09.21 14:12, Greg KH wrote:
> > On Mon, Sep 20, 2021 at 01:32:24PM +0200, David Hildenbrand wrote:
> > > commit 7cf209ba8a86410939a24cb1aeb279479a7e0ca6 upstream.
> > > 
> > 
> > We also need a 5.4.y version if we are going to be able to apply the
> > 4.19.y and 4.14.y versions.
> 
> On it, still compiling :)

Ah, thanks, all now queued up.

greg k-h

Patch

diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index d17d45c41a0b..565317876822 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -344,6 +344,6 @@  extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map,
 					  unsigned long pnum);
 extern bool allow_online_pfn_range(int nid, unsigned long pfn, unsigned long nr_pages,
 		int online_type);
-extern struct zone *zone_for_pfn_range(int online_type, int nid, unsigned start_pfn,
-		unsigned long nr_pages);
+extern struct zone *zone_for_pfn_range(int online_type, int nid,
+		unsigned long start_pfn, unsigned long nr_pages);
 #endif /* __LINUX_MEMORY_HOTPLUG_H */
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index e60e28131f67..20f079c81b33 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -783,8 +783,8 @@  static inline struct zone *default_zone_for_pfn(int nid, unsigned long start_pfn
 	return movable_node_enabled ? movable_zone : kernel_zone;
 }
 
-struct zone * zone_for_pfn_range(int online_type, int nid, unsigned start_pfn,
-		unsigned long nr_pages)
+struct zone *zone_for_pfn_range(int online_type, int nid,
+		unsigned long start_pfn, unsigned long nr_pages)
 {
 	if (online_type == MMOP_ONLINE_KERNEL)
 		return default_kernel_zone_for_pfn(nid, start_pfn, nr_pages);