Re: [PATCH net-next] net: stmmac: xgmac: Report the VLAN tag type from the descriptor

From: Maxime Chevallier

Date: Fri Nov 20 2026 - 05:23:16 EST




On 11/19/26 18:09, netdev-bot+sashiko@xxxxxxxxxx wrote:
> 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.

I don't have the databooks. The AgileX5 doc is pretty clear about which
value is what though, we could rename the macros but that's not very
urgent IMO.

>
> [ ... ]
>
>> 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's not strictly speaking a regression, I'm ok sending this to
net but I'm not sure this is worth.

Maxime