Commit fdb7d9b7 authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

alpha: remove DISCONTIGMEM and NUMA 

Patch series "Remove DISCONTIGMEM memory model", v3.

SPARSEMEM memory model was supposed to entirely replace DISCONTIGMEM a
(long) while ago.  The last architectures that used DISCONTIGMEM were
updated to use other memory models in v5.11 and it is about the time to
entirely remove DISCONTIGMEM from the kernel.

This set removes DISCONTIGMEM from alpha, arc and m68k, simplifies memory
model selection in mm/Kconfig and replaces usage of redundant
CONFIG_NEED_MULTIPLE_NODES and CONFIG_FLAT_NODE_MEM_MAP with CONFIG_NUMA
and CONFIG_FLATMEM respectively.

I've also removed NUMA support on alpha that was BROKEN for more than 15
years.

There were also minor updates all over arch/ to remove mentions of
DISCONTIGMEM in comments and #ifdefs.

This patch (of 9):

NUMA is marked broken on alpha for more than 15 years and DISCONTIGMEM was
replaced with SPARSEMEM in v5.11.

Remove both NUMA and DISCONTIGMEM support from alpha.

Link: https://lkml.kernel.org/r/20210608091316.3622-1-rppt@kernel.org
Link: https://lkml.kernel.org/r/20210608091316.3622-2-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 21d02f8f

arch/alpha/Kconfig

+0 −22
Original line number Diff line number Diff line
@@ -549,29 +549,12 @@ config NR_CPUS 
	  MARVEL support can handle a maximum of 32 CPUs, all the others

	  with working support have a maximum of 4 CPUs.



config ARCH_DISCONTIGMEM_ENABLE

	bool "Discontiguous Memory Support"

	depends on BROKEN

	help

	  Say Y to support efficient handling of discontiguous physical memory,

	  for architectures which are either NUMA (Non-Uniform Memory Access)

	  or have huge holes in the physical address space for other reasons.

	  See <file:Documentation/vm/numa.rst> for more.



config ARCH_SPARSEMEM_ENABLE

	bool "Sparse Memory Support"

	help

	  Say Y to support efficient handling of discontiguous physical memory,

	  for systems that have huge holes in the physical address space.



config NUMA

	bool "NUMA Support (EXPERIMENTAL)"

	depends on DISCONTIGMEM && BROKEN

	help

	  Say Y to compile the kernel to support NUMA (Non-Uniform Memory

	  Access).  This option is for configuring high-end multiprocessor

	  server machines.  If in doubt, say N.



config ALPHA_WTINT

	bool "Use WTINT" if ALPHA_SRM || ALPHA_GENERIC

	default y if ALPHA_QEMU
@@ -596,11 +579,6 @@ config ALPHA_WTINT 


	  If unsure, say N.



config NODES_SHIFT

	int

	default "7"

	depends on NEED_MULTIPLE_NODES



# LARGE_VMALLOC is racy, if you *really* need it then fix it first

config ALPHA_LARGE_VMALLOC

	bool

arch/alpha/include/asm/machvec.h

+0 −6
Original line number Diff line number Diff line
@@ -99,12 +99,6 @@ struct alpha_machine_vector 


	const char *vector_name;



	/* NUMA information */

	int (*pa_to_nid)(unsigned long);

	int (*cpuid_to_nid)(int);

	unsigned long (*node_mem_start)(int);

	unsigned long (*node_mem_size)(int);



	/* System specific parameters.  */

	union {

	    struct {

arch/alpha/include/asm/mmzone.h

deleted100644 → 0
+0 −100
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Written by Kanoj Sarcar (kanoj@sgi.com) Aug 99

 * Adapted for the alpha wildfire architecture Jan 2001.

 */

#ifndef _ASM_MMZONE_H_

#define _ASM_MMZONE_H_



#ifdef CONFIG_DISCONTIGMEM



#include <asm/smp.h>



/*

 * Following are macros that are specific to this numa platform.

 */



extern pg_data_t node_data[];



#define alpha_pa_to_nid(pa)		\

        (alpha_mv.pa_to_nid 		\

	 ? alpha_mv.pa_to_nid(pa)	\

	 : (0))

#define node_mem_start(nid)		\

        (alpha_mv.node_mem_start 	\

	 ? alpha_mv.node_mem_start(nid) \

	 : (0UL))

#define node_mem_size(nid)		\

        (alpha_mv.node_mem_size 	\

	 ? alpha_mv.node_mem_size(nid) 	\

	 : ((nid) ? (0UL) : (~0UL)))



#define pa_to_nid(pa)		alpha_pa_to_nid(pa)

#define NODE_DATA(nid)		(&node_data[(nid)])



#define node_localnr(pfn, nid)	((pfn) - NODE_DATA(nid)->node_start_pfn)



#if 1

#define PLAT_NODE_DATA_LOCALNR(p, n)	\

	(((p) >> PAGE_SHIFT) - PLAT_NODE_DATA(n)->gendata.node_start_pfn)

#else

static inline unsigned long

PLAT_NODE_DATA_LOCALNR(unsigned long p, int n)

{

	unsigned long temp;

	temp = p >> PAGE_SHIFT;

	return temp - PLAT_NODE_DATA(n)->gendata.node_start_pfn;

}

#endif



/*

 * Following are macros that each numa implementation must define.

 */



/*

 * Given a kernel address, find the home node of the underlying memory.

 */

#define kvaddr_to_nid(kaddr)	pa_to_nid(__pa(kaddr))



/*

 * Given a kaddr, LOCAL_BASE_ADDR finds the owning node of the memory

 * and returns the kaddr corresponding to first physical page in the

 * node's mem_map.

 */

#define LOCAL_BASE_ADDR(kaddr)						  \

    ((unsigned long)__va(NODE_DATA(kvaddr_to_nid(kaddr))->node_start_pfn  \

			 << PAGE_SHIFT))



/* XXX: FIXME -- nyc */

#define kern_addr_valid(kaddr)	(0)



#define mk_pte(page, pgprot)						     \

({								 	     \

	pte_t pte;                                                           \

	unsigned long pfn;                                                   \

									     \

	pfn = page_to_pfn(page) << 32; \

	pte_val(pte) = pfn | pgprot_val(pgprot);			     \

									     \

	pte;								     \

})



#define pte_page(x)							\

({									\

       	unsigned long kvirt;						\

	struct page * __xx;						\

									\

	kvirt = (unsigned long)__va(pte_val(x) >> (32-PAGE_SHIFT));	\

	__xx = virt_to_page(kvirt);					\

									\

	__xx;                                                           \

})



#define pfn_to_nid(pfn)		pa_to_nid(((u64)(pfn) << PAGE_SHIFT))

#define pfn_valid(pfn)							\

	(((pfn) - node_start_pfn(pfn_to_nid(pfn))) <			\

	 node_spanned_pages(pfn_to_nid(pfn)))					\



#endif /* CONFIG_DISCONTIGMEM */



#endif /* _ASM_MMZONE_H_ */

arch/alpha/include/asm/pgtable.h

+0 −4
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ extern unsigned long __zero_page(void); 
#define page_to_pa(page)	(page_to_pfn(page) << PAGE_SHIFT)

#define pte_pfn(pte)	(pte_val(pte) >> 32)



#ifndef CONFIG_DISCONTIGMEM

#define pte_page(pte)	pfn_to_page(pte_pfn(pte))

#define mk_pte(page, pgprot)						\

({									\
@@ -215,7 +214,6 @@ extern unsigned long __zero_page(void); 
	pte_val(pte) = (page_to_pfn(page) << 32) | pgprot_val(pgprot);	\

	pte;								\

})

#endif



extern inline pte_t pfn_pte(unsigned long physpfn, pgprot_t pgprot)

{ pte_t pte; pte_val(pte) = (PHYS_TWIDDLE(physpfn) << 32) | pgprot_val(pgprot); return pte; }
@@ -330,9 +328,7 @@ extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset) 
#define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })

#define __swp_entry_to_pte(x)	((pte_t) { (x).val })



#ifndef CONFIG_DISCONTIGMEM

#define kern_addr_valid(addr)	(1)

#endif



#define pte_ERROR(e) \

	printk("%s:%d: bad pte %016lx.\n", __FILE__, __LINE__, pte_val(e))

arch/alpha/include/asm/topology.h

+0 −39
Original line number Diff line number Diff line
@@ -7,45 +7,6 @@ 
#include <linux/numa.h>

#include <asm/machvec.h>



#ifdef CONFIG_NUMA

static inline int cpu_to_node(int cpu)

{

	int node;

	

	if (!alpha_mv.cpuid_to_nid)

		return 0;



	node = alpha_mv.cpuid_to_nid(cpu);



#ifdef DEBUG_NUMA

	BUG_ON(node < 0);

#endif



	return node;

}



extern struct cpumask node_to_cpumask_map[];

/* FIXME: This is dumb, recalculating every time.  But simple. */

static const struct cpumask *cpumask_of_node(int node)

{

	int cpu;



	if (node == NUMA_NO_NODE)

		return cpu_all_mask;



	cpumask_clear(&node_to_cpumask_map[node]);



	for_each_online_cpu(cpu) {

		if (cpu_to_node(cpu) == node)

			cpumask_set_cpu(cpu, node_to_cpumask_map[node]);

	}



	return &node_to_cpumask_map[node];

}



#define cpumask_of_pcibus(bus)	(cpu_online_mask)



#endif /* !CONFIG_NUMA */

# include <asm-generic/topology.h>



#endif /* _ASM_ALPHA_TOPOLOGY_H */