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;
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        UNGLinuxDriver@microchip.com, Andrew Lunn <andrew@lunn.ch>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Michael Walle <michael@walle.cc>,
        Vinicius Costa Gomes <vinicius.gomes@intel.com>,
        Maxim Kochetkov <fido_max@inbox.ru>,
        Colin Foster <colin.foster@in-advantage.com>,
        Richie Pearn <richard.pearn@nxp.com>,
        linux-kernel@vger.kernel.org
Subject: [PATCH net 3/3] net: dsa: felix: access QSYS_TAG_CONFIG under tas_lock in vsc9959_sched_speed_set
Date:   Sat,  3 Sep 2022 00:57:02 +0300
Message-Id: <20220902215702.3895073-4-vladimir.oltean@nxp.com>
In-Reply-To: <20220902215702.3895073-1-vladimir.oltean@nxp.com>
References: <20220902215702.3895073-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MprNVvYEcOc2aVwMaGNAUCaB2k8e7fYh4hTXjP5FvdRK2TSKrvemAXlb0ZIE?=
 =?us-ascii?Q?eGp1Uaor2fqW9aC/YQfOjqNIiN9NN+LSl3sSO2Qm058yKm8WnxDsZczmA4d5?=
 =?us-ascii?Q?UgKe+2wlxiyLIx5HPZ/cff7mYezk6vt7sYppoagZL6gN3yTAneqdDvduzcYZ?=
 =?us-ascii?Q?a/v4sGKKIDVCx5F4mu7HT2y4h4QrDsRrVkfb9m8xTUlEA79CFykPsUJcHUQr?=
 =?us-ascii?Q?yNgI+7I3EkWwCpGNcFiM3S+kX613vW5KOFTGYtwdlYgB4ioHoCiU6SRKLor2?=
 =?us-ascii?Q?SxL2cppzQdnSvdK8mV3aAp2Cu53AeN4K6K8m6Bcn41WNgpfVk5Hy4CJTrxTg?=
 =?us-ascii?Q?5l0rdlTGDjXfLI61hdt9Ng8WFE6dd8jpcCwzqaEs/HXI85xVW4vJU66TrLN+?=
 =?us-ascii?Q?G7Vntb5PpxMcB/rPSgocSRrHVyMgvVigH+T322UtsLeoz6Aa6nkpsef0o0LR?=
 =?us-ascii?Q?J7RguzeHtyRToryZJEXQGngGorYIIYCU+hlI86pLWclJLz3DaLedzDH55CY+?=
 =?us-ascii?Q?sWoQjbW24LuK3Tcqvp1R5HsHFhX/vUxGmFgwNIBJcnG9WDBcUvwH8aK8qXqP?=
 =?us-ascii?Q?l4WLmUHKy1NluiTIP/flzkln1hdDtMC/9Mdf32XGQKdqNk/jjOG4IhVlQTTw?=
 =?us-ascii?Q?aPwJ9AePStG4ii0nHCvww6kM0TzLFwQRVMPMwxZzIb/up9osJQr0HyyG0yog?=
 =?us-ascii?Q?5+Seeq0yMP0+qOqGcFoQYGGMsFM212F5o9GHOvNFyeb6JE9zeyeZjrusEE+h?=
 =?us-ascii?Q?SZKqRVGkjceUMbaj46e7UwmrEMRmMa0tYpP02K0btcKd05qMmjGem+erUiQI?=
 =?us-ascii?Q?PTQAfuGzXFhZqYM9ag8xpozRKoDifQ/+/QgZoewkqaBeQ8igtY+DblJcIV87?=
 =?us-ascii?Q?ISZes9g7p7PrDKvKnPx8p4A9ThpieH1cxWDpbP2NYEPjkRpWZD6PNab7oiVQ?=
 =?us-ascii?Q?MSGj5TZ7jjepRzuxDGe2LVqAd/X6EQw9n15IOjXwnsh02e8OVXUjjSMjrejL?=
 =?us-ascii?Q?MYk6uO+ACrD2EbYBvLwVeblHz1Z9bC8XEgvMfY25C2mjKSWWnZKU2nExCLE3?=
 =?us-ascii?Q?rup5s2dczZ+m/hDAcRbHopSyfIUhL68lxOOhnDmYcWVTTFG6ZuW+t6XmXwQt?=
 =?us-ascii?Q?fT2t0R2INguk/4Zfs6ljp1P/1LSFCnkdEsosDkdxXGg4t0cBIUMitkyKXkBE?=
 =?us-ascii?Q?FVidc2WnG3hL+15CnQcjw5cai3jRXeTdmOdQctQIqTFAOELtrxYNOtHWLbuo?=
 =?us-ascii?Q?Apy8gtMbC2fNDpf4fS1fye2GLvNrI5h7JgNQD4VbyHBt7RPs/pXP4Y3H3vXc?=
 =?us-ascii?Q?Ic8yN8edidjRuJS1XV/yQ58Pc+SYG0LEMyYYj/0sI0z6xKt1JUBvMlIZUAYf?=
 =?us-ascii?Q?uOUd67xY/rtxuauJYlPlNyd2GRBcT/Shup3MsEAcVtxYtuHenz6d0y2OK0K4?=
 =?us-ascii?Q?9+kCiM3eeiLvH+paAweR/i3nipLz501KThkH5M4qGUUa/sivUv4mNHywai+K?=
 =?us-ascii?Q?CqXRlLtpoyT/TZDV6emr6TpIjBg9nH/PxvQUY1RExoPCFzgzBjEQaNq3nxTE?=
 =?us-ascii?Q?qJHKERQVq5P8pvfxFZKm6BlCTBC/iHr4A0Bk+CPMtJakKLsczipKArRpQmiP?=
 =?us-ascii?Q?/g=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 47649cf8-931c-4ee1-7dbf-08da8d2e1a64
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2022 21:57:17.9339
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: tC6JSnDkdRBHoajg1bXAp5mV63caNOikGxBz00TiGQLCD1SnhWoVrhB42KhF87Y+g9X/PjygHc/B052UvQctuQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4576
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,
        SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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

The read-modify-write of QSYS_TAG_CONFIG from vsc9959_sched_speed_set()
runs unlocked with respect to the other functions that access it, which
are vsc9959_tas_guard_bands_update(), vsc9959_qos_port_tas_set() and
vsc9959_tas_clock_adjust(). All the others are under ocelot->tas_lock,
so move the vsc9959_sched_speed_set() access under that lock as well, to
resolve the concurrency.

Fixes: 55a515b1f5a9 ("net: dsa: felix: drop oversized frames with tc-taprio instead of hanging the port")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 drivers/net/dsa/ocelot/felix_vsc9959.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 35ce08b485f3..db0aec807965 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -1741,13 +1741,13 @@ static void vsc9959_sched_speed_set(struct ocelot *ocelot, int port,
 		break;
 	}
 
+	mutex_lock(&ocelot->tas_lock);
+
 	ocelot_rmw_rix(ocelot,
 		       QSYS_TAG_CONFIG_LINK_SPEED(tas_speed),
 		       QSYS_TAG_CONFIG_LINK_SPEED_M,
 		       QSYS_TAG_CONFIG, port);
 
-	mutex_lock(&ocelot->tas_lock);
-
 	if (ocelot_port->taprio)
 		vsc9959_tas_guard_bands_update(ocelot, port);
 
-- 
2.34.1