kevin/linux
1
Fork 0
Code

x86/numa: numa_{add,remove}_cpu: make cpu parameter unsigned

Browse Source 
CPU id cannot be negative.

Making it unsigned also aligns with declarations in
include/asm-generic/numa.h used by arm64 and riscv and allows sharing numa
emulation code with these architectures.

Link: https://lkml.kernel.org/r/20240807064110.1003856-17-rppt@kernel.org
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Tested-by: Zi Yan <ziy@nvidia.com> # for x86_64 and arm64
Tested-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> [arm64 + CXL via QEMU]
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: David Hildenbrand <david@redhat.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: David S. Miller <davem@davemloft.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Rafael J. Wysocki <rafael@kernel.org>
Cc: Rob Herring (Arm) <robh@kernel.org>
Cc: Samuel Holland <samuel.holland@sifive.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Mike Rapoport (Microsoft) 2024-08-07 09:41:00 +03:00 committed by Andrew Morton
parent e52d5873d1
commit 7a7152857d
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/include/asm/numa.h
View File

@ -54,20 +54,20 @@ static inline int numa_cpu_node(int cpu)
extern void numa_set_node(int cpu, int node); extern void numa_set_node(int cpu, int node);
extern void numa_clear_node(int cpu); extern void numa_clear_node(int cpu);
extern void __init init_cpu_to_node(void); extern void __init init_cpu_to_node(void);
extern void numa_add_cpu(int cpu); extern void numa_add_cpu(unsigned int cpu);
extern void numa_remove_cpu(int cpu); extern void numa_remove_cpu(unsigned int cpu);
extern void init_gi_nodes(void); extern void init_gi_nodes(void);
#else /* CONFIG_NUMA */ #else /* CONFIG_NUMA */
static inline void numa_set_node(int cpu, int node) { } static inline void numa_set_node(int cpu, int node) { }
static inline void numa_clear_node(int cpu) { } static inline void numa_clear_node(int cpu) { }
static inline void init_cpu_to_node(void) { } static inline void init_cpu_to_node(void) { }
static inline void numa_add_cpu(int cpu) { } static inline void numa_add_cpu(unsigned int cpu) { }
static inline void numa_remove_cpu(int cpu) { } static inline void numa_remove_cpu(unsigned int cpu) { }
static inline void init_gi_nodes(void) { } static inline void init_gi_nodes(void) { }
#endif /* CONFIG_NUMA */ #endif /* CONFIG_NUMA */
#ifdef CONFIG_DEBUG_PER_CPU_MAPS #ifdef CONFIG_DEBUG_PER_CPU_MAPS
void debug_cpumask_set_cpu(int cpu, int node, bool enable); void debug_cpumask_set_cpu(unsigned int cpu, int node, bool enable);
#endif #endif
#ifdef CONFIG_NUMA_EMU #ifdef CONFIG_NUMA_EMU

10
arch/x86/mm/numa.c
View File

@ -741,12 +741,12 @@ void __init init_cpu_to_node(void)
#ifndef CONFIG_DEBUG_PER_CPU_MAPS #ifndef CONFIG_DEBUG_PER_CPU_MAPS
# ifndef CONFIG_NUMA_EMU # ifndef CONFIG_NUMA_EMU
void numa_add_cpu(int cpu) void numa_add_cpu(unsigned int cpu)
{ {
cpumask_set_cpu(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]); cpumask_set_cpu(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]);
} }
void numa_remove_cpu(int cpu) void numa_remove_cpu(unsigned int cpu)
{ {
cpumask_clear_cpu(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]); cpumask_clear_cpu(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]);
} }
@ -784,7 +784,7 @@ int early_cpu_to_node(int cpu)
return per_cpu(x86_cpu_to_node_map, cpu); return per_cpu(x86_cpu_to_node_map, cpu);
} }
void debug_cpumask_set_cpu(int cpu, int node, bool enable) void debug_cpumask_set_cpu(unsigned int cpu, int node, bool enable)
{ {
struct cpumask *mask; struct cpumask *mask;
@ -816,12 +816,12 @@ static void numa_set_cpumask(int cpu, bool enable)
debug_cpumask_set_cpu(cpu, early_cpu_to_node(cpu), enable); debug_cpumask_set_cpu(cpu, early_cpu_to_node(cpu), enable);
} }
void numa_add_cpu(int cpu) void numa_add_cpu(unsigned int cpu)
{ {
numa_set_cpumask(cpu, true); numa_set_cpumask(cpu, true);
} }
void numa_remove_cpu(int cpu) void numa_remove_cpu(unsigned int cpu)
{ {
numa_set_cpumask(cpu, false); numa_set_cpumask(cpu, false);
} }

10
arch/x86/mm/numa_emulation.c
View File

@ -514,7 +514,7 @@ no_emu:
} }
#ifndef CONFIG_DEBUG_PER_CPU_MAPS #ifndef CONFIG_DEBUG_PER_CPU_MAPS
void numa_add_cpu(int cpu) void numa_add_cpu(unsigned int cpu)
{ {
int physnid, nid; int physnid, nid;
@ -532,7 +532,7 @@ void numa_add_cpu(int cpu)
cpumask_set_cpu(cpu, node_to_cpumask_map[nid]); cpumask_set_cpu(cpu, node_to_cpumask_map[nid]);
} }
void numa_remove_cpu(int cpu) void numa_remove_cpu(unsigned int cpu)
{ {
int i; int i;
@ -540,7 +540,7 @@ void numa_remove_cpu(int cpu)
cpumask_clear_cpu(cpu, node_to_cpumask_map[i]); cpumask_clear_cpu(cpu, node_to_cpumask_map[i]);
} }
#else /* !CONFIG_DEBUG_PER_CPU_MAPS */ #else /* !CONFIG_DEBUG_PER_CPU_MAPS */
static void numa_set_cpumask(int cpu, bool enable) static void numa_set_cpumask(unsigned int cpu, bool enable)
{ {
int nid, physnid; int nid, physnid;
@ -560,12 +560,12 @@ static void numa_set_cpumask(int cpu, bool enable)
} }
} }
void numa_add_cpu(int cpu) void numa_add_cpu(unsigned int cpu)
{ {
numa_set_cpumask(cpu, true); numa_set_cpumask(cpu, true);
} }
void numa_remove_cpu(int cpu) void numa_remove_cpu(unsigned int cpu)
{ {
numa_set_cpumask(cpu, false); numa_set_cpumask(cpu, false);
} }