Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 09:12:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib/nodemask: inline next_node_in() and node_random()

Browse Source 
The functions are pretty thin wrappers around find_bit engine, and
keeping them in c-file prevents compiler from small_const_nbits()
optimization, which must take place for all systems with MAX_NUMNODES
less than BITS_PER_LONG (default is 16 for me).

Moving them to header file doesn't blow up the kernel size:
add/remove: 1/2 grow/shrink: 9/5 up/down: 968/-88 (880)

CC: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Michael Ellerman <mpe@ellerman.id.au>
CC: Paul Mackerras <paulus@samba.org>
CC: Rasmus Villemoes <linux@rasmusvillemoes.dk>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
CC: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Yury Norov <yury.norov@gmail.com>
This commit is contained in:
Yury Norov 2022-07-25 09:39:17 -07:00
parent 3e73120315
commit 36d4b36b69
4 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -3540,7 +3540,6 @@ F: lib/bitmap.c
F: lib/cpumask.c F: lib/cpumask.c
F: lib/find_bit.c F: lib/find_bit.c
F: lib/find_bit_benchmark.c F: lib/find_bit_benchmark.c
F: lib/nodemask.c
F: lib/test_bitmap.c F: lib/test_bitmap.c
F: tools/include/linux/bitmap.h F: tools/include/linux/bitmap.h
F: tools/include/linux/find.h F: tools/include/linux/find.h

26
include/linux/nodemask.h
View File

@ -94,6 +94,7 @@
#include <linux/bitmap.h> #include <linux/bitmap.h>
#include <linux/minmax.h> #include <linux/minmax.h>
#include <linux/numa.h> #include <linux/numa.h>
#include <linux/random.h>
typedef struct { DECLARE_BITMAP(bits, MAX_NUMNODES); } nodemask_t; typedef struct { DECLARE_BITMAP(bits, MAX_NUMNODES); } nodemask_t;
extern nodemask_t _unused_nodemask_arg_; extern nodemask_t _unused_nodemask_arg_;
@ -276,7 +277,14 @@ static inline unsigned int __next_node(int n, const nodemask_t *srcp)
* the first node in src if needed. Returns MAX_NUMNODES if src is empty. * the first node in src if needed. Returns MAX_NUMNODES if src is empty.
*/ */
#define next_node_in(n, src) __next_node_in((n), &(src)) #define next_node_in(n, src) __next_node_in((n), &(src))
unsigned int __next_node_in(int node, const nodemask_t *srcp); static inline unsigned int __next_node_in(int node, const nodemask_t *srcp)
{
unsigned int ret = __next_node(node, srcp);
if (ret == MAX_NUMNODES)
ret = __first_node(srcp);
return ret;
}
static inline void init_nodemask_of_node(nodemask_t *mask, int node) static inline void init_nodemask_of_node(nodemask_t *mask, int node)
{ {
@ -493,14 +501,20 @@ static inline int num_node_state(enum node_states state)
#endif #endif
#if defined(CONFIG_NUMA) && (MAX_NUMNODES > 1) static inline int node_random(const nodemask_t *maskp)
extern int node_random(const nodemask_t *maskp);
#else
static inline int node_random(const nodemask_t *mask)
{ {
#if defined(CONFIG_NUMA) && (MAX_NUMNODES > 1)
int w, bit = NUMA_NO_NODE;
w = nodes_weight(*maskp);
if (w)
bit = bitmap_ord_to_pos(maskp->bits,
get_random_int() % w, MAX_NUMNODES);
return bit;
#else
return 0; return 0;
}
#endif #endif
}
#define node_online_map node_states[N_ONLINE] #define node_online_map node_states[N_ONLINE]
#define node_possible_map node_states[N_POSSIBLE] #define node_possible_map node_states[N_POSSIBLE]

2
lib/Makefile
View File

@ -33,7 +33,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
flex_proportions.o ratelimit.o show_mem.o \ flex_proportions.o ratelimit.o show_mem.o \
is_single_threaded.o plist.o decompress.o kobject_uevent.o \ is_single_threaded.o plist.o decompress.o kobject_uevent.o \
earlycpio.o seq_buf.o siphash.o dec_and_lock.o \ earlycpio.o seq_buf.o siphash.o dec_and_lock.o \
nmi_backtrace.o nodemask.o win_minmax.o memcat_p.o \ nmi_backtrace.o win_minmax.o memcat_p.o \
buildid.o buildid.o
lib-$(CONFIG_PRINTK) += dump_stack.o lib-$(CONFIG_PRINTK) += dump_stack.o

8
lib/nodemask.c
View File

@ -3,14 +3,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/random.h> #include <linux/random.h>
unsigned int __next_node_in(int node, const nodemask_t *srcp)
{
unsigned int ret = __next_node(node, srcp);
if (ret == MAX_NUMNODES)
ret = __first_node(srcp);
return ret;
}
EXPORT_SYMBOL(__next_node_in); EXPORT_SYMBOL(__next_node_in);
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA