Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Received-SPF: Pass (protection.outlook.com: domain of seco.com designates
 20.160.56.81 as permitted sender) receiver=protection.outlook.com;
 client-ip=20.160.56.81; helo=inpost-eu.tmcas.trendmicro.com; pr=C
Authentication-Results-Original: dkim=none (message not signed)
 header.d=none;dmarc=none action=none header.from=seco.com;
Message-ID: <ed94f05d-929d-c4dd-3b00-0fde2a1b4595@seco.com>
Date:   Fri, 31 Mar 2023 10:55:52 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.4.0
Subject: Re: [PATCH 1/2] soc: fsl: qbman: Always disable interrupts when
 taking cgr_lock
Content-Language: en-US
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:     Scott Wood <oss@buserror.net>,
        "linux-kernel@vger.kernel.org" <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>
References: <20230327192841.952688-1-sean.anderson@seco.com>
 <AM6PR04MB57997C946E6AE7F2D87B5C78F28F9@AM6PR04MB5799.eurprd04.prod.outlook.com>
From:   Sean Anderson <sean.anderson@seco.com>
In-Reply-To: <AM6PR04MB57997C946E6AE7F2D87B5C78F28F9@AM6PR04MB5799.eurprd04.prod.outlook.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-Microsoft-Antispam-Message-Info-Original: JMIKbtW4UumUx7F9cjTauqSN8ckMEbwyGsinLV+htALourWbV3ZjlKwgzMc/h4Yxmcs0lfsQkmIEZd/lp5CUIhsivTI/rNlZwTPTbuAFN4RPiDT7HH8WB2ilSiWu9z32okqdRIlKJcB9CUmwsXazq8UnOFjRFpiz8AnU9wBGPZ7kIlKRfgDjGDHF2gBGYMyZGz+KmCs8vlBqRu++5ohVBJnBX7JO1Pehpw63q5hKUGARJJWcJPsPhw7a9yf3U0Fq3cqj02nAttiwmEc1H2fwUYUduj5RNXKdgAmqwypUzPLmsVQymxXxkdzRGdFKEmq0wjuhAy2edRTWBp/eb38R04rLWBGpcXIKQiM6YnMhwcIYlZ2lTqi3uO6EYjnnhuK10C2aJNG7a6AfJcziaIYmCPDoISsypYYWU/rozEXWlKl9ijJfK5kMm2m+GmUbgLlbM5e5nD/XQm0hCKGSxELzySOxOz509Ogi5xAGwvextkaI3BMfHOImd4T7ersEofczH02HBPn3/Sz6Xlu7eAsuBNR1XcNT/Y2ljAQ8txBvkx8ay2aQ9CDbTWxrscJ+L3JdMPWW1YUUpHspxbP4B61R7DF9MGBQc2rMe1O0B9UGGtiggp4c/c2qPTp6T8E+0VByGGAoGCaf9hDnl1ca5Sg8lU5wiLqSBEt7n0AO6HR6h7EILn4mYZWwxst9Tj5U2HKi
X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR03MB8847.eurprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(136003)(346002)(376002)(39850400004)(366004)(396003)(451199021)(83380400001)(2616005)(86362001)(52116002)(6486002)(26005)(110136005)(316002)(53546011)(6506007)(54906003)(2906002)(186003)(478600001)(6666004)(38350700002)(6512007)(36756003)(44832011)(5660300002)(4326008)(7416002)(31696002)(38100700002)(8936002)(8676002)(66476007)(66556008)(41300700001)(66946007)(31686004)(45980500001)(43740500002);DIR:OUT;SFP:1101;
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR03MB6287
X-EOPAttributedMessage: 0
X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM6EUR05FT020.eop-eur05.prod.protection.outlook.com
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id-Prvs: 33ca7e93-7dc9-4e03-7bff-08db31f808b8
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: yxEYlXdMg+61MSMlP/YefKGMUhAAWdYbgPg+2z1mydFJ6T+hnET3kne8ITKdHWMDAhj5o+2rPSFS5WsHKFpKQjod3sgvrdb21xo97VH3G9XI1fsvOry+U2yvseCpSLAvWhRFWn80DDf5sOq0kRXQLCvL+9tlm7vwNBY5wz0RGSNGoDOnhf8yjha43UYkVU+joh5k4sDlqytukOztCu2cU078rbsjjuk/qpAP9xrqUe8Aezu6kzwjvsAEQDwb7amVaV4FWvnxZ/7t45ER7VS1bU51uSU4rkcl5zm+9Ie/Oa+fZMRr8TFJoBEZ2t6bsoy2+9WXuhnX0GE9CdttNOqyn1l8T2fcun3FiGcxWVjKQDfi3cY5gdOZ95CP7NMOPdHCcOIV+An1tsM4/xBI3tMwv50DbEnAvmNcCGjJJMkfzPjLf2E55S9695vS4Kmz4eCvK2KTEHA2FBIAnA6zxDS3vIr0naQD+JTr/UqjUeDh7dBZPFTLrNE7TxZ0hM0mdW4AdAQpXRHLdk4uZLKeMcosHtFlO1ZbaKe0sqTGZvJEBQ11rZsSDJ6fxvI4kwtYl1v6R4w55JyZbKtty7RVRDTia6RbN8+5dIAM1H9qhrBxBXYPQ/0TQKMu3XTbNuhWvYHfj97xqi9ZvYME8xyBIS/Y+gi7tE6uCkigEkNQgU4CFnmoV+lrUxaV29ruA2QNp+QQKenbelhKyyKKxTGJlxqcJVfA1e7x+movOun7FqYn+WqAgXdl6caKcNj9Q2sO2tQTPenMk14xKcD2AraQLa2YXQ==
X-Forefront-Antispam-Report: CIP:20.160.56.81;CTRY:NL;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:inpost-eu.tmcas.trendmicro.com;PTR:inpost-eu.tmcas.trendmicro.com;CAT:NONE;SFS:(13230028)(396003)(39850400004)(136003)(376002)(346002)(451199021)(46966006)(40470700004)(36840700001)(31686004)(6506007)(53546011)(26005)(2906002)(6512007)(44832011)(5660300002)(110136005)(7416002)(8936002)(8676002)(41300700001)(336012)(4326008)(316002)(70206006)(70586007)(6666004)(54906003)(6486002)(47076005)(36860700001)(83380400001)(186003)(478600001)(2616005)(82310400005)(356005)(40460700003)(7596003)(82740400003)(7636003)(36756003)(40480700001)(86362001)(31696002)(34070700002)(43740500002);DIR:OUT;SFP:1101;
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2023 14:56:05.3076
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 69a9cbeb-96ff-4e03-c7b5-08db31f80da3
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bebe97c3-6438-442e-ade3-ff17aa50e733;Ip=[20.160.56.81];Helo=[inpost-eu.tmcas.trendmicro.com]
X-MS-Exchange-CrossTenant-AuthSource: AM6EUR05FT020.eop-eur05.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAVPR03MB9068
X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=unavailable
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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
>