| Message ID | 20241025093944.485691531@infradead.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | futex: The remaining futex2 bits | expand |
On Fri, 25 Oct 2024, Peter Zijlstra wrote:\n > static int __init futex_init(void) > { >- unsigned int futex_shift; >- unsigned long i; >+ unsigned int order, n; >+ unsigned long size, i; > > #ifdef CONFIG_BASE_SMALL > futex_hashsize = 16; > #else >- futex_hashsize = roundup_pow_of_two(256 * num_possible_cpus()); >+ futex_hashsize = 256 * num_possible_cpus(); >+ futex_hashsize /= num_possible_nodes(); >+ futex_hashsize = roundup_pow_of_two(futex_hashsize); > #endif >+ futex_hashshift = ilog2(futex_hashsize); >+ size = sizeof(struct futex_hash_bucket) * futex_hashsize; >+ order = get_order(size); >+ >+ for_each_node(n) { Probably want to skip nodes that don't have CPUs, those will never have the remote for .node value.
On Fri, 25 Oct 2024, Peter Zijlstra wrote: > Extend the futex2 interface to be numa aware. > > When FUTEX2_NUMA is specified for a futex, the user value is extended > to two words (of the same size). The first is the user value we all > know, the second one will be the node to place this futex on. > > struct futex_numa_32 { > u32 val; > u32 node; > }; > > When node is set to ~0, WAIT will set it to the current node_id such > that WAKE knows where to find it. If userspace corrupts the node value > between WAIT and WAKE, the futex will not be found and no wakeup will > happen. > > When FUTEX2_NUMA is not set, the node is simply an extention of the > hash, such that traditional futexes are still interleaved over the > nodes. Would it be possible to follow the NUMA memory policy set up for a task when making these decisions? We may not need a separate FUTEX2_NUMA option. There are supportive functions in mm/mempolicy.c that will yield a node for the futex logic to use. See f.e. linux/include/uapi/mempolicy.h for the types of memory policy that can be set for a task in current->mempolicy. MPOL_DEFAULT get local memory / use system default policy MPOL_INTERLEAVE interleaved over nodes MPOL_BIND use the node specified in the task policy. MPOL_LOCAL get_local_memory etc. You will get a page or objects with the correct node by calling alloc_pages() or kmalloc without GFP_THISNODE. If you just need the node to use then use mempolicy_slab_node() and assign that to the node of the futex. The function will determine which node to use depending on the active memory policy.
Hey Peter, Em 25/10/2024 06:03, Peter Zijlstra escreveu: > Extend the futex2 interface to be numa aware. > > When FUTEX2_NUMA is specified for a futex, the user value is extended > to two words (of the same size). The first is the user value we all > know, the second one will be the node to place this futex on. > > struct futex_numa_32 { > u32 val; > u32 node; > }; > Maybe this should live at include/uapi/linux/futex.h. > When node is set to ~0, WAIT will set it to the current node_id such > that WAKE knows where to find it. If userspace corrupts the node value > between WAIT and WAKE, the futex will not be found and no wakeup will > happen. > > When FUTEX2_NUMA is not set, the node is simply an extention of the > hash, such that traditional futexes are still interleaved over the > nodes. > > This is done to avoid having to have a separate !numa hash-table. > > Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Do you think some of those changes should be guarded with #ifdef CONFIG_NUMA? Or is fine as it is? I see that most of NUMA_ values defines to 1 anyway on !numa, but maybe the futex_init() and futex_hash() would be a bit more simplified. [...] > > +static int futex_get_value(u32 *val, u32 __user *from, unsigned int flags) > +{ > + switch (futex_size(flags)) { > + case 1: return __get_user(*val, (u8 __user *)from); > + case 2: return __get_user(*val, (u16 __user *)from); > + case 4: return __get_user(*val, (u32 __user *)from); > + default: BUG(); > + } > +} > + > +static int futex_put_value(u32 val, u32 __user *to, unsigned int flags) > +{ > + switch (futex_size(flags)) { > + case 1: return __put_user(val, (u8 __user *)to); > + case 2: return __put_user(val, (u16 __user *)to); > + case 4: return __put_user(val, (u32 __user *)to); > + default: BUG(); > + } > +} > + I found a bit confusing that this is here, shouldn't be at [PATCH 4/6] futex: Enable FUTEX2_{8,16}?
On Fri, 25 Oct 2024, Christoph Lameter (Ampere) wrote:\n >Would it be possible to follow the NUMA memory policy set up for a task >when making these decisions? We may not need a separate FUTEX2_NUMA >option. There are supportive functions in mm/mempolicy.c that will yield >a node for the futex logic to use. With numa-awareness, when would lookups ever want to be anywhere but local? mempolicy is about allocations, futexes are not that.
On Fri, Oct 25, 2024 at 11:30:26AM -0700, Davidlohr Bueso wrote: > On Fri, 25 Oct 2024, Peter Zijlstra wrote:\n > > > static int __init futex_init(void) > > { > > - unsigned int futex_shift; > > - unsigned long i; > > + unsigned int order, n; > > + unsigned long size, i; > > > > #ifdef CONFIG_BASE_SMALL > > futex_hashsize = 16; > > #else > > - futex_hashsize = roundup_pow_of_two(256 * num_possible_cpus()); > > + futex_hashsize = 256 * num_possible_cpus(); > > + futex_hashsize /= num_possible_nodes(); > > + futex_hashsize = roundup_pow_of_two(futex_hashsize); > > #endif > > + futex_hashshift = ilog2(futex_hashsize); > > + size = sizeof(struct futex_hash_bucket) * futex_hashsize; > > + order = get_order(size); > > + > > + for_each_node(n) { > > Probably want to skip nodes that don't have CPUs, those will never > have the remote for .node value. What if the CPU-less node is placed equidistant between two (or more) regular nodes and it is the best location for a futex that is spanning those nodes? That is to say, just because it doesn't have CPUs, doesn't mean it is never the right node. Hmm?
On Fri, Oct 25, 2024 at 12:28:54PM -0700, Christoph Lameter (Ampere) wrote: > On Fri, 25 Oct 2024, Peter Zijlstra wrote: > > > Extend the futex2 interface to be numa aware. > > > > When FUTEX2_NUMA is specified for a futex, the user value is extended > > to two words (of the same size). The first is the user value we all > > know, the second one will be the node to place this futex on. > > > > struct futex_numa_32 { > > u32 val; > > u32 node; > > }; > > > > When node is set to ~0, WAIT will set it to the current node_id such > > that WAKE knows where to find it. If userspace corrupts the node value > > between WAIT and WAKE, the futex will not be found and no wakeup will > > happen. > > > > When FUTEX2_NUMA is not set, the node is simply an extention of the > > hash, such that traditional futexes are still interleaved over the > > nodes. > > > Would it be possible to follow the NUMA memory policy set up for a task > when making these decisions? We may not need a separate FUTEX2_NUMA > option. There are supportive functions in mm/mempolicy.c that will yield > a node for the futex logic to use. Using get_task_policy() seems very dangerous to me. It is explicitly possible for different tasks in a process to have different policies, which means (private) futexes would fail to work correctly. We need something that is process wide consistent -- like the vma policies. Except at current, those are to expensive to readily access.
On Sun, 27 Oct 2024, Davidlohr Bueso wrote: > On Fri, 25 Oct 2024, Christoph Lameter (Ampere) wrote:\n > > > Would it be possible to follow the NUMA memory policy set up for a task > > when making these decisions? We may not need a separate FUTEX2_NUMA > > option. There are supportive functions in mm/mempolicy.c that will yield > > a node for the futex logic to use. > > With numa-awareness, when would lookups ever want to be anywhere but > local? mempolicy is about allocations, futexes are not that. futexes use kernel metadata right? Those allocations are controlled by the tasks memory policy.
On Mon, 28 Oct 2024, Peter Zijlstra wrote: > Using get_task_policy() seems very dangerous to me. It is explicitly > possible for different tasks in a process to have different policies, > which means (private) futexes would fail to work correctly. > > We need something that is process wide consistent -- like the vma > policies. Except at current, those are to expensive to readily access. The vma policies are bound to addresses that in turn yields address space wide validity. However, different threads may run on processes on different nodes and therefore having different numa nodes close to them etc.
--- a/include/linux/futex.h +++ b/include/linux/futex.h @@ -34,6 +34,7 @@ union futex_key { u64 i_seq; unsigned long pgoff; unsigned int offset; + /* unsigned int node; */ } shared; struct { union { @@ -42,11 +43,13 @@ union futex_key { }; unsigned long address; unsigned int offset; + /* unsigned int node; */ } private; struct { u64 ptr; unsigned long word; unsigned int offset; + unsigned int node; /* NOT hashed! */ } both; }; --- a/include/uapi/linux/futex.h +++ b/include/uapi/linux/futex.h @@ -74,6 +74,14 @@ /* do not use */ #define FUTEX_32 FUTEX2_SIZE_U32 /* historical accident :-( */ + +/* + * When FUTEX2_NUMA doubles the futex word, the second word is a node value. + * The special value -1 indicates no-node. This is the same value as + * NUMA_NO_NODE, except that value is not ABI, this is. + */ +#define FUTEX_NO_NODE (-1) + /* * Max numbers of elements in a futex_waitv array */ --- a/kernel/futex/core.c +++ b/kernel/futex/core.c @@ -36,7 +36,8 @@ #include <linux/pagemap.h> #include <linux/debugfs.h> #include <linux/plist.h> -#include <linux/memblock.h> +#include <linux/gfp.h> +#include <linux/vmalloc.h> #include <linux/fault-inject.h> #include <linux/slab.h> @@ -49,12 +50,14 @@ * reside in the same cacheline. */ static struct { - struct futex_hash_bucket *queues; unsigned long hashsize; + unsigned int hashshift; + struct futex_hash_bucket *queues[MAX_NUMNODES]; } __futex_data __read_mostly __aligned(2*sizeof(long)); -#define futex_queues (__futex_data.queues) -#define futex_hashsize (__futex_data.hashsize) +#define futex_hashsize (__futex_data.hashsize) +#define futex_hashshift (__futex_data.hashshift) +#define futex_queues (__futex_data.queues) /* * Fault injections for futexes. @@ -107,6 +110,26 @@ late_initcall(fail_futex_debugfs); #endif /* CONFIG_FAIL_FUTEX */ +static int futex_get_value(u32 *val, u32 __user *from, unsigned int flags) +{ + switch (futex_size(flags)) { + case 1: return __get_user(*val, (u8 __user *)from); + case 2: return __get_user(*val, (u16 __user *)from); + case 4: return __get_user(*val, (u32 __user *)from); + default: BUG(); + } +} + +static int futex_put_value(u32 val, u32 __user *to, unsigned int flags) +{ + switch (futex_size(flags)) { + case 1: return __put_user(val, (u8 __user *)to); + case 2: return __put_user(val, (u16 __user *)to); + case 4: return __put_user(val, (u32 __user *)to); + default: BUG(); + } +} + /** * futex_hash - Return the hash bucket in the global hash * @key: Pointer to the futex key for which the hash is calculated @@ -116,10 +139,29 @@ late_initcall(fail_futex_debugfs); */ struct futex_hash_bucket *futex_hash(union futex_key *key) { - u32 hash = jhash2((u32 *)key, offsetof(typeof(*key), both.offset) / 4, + u32 hash = jhash2((u32 *)key, + offsetof(typeof(*key), both.offset) / sizeof(u32), key->both.offset); + int node = key->both.node; - return &futex_queues[hash & (futex_hashsize - 1)]; + if (node == FUTEX_NO_NODE) { + /* + * In case of !FLAGS_NUMA, use some unused hash bits to pick a + * node -- this ensures regular futexes are interleaved across + * the nodes and avoids having to allocate multiple + * hash-tables. + * + * NOTE: this isn't perfectly uniform, but it is fast and + * handles sparse node masks. + */ + node = (hash >> futex_hashshift) % nr_node_ids; + if (!node_possible(node)) { + node = find_next_bit_wrap(node_possible_map.bits, + nr_node_ids, node); + } + } + + return &futex_queues[node][hash & (futex_hashsize - 1)]; } @@ -219,7 +261,7 @@ static u64 get_inode_sequence_number(str * * lock_page() might sleep, the caller should not hold a spinlock. */ -int get_futex_key(u32 __user *uaddr, unsigned int flags, union futex_key *key, +int get_futex_key(void __user *uaddr, unsigned int flags, union futex_key *key, enum futex_access rw) { unsigned long address = (unsigned long)uaddr; @@ -227,25 +269,49 @@ int get_futex_key(u32 __user *uaddr, uns struct page *page; struct folio *folio; struct address_space *mapping; - int err, ro = 0; + int node, err, size, ro = 0; bool fshared; fshared = flags & FLAGS_SHARED; + size = futex_size(flags); + if (flags & FLAGS_NUMA) + size *= 2; /* * The futex address must be "naturally" aligned. */ key->both.offset = address % PAGE_SIZE; - if (unlikely((address % sizeof(u32)) != 0)) + if (unlikely((address % size) != 0)) return -EINVAL; address -= key->both.offset; - if (unlikely(!access_ok(uaddr, sizeof(u32)))) + if (unlikely(!access_ok(uaddr, size))) return -EFAULT; if (unlikely(should_fail_futex(fshared))) return -EFAULT; + if (flags & FLAGS_NUMA) { + void __user *naddr = uaddr + size / 2; + + if (futex_get_value(&node, naddr, flags)) + return -EFAULT; + + if (node == FUTEX_NO_NODE) { + node = numa_node_id(); + if (futex_put_value(node, naddr, flags)) + return -EFAULT; + + } else if (node >= MAX_NUMNODES || !node_possible(node)) { + return -EINVAL; + } + + key->both.node = node; + + } else { + key->both.node = FUTEX_NO_NODE; + } + /* * PROCESS_PRIVATE futexes are fast. * As the mm cannot disappear under us and the 'key' only needs @@ -1148,26 +1214,42 @@ void futex_exit_release(struct task_stru static int __init futex_init(void) { - unsigned int futex_shift; - unsigned long i; + unsigned int order, n; + unsigned long size, i; #ifdef CONFIG_BASE_SMALL futex_hashsize = 16; #else - futex_hashsize = roundup_pow_of_two(256 * num_possible_cpus()); + futex_hashsize = 256 * num_possible_cpus(); + futex_hashsize /= num_possible_nodes(); + futex_hashsize = roundup_pow_of_two(futex_hashsize); #endif + futex_hashshift = ilog2(futex_hashsize); + size = sizeof(struct futex_hash_bucket) * futex_hashsize; + order = get_order(size); + + for_each_node(n) { + struct futex_hash_bucket *table; + + if (order > MAX_ORDER) + table = vmalloc_huge_node(size, GFP_KERNEL, n); + else + table = alloc_pages_exact_nid(n, size, GFP_KERNEL); + + BUG_ON(!table); + + for (i = 0; i < futex_hashsize; i++) { + atomic_set(&table[i].waiters, 0); + spin_lock_init(&table[i].lock); + plist_head_init(&table[i].chain); + } - futex_queues = alloc_large_system_hash("futex", sizeof(*futex_queues), - futex_hashsize, 0, 0, - &futex_shift, NULL, - futex_hashsize, futex_hashsize); - futex_hashsize = 1UL << futex_shift; - - for (i = 0; i < futex_hashsize; i++) { - atomic_set(&futex_queues[i].waiters, 0); - plist_head_init(&futex_queues[i].chain); - spin_lock_init(&futex_queues[i].lock); + futex_queues[n] = table; } + pr_info("futex hash table, %d nodes, %ld entries (order: %d, %lu bytes)\n", + num_possible_nodes(), + futex_hashsize, order, + sizeof(struct futex_hash_bucket) * futex_hashsize); return 0; } --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -52,7 +52,7 @@ static inline unsigned int futex_to_flag return flags; } -#define FUTEX2_VALID_MASK (FUTEX2_SIZE_MASK | FUTEX2_PRIVATE) +#define FUTEX2_VALID_MASK (FUTEX2_SIZE_MASK | FUTEX2_NUMA | FUTEX2_PRIVATE) /* FUTEX2_ to FLAGS_ */ static inline unsigned int futex2_to_flags(unsigned int flags2) @@ -85,6 +85,19 @@ static inline bool futex_flags_valid(uns if ((flags & FLAGS_SIZE_MASK) != FLAGS_SIZE_32) return false; + /* + * Must be able to represent both FUTEX_NO_NODE and every valid nodeid + * in a futex word. + */ + if (flags & FLAGS_NUMA) { + int bits = 8 * futex_size(flags); + u64 max = ~0ULL; + + max >>= 64 - bits; + if (nr_node_ids >= max) + return false; + } + return true; } @@ -193,7 +206,7 @@ enum futex_access { FUTEX_WRITE }; -extern int get_futex_key(u32 __user *uaddr, unsigned int flags, union futex_key *key, +extern int get_futex_key(void __user *uaddr, unsigned int flags, union futex_key *key, enum futex_access rw); extern struct hrtimer_sleeper *
Extend the futex2 interface to be numa aware. When FUTEX2_NUMA is specified for a futex, the user value is extended to two words (of the same size). The first is the user value we all know, the second one will be the node to place this futex on. struct futex_numa_32 { u32 val; u32 node; }; When node is set to ~0, WAIT will set it to the current node_id such that WAKE knows where to find it. If userspace corrupts the node value between WAIT and WAKE, the futex will not be found and no wakeup will happen. When FUTEX2_NUMA is not set, the node is simply an extention of the hash, such that traditional futexes are still interleaved over the nodes. This is done to avoid having to have a separate !numa hash-table. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> --- include/linux/futex.h | 3 + include/uapi/linux/futex.h | 8 ++ kernel/futex/core.c | 128 ++++++++++++++++++++++++++++++++++++--------- kernel/futex/futex.h | 17 +++++ 4 files changed, 131 insertions(+), 25 deletions(-)