Received-SPF: pass (google.com: domain of linux-kernel+bounces-19835-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.81 as permitted sender) receiver=protection.outlook.com;
 client-ip=20.160.56.81; 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 1/2] soc: fsl: qbman: Always disable interrupts when taking cgr_lock
Date: Mon,  8 Jan 2024 11:19:03 -0500
Message-Id: <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:
 HrGX7/LAASLMhDD55CMV/MRC1j+/NKDYjOaQqswu7CwePZhvnFzgVFCzhXCewEuoWlSF1G9eZB/f2Y0OF9a5r1em9qa5yu2D9vgnYpOYulwY808AvJ5Q36fi8U9fJidr6MPAJbHrjRF8Yg7L5X+zreUYMFo3v5lKvY5+aK63fvBLa7zJNTvsOGd7f8Yr5DU4CPYqhX3Px2Nc+ca40ijvfe5KyLrpuPjt6FSafKuRsnOFQZ2uUwk032iZ/T/Yd1/znOBfovoFFcKiloJnR6+HQxu08vSg01pvLfWo2NQ45Ss94zC6vGmKsAKqXAoNS0VPT+H7b5o1yKl0Y5Dy0In+2pkgmNeAYtbabiFJLfm7jCUS2El3hIPvv+VY1/2YiY2nL75xvPfDENvWuz1hASG1c1UoX1lrKQhGZ9e5L5MbiYqtGmcoKyieh7zKhXLrwr4YSLIRjYGYmAProuKDZTGwhwAwCWIiceVTIcyGxplKqHKelKOtpFHjHEQ6a1VXqgIXLHT4rmoVz8oiO7b17wDIMk5uEANC4Azq5OW/I3ShOMz+rc+D2V8w/xXWqKIGBj1sKtFi+ivp0NKO0PgKl2ChQlsgQLx30mVHdDvGXb1oZWv2FO2lEupEEsKS0wpjgl6d
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)(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:
 VI1EUR05FT049.eop-eur05.prod.protection.outlook.com
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id-Prvs:
	8602ca66-4b72-4fb2-b014-08dc10659487
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
	lSVlmRzTL8OoTo6yVVodfNjK2rQfvx8e0KfAXbqc4E6RvyQ5+ydD+nQjyQ5sOLM/89hDhoYN96JgfuK328KpXFbOvwjGiB9ZKbYN1wmv9q7xPuKGW5GBZ0tpvCWMfFd+QykVB3ZpEJ2ycsc84egS5Sy3nEBqAs3AHMRBTfV1aV9ff05z1q3iAx5mgLllbDiSlbz/8Q946zz6w41cGvzAe7OhjT/hEqoxZ3wGQC2SKX3+SrAOK2zohw7V4yLeH6Po4hZ/cCO5tRtOWFJkxXrC8aBn2VAJfaktUYgCnfBBg16oOvHsFCYvMwafvuHyLVCv6MLcZumyJUabAGqnEQ8/3pfrAOAbW2tIWndWF/pVjRQlnCALZ0EKwmHEqTEsyr3tkUvelsMvYn8TN1Padq6P3a8u/pAVRGW7JmQBIJaccLxav5QCPChf2MQB0sy7kGVVIoMExl2LJyuYcFyvT7eLbccd5Qp/rYasAdrlR0Ym7iRyjKi6vcRjC4RgAQBudljYXsaIqZ/2UHIVjmqEc3ckNfuU29pf13B5Q1o4a7GMMtd78md3qWThnv51q2bIaSj6KHinys8xswZrteVhomJNk0trZCp+itvpzw44123e4uipuiBjv/VQl8paDYSG55BbUMWYodQ86b9B7BSkQspxMjHX569NadV8QNCivDTBWQnQOT1H2viZ+j4r6/X3U2xVS+Gpv83I2kp73AGPORtMynFW1NnwyV3WzfbAxGQjOjNMmi3B1e5r52BHCjUg2/UNdK0Ombp0FCoTkUU67wg7ZA==
X-Forefront-Antispam-Report:
	CIP:20.160.56.81;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)(39850400004)(376002)(346002)(396003)(230922051799003)(82310400011)(186009)(64100799003)(451199024)(1800799012)(36840700001)(46966006)(40470700004)(40480700001)(40460700003)(6506007)(1076003)(2616005)(336012)(47076005)(6666004)(6512007)(478600001)(26005)(6486002)(34070700002)(86362001)(82740400003)(356005)(36756003)(7596003)(7636003)(7416002)(41300700001)(5660300002)(36860700001)(107886003)(83380400001)(2906002)(70586007)(54906003)(316002)(4326008)(70206006)(8676002)(44832011)(8936002);DIR:OUT;SFP:1101;
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2024 16:19:30.2350
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: f1e9c52f-f69f-4de3-1d03-08dc106597bb
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=[repost-eu.tmcas.trendmicro.com]
X-MS-Exchange-CrossTenant-AuthSource:
	VI1EUR05FT049.eop-eur05.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR03MB8679

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: 96f413f47677 ("soc/fsl/qbman: fix issue in qman_delete_cgr_safe()")
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>
---

(no changes since v3)

Changes in v3:
- Change blamed commit to something more appropriate

Changes in v2:
- Fix one additional call to spin_unlock

 drivers/soc/fsl/qbman/qman.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c
index 739e4eee6b75..1bf1f1ea67f0 100644
--- a/drivers/soc/fsl/qbman/qman.c
+++ b/drivers/soc/fsl/qbman/qman.c
@@ -1456,11 +1456,11 @@ 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)) {
-		spin_unlock(&p->cgr_lock);
+		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 +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);
 }
 
@@ -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