From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795108156; b=g68VYpBpuKkRR41MdWYTt7RmRfdK8eFQNVkDB/ZVeBm21Yu6iBnG2eQIoKLsugONNZPe CNgrKRLrUloC61HH4NsiRc49S/UvPytbauK8bN/5WqqbepKXvlkBakq6lqE9WV/Cy3g3V aoyTSlgnllGu+qExoUZm+g3KwOOyjNnTehm2tC64NbsKJJeByXv5zcx+1ipKeWCTPDqJJ wnZlXl9EIvB7sEcLe7FL0i+guba1UOC9LSviCjYTswW2myKJtsRHrnxz2/1YjW+vWP2F8 0OH9JqPa5RQ8qxZcwmExpF4ypnWs1IJYmJ2R1rrF+9USYSo9xOn3+pOHK/xqz2D85lw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795108156; h=Received:DKIM-Signature:Subject:From:To:Cc:Date:Message-ID: In-Reply-To:References:X-sashiko-severity:Content-Type: Content-Transfer-Encoding:MIME-Version; bh=sqvTwsXdZDVo9Q8YUhRZTyiKNxf1YYo/1XNakZHY59k=; b=bacyGBayX7tdu8AcvGswN2Jmqm+xd81siOZKRVcWrvu4fERtju7Q3iXfvqKeAn6DriZi VggqiAPRll9EbLTxWSJCQpbQu0x5VugXyiIIeUNADoG1g6sQp3GClmlCUT7APdLrU7HmN /wUw5fUe6ZlzF46vICSF+f0po7r4Iyjk//djaPehL08PbxMj9/LP5EEWPDHw0zrB4IGRX lVrAXexnqfJjSLpqeGoSjDVdMniWU3ijY28kQ+sgbUzEQ7HcaBXmbJBNjOSAnP+CxGqdu vsQHa4cDf3qggsbvV+iYpqfoPWcH/CCnhrzRXkWFsVaJSB04mu0uYn20kxedBqAuR8Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b="ebmD9/m+"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 38AD5606CA9C; Thu, 19 Nov 2026 17:09:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=ebmD9/m+ Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02D0C1F00926; Thu, 19 Nov 2026 17:09:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1795108156; bh=sqvTwsXdZDVo9Q8YUhRZTyiKNxf1YYo/1XNakZHY59k=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=ebmD9/m+Na9scd8rjMLW0uwVyHsoOUjfmr3+DNbAcwVLr+Nz/10DXRLlJ9UBQUYPn RPTZQEcflL7+Eo3QbXP5REPv1wyQWeaq40kNYMpbQfKP/IKm2JM0cAfddaa5xgDVZP eO7XM7MEAu8QeTRqWcKpOiUqlo9FKk+G1GVKKwnRRNiBlmx3DlnAheYlyDTpeZE8oA rqj5L0ljBqfp8kTLFZwPHNIvDgBJ+NDsv06mDUUI83fOEU7QHRPJFJIa90+0NjfAWL o6U02/MFsiTPg/G2k0TUMCjD4Y8slR/nBUlILplxNdXCXglkKG5KFM65k3I2yYyu9w WuMZE9oFIo3Bg== Subject: Re: [PATCH net-next] net: stmmac: xgmac: Report the VLAN tag type from the descriptor From: netdev-bot+sashiko@kernel.org To: maxime.chevallier@bootlin.com Cc: andrew+netdev@lunn.ch, kuba@kernel.org, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, horms@kernel.org, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, linux@armlinux.org.uk, lorenzo.bianconi@oss.qualcomm.com, nb@tipi-net.de, ovidiu.panait.rb@renesas.com, recv.jo@gmail.com, muhammad.nazim.amirul.nazle.asmade@altera.com, thomas.petazzoni@bootlin.com, alexis.lothore@bootlin.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Date: Thu, 19 Nov 2026 17:09:14 +0000 Message-ID: <179510815456.3136.11469597684415088@kernel.org> In-Reply-To: <20261118162136.2782405-1-maxime.chevallier@bootlin.com> References: <20261118162136.2782405-1-maxime.chevallier@bootlin.com> X-sashiko-severity: Medium Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider. Critical: 0 · High: 0 · Medium: 1 · Low: 1 If you believe none of the issues are legitimate, please reply to each issue of Medium severity or higher and explain why the AI is wrong. If any of them are legitimate and you plan to respin, please let patchwork know by including "pw-bot: cr" as a separate line at the end of your reply (one such reply per series is enough). - [Medium] This patch is a bug fix but carries no Fixes: tag, and the subject reads like a new feature ("Report the VLAN tag type from the… - [Low] The ET/LT macro names in dwxgmac2.h disagree with how the new dwxgmac2_wrback_get_rx_vlan_proto() reads them. -- net: stmmac: xgmac: Report the VLAN tag type from the descriptor This adds a get_rx_vlan_proto() desc op for XGMAC. The op decodes the RDES3 ET_LT field and reports either ETH_P_8021AD or ETH_P_8021Q as the stripped outer tag type. vlan_rx_hw() now uses that op when it exists and keeps ETH_P_8021Q as the fallback. > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c > index 6719ac6e395bc..71ce2bc9b5e11 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c > @@ -76,6 +76,18 @@ static bool dwxgmac2_wrback_get_rx_vlan_valid(struct dma_desc *p) > et_lt <= XGMAC_ET_LT_DVLAN_STAG_CTAG; > } > > +static u16 dwxgmac2_wrback_get_rx_vlan_proto(struct dma_desc *p) > +{ > + switch (FIELD_GET(XGMAC_RDES3_ET_LT, le32_to_cpu(p->des3))) { > + case XGMAC_ET_LT_VLAN_STAG: > + case XGMAC_ET_LT_DVLAN_STAG_STAG: > + case XGMAC_ET_LT_DVLAN_CTAG_STAG: > + return ETH_P_8021AD; > + default: > + return ETH_P_8021Q; > + } > +} [Severity: Low] This isn't a bug, but the macro names in dwxgmac2.h don't match how they are used here. The only comment on them is: drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h: /* Error Type or L2 Type(ET/LT) Field Number */ #define XGMAC_ET_LT_VLAN_STAG 8 #define XGMAC_ET_LT_VLAN_CTAG 9 #define XGMAC_ET_LT_DVLAN_CTAG_CTAG 10 #define XGMAC_ET_LT_DVLAN_STAG_STAG 11 #define XGMAC_ET_LT_DVLAN_CTAG_STAG 12 #define XGMAC_ET_LT_DVLAN_STAG_CTAG 13 Read outer-first, XGMAC_ET_LT_DVLAN_CTAG_STAG means an outer C-tag, yet dwxgmac2_wrback_get_rx_vlan_proto() returns ETH_P_8021AD for it. Likewise XGMAC_ET_LT_DVLAN_STAG_CTAG falls through to ETH_P_8021Q. The commit message says "note inner/outer is reversed in the macro names", but nothing in the tree records that. Could the macros be renamed (for example XGMAC_ET_LT_DVLAN_OUTER_STAG_INNER_CTAG), or could a comment in dwxgmac2.h give the tag order? Otherwise a future user of these constants could easily invert the mapping. If the names do follow the databook's outer-first order, the mapping for values 12 and 13 would be inverted. That can't be checked without the databook, so it would help to confirm which reading is correct. [ ... ] > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c > index fb9aad748cb34..bf23d82e9f383 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c > @@ -209,8 +209,12 @@ static void vlan_rx_hw(struct mac_device_info *hw, > { > if (hw->desc->get_rx_vlan_valid(rx_desc)) { > u16 vid = hw->desc->get_rx_vlan_tci(rx_desc); > + u16 proto = ETH_P_8021Q; > > - __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid); > + if (hw->desc->get_rx_vlan_proto) > + proto = hw->desc->get_rx_vlan_proto(rx_desc); > + > + __vlan_hwaccel_put_tag(skb, htons(proto), vid); [Severity: Medium] Should this patch carry a Fixes: tag? It looks like it fixes a user-visible regression on XGMAC. On XGMAC, __stmmac_dvr_probe() advertises NETIF_F_HW_VLAN_STAG_RX and enables MAC-level stripping by default: drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:__stmmac_dvr_probe() { ... if (priv->plat->core_type == DWMAC_CORE_XGMAC) ndev->features |= NETIF_F_HW_VLAN_STAG_RX; if (dwmac_is_xmac(priv->plat->core_type)) { ndev->hw_features |= NETIF_F_HW_VLAN_CTAG_RX; priv->hw->hw_vlan_en = true; } ... } stmmac_fix_features() also keeps STAG_RX tied to CTAG_RX on XGMAC. Because of this, every frame with a stripped 802.1ad outer tag went through the old vlan_rx_hw() and reached the stack labelled as ETH_P_8021Q. 802.1ad VLAN uppers received no traffic and QinQ between hosts failed. The sibling commit da17990421d7 ("net: stmmac: Disable S-Tag processing on dwmac4") describes this exact failure and carries a Fixes: tag. Its message says the dwxgmac2 side can be fixed using the RDES3 ET_LT field, which is what this patch does. Without a Fixes: tag, stable trees that pick up the dwmac4 half would still mislabel S-tags on XGMAC. Would this be a suitable tag? Fixes: 534df0c1724b ("net: stmmac: dwxgmac2: Add support for HW-accelerated VLAN stripping") That commit started XGMAC hardware stripping with the hardcoded ETH_P_8021Q proto. The subject also reads like a new feature. The commit message only says double VLAN handling "hasn't been working great for a while". Could it state the actual failure, that S-tagged and QinQ frames are passed up as 802.1Q? > } > } -- Sashiko AI review · https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20261118162136.2782405-1-maxime.chevallier%40bootlin.com