Received-SPF: pass (google.com: domain of linux-kernel+bounces-36066-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Received-SPF: Pass (protection.outlook.com: domain of seco.com designates
 20.160.56.83 as permitted sender) receiver=protection.outlook.com;
 client-ip=20.160.56.83; helo=repost-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: <f25c58fe-55e3-490f-bfe4-34dee945d585@seco.com>
Date: Tue, 23 Jan 2024 16:24:59 -0500
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v4 2/2] soc: fsl: qbman: Use raw spinlock for cgr_lock
Content-Language: en-US
To: Li Yang <leoyang.li@nxp.com>, linuxppc-dev@lists.ozlabs.org,
 linux-arm-kernel@lists.infradead.org
Cc: Roy Pledge <roy.pledge@nxp.com>, Camelia Groza <camelia.groza@nxp.com>,
 "David S . Miller" <davem@davemloft.net>,
 Claudiu Manoil <claudiu.manoil@nxp.com>, linux-kernel@vger.kernel.org,
 Scott Wood <oss@buserror.net>, Steffen Trumtrar <s.trumtrar@pengutronix.de>,
 stable@vger.kernel.org, Vladimir Oltean <vladimir.oltean@nxp.com>
References: <20240108161904.2865093-1-sean.anderson@seco.com>
 <20240108161904.2865093-2-sean.anderson@seco.com>
From: Sean Anderson <sean.anderson@seco.com>
In-Reply-To: <20240108161904.2865093-2-sean.anderson@seco.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-Microsoft-Antispam-Message-Info-Original:
 ptdI9CvAAt7y43UXZi4zLLFX8rRhkgjs+H1stHiq3H2CwWfhpfuhMbnNbUFqrR59ROJO8JKO3fzV+Ma6MRWy7J9ward6DEhnAtmTDoIzZG7uXv31+Uv9YWtOqp0ItMr5ZDQB4fObZDTVh1YuGW+LmlxapNausNwhm3cgHN8AwTb5x07+jz3rr4olmc3YNtsRnogxheGDQfT1Kz5qU19fKrEKWG2r/OYN0UulZ1fHzGIreJ1OksEVCo9im4SWP06+KfnCTebZKxql5ZiqFoTsLPd0ozcRUW2SFH8i/471JuEoEvxjR6MPx2Y6/Tx6HVE/nD0/IGdUzaHpZrNGvcBRTmO2FfHrWzGN/e3ScEYJhLZ+Nk3lo5YnXMxo7hnvCN1g7LjBK58ImbaFMHuilLDJVG+bigKsFgbBZs5nXQOpgRiDg+0wgT0qQUkYZP8rqVF2tZOmjsd5nS14fQV34vq+HcrWcgLwI9PsN31uj5/sAr7piZLqPVRqwA80fWvuJoZHDO4Fn3kKiIGUp7ZjgrFVqsdfW8v35y5Kdck9Z61PMrRs6MD+h2rt0HHO7W99DBwGI4EVsz3NlVvgx2uB9YTuyaNYBjjgVtiW1Hwq4jBRhXItRtbZxvYPnKPeafPjDpJEAvFjEoPzYaJ6E3fBpV8YdKa8c1hMu/Pnq+HJeVwhxJM=
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:(13230031)(366004)(396003)(39850400004)(376002)(136003)(346002)(230922051799003)(451199024)(1800799012)(64100799003)(186009)(66946007)(26005)(8936002)(38350700005)(6506007)(53546011)(41300700001)(36756003)(6666004)(52116002)(6512007)(2616005)(66476007)(316002)(54906003)(4326008)(5660300002)(66556008)(7416002)(8676002)(44832011)(38100700002)(2906002)(966005)(478600001)(6486002)(86362001)(31696002)(83380400001)(31686004)(45980500001)(43740500002);DIR:OUT;SFP:1101;
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR03MB7596
X-EOPAttributedMessage: 0
X-MS-Exchange-Transport-CrossTenantHeadersStripped:
 DB8EUR05FT036.eop-eur05.prod.protection.outlook.com
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id-Prvs:
	aae1e122-d29c-4a40-47eb-08dc1c59c2e4
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
	bK+h3GTQ9eop0jcdYER4n3XlsNJz4AT9h3ENyqnFZN/jjlQ3d7Lp+9V5T7L+ZXVNbLlCkpIWML9a4FfHoXdSv03VUNUaNftDgY0npuo8mfcXJqr0Ko1S0ZEdvpe22tdgZVVVv00GjDrEEyx21DxZ+yJts521kdw2HA7lSSaak02UMh09r9TygN9vwaBIKTCYcoikdLwp6gmjh9KskvwoXoGRZ1CBr4zQwXcspVIktpg7aFxTo6Ju2wmarU/ou1nIGezXKV+wGywyk+GCBIPuv0xfnuvNVIc2NrpntY06xHhcQvod83KYCxp2OscXPXoifdc2fClltzBamFWK1oFqp67F1dgI3qobw3d00Fa4Id+ZNGFheMVQUC67J1q3n4R4fKM/5M3XMbqLleu0IoY6yRCczwmiyn+ZwCLWVFSk+FApOLouwGEKWeppDfUqljGQoK9QYJVO6Hr1nGh+ATT1ZheFT5U02ACnW9DRadj6Nf9/6O9gERnYXHcQ2RM3EZjxtBN36U+W/ntg31sxCzASJDXQCjJ86/414JVx9xW0FzP9jcjbO8oCxnjSgpIh8sV48ldDfbR5P3pcqAfg1biuFR2Mn7uHTUO8yCdYHqBelT3t9zSSdAV6TMm635UINGj91vyG0cfx5uELZNuu8ayFXF3btKbuQsUn1cJAt/s6iIzVzghgRLZ/dssyRcIZWHvlmxNTBxirp+BTzT3hIV8CG8KySgE+ZbNCwUCBuqEP12zRZyjsUmqeG5AXpy7nL7g+1LDdyV0x5j6oIj01BnVy6w==
X-Forefront-Antispam-Report:
	CIP:20.160.56.83;CTRY:NL;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:repost-eu.tmcas.trendmicro.com;PTR:repost-eu.tmcas.trendmicro.com;CAT:NONE;SFS:(13230031)(136003)(346002)(39850400004)(396003)(376002)(230922051799003)(451199024)(186009)(64100799003)(82310400011)(1800799012)(36840700001)(46966006)(6506007)(53546011)(40480700001)(336012)(44832011)(7416002)(26005)(5660300002)(31686004)(478600001)(83380400001)(6512007)(6666004)(6486002)(966005)(70586007)(316002)(2616005)(54906003)(70206006)(47076005)(8936002)(8676002)(4326008)(36860700001)(2906002)(82740400003)(41300700001)(86362001)(34070700002)(31696002)(356005)(36756003)(7596003)(7636003)(43740500002);DIR:OUT;SFP:1101;
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jan 2024 21:25:06.2650
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 89a1bf55-b76c-478e-e3ab-08dc1c59c50f
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.83];Helo=[repost-eu.tmcas.trendmicro.com]
X-MS-Exchange-CrossTenant-AuthSource:
	DB8EUR05FT036.eop-eur05.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR03MB6310

On 1/8/24 11:19, Sean Anderson wrote:
> cgr_lock may be locked with interrupts already disabled by
> smp_call_function_single. As such, we must use a raw spinlock to avoid
> problems on PREEMPT_RT kernels. Although this bug has existed for a
> while, it was not apparent until commit ef2a8d5478b9 ("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: 96f413f47677 ("soc/fsl/qbman: fix issue in qman_delete_cgr_safe()")
> 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@seco.com>
> Reviewed-by: Camelia Groza <camelia.groza@nxp.com>
> Tested-by: Vladimir Oltean <vladimir.oltean@nxp.com>
> ---
> Please backport these fixes when applied. This bug has been reported
> multiple times (see links above).
> 
> Changes in v4:
> - Add a note about how raw spinlocks aren't quite right
> 
> Changes in v3:
> - Change blamed commit to something more appropriate
> 
>  drivers/soc/fsl/qbman/qman.c | 25 ++++++++++++++-----------
>  1 file changed, 14 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c
> index 1bf1f1ea67f0..7e9074519ad2 100644
> --- a/drivers/soc/fsl/qbman/qman.c
> +++ b/drivers/soc/fsl/qbman/qman.c
> @@ -991,7 +991,7 @@ struct qman_portal {
>  	/* linked-list of CSCN handlers. */
>  	struct list_head cgr_cbs;
>  	/* list lock */
> -	spinlock_t cgr_lock;
> +	raw_spinlock_t cgr_lock;
>  	struct work_struct congestion_work;
>  	struct work_struct mr_work;
>  	char irqname[MAX_IRQNAME];
> @@ -1281,7 +1281,7 @@ static int qman_create_portal(struct qman_portal *portal,
>  		/* if the given mask is NULL, assume all CGRs can be seen */
>  		qman_cgrs_fill(&portal->cgrs[0]);
>  	INIT_LIST_HEAD(&portal->cgr_cbs);
> -	spin_lock_init(&portal->cgr_lock);
> +	raw_spin_lock_init(&portal->cgr_lock);
>  	INIT_WORK(&portal->congestion_work, qm_congestion_task);
>  	INIT_WORK(&portal->mr_work, qm_mr_process_task);
>  	portal->bits = 0;
> @@ -1456,11 +1456,14 @@ static void qm_congestion_task(struct work_struct *work)
>  	union qm_mc_result *mcr;
>  	struct qman_cgr *cgr;
>  
> -	spin_lock_irq(&p->cgr_lock);
> +	/*
> +	 * FIXME: QM_MCR_TIMEOUT is 10ms, which is too long for a raw spinlock!
> +	 */
> +	raw_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)) {
> -		spin_unlock_irq(&p->cgr_lock);
> +		raw_spin_unlock_irq(&p->cgr_lock);
>  		dev_crit(p->config->dev, "QUERYCONGESTION timeout\n");
>  		qman_p_irqsource_add(p, QM_PIRQ_CSCI);
>  		return;
> @@ -1476,7 +1479,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_irq(&p->cgr_lock);
> +	raw_spin_unlock_irq(&p->cgr_lock);
>  	qman_p_irqsource_add(p, QM_PIRQ_CSCI);
>  }
>  
> @@ -2440,7 +2443,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags,
>  	preempt_enable();
>  
>  	cgr->chan = p->config->channel;
> -	spin_lock_irq(&p->cgr_lock);
> +	raw_spin_lock_irq(&p->cgr_lock);
>  
>  	if (opts) {
>  		struct qm_mcc_initcgr local_opts = *opts;
> @@ -2477,7 +2480,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_irq(&p->cgr_lock);
> +	raw_spin_unlock_irq(&p->cgr_lock);
>  	put_affine_portal();
>  	return ret;
>  }
> @@ -2512,7 +2515,7 @@ int qman_delete_cgr(struct qman_cgr *cgr)
>  		return -EINVAL;
>  
>  	memset(&local_opts, 0, sizeof(struct qm_mcc_initcgr));
> -	spin_lock_irqsave(&p->cgr_lock, irqflags);
> +	raw_spin_lock_irqsave(&p->cgr_lock, irqflags);
>  	list_del(&cgr->node);
>  	/*
>  	 * 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)
>  		/* add back to the list */
>  		list_add(&cgr->node, &p->cgr_cbs);
>  release_lock:
> -	spin_unlock_irqrestore(&p->cgr_lock, irqflags);
> +	raw_spin_unlock_irqrestore(&p->cgr_lock, irqflags);
>  	put_affine_portal();
>  	return ret;
>  }
> @@ -2577,9 +2580,9 @@ static int qman_update_cgr(struct qman_cgr *cgr, struct qm_mcc_initcgr *opts)
>  	if (!p)
>  		return -EINVAL;
>  
> -	spin_lock_irqsave(&p->cgr_lock, irqflags);
> +	raw_spin_lock_irqsave(&p->cgr_lock, irqflags);
>  	ret = qm_modify_cgr(cgr, 0, opts);
> -	spin_unlock_irqrestore(&p->cgr_lock, irqflags);
> +	raw_spin_unlock_irqrestore(&p->cgr_lock, irqflags);
>  	put_affine_portal();
>  	return ret;
>  }

ping

I'd like to get this in for 6.8.

Would it be more convenient for this to go via net?

--Sean