| Message ID | 20210602105348.13387-5-rppt@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Remove DISCINTIGMEM memory model | expand |
Hi Mike, On Wed, Jun 2, 2021 at 12:54 PM Mike Rapoport <rppt@kernel.org> wrote: > From: Mike Rapoport <rppt@linux.ibm.com> > > DISCONTIGMEM was replaced by FLATMEM with freeing of the unused memory map > in v5.11. > > Remove the support for DISCONTIGMEM entirely. > > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> Thanks for your patch! Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> > --- a/arch/m68k/include/asm/page_mm.h > +++ b/arch/m68k/include/asm/page_mm.h > @@ -126,25 +126,7 @@ static inline void *__va(unsigned long x) > > extern int m68k_virt_to_node_shift; > > -#ifndef CONFIG_DISCONTIGMEM > #define __virt_to_node(addr) (&pg_data_map[0]) With pg_data_map[] removed, this definition can go as well. Seems to be a leftover from 1008a11590b966b4 ("m68k: switch to MEMBLOCK + NO_BOOTMEM") There are a few more: arch/m68k/include/asm/mmzone.h:extern pg_data_t pg_data_map[]; arch/m68k/include/asm/mmzone.h:#define NODE_DATA(nid) (&pg_data_map[nid]) > -#else > -extern struct pglist_data *pg_data_table[]; > - > -static inline __attribute_const__ int __virt_to_node_shift(void) > -{ > - int shift; > - > - asm ( > - "1: moveq #0,%0\n" > - m68k_fixup(%c1, 1b) > - : "=d" (shift) > - : "i" (m68k_fixup_vnode_shift)); > - return shift; > -} > - > -#define __virt_to_node(addr) (pg_data_table[(unsigned long)(addr) >> __virt_to_node_shift()]) > -#endif > --- a/arch/m68k/mm/init.c > +++ b/arch/m68k/mm/init.c > @@ -44,28 +44,8 @@ EXPORT_SYMBOL(empty_zero_page); > > int m68k_virt_to_node_shift; > > -#ifdef CONFIG_DISCONTIGMEM > -pg_data_t pg_data_map[MAX_NUMNODES]; > -EXPORT_SYMBOL(pg_data_map); > - > -pg_data_t *pg_data_table[65]; > -EXPORT_SYMBOL(pg_data_table); > -#endif > - Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Wed, Jun 02, 2021 at 01:25:24PM +0200, Geert Uytterhoeven wrote: > Hi Mike, > > On Wed, Jun 2, 2021 at 12:54 PM Mike Rapoport <rppt@kernel.org> wrote: > > From: Mike Rapoport <rppt@linux.ibm.com> > > > > DISCONTIGMEM was replaced by FLATMEM with freeing of the unused memory map > > in v5.11. > > > > Remove the support for DISCONTIGMEM entirely. > > > > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> > > Thanks for your patch! > > Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> > Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> > > > --- a/arch/m68k/include/asm/page_mm.h > > +++ b/arch/m68k/include/asm/page_mm.h > > @@ -126,25 +126,7 @@ static inline void *__va(unsigned long x) > > > > extern int m68k_virt_to_node_shift; > > > > -#ifndef CONFIG_DISCONTIGMEM > > #define __virt_to_node(addr) (&pg_data_map[0]) > > With pg_data_map[] removed, this definition can go as well. > Seems to be a leftover from 1008a11590b966b4 ("m68k: switch to MEMBLOCK > + NO_BOOTMEM") > > There are a few more: > arch/m68k/include/asm/mmzone.h:extern pg_data_t pg_data_map[]; > arch/m68k/include/asm/mmzone.h:#define NODE_DATA(nid) > (&pg_data_map[nid]) It seems that arch/m68k/include/asm/mmzone.h can be simply removed. > > -#else > > -extern struct pglist_data *pg_data_table[]; > > - > > -static inline __attribute_const__ int __virt_to_node_shift(void) > > -{ > > - int shift; > > - > > - asm ( > > - "1: moveq #0,%0\n" > > - m68k_fixup(%c1, 1b) > > - : "=d" (shift) > > - : "i" (m68k_fixup_vnode_shift)); > > - return shift; > > -} > > - > > -#define __virt_to_node(addr) (pg_data_table[(unsigned long)(addr) >> __virt_to_node_shift()]) > > -#endif > > > --- a/arch/m68k/mm/init.c > > +++ b/arch/m68k/mm/init.c > > @@ -44,28 +44,8 @@ EXPORT_SYMBOL(empty_zero_page); > > > > int m68k_virt_to_node_shift; > > > > -#ifdef CONFIG_DISCONTIGMEM > > -pg_data_t pg_data_map[MAX_NUMNODES]; > > -EXPORT_SYMBOL(pg_data_map); > > - > > -pg_data_t *pg_data_table[65]; > > -EXPORT_SYMBOL(pg_data_table); > > -#endif > > - > > Gr{oetje,eeting}s, > > Geert > > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu index f4d23977d2a5..29e946394fdb 100644 --- a/arch/m68k/Kconfig.cpu +++ b/arch/m68k/Kconfig.cpu @@ -408,10 +408,6 @@ config SINGLE_MEMORY_CHUNK order" to save memory that could be wasted for unused memory map. Say N if not sure. -config ARCH_DISCONTIGMEM_ENABLE - depends on BROKEN - def_bool MMU && !SINGLE_MEMORY_CHUNK - config FORCE_MAX_ZONEORDER int "Maximum zone order" if ADVANCED depends on !SINGLE_MEMORY_CHUNK @@ -451,11 +447,6 @@ config M68K_L2_CACHE depends on MAC default y -config NODES_SHIFT - int - default "3" - depends on DISCONTIGMEM - config CPU_HAS_NO_BITFIELDS bool @@ -553,4 +544,3 @@ config CACHE_COPYBACK The ColdFire CPU cache is set into Copy-back mode. endchoice endif - diff --git a/arch/m68k/include/asm/page.h b/arch/m68k/include/asm/page.h index 97087dd3ca6d..2f1c54e4725d 100644 --- a/arch/m68k/include/asm/page.h +++ b/arch/m68k/include/asm/page.h @@ -62,7 +62,7 @@ extern unsigned long _ramend; #include <asm/page_no.h> #endif -#if !defined(CONFIG_MMU) || defined(CONFIG_DISCONTIGMEM) +#ifndef CONFIG_MMU #define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT)) #define __pfn_to_phys(pfn) PFN_PHYS(pfn) #endif diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h index 2411ea9ef578..ff8f8a3f7cac 100644 --- a/arch/m68k/include/asm/page_mm.h +++ b/arch/m68k/include/asm/page_mm.h @@ -126,25 +126,7 @@ static inline void *__va(unsigned long x) extern int m68k_virt_to_node_shift; -#ifndef CONFIG_DISCONTIGMEM #define __virt_to_node(addr) (&pg_data_map[0]) -#else -extern struct pglist_data *pg_data_table[]; - -static inline __attribute_const__ int __virt_to_node_shift(void) -{ - int shift; - - asm ( - "1: moveq #0,%0\n" - m68k_fixup(%c1, 1b) - : "=d" (shift) - : "i" (m68k_fixup_vnode_shift)); - return shift; -} - -#define __virt_to_node(addr) (pg_data_table[(unsigned long)(addr) >> __virt_to_node_shift()]) -#endif #define virt_to_page(addr) ({ \ pfn_to_page(virt_to_pfn(addr)); \ @@ -153,23 +135,8 @@ static inline __attribute_const__ int __virt_to_node_shift(void) pfn_to_virt(page_to_pfn(page)); \ }) -#ifdef CONFIG_DISCONTIGMEM -#define pfn_to_page(pfn) ({ \ - unsigned long __pfn = (pfn); \ - struct pglist_data *pgdat; \ - pgdat = __virt_to_node((unsigned long)pfn_to_virt(__pfn)); \ - pgdat->node_mem_map + (__pfn - pgdat->node_start_pfn); \ -}) -#define page_to_pfn(_page) ({ \ - const struct page *__p = (_page); \ - struct pglist_data *pgdat; \ - pgdat = &pg_data_map[page_to_nid(__p)]; \ - ((__p) - pgdat->node_mem_map) + pgdat->node_start_pfn; \ -}) -#else #define ARCH_PFN_OFFSET (m68k_memory[0].addr >> PAGE_SHIFT) #include <asm-generic/memory_model.h> -#endif #define virt_addr_valid(kaddr) ((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory) #define pfn_valid(pfn) virt_addr_valid(pfn_to_virt(pfn)) diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c index 1759ab875d47..5d749e188246 100644 --- a/arch/m68k/mm/init.c +++ b/arch/m68k/mm/init.c @@ -44,28 +44,8 @@ EXPORT_SYMBOL(empty_zero_page); int m68k_virt_to_node_shift; -#ifdef CONFIG_DISCONTIGMEM -pg_data_t pg_data_map[MAX_NUMNODES]; -EXPORT_SYMBOL(pg_data_map); - -pg_data_t *pg_data_table[65]; -EXPORT_SYMBOL(pg_data_table); -#endif - void __init m68k_setup_node(int node) { -#ifdef CONFIG_DISCONTIGMEM - struct m68k_mem_info *info = m68k_memory + node; - int i, end; - - i = (unsigned long)phys_to_virt(info->addr) >> __virt_to_node_shift(); - end = (unsigned long)phys_to_virt(info->addr + info->size - 1) >> __virt_to_node_shift(); - for (; i <= end; i++) { - if (pg_data_table[i]) - pr_warn("overlap at %u for chunk %u\n", i, node); - pg_data_table[i] = pg_data_map + node; - } -#endif node_set_online(node); }