Received-SPF: pass (google.com: domain of linux-kernel+bounces-67303-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
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;
From: Sean Anderson <sean.anderson@seco.com>
To: "David S . Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>,
	Paolo Abeni <pabeni@redhat.com>,
	netdev@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org,
	Steffen Trumtrar <s.trumtrar@pengutronix.de>,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	Roy Pledge <roy.pledge@nxp.com>,
	Vladimir Oltean <vladimir.oltean@nxp.com>,
	Li Yang <leoyang.li@nxp.com>,
	Camelia Groza <camelia.groza@nxp.com>,
	Claudiu Manoil <claudiu.manoil@nxp.com>,
	Scott Wood <oss@buserror.net>,
	Sean Anderson <sean.anderson@seco.com>,
	stable@vger.kernel.org
Subject: [RESEND PATCH net v4 1/2] soc: fsl: qbman: Always disable interrupts when taking cgr_lock
Date: Thu, 15 Feb 2024 11:23:26 -0500
Message-Id: <20240215162327.3663092-1-sean.anderson@seco.com>
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-Microsoft-Antispam-Message-Info-Original:
 tnG668E4SNB6rQHMmgtoJPCVCeSyBHh2CxicGa3M0cClWbC/JjGno8Hs1mICWvjgfSNRXsyJ9CKDhAmIlCJCPagvcxIcEhzLYVXcIY9vNEgSi3Vy4Uw5+B7nJ7P++SSa/hHK81gFbhpqqewf6KvoRewL5A68ELWrsQELbVbPmnNNX72ynk1GvOhk3P0H66sipXXCII4HfzodKoiyTNE6iu6pz/nU/9ukh+w6aPKBRttwqoj7MZaZRHYpN31/fPLN4Yq5TmHXP8aTbaT7hl8Fz8p3ygmel6xLg0U5sDar71YfTZw0C7zGZG/bZoHU4wVokY05MbJTi/5C9N/6wWK4YA1hBpamILcTQqOTeX4OxrUTyl1S3vvoQ4xVzuID5ttlxfq3LZDSy1VSqJYLM8NAmNGn68KL3YVl9NBCN2T37Fw8uGKLpntO+L4VFxilFFA6J3ELq3vwNEA3/0VmI0+H4JdHwmtX7+k6khKMIp8ZPmatwD0agiDD3GKPKOr7I0UuauY6nrd7DRVLEhUNsCSplLcyaxBGhyWXHOZBFQYn6eEp221OihYwpipkUFDptXStLbA4ErG6w9vUMgqNllxisInlEQEpWyz//ZggQMrD0/E=
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)(136003)(366004)(396003)(346002)(39850400004)(376002)(230922051799003)(64100799003)(451199024)(186009)(1800799012)(2616005)(41300700001)(1076003)(26005)(2906002)(8676002)(4326008)(7416002)(44832011)(66556008)(66946007)(5660300002)(66476007)(110136005)(478600001)(966005)(6486002)(38350700005)(316002)(6506007)(6512007)(6666004)(52116002)(54906003)(8936002)(86362001)(36756003)(83380400001)(38100700002);DIR:OUT;SFP:1102;
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7449
X-EOPAttributedMessage: 0
X-MS-Exchange-Transport-CrossTenantHeadersStripped:
 AMS0EPF000001B5.eurprd05.prod.outlook.com
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id-Prvs:
	95f58879-c10c-452b-2a23-08dc2e427952
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
	+aISMcb8xGMjYRankcQoFNJ2NU4i2U30dk3+UlbqJ5bd+fySVWNeBzgdp1RoL5C8SK+cUoqK4BabQdcCVf1ZOH4pcI2mdfL8Ub+T5wcTCNjyhK9CTpGiokWM25oxvFeHx9GNYzzr5rWARv/HYesRT1klegPc8ndJTNfAv0vyl0w+FOUtF/FIboZT/oVZ1yReyV+QK7+6zU0JC7wRyUo6RgCuM8NOHgVoyfObTCt3/yo2vNwhUcQFQh2EBkLEgZRoiyQby5Ty2rkDgKjcf4zbD1p8k+d4qrU8C0iAoCiTlzOMYj0MeKyi4M4hfFlxYUh8nSsLOCXtD/uiduwgO2odLGPglCrG15GoBAIShISgyLFXkVXSmv4q08ebnLakSucU+BIkohyM1G3WBRGlxLnSh83Vt9WNdfvE7jWR+3+6ybhpwbV91a0hKCXOau8Faf0nDVZuc+SNBFjB7CT1MoaxDlUnbtGMoMG4LqrzamCojreYvAYhIiiP9iANS4pWZjCMRkkZgTyqDPK1ve/DV7xH0ULD+etD10lWF4YpO1k/WhI9/4vDDN2XexzXEHazvRFLDwOofraUTZFp3FIuoAolGiChVQZJB83KERbU7ArPgPJfrziyTHzERW1jfojDJFg6CJ6oUprg/AeThKl1FNbJmQ==
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)(376002)(346002)(136003)(396003)(39850400004)(230922051799003)(82310400011)(186009)(451199024)(36860700004)(64100799003)(1800799012)(40470700004)(46966006)(1076003)(26005)(356005)(7636003)(7596003)(336012)(83380400001)(82740400003)(2616005)(41300700001)(4326008)(7416002)(8676002)(5660300002)(8936002)(70586007)(70206006)(2906002)(478600001)(44832011)(966005)(6512007)(6486002)(6506007)(316002)(110136005)(6666004)(54906003)(36756003)(86362001);DIR:OUT;SFP:1102;
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2024 16:23:46.5437
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: fbbf3797-9fc6-4eed-75bb-08dc2e427c2e
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:
	AMS0EPF000001B5.eurprd05.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB10396

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()")
CC: stable@vger.kernel.org
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>
---
I got no response the first time I sent this, so I am resending to net.
This issue was introduced in a series which went through net, so I hope
it makes sense to take it via net.

[1] https://lore.kernel.org/linux-arm-kernel/20240108161904.2865093-1-sean.=
anderson@seco.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 *wo=
rk)
        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 =3D p->config->channel;
-       spin_lock(&p->cgr_lock);
+       spin_lock_irq(&p->cgr_lock);

        if (opts) {
                struct qm_mcc_initcgr local_opts =3D *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


[Embedded World 2024, SECO SpA]<https://www.messe-ticket.de/Nuernberg/embed=
dedworld2024/Register/ew24517689>