From nobody Mon Feb 9 06:19:13 2026 Received: from mail-oo1-f48.google.com (mail-oo1-f48.google.com [209.85.161.48]) (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 6A3FA21FF49 for ; Fri, 30 Jan 2026 02:13:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769739186; cv=none; b=k7QpM3kvWmEds0CfI5Hff+YTBiHYvQwAaCPpRJpe00wX498TPsYR/gUbipjSZDG3wfB5UV4/NY0q+CkbD5vx25Uk7S0oA/DQc2IU7B8Y02rs8rlVjF1Dd3Y2FRUHBRzCuZ9PUrviI3OLBWPSmIIVvpm4U2mBgLb1w1A2wnDW0+Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769739186; c=relaxed/simple; bh=Dn0oqzj3iBayzVAA5eJCgjCzUszuWjmSuPyXMeMUfZ0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=a/unLsjr6n8njccaXZ/wkhRx6GWUu+kyDQPaBcW6iZLUp59eCVyph0JcN7uQk4PUgasnDM3nbWJGTGqxd00c2+kDD/CMw3kVi5jIbZjV3/3nu5gOYcvrNcRaIy5JcgibRVG+DyNc5TXPkZydacBmpujLcHgA+z0Y8twXq4Gos7U= 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=PvW12i2p; arc=none smtp.client-ip=209.85.161.48 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="PvW12i2p" Received: by mail-oo1-f48.google.com with SMTP id 006d021491bc7-6630b08ad60so641899eaf.2 for ; Thu, 29 Jan 2026 18:13:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=u-northwestern-edu.20230601.gappssmtp.com; s=20230601; t=1769739183; x=1770343983; 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=80SaEL47Vnh+hnTyM2lFliJDSZtWJHU4tFxt7GihUPg=; b=PvW12i2p5K2TP42HSutgF8M2AWPe1rct45nHTUL3YX32iFnRa0Xz3fxdD8c6LhyS4+ SFtifCrIoFbrUyt4jBr2rWn+9Vd3mfByr/9Syx5zJwMAVTOpuE0+gsq0ETFI2xgBiTVf RpVbwBZcuDuq9GByjQOSUTJeFQRdFQ4LrwprCT0Pflt7uQ8QxtnrGRRP1sgHSStG4EWr OlsyUs4z7plnwDS/Uq+vnCJviwCMWkEpUaZx0xsTA5vi/a6YpUttrtx/3uSnZLrm7mQk QX0+RxnMwS8N3kcQbRljnVAYb53tKekzMrXtjE7HmUuG6eP+rJLsKZWznThGkWpgvP5x O3aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769739183; x=1770343983; 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=80SaEL47Vnh+hnTyM2lFliJDSZtWJHU4tFxt7GihUPg=; b=bMTvGfK7L3zoEQ3R92TscCTkkKsw6ZeD/n/AGb52mhtpvh5Ri7Okp9sdDqwPS+KGfo cbmcJGtGsGt9lsrkCHetMNwiDpVdXZg/WRrYGMXed4imi6p7ZYS2Xa8CKDTQIHCbEQ4B Z850IcqU06Lc34ajI+v+5DUtmY+rQTtI2WCd1kGHTx8Bg8OhIWgTtRuFZqYmFDH0XWks Y7m1dndFkO8cYpnmafqTAcSS/yEc7oA5hup3dk8E597DXOqLiXdmEO3VxJjOpMgFLDHi dtg4gZ/9EK2/yKLjNNT8PGdKtgFNXDxkLDjGYYvhoLmfHtHtL3bW9R/+9l4poHmWhhpZ lNlw== X-Forwarded-Encrypted: i=1; AJvYcCVlINqR8MngVVq85ZtBXwDFnKOZaSMnWkxZaeZRjN2kRNwYQzo9aT+JY9I8qWfvXfSHttjEDzFl6dFrc50=@vger.kernel.org X-Gm-Message-State: AOJu0YyEwBX/pOBtTxjXzUEKZWCVjVIHAKA2EHjsov0y3dX7zWFCNVeV 0YrKhFiVU0IvbzW4Mr3KDGqVgS//Nky8G4wNWsQruiQiUlT11LbtoOZWK66/bmWum/M= X-Gm-Gg: AZuq6aL/PB3B64TtfUOT1zogGLR5A43VoFdNkleS6yfZ99jvyyttUS0ITXgUjmvJYUG RKboQFx1bBKSZ5uyiTIpbjxcd0aW3/w7EmYK5T9c8onygzfpj0By/302GSLhTwHltpWKwKtJjal uij8YhedHScUPV9DmlQpexPjAeMMr7Hd2ZgZG9KzMxl0C0/VU1tHRROZWqznT3X9puRWgg8HJGc 0TlwsvBmFZrBckXEBPyYPDn7g5qU1YTh4n3VX5glTplLHdMHOOt1IqJuK3o5C2GrZ3T4SkDOojM kbJ4g4zSCuX2FS7R7+6aRi4yMfE/1r7r/hRDudkzwacSUM4QYrWorWFUaGDdkzXX5Phy8t95icK TmgXkWSq+eOs0sWFSkSy+9c6YmRwjpz6nL6IctWUgbsbVW4ITHchf032q07Cxd3oCMkttKQ6USs ziVdZGEtKU1nGXdefshsdK9hGcu4f0NTBT83/7//PXd/EnxikdKq/R9Ak+uKVqyWbySW8+e785Z HDOLtEdXv7LEK57ikCa5AqMIoRO4GU= X-Received: by 2002:a05:6820:2909:b0:662:f997:8448 with SMTP id 006d021491bc7-6630f37792emr947590eaf.58.1769739183295; Thu, 29 Jan 2026 18:13:03 -0800 (PST) Received: from security.cs.northwestern.edu (security.cs.northwestern.edu. [165.124.184.136]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-662f9a1a876sm4140788eaf.10.2026.01.29.18.13.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jan 2026 18:13:02 -0800 (PST) From: Ziyi Guo To: Vladimir Oltean , Claudiu Manoil , Alexandre Belloni Cc: UNGLinuxDriver@microchip.com, Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ziyi Guo Subject: [PATCH] net: mscc: ocelot: add missing lock protection in ocelot_port_xmit() Date: Fri, 30 Jan 2026 02:12:58 +0000 Message-Id: <20260130021258.95045-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. Signed-off-by: Ziyi Guo --- 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