From nobody Mon Feb 9 08:50:45 2026 Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 54664275AEB for ; Sat, 31 Jan 2026 04:49:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769834957; cv=none; b=jfS+Rc5XH10FZEhytxu1CBMg1U7W9Uqrm5nSe5gD/YKUcH8J6nhxA4Bz3edXeamYEMlpsOsbWD8AWGkTTN0y3voyKv2Xlps/myElaclI8mrapx9Gy0dpGKA0DLv09873mliKpQJuLQqXijUykAnWLLCu4rvzvevKo8gXrvjD+pU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769834957; c=relaxed/simple; bh=NI/J5YVJoSSiQ3mTUWeXWKPuwaq80Ooxo7G978V0aCM=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=H30dGojSzdamNB+G3duxcEbJxJg1Hp/5p2cBX0t8jwqLvsPAX0XtdVymB5uVlr5PKXWxoEAs4i/9YvyQcQ4EwaCcPFshSw/qPZN9JDuYeY8aW3V0mPQiEg30kt4mI81fKJHA2YXf6uoQ/fkQivGAUbac/e6rvcQBI73jH/b3mZU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=u.northwestern.edu; spf=pass smtp.mailfrom=u.northwestern.edu; dkim=pass (2048-bit key) header.d=u-northwestern-edu.20230601.gappssmtp.com header.i=@u-northwestern-edu.20230601.gappssmtp.com header.b=fCqtSdJ+; arc=none smtp.client-ip=209.85.160.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=u.northwestern.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=u.northwestern.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=u-northwestern-edu.20230601.gappssmtp.com header.i=@u-northwestern-edu.20230601.gappssmtp.com header.b="fCqtSdJ+" Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-4095b6f9c5aso1676625fac.0 for ; Fri, 30 Jan 2026 20:49:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=u-northwestern-edu.20230601.gappssmtp.com; s=20230601; t=1769834955; x=1770439755; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZZXYKxyu6lh9MR30vXXlY8KAs8v4vrLS853z6QRmTzQ=; b=fCqtSdJ+a6VSXJwzpanDWyP0YCiILHw+8OmmZBBN5joYz/lor2ZdmLU5R9hoKCaZ67 Msh3XxVASrCH1MkQ5wo+PVOYGmg+hzQkjsrv3eDUw94kUODm8Es997pI5Jar3GGKQCft W4PEG6ZmL49/1NWV3iFEGd0yoWBsZ6mRGErHkqFD0CFMYGx2K3Tx3FtO5wdOfQauGudC z+/wklq27h2T4IETcXcLPVfVrp+7pCIMJ2tIOhM3I8q5Upnve1gbeyLGLuGqIsSgena5 iJa1+S8l/30haO2T1rtknYY0oL0mglJHMzAY5AEmaosweHe/WoBxWjeFRJvU8hyJn9NW 9thw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769834955; x=1770439755; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ZZXYKxyu6lh9MR30vXXlY8KAs8v4vrLS853z6QRmTzQ=; b=BtoHPjGWmEbPdyZlGXw4ITSDYQkfUcr6Y1QBY9zuPxJv0t+rnZQPNkOj/8PYWJog3H +ZTTshxrUzaysUxj+HWmlzH65gVZPRLbVSGfsFWw4z9Vqrwcn/M0IZ7MM/AJhbEhbOF5 O629F9a/LzdU2xfYMuptH3bl+AuhhUfNgK/oDHnrrP5+S2LT6C47D6v9NJaKsd4Zrfml bvOD0J+iGe2d857IfT6Puss0SyDSvnJWA5fKy4Eak74QvbTpUNAsKkH2zI2Ec2UvFPnA YCUfGE5UifWfS4R9jkREAjDpoDEDD2s1AVv9HVPkmy4m0kPzOekOWw811DmqxCdFm1Sx FzeQ== X-Forwarded-Encrypted: i=1; AJvYcCWwKK/GwCC5kelnkTJ8TcMarIfzYGQCPgX6TKu2MRtUqmS5ZIHhpqW7mhYKm1pvYlsY7XSDIgGMisnv7GQ=@vger.kernel.org X-Gm-Message-State: AOJu0YylX+7+VBAkEvH+X1I01vYd1OdU/5rfE6fgrwm2CKkwxJdfLoAS KNOqVP05u57l/C5w2ShwvWzrSUntYjlGMI8Bjrq9hCw3yapRXoSzdD9Y04tF4Itkl88= X-Gm-Gg: AZuq6aKZ0TUNur+SGKjNLgLlrXHFVjEI0g9+h09odfRaj24djgtwkwpAdNjcmJYQnPb oxAL7cXAKGHkWd9OEg+d1N1BOsojLh99Kx5F+L3zDIrIijuwULQoGj4fI/Lzbb8nN07+qnxTUBK HyT56n2qUQkaQwtk5UEptKOmouAHv/iS5HNQ2vRTfgXTX+7aS+1MlhUPtgX+0p19XPi1OpjjWyG 6OaYi/XtcZ+GQVKbh8IC133m7YDcyVBD0lx0tgGdeN9pmmUcpYL4Cdy4TH+7TsqpEz6etn7clJD kRQ1PBhN1R0I4Nz4wjjMfaOY4A3dTfuKeBxHQJ4FEYTOwYU8YqZz9IGEmERlYvjJ/UyqnFojlJg 59Cqu+RR2kXwD7Z+br4eoPkz5HCZK4RuPH6Ogh4SLdurY8uR3P/EohjhZKLl4kkSLV44ylib2mL os89zLZjKQygMq7ekZo0/m/55o1lb2rVc6jB4QyHltnpfmEqly8befIGWm6LV5H9fsAt3fnqdqK t3XmPPb0beaD/BKxVRYlT2EKZvf5FY= X-Received: by 2002:a05:6870:48d:b0:408:882c:90f6 with SMTP id 586e51a60fabf-409a7026d2cmr2673953fac.57.1769834954611; Fri, 30 Jan 2026 20:49:14 -0800 (PST) Received: from security.cs.northwestern.edu (security.cs.northwestern.edu. [165.124.184.136]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-409570f3029sm7367575fac.1.2026.01.30.20.49.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 20:49:14 -0800 (PST) From: Ziyi Guo To: Vladimir Oltean , Claudiu Manoil , Alexandre Belloni , UNGLinuxDriver@microchip.com Cc: Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ziyi Guo Subject: [PATCH v2] net: mscc: ocelot: add missing lock protection in ocelot_port_xmit() Date: Sat, 31 Jan 2026 04:49:11 +0000 Message-Id: <20260131044911.2257072-1-n7l8m4@u.northwestern.edu> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ocelot_port_xmit() calls ocelot_can_inject() and ocelot_port_inject_frame() without holding ocelot->inj_lock. However, both functions have lockdep_assert_held(&ocelot->inj_lock) indicating that callers must hold this lock. The correct caller felix_port_deferred_xmit() properly acquires the lock using ocelot_lock_inj_grp() before calling these functions. Add ocelot_lock_inj_grp()/ocelot_unlock_inj_grp() around the injection code path in ocelot_port_xmit() to fix the missing lock protection. Fixes: c5e12ac3beb0 ("net: mscc: ocelot: serialize access to the injection/= extraction groups") Signed-off-by: Ziyi Guo --- v2: - Add missing Fixes tag drivers/net/ethernet/mscc/ocelot_net.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mscc/ocelot_net.c b/drivers/net/ethernet/= mscc/ocelot_net.c index 469784d3a1a6..da8579abea1e 100644 --- a/drivers/net/ethernet/mscc/ocelot_net.c +++ b/drivers/net/ethernet/mscc/ocelot_net.c @@ -559,15 +559,22 @@ static netdev_tx_t ocelot_port_xmit(struct sk_buff *s= kb, struct net_device *dev) int port =3D priv->port.index; u32 rew_op =3D 0; =20 - if (!static_branch_unlikely(&ocelot_fdma_enabled) && - !ocelot_can_inject(ocelot, 0)) - return NETDEV_TX_BUSY; + if (!static_branch_unlikely(&ocelot_fdma_enabled)) { + ocelot_lock_inj_grp(ocelot, 0); + + if (!ocelot_can_inject(ocelot, 0)) { + ocelot_unlock_inj_grp(ocelot, 0); + return NETDEV_TX_BUSY; + } + } =20 /* Check if timestamping is needed */ if (ocelot->ptp && (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) { struct sk_buff *clone =3D NULL; =20 if (ocelot_port_txtstamp_request(ocelot, port, skb, &clone)) { + if (!static_branch_unlikely(&ocelot_fdma_enabled)) + ocelot_unlock_inj_grp(ocelot, 0); kfree_skb(skb); return NETDEV_TX_OK; } @@ -582,6 +589,7 @@ static netdev_tx_t ocelot_port_xmit(struct sk_buff *skb= , struct net_device *dev) ocelot_fdma_inject_frame(ocelot, port, rew_op, skb, dev); } else { ocelot_port_inject_frame(ocelot, port, 0, rew_op, skb); + ocelot_unlock_inj_grp(ocelot, 0); =20 consume_skb(skb); } --=20 2.34.1