Skip to content

Commit 97e047f

Browse files
Yongliang Gaorostedt
authored andcommitted
trace/pid_list: optimize pid_list->lock contention
When the system has many cores and task switching is frequent, setting set_ftrace_pid can cause frequent pid_list->lock contention and high system sys usage. For example, in a 288-core VM environment, we observed 267 CPUs experiencing contention on pid_list->lock, with stack traces showing: #4 [ffffa6226fb4bc70] native_queued_spin_lock_slowpath at ffffffff99cd4b7e #5 [ffffa6226fb4bc90] _raw_spin_lock_irqsave at ffffffff99cd3e36 #6 [ffffa6226fb4bca0] trace_pid_list_is_set at ffffffff99267554 #7 [ffffa6226fb4bcc0] trace_ignore_this_task at ffffffff9925c288 #8 [ffffa6226fb4bcd8] ftrace_filter_pid_sched_switch_probe at ffffffff99246efe #9 [ffffa6226fb4bcf0] __schedule at ffffffff99ccd161 Replaces the existing spinlock with a seqlock to allow concurrent readers, while maintaining write exclusivity. Link: https://patch.msgid.link/[email protected] Reviewed-by: Huang Cun <[email protected]> Signed-off-by: Yongliang Gao <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent e29aa91 commit 97e047f

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

kernel/trace/pid_list.c

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright (C) 2021 VMware Inc, Steven Rostedt <[email protected]>
44
*/
55
#include <linux/spinlock.h>
6+
#include <linux/seqlock.h>
67
#include <linux/irq_work.h>
78
#include <linux/slab.h>
89
#include "trace.h"
@@ -126,7 +127,7 @@ bool trace_pid_list_is_set(struct trace_pid_list *pid_list, unsigned int pid)
126127
{
127128
union upper_chunk *upper_chunk;
128129
union lower_chunk *lower_chunk;
129-
unsigned long flags;
130+
unsigned int seq;
130131
unsigned int upper1;
131132
unsigned int upper2;
132133
unsigned int lower;
@@ -138,14 +139,16 @@ bool trace_pid_list_is_set(struct trace_pid_list *pid_list, unsigned int pid)
138139
if (pid_split(pid, &upper1, &upper2, &lower) < 0)
139140
return false;
140141

141-
raw_spin_lock_irqsave(&pid_list->lock, flags);
142-
upper_chunk = pid_list->upper[upper1];
143-
if (upper_chunk) {
144-
lower_chunk = upper_chunk->data[upper2];
145-
if (lower_chunk)
146-
ret = test_bit(lower, lower_chunk->data);
147-
}
148-
raw_spin_unlock_irqrestore(&pid_list->lock, flags);
142+
do {
143+
seq = read_seqcount_begin(&pid_list->seqcount);
144+
ret = false;
145+
upper_chunk = pid_list->upper[upper1];
146+
if (upper_chunk) {
147+
lower_chunk = upper_chunk->data[upper2];
148+
if (lower_chunk)
149+
ret = test_bit(lower, lower_chunk->data);
150+
}
151+
} while (read_seqcount_retry(&pid_list->seqcount, seq));
149152

150153
return ret;
151154
}
@@ -178,6 +181,7 @@ int trace_pid_list_set(struct trace_pid_list *pid_list, unsigned int pid)
178181
return -EINVAL;
179182

180183
raw_spin_lock_irqsave(&pid_list->lock, flags);
184+
write_seqcount_begin(&pid_list->seqcount);
181185
upper_chunk = pid_list->upper[upper1];
182186
if (!upper_chunk) {
183187
upper_chunk = get_upper_chunk(pid_list);
@@ -199,6 +203,7 @@ int trace_pid_list_set(struct trace_pid_list *pid_list, unsigned int pid)
199203
set_bit(lower, lower_chunk->data);
200204
ret = 0;
201205
out:
206+
write_seqcount_end(&pid_list->seqcount);
202207
raw_spin_unlock_irqrestore(&pid_list->lock, flags);
203208
return ret;
204209
}
@@ -230,6 +235,7 @@ int trace_pid_list_clear(struct trace_pid_list *pid_list, unsigned int pid)
230235
return -EINVAL;
231236

232237
raw_spin_lock_irqsave(&pid_list->lock, flags);
238+
write_seqcount_begin(&pid_list->seqcount);
233239
upper_chunk = pid_list->upper[upper1];
234240
if (!upper_chunk)
235241
goto out;
@@ -250,6 +256,7 @@ int trace_pid_list_clear(struct trace_pid_list *pid_list, unsigned int pid)
250256
}
251257
}
252258
out:
259+
write_seqcount_end(&pid_list->seqcount);
253260
raw_spin_unlock_irqrestore(&pid_list->lock, flags);
254261
return 0;
255262
}
@@ -340,8 +347,10 @@ static void pid_list_refill_irq(struct irq_work *iwork)
340347

341348
again:
342349
raw_spin_lock(&pid_list->lock);
350+
write_seqcount_begin(&pid_list->seqcount);
343351
upper_count = CHUNK_ALLOC - pid_list->free_upper_chunks;
344352
lower_count = CHUNK_ALLOC - pid_list->free_lower_chunks;
353+
write_seqcount_end(&pid_list->seqcount);
345354
raw_spin_unlock(&pid_list->lock);
346355

347356
if (upper_count <= 0 && lower_count <= 0)
@@ -370,6 +379,7 @@ static void pid_list_refill_irq(struct irq_work *iwork)
370379
}
371380

372381
raw_spin_lock(&pid_list->lock);
382+
write_seqcount_begin(&pid_list->seqcount);
373383
if (upper) {
374384
*upper_next = pid_list->upper_list;
375385
pid_list->upper_list = upper;
@@ -380,6 +390,7 @@ static void pid_list_refill_irq(struct irq_work *iwork)
380390
pid_list->lower_list = lower;
381391
pid_list->free_lower_chunks += lcnt;
382392
}
393+
write_seqcount_end(&pid_list->seqcount);
383394
raw_spin_unlock(&pid_list->lock);
384395

385396
/*
@@ -419,6 +430,7 @@ struct trace_pid_list *trace_pid_list_alloc(void)
419430
init_irq_work(&pid_list->refill_irqwork, pid_list_refill_irq);
420431

421432
raw_spin_lock_init(&pid_list->lock);
433+
seqcount_raw_spinlock_init(&pid_list->seqcount, &pid_list->lock);
422434

423435
for (i = 0; i < CHUNK_ALLOC; i++) {
424436
union upper_chunk *chunk;

kernel/trace/pid_list.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ union upper_chunk {
7676
};
7777

7878
struct trace_pid_list {
79+
seqcount_raw_spinlock_t seqcount;
7980
raw_spinlock_t lock;
8081
struct irq_work refill_irqwork;
8182
union upper_chunk *upper[UPPER1_SIZE]; // 1 or 2K in size

0 commit comments

Comments
 (0)