Skip to content

Commit b3b2431

Browse files
Zqianggregkh
Zqiang
authored andcommitted
rcu-tasks: Fix access non-existent percpu rtpcp variable in rcu_tasks_need_gpcb()
[ Upstream commit fd70e9f ] For kernels built with CONFIG_FORCE_NR_CPUS=y, the nr_cpu_ids is defined as NR_CPUS instead of the number of possible cpus, this will cause the following system panic: smpboot: Allowing 4 CPUs, 0 hotplug CPUs ... setup_percpu: NR_CPUS:512 nr_cpumask_bits:512 nr_cpu_ids:512 nr_node_ids:1 ... BUG: unable to handle page fault for address: ffffffff9911c8c8 Oops: 0000 [#1] PREEMPT SMP PTI CPU: 0 PID: 15 Comm: rcu_tasks_trace Tainted: G W 6.6.21 #1 5dc7acf91a5e8e9ac9dcfc35bee0245691283ea6 RIP: 0010:rcu_tasks_need_gpcb+0x25d/0x2c0 RSP: 0018:ffffa371c00a3e60 EFLAGS: 00010082 CR2: ffffffff9911c8c8 CR3: 000000040fa20005 CR4: 00000000001706f0 Call Trace: <TASK> ? __die+0x23/0x80 ? page_fault_oops+0xa4/0x180 ? exc_page_fault+0x152/0x180 ? asm_exc_page_fault+0x26/0x40 ? rcu_tasks_need_gpcb+0x25d/0x2c0 ? __pfx_rcu_tasks_kthread+0x40/0x40 rcu_tasks_one_gp+0x69/0x180 rcu_tasks_kthread+0x94/0xc0 kthread+0xe8/0x140 ? __pfx_kthread+0x40/0x40 ret_from_fork+0x34/0x80 ? __pfx_kthread+0x40/0x40 ret_from_fork_asm+0x1b/0x80 </TASK> Considering that there may be holes in the CPU numbers, use the maximum possible cpu number, instead of nr_cpu_ids, for configuring enqueue and dequeue limits. [ neeraj.upadhyay: Fix htmldocs build error reported by Stephen Rothwell ] Closes: https://lore.kernel.org/linux-input/CALMA0xaTSMN+p4xUXkzrtR5r6k7hgoswcaXx7baR_z9r5jjskw@mail.gmail.com/T/#u Reported-by: Zhixu Liu <[email protected]> Signed-off-by: Zqiang <[email protected]> Signed-off-by: Neeraj Upadhyay <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 7679283 commit b3b2431

File tree

1 file changed

+53
-29
lines changed

1 file changed

+53
-29
lines changed

kernel/rcu/tasks.h

+53-29
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ typedef void (*postgp_func_t)(struct rcu_tasks *rtp);
3434
* @rtp_blkd_tasks: List of tasks blocked as readers.
3535
* @rtp_exit_list: List of tasks in the latter portion of do_exit().
3636
* @cpu: CPU number corresponding to this entry.
37+
* @index: Index of this CPU in rtpcp_array of the rcu_tasks structure.
3738
* @rtpp: Pointer to the rcu_tasks structure.
3839
*/
3940
struct rcu_tasks_percpu {
@@ -49,6 +50,7 @@ struct rcu_tasks_percpu {
4950
struct list_head rtp_blkd_tasks;
5051
struct list_head rtp_exit_list;
5152
int cpu;
53+
int index;
5254
struct rcu_tasks *rtpp;
5355
};
5456

@@ -75,6 +77,7 @@ struct rcu_tasks_percpu {
7577
* @postgp_func: This flavor's post-grace-period function (optional).
7678
* @call_func: This flavor's call_rcu()-equivalent function.
7779
* @rtpcpu: This flavor's rcu_tasks_percpu structure.
80+
* @rtpcp_array: Array of pointers to rcu_tasks_percpu structure of CPUs in cpu_possible_mask.
7881
* @percpu_enqueue_shift: Shift down CPU ID this much when enqueuing callbacks.
7982
* @percpu_enqueue_lim: Number of per-CPU callback queues in use for enqueuing.
8083
* @percpu_dequeue_lim: Number of per-CPU callback queues in use for dequeuing.
@@ -108,6 +111,7 @@ struct rcu_tasks {
108111
postgp_func_t postgp_func;
109112
call_rcu_func_t call_func;
110113
struct rcu_tasks_percpu __percpu *rtpcpu;
114+
struct rcu_tasks_percpu **rtpcp_array;
111115
int percpu_enqueue_shift;
112116
int percpu_enqueue_lim;
113117
int percpu_dequeue_lim;
@@ -181,6 +185,8 @@ module_param(rcu_task_collapse_lim, int, 0444);
181185
static int rcu_task_lazy_lim __read_mostly = 32;
182186
module_param(rcu_task_lazy_lim, int, 0444);
183187

188+
static int rcu_task_cpu_ids;
189+
184190
/* RCU tasks grace-period state for debugging. */
185191
#define RTGS_INIT 0
186192
#define RTGS_WAIT_WAIT_CBS 1
@@ -245,6 +251,8 @@ static void cblist_init_generic(struct rcu_tasks *rtp)
245251
unsigned long flags;
246252
int lim;
247253
int shift;
254+
int maxcpu;
255+
int index = 0;
248256

249257
if (rcu_task_enqueue_lim < 0) {
250258
rcu_task_enqueue_lim = 1;
@@ -254,14 +262,9 @@ static void cblist_init_generic(struct rcu_tasks *rtp)
254262
}
255263
lim = rcu_task_enqueue_lim;
256264

257-
if (lim > nr_cpu_ids)
258-
lim = nr_cpu_ids;
259-
shift = ilog2(nr_cpu_ids / lim);
260-
if (((nr_cpu_ids - 1) >> shift) >= lim)
261-
shift++;
262-
WRITE_ONCE(rtp->percpu_enqueue_shift, shift);
263-
WRITE_ONCE(rtp->percpu_dequeue_lim, lim);
264-
smp_store_release(&rtp->percpu_enqueue_lim, lim);
265+
rtp->rtpcp_array = kcalloc(num_possible_cpus(), sizeof(struct rcu_tasks_percpu *), GFP_KERNEL);
266+
BUG_ON(!rtp->rtpcp_array);
267+
265268
for_each_possible_cpu(cpu) {
266269
struct rcu_tasks_percpu *rtpcp = per_cpu_ptr(rtp->rtpcpu, cpu);
267270

@@ -275,14 +278,29 @@ static void cblist_init_generic(struct rcu_tasks *rtp)
275278
INIT_WORK(&rtpcp->rtp_work, rcu_tasks_invoke_cbs_wq);
276279
rtpcp->cpu = cpu;
277280
rtpcp->rtpp = rtp;
281+
rtpcp->index = index;
282+
rtp->rtpcp_array[index] = rtpcp;
283+
index++;
278284
if (!rtpcp->rtp_blkd_tasks.next)
279285
INIT_LIST_HEAD(&rtpcp->rtp_blkd_tasks);
280286
if (!rtpcp->rtp_exit_list.next)
281287
INIT_LIST_HEAD(&rtpcp->rtp_exit_list);
288+
maxcpu = cpu;
282289
}
283290

284-
pr_info("%s: Setting shift to %d and lim to %d rcu_task_cb_adjust=%d.\n", rtp->name,
285-
data_race(rtp->percpu_enqueue_shift), data_race(rtp->percpu_enqueue_lim), rcu_task_cb_adjust);
291+
rcu_task_cpu_ids = maxcpu + 1;
292+
if (lim > rcu_task_cpu_ids)
293+
lim = rcu_task_cpu_ids;
294+
shift = ilog2(rcu_task_cpu_ids / lim);
295+
if (((rcu_task_cpu_ids - 1) >> shift) >= lim)
296+
shift++;
297+
WRITE_ONCE(rtp->percpu_enqueue_shift, shift);
298+
WRITE_ONCE(rtp->percpu_dequeue_lim, lim);
299+
smp_store_release(&rtp->percpu_enqueue_lim, lim);
300+
301+
pr_info("%s: Setting shift to %d and lim to %d rcu_task_cb_adjust=%d rcu_task_cpu_ids=%d.\n",
302+
rtp->name, data_race(rtp->percpu_enqueue_shift), data_race(rtp->percpu_enqueue_lim),
303+
rcu_task_cb_adjust, rcu_task_cpu_ids);
286304
}
287305

288306
// Compute wakeup time for lazy callback timer.
@@ -350,7 +368,7 @@ static void call_rcu_tasks_generic(struct rcu_head *rhp, rcu_callback_t func,
350368
rtpcp->rtp_n_lock_retries = 0;
351369
}
352370
if (rcu_task_cb_adjust && ++rtpcp->rtp_n_lock_retries > rcu_task_contend_lim &&
353-
READ_ONCE(rtp->percpu_enqueue_lim) != nr_cpu_ids)
371+
READ_ONCE(rtp->percpu_enqueue_lim) != rcu_task_cpu_ids)
354372
needadjust = true; // Defer adjustment to avoid deadlock.
355373
}
356374
// Queuing callbacks before initialization not yet supported.
@@ -370,10 +388,10 @@ static void call_rcu_tasks_generic(struct rcu_head *rhp, rcu_callback_t func,
370388
raw_spin_unlock_irqrestore_rcu_node(rtpcp, flags);
371389
if (unlikely(needadjust)) {
372390
raw_spin_lock_irqsave(&rtp->cbs_gbl_lock, flags);
373-
if (rtp->percpu_enqueue_lim != nr_cpu_ids) {
391+
if (rtp->percpu_enqueue_lim != rcu_task_cpu_ids) {
374392
WRITE_ONCE(rtp->percpu_enqueue_shift, 0);
375-
WRITE_ONCE(rtp->percpu_dequeue_lim, nr_cpu_ids);
376-
smp_store_release(&rtp->percpu_enqueue_lim, nr_cpu_ids);
393+
WRITE_ONCE(rtp->percpu_dequeue_lim, rcu_task_cpu_ids);
394+
smp_store_release(&rtp->percpu_enqueue_lim, rcu_task_cpu_ids);
377395
pr_info("Switching %s to per-CPU callback queuing.\n", rtp->name);
378396
}
379397
raw_spin_unlock_irqrestore(&rtp->cbs_gbl_lock, flags);
@@ -446,6 +464,8 @@ static int rcu_tasks_need_gpcb(struct rcu_tasks *rtp)
446464

447465
dequeue_limit = smp_load_acquire(&rtp->percpu_dequeue_lim);
448466
for (cpu = 0; cpu < dequeue_limit; cpu++) {
467+
if (!cpu_possible(cpu))
468+
continue;
449469
struct rcu_tasks_percpu *rtpcp = per_cpu_ptr(rtp->rtpcpu, cpu);
450470

451471
/* Advance and accelerate any new callbacks. */
@@ -483,7 +503,7 @@ static int rcu_tasks_need_gpcb(struct rcu_tasks *rtp)
483503
if (rcu_task_cb_adjust && ncbs <= rcu_task_collapse_lim) {
484504
raw_spin_lock_irqsave(&rtp->cbs_gbl_lock, flags);
485505
if (rtp->percpu_enqueue_lim > 1) {
486-
WRITE_ONCE(rtp->percpu_enqueue_shift, order_base_2(nr_cpu_ids));
506+
WRITE_ONCE(rtp->percpu_enqueue_shift, order_base_2(rcu_task_cpu_ids));
487507
smp_store_release(&rtp->percpu_enqueue_lim, 1);
488508
rtp->percpu_dequeue_gpseq = get_state_synchronize_rcu();
489509
gpdone = false;
@@ -498,7 +518,9 @@ static int rcu_tasks_need_gpcb(struct rcu_tasks *rtp)
498518
pr_info("Completing switch %s to CPU-0 callback queuing.\n", rtp->name);
499519
}
500520
if (rtp->percpu_dequeue_lim == 1) {
501-
for (cpu = rtp->percpu_dequeue_lim; cpu < nr_cpu_ids; cpu++) {
521+
for (cpu = rtp->percpu_dequeue_lim; cpu < rcu_task_cpu_ids; cpu++) {
522+
if (!cpu_possible(cpu))
523+
continue;
502524
struct rcu_tasks_percpu *rtpcp = per_cpu_ptr(rtp->rtpcpu, cpu);
503525

504526
WARN_ON_ONCE(rcu_segcblist_n_cbs(&rtpcp->cblist));
@@ -513,30 +535,32 @@ static int rcu_tasks_need_gpcb(struct rcu_tasks *rtp)
513535
// Advance callbacks and invoke any that are ready.
514536
static void rcu_tasks_invoke_cbs(struct rcu_tasks *rtp, struct rcu_tasks_percpu *rtpcp)
515537
{
516-
int cpu;
517-
int cpunext;
518538
int cpuwq;
519539
unsigned long flags;
520540
int len;
541+
int index;
521542
struct rcu_head *rhp;
522543
struct rcu_cblist rcl = RCU_CBLIST_INITIALIZER(rcl);
523544
struct rcu_tasks_percpu *rtpcp_next;
524545

525-
cpu = rtpcp->cpu;
526-
cpunext = cpu * 2 + 1;
527-
if (cpunext < smp_load_acquire(&rtp->percpu_dequeue_lim)) {
528-
rtpcp_next = per_cpu_ptr(rtp->rtpcpu, cpunext);
529-
cpuwq = rcu_cpu_beenfullyonline(cpunext) ? cpunext : WORK_CPU_UNBOUND;
530-
queue_work_on(cpuwq, system_wq, &rtpcp_next->rtp_work);
531-
cpunext++;
532-
if (cpunext < smp_load_acquire(&rtp->percpu_dequeue_lim)) {
533-
rtpcp_next = per_cpu_ptr(rtp->rtpcpu, cpunext);
534-
cpuwq = rcu_cpu_beenfullyonline(cpunext) ? cpunext : WORK_CPU_UNBOUND;
546+
index = rtpcp->index * 2 + 1;
547+
if (index < num_possible_cpus()) {
548+
rtpcp_next = rtp->rtpcp_array[index];
549+
if (rtpcp_next->cpu < smp_load_acquire(&rtp->percpu_dequeue_lim)) {
550+
cpuwq = rcu_cpu_beenfullyonline(rtpcp_next->cpu) ? rtpcp_next->cpu : WORK_CPU_UNBOUND;
535551
queue_work_on(cpuwq, system_wq, &rtpcp_next->rtp_work);
552+
index++;
553+
if (index < num_possible_cpus()) {
554+
rtpcp_next = rtp->rtpcp_array[index];
555+
if (rtpcp_next->cpu < smp_load_acquire(&rtp->percpu_dequeue_lim)) {
556+
cpuwq = rcu_cpu_beenfullyonline(rtpcp_next->cpu) ? rtpcp_next->cpu : WORK_CPU_UNBOUND;
557+
queue_work_on(cpuwq, system_wq, &rtpcp_next->rtp_work);
558+
}
559+
}
536560
}
537561
}
538562

539-
if (rcu_segcblist_empty(&rtpcp->cblist) || !cpu_possible(cpu))
563+
if (rcu_segcblist_empty(&rtpcp->cblist))
540564
return;
541565
raw_spin_lock_irqsave_rcu_node(rtpcp, flags);
542566
rcu_segcblist_advance(&rtpcp->cblist, rcu_seq_current(&rtp->tasks_gp_seq));

0 commit comments

Comments
 (0)