Commit f7b01bb0 authored by Mathieu Desnoyers's avatar Mathieu Desnoyers Committed by Peter Zijlstra

rseq: Extend struct rseq with per-memory-map concurrency ID

If a memory map has fewer threads than there are cores on the system, or
is limited to run on few cores concurrently through sched affinity or
cgroup cpusets, the concurrency IDs will be values close to 0, thus
allowing efficient use of user-space memory for per-cpu data structures.
Signed-off-by: default avatarMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20221122203932.231377-9-mathieu.desnoyers@efficios.com
parent af7f588d
...@@ -139,6 +139,15 @@ struct rseq { ...@@ -139,6 +139,15 @@ struct rseq {
*/ */
__u32 node_id; __u32 node_id;
/*
* Restartable sequences mm_cid field. Updated by the kernel. Read by
* user-space with single-copy atomicity semantics. This field should
* only be read by the thread which registered this data structure.
* Aligned on 32-bit. Contains the current thread's concurrency ID
* (allocated uniquely within a memory map).
*/
__u32 mm_cid;
/* /*
* Flexible array member at end of structure, after last feature field. * Flexible array member at end of structure, after last feature field.
*/ */
......
...@@ -90,12 +90,15 @@ static int rseq_update_cpu_node_id(struct task_struct *t) ...@@ -90,12 +90,15 @@ static int rseq_update_cpu_node_id(struct task_struct *t)
struct rseq __user *rseq = t->rseq; struct rseq __user *rseq = t->rseq;
u32 cpu_id = raw_smp_processor_id(); u32 cpu_id = raw_smp_processor_id();
u32 node_id = cpu_to_node(cpu_id); u32 node_id = cpu_to_node(cpu_id);
u32 mm_cid = task_mm_cid(t);
WARN_ON_ONCE((int) mm_cid < 0);
if (!user_write_access_begin(rseq, t->rseq_len)) if (!user_write_access_begin(rseq, t->rseq_len))
goto efault; goto efault;
unsafe_put_user(cpu_id, &rseq->cpu_id_start, efault_end); unsafe_put_user(cpu_id, &rseq->cpu_id_start, efault_end);
unsafe_put_user(cpu_id, &rseq->cpu_id, efault_end); unsafe_put_user(cpu_id, &rseq->cpu_id, efault_end);
unsafe_put_user(node_id, &rseq->node_id, efault_end); unsafe_put_user(node_id, &rseq->node_id, efault_end);
unsafe_put_user(mm_cid, &rseq->mm_cid, efault_end);
/* /*
* Additional feature fields added after ORIG_RSEQ_SIZE * Additional feature fields added after ORIG_RSEQ_SIZE
* need to be conditionally updated only if * need to be conditionally updated only if
...@@ -113,7 +116,8 @@ static int rseq_update_cpu_node_id(struct task_struct *t) ...@@ -113,7 +116,8 @@ static int rseq_update_cpu_node_id(struct task_struct *t)
static int rseq_reset_rseq_cpu_node_id(struct task_struct *t) static int rseq_reset_rseq_cpu_node_id(struct task_struct *t)
{ {
u32 cpu_id_start = 0, cpu_id = RSEQ_CPU_ID_UNINITIALIZED, node_id = 0; u32 cpu_id_start = 0, cpu_id = RSEQ_CPU_ID_UNINITIALIZED, node_id = 0,
mm_cid = 0;
/* /*
* Reset cpu_id_start to its initial state (0). * Reset cpu_id_start to its initial state (0).
...@@ -132,6 +136,11 @@ static int rseq_reset_rseq_cpu_node_id(struct task_struct *t) ...@@ -132,6 +136,11 @@ static int rseq_reset_rseq_cpu_node_id(struct task_struct *t)
*/ */
if (put_user(node_id, &t->rseq->node_id)) if (put_user(node_id, &t->rseq->node_id))
return -EFAULT; return -EFAULT;
/*
* Reset mm_cid to its initial state (0).
*/
if (put_user(mm_cid, &t->rseq->mm_cid))
return -EFAULT;
/* /*
* Additional feature fields added after ORIG_RSEQ_SIZE * Additional feature fields added after ORIG_RSEQ_SIZE
* need to be conditionally reset only if * need to be conditionally reset only if
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment