Received-SPF: pass (google.com: domain of linux-kernel+bounces-19836-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Received-SPF: Pass (protection.outlook.com: domain of seco.com designates
 20.160.56.82 as permitted sender) receiver=protection.outlook.com;
 client-ip=20.160.56.82; 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;
From: Sean Anderson <sean.anderson@seco.com>
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>,
	Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH v4 2/2] soc: fsl: qbman: Use raw spinlock for cgr_lock
Date: Mon,  8 Jan 2024 11:19:04 -0500
Message-Id: <20240108161904.2865093-2-sean.anderson@seco.com>
In-Reply-To: <20240108161904.2865093-1-sean.anderson@seco.com>
References: <20240108161904.2865093-1-sean.anderson@seco.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-Microsoft-Antispam-Message-Info-Original:
 7RevYU7OWBDopUQDUYLsl9s/Ac2VZcfTVTIbufS1NYcx9rjBuvwo8Q3fTePwsfH82MbldfVhcj0KHjwINyE0U0nQwrHeexOPIGMZIqxvh/h3IU1GD4tuZek+C/AWZSRKxJNtQpCyban6LkevO/Cg+yl4z7U9r/g2TRQLMEhhEsDbODbuB1QKOfA10bhoo4lCZ2zhdiX4QBSrwFGtd0Jg2G7/23eaUTbiwVM2r4dmXF8QLFZAYxf1xgBTxXxW2ol/VSkR0LrNPISt7ddfiTPC80vqDE5ohAtK2CNqyac8gs72ity0byEzgzkieALW4Xfx1Y2P4Lj7tSiSKsDKskHFDq5tH1JNLXH5rBcGMihNbIXxRHXuNjzuVr6zxKuAlOyaX9jb/4EnwtXvJtVoq1N+ONh6t59Q+br9ZfSBpNgLdGJfXCOuFyO+ACgZpwxam0+/bR/lh8ySC6C41FN8ALy5GP4jLgEVI9AskEUkRTm2Jpq0ItduuG1qkcf1wlm93RNR37Vb9Y0mLSmyA6M0sSiBwZIkmeBR5YFoQ2kKXzjs5ykq2y/dVAXMd4XxeEHmPFrWc+iwiNEZ6fCr/5ax88N1y799UEnUQNoN1BojkGtu4cc=
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)(39850400004)(136003)(396003)(366004)(346002)(376002)(230922051799003)(1800799012)(186009)(64100799003)(451199024)(6666004)(2616005)(26005)(1076003)(966005)(52116002)(478600001)(6486002)(6506007)(6512007)(83380400001)(66476007)(107886003)(5660300002)(2906002)(41300700001)(7416002)(316002)(66556008)(54906003)(8676002)(4326008)(44832011)(8936002)(66946007)(38350700005)(38100700002)(36756003)(86362001);DIR:OUT;SFP:1101;
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR03MB9858
X-EOPAttributedMessage: 0
X-MS-Exchange-Transport-CrossTenantHeadersStripped:
 DB8EUR05FT028.eop-eur05.prod.protection.outlook.com
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id-Prvs:
	46a89d09-a91e-4918-3b5e-08dc10659618
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
	3g9yNprucK2DBC4h77ZBbAkUnspz6VBeXUxHSVTFcMQbWCnDctigcl96qZyOsBIAx5l3iRpZ03fJ3UqJcbvVc0LZcKjEJlRbY72qGP76ozGCNQFXltw1RfoNwsT9rU/vKjXhkdWPJMnd/5i3HpJXk4LJhC1Yo9goNyhDeM3dlccW1tKGQTbmHpPhttMCwa3RUbU7T0X7w9xhIYcIXYHQdJ+6DwACIH5JCPo2Rhe89yaARHpQ49b/DY5ZWviIayN4BZqo4wH0yVQqvVdtORkTRmIb4+joad+AYNI1cIFUn/e7eLrFRHktR8hysvg0JXbMq+0eOZRzSifmacSdDgTKg2dYhPnocZ8TbmGbOSXAziWgyz/3Nfvu1sKKO8tRyvAsOabE3yM/hctQ6baUMRHTlEQ4JE6J1701DMNwslBd0/WmrQRmuD3rY5pYzscTA3AE+7fJ9J2/xuh1a4nuEXZ2xJ1XZ7S0tcGVLpacoXGs7yERNUjn/N7DDY4g6crBNMV+smXFqoIb3bzwgZjNb9YY7A1031cwuZcd5lHwB/+V6nweeezxVt1+SC4+aakuVKkTbEjb7X4H6vr804Z/ZKOUV3cQfW7HiKKDnUVweGFKhdfVdmdGoQjr9rfQQhXq0WcR6zT/ZAh5VVZhvuDVmcg5jJEyipNNi5nW8jsdGo/7VG+WFD2sXu0zdEsoacyrqwr2TFSaAWClL3rcPMXj/Fdcjm0Z7kM7DImnA/XZsf6pnXDhIa2OKvXYHejBYsYUgT1KdOJ/fnMU7Tg4ELkskaPSRw==
X-Forefront-Antispam-Report:
	CIP:20.160.56.82;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)(376002)(346002)(136003)(396003)(39850400004)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(82310400011)(40470700004)(36840700001)(46966006)(7636003)(356005)(82740400003)(7596003)(36756003)(8676002)(8936002)(83380400001)(54906003)(336012)(316002)(5660300002)(4326008)(6506007)(478600001)(44832011)(966005)(6512007)(6666004)(26005)(1076003)(70586007)(70206006)(107886003)(6486002)(2616005)(34070700002)(41300700001)(7416002)(47076005)(2906002)(36860700001)(40460700003)(86362001)(40480700001);DIR:OUT;SFP:1101;
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2024 16:19:37.4962
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: fc7e8839-e641-454d-160f-08dc10659c0f
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.82];Helo=[repost-eu.tmcas.trendmicro.com]
X-MS-Exchange-CrossTenant-AuthSource:
	DB8EUR05FT028.eop-eur05.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR03MB9708

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;
 }
-- 
2.35.1.1320.gc452695387.dirty