Skip to content

Commit fbec4e7

Browse files
Sean Andersondavem330
authored andcommitted
soc: fsl: qbman: Use raw spinlock for cgr_lock
smp_call_function always runs its callback in hard IRQ context, even on PREEMPT_RT, where spinlocks can sleep. So we need to use a raw spinlock for cgr_lock to ensure we aren't waiting on a sleeping task. Although this bug has existed for a while, it was not apparent until commit ef2a8d5 ("net: dpaa: Adjust queue depth on rate change") which invokes smp_call_function_single via qman_update_cgr_safe every time a link goes up or down. Fixes: 96f413f ("soc/fsl/qbman: fix issue in qman_delete_cgr_safe()") CC: stable@vger.kernel.org Reported-by: Vladimir Oltean <vladimir.oltean@nxp.com> Closes: https://lore.kernel.org/all/20230323153935.nofnjucqjqnz34ej@skbuf/ Reported-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Closes: https://lore.kernel.org/linux-arm-kernel/87wmsyvclu.fsf@pengutronix.de/ Signed-off-by: Sean Anderson <sean.anderson@linux.dev> Reviewed-by: Camelia Groza <camelia.groza@nxp.com> Tested-by: Vladimir Oltean <vladimir.oltean@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 584c2a9 commit fbec4e7

1 file changed

Lines changed: 14 additions & 11 deletions

File tree

drivers/soc/fsl/qbman/qman.c

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@ struct qman_portal {
991991
/* linked-list of CSCN handlers. */
992992
struct list_head cgr_cbs;
993993
/* list lock */
994-
spinlock_t cgr_lock;
994+
raw_spinlock_t cgr_lock;
995995
struct work_struct congestion_work;
996996
struct work_struct mr_work;
997997
char irqname[MAX_IRQNAME];
@@ -1281,7 +1281,7 @@ static int qman_create_portal(struct qman_portal *portal,
12811281
/* if the given mask is NULL, assume all CGRs can be seen */
12821282
qman_cgrs_fill(&portal->cgrs[0]);
12831283
INIT_LIST_HEAD(&portal->cgr_cbs);
1284-
spin_lock_init(&portal->cgr_lock);
1284+
raw_spin_lock_init(&portal->cgr_lock);
12851285
INIT_WORK(&portal->congestion_work, qm_congestion_task);
12861286
INIT_WORK(&portal->mr_work, qm_mr_process_task);
12871287
portal->bits = 0;
@@ -1456,11 +1456,14 @@ static void qm_congestion_task(struct work_struct *work)
14561456
union qm_mc_result *mcr;
14571457
struct qman_cgr *cgr;
14581458

1459-
spin_lock_irq(&p->cgr_lock);
1459+
/*
1460+
* FIXME: QM_MCR_TIMEOUT is 10ms, which is too long for a raw spinlock!
1461+
*/
1462+
raw_spin_lock_irq(&p->cgr_lock);
14601463
qm_mc_start(&p->p);
14611464
qm_mc_commit(&p->p, QM_MCC_VERB_QUERYCONGESTION);
14621465
if (!qm_mc_result_timeout(&p->p, &mcr)) {
1463-
spin_unlock_irq(&p->cgr_lock);
1466+
raw_spin_unlock_irq(&p->cgr_lock);
14641467
dev_crit(p->config->dev, "QUERYCONGESTION timeout\n");
14651468
qman_p_irqsource_add(p, QM_PIRQ_CSCI);
14661469
return;
@@ -1476,7 +1479,7 @@ static void qm_congestion_task(struct work_struct *work)
14761479
list_for_each_entry(cgr, &p->cgr_cbs, node)
14771480
if (cgr->cb && qman_cgrs_get(&c, cgr->cgrid))
14781481
cgr->cb(p, cgr, qman_cgrs_get(&rr, cgr->cgrid));
1479-
spin_unlock_irq(&p->cgr_lock);
1482+
raw_spin_unlock_irq(&p->cgr_lock);
14801483
qman_p_irqsource_add(p, QM_PIRQ_CSCI);
14811484
}
14821485

@@ -2440,7 +2443,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags,
24402443
preempt_enable();
24412444

24422445
cgr->chan = p->config->channel;
2443-
spin_lock_irq(&p->cgr_lock);
2446+
raw_spin_lock_irq(&p->cgr_lock);
24442447

24452448
if (opts) {
24462449
struct qm_mcc_initcgr local_opts = *opts;
@@ -2477,7 +2480,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags,
24772480
qman_cgrs_get(&p->cgrs[1], cgr->cgrid))
24782481
cgr->cb(p, cgr, 1);
24792482
out:
2480-
spin_unlock_irq(&p->cgr_lock);
2483+
raw_spin_unlock_irq(&p->cgr_lock);
24812484
put_affine_portal();
24822485
return ret;
24832486
}
@@ -2512,7 +2515,7 @@ int qman_delete_cgr(struct qman_cgr *cgr)
25122515
return -EINVAL;
25132516

25142517
memset(&local_opts, 0, sizeof(struct qm_mcc_initcgr));
2515-
spin_lock_irqsave(&p->cgr_lock, irqflags);
2518+
raw_spin_lock_irqsave(&p->cgr_lock, irqflags);
25162519
list_del(&cgr->node);
25172520
/*
25182521
* If there are no other CGR objects for this CGRID in the list,
@@ -2537,7 +2540,7 @@ int qman_delete_cgr(struct qman_cgr *cgr)
25372540
/* add back to the list */
25382541
list_add(&cgr->node, &p->cgr_cbs);
25392542
release_lock:
2540-
spin_unlock_irqrestore(&p->cgr_lock, irqflags);
2543+
raw_spin_unlock_irqrestore(&p->cgr_lock, irqflags);
25412544
put_affine_portal();
25422545
return ret;
25432546
}
@@ -2577,9 +2580,9 @@ static int qman_update_cgr(struct qman_cgr *cgr, struct qm_mcc_initcgr *opts)
25772580
if (!p)
25782581
return -EINVAL;
25792582

2580-
spin_lock_irqsave(&p->cgr_lock, irqflags);
2583+
raw_spin_lock_irqsave(&p->cgr_lock, irqflags);
25812584
ret = qm_modify_cgr(cgr, 0, opts);
2582-
spin_unlock_irqrestore(&p->cgr_lock, irqflags);
2585+
raw_spin_unlock_irqrestore(&p->cgr_lock, irqflags);
25832586
put_affine_portal();
25842587
return ret;
25852588
}

0 commit comments

Comments
 (0)