From: Sean Anderson <sean.anderson@seco.com>
To: Camelia Alexandra Groza <camelia.groza@nxp.com>,
Leo Li <leoyang.li@nxp.com>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Cc: Vladimir Oltean <vladimir.oltean@nxp.com>,
Roy Pledge <roy.pledge@nxp.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Scott Wood <oss@buserror.net>,
Claudiu Manoil <claudiu.manoil@nxp.com>,
"David S . Miller" <davem@davemloft.net>
Subject: Re: [PATCH 1/2] soc: fsl: qbman: Always disable interrupts when taking cgr_lock
Date: Fri, 31 Mar 2023 10:55:52 -0400 [thread overview]
Message-ID: <ed94f05d-929d-c4dd-3b00-0fde2a1b4595@seco.com> (raw)
In-Reply-To: <AM6PR04MB57997C946E6AE7F2D87B5C78F28F9@AM6PR04MB5799.eurprd04.prod.outlook.com>
On 3/31/23 06:58, Camelia Alexandra Groza wrote:
>> -----Original Message-----
>> From: Sean Anderson <sean.anderson@seco.com>
>> Sent: Monday, March 27, 2023 22:29
>> To: Leo Li <leoyang.li@nxp.com>; linuxppc-dev@lists.ozlabs.org; linux-arm-
>> kernel@lists.infradead.org
>> Cc: Scott Wood <oss@buserror.net>; linux-kernel@vger.kernel.org; David S .
>> Miller <davem@davemloft.net>; Claudiu Manoil <claudiu.manoil@nxp.com>;
>> Roy Pledge <roy.pledge@nxp.com>; Vladimir Oltean
>> <vladimir.oltean@nxp.com>; Camelia Alexandra Groza
>> <camelia.groza@nxp.com>; Sean Anderson <sean.anderson@seco.com>
>> Subject: [PATCH 1/2] soc: fsl: qbman: Always disable interrupts when taking
>> cgr_lock
>>
>> smp_call_function_single disables IRQs when executing the callback. To
>> prevent deadlocks, we must disable IRQs when taking cgr_lock elsewhere.
>> This is already done by qman_update_cgr and qman_delete_cgr; fix the
>> other lockers.
>>
>> Fixes: c535e923bb97 ("soc/fsl: Introduce DPAA 1.x QMan device driver")
>> Signed-off-by: Sean Anderson <sean.anderson@seco.com>
>> ---
>>
>> drivers/soc/fsl/qbman/qman.c | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c
>> index 739e4eee6b75..ff870ca07596 100644
>> --- a/drivers/soc/fsl/qbman/qman.c
>> +++ b/drivers/soc/fsl/qbman/qman.c
>> @@ -1456,7 +1456,7 @@ static void qm_congestion_task(struct work_struct
>> *work)
>> union qm_mc_result *mcr;
>> struct qman_cgr *cgr;
>>
>> - spin_lock(&p->cgr_lock);
>> + spin_lock_irq(&p->cgr_lock);
>> qm_mc_start(&p->p);
>> qm_mc_commit(&p->p, QM_MCC_VERB_QUERYCONGESTION);
>> if (!qm_mc_result_timeout(&p->p, &mcr)) {
>> @@ -1476,7 +1476,7 @@ static void qm_congestion_task(struct work_struct
>> *work)
>> list_for_each_entry(cgr, &p->cgr_cbs, node)
>> if (cgr->cb && qman_cgrs_get(&c, cgr->cgrid))
>> cgr->cb(p, cgr, qman_cgrs_get(&rr, cgr->cgrid));
>> - spin_unlock(&p->cgr_lock);
>> + spin_unlock_irq(&p->cgr_lock);
>> qman_p_irqsource_add(p, QM_PIRQ_CSCI);
>> }
>
> There is one more spin_unlock call in qm_congestion_task on the error path that needs updating:
>
> if (!qm_mc_result_timeout(&p->p, &mcr)) {
> spin_unlock(&p->cgr_lock);
Will fix. Thanks.
--Sean
>
>> @@ -2440,7 +2440,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32
>> flags,
>> preempt_enable();
>>
>> cgr->chan = p->config->channel;
>> - spin_lock(&p->cgr_lock);
>> + spin_lock_irq(&p->cgr_lock);
>>
>> if (opts) {
>> struct qm_mcc_initcgr local_opts = *opts;
>> @@ -2477,7 +2477,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32
>> flags,
>> qman_cgrs_get(&p->cgrs[1], cgr->cgrid))
>> cgr->cb(p, cgr, 1);
>> out:
>> - spin_unlock(&p->cgr_lock);
>> + spin_unlock_irq(&p->cgr_lock);
>> put_affine_portal();
>> return ret;
>> }
>> --
>> 2.35.1.1320.gc452695387.dirty
>
prev parent reply other threads:[~2023-03-31 14:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-27 19:28 [PATCH 1/2] soc: fsl: qbman: Always disable interrupts when taking cgr_lock Sean Anderson
2023-03-27 19:28 ` [PATCH 2/2] soc: fsl: qbman: Use raw spinlock for cgr_lock Sean Anderson
2023-03-31 10:58 ` [PATCH 1/2] soc: fsl: qbman: Always disable interrupts when taking cgr_lock Camelia Alexandra Groza
2023-03-31 14:55 ` Sean Anderson [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ed94f05d-929d-c4dd-3b00-0fde2a1b4595@seco.com \
--to=sean.anderson@seco.com \
--cc=camelia.groza@nxp.com \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=oss@buserror.net \
--cc=roy.pledge@nxp.com \
--cc=vladimir.oltean@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).