From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4B794C982CC for ; Sat, 19 Sep 2026 12:59:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=t774MCqksyko10xJEtl8EAD6NNryFWQ5tmKdqLGsvVE=; b=ypGqbDU7ecuLynx6HTGOM9s/b8 cuTbSJnR3ALNgKL21RM4XpeNpnb7mTMd1fmIGy5fdm+Kwf94d6VArL0XuzOMUjz2gsXMrMl5WZBD7 k92TcaS8oK16sqxPdd/2kOZMn4qYsEzbiA++AMgvt9IZrVqHnFDEJrruLXE5UfH5jpVjvBZiTTPJ6 SlVccJRx861scrlxe8h4w0oCgSBC1yPAJ1Oup/mNbCcJ3sMJNVwQnSSrl71iySTweyvZD9EnuoEq5 6/i3tj0hwdS4VNNn2MJvKt/GUgQAMXYZ7YLYOmcDWUWD4uMY0xm5SBYlSYUz7U/MsAZ9x3cXtnOxp bJXaqXzw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x7ufC-0000000GIbj-0WpQ; Sat, 19 Sep 2026 12:59:30 +0000 Received: from mail-8140.vip.163.com ([60.191.81.40]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x7ufA-0000000GIbG-1g9N for linux-arm-kernel@lists.infradead.org; Sat, 19 Sep 2026 12:59:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=t7 74MCqksyko10xJEtl8EAD6NNryFWQ5tmKdqLGsvVE=; b=WPBFlyZTLgdRkoPIU8 TiT7Xly5oc7sOZ3Sx3npWErNL6y9AYUYc3bjdBFv+U5hOxjh8MeBm/2f/fJJr/ZP WkSVwyTZVCxVIQYR3EUj9114/yKhcs8DzKaWv5/5lFXp5qIDsIUXkC6Pu2/7QdRU CLR6gLhfez1EsSTJCTjT8IEYU= Received: from hpl-VMware-Virtual-Platform.. (unknown []) by gzga-smtp-mtada-g1-2 (Coremail) with SMTP id _____wA3Rprlhq5qpMqHBg--.54511S4; Sat, 19 Sep 2026 20:58:14 +0800 (CST) From: peilinhe2020@163.com To: Maxime Chevallier , Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peilin He , xu xin , Jiang Kun Subject: [PATCH net v8 2/2] net: stmmac: remove software VLAN tag stripping Date: Sat, 19 Sep 2026 20:54:13 +0800 Message-ID: <20260919125413.18058-3-peilinhe2020@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260919125413.18058-1-peilinhe2020@163.com> References: <20260919125413.18058-1-peilinhe2020@163.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: _____wA3Rprlhq5qpMqHBg--.54511S4 X-Coremail-Antispam: 1Uf129KBjvJXoWxWw13WF4DJr15Cw1rurW3Wrg_yoW7JFy7pa yUAas8Cr4kJrnFvayUtw48ZFy3Aan3KayUJanYyayIyanFkryaqFsagFZIvFWkGrZ3uw13 KFyjvFW5C3WDWrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j12NtUUUUU= X-CM-SenderInfo: xshlzxhqkhjiisq6il2tof0z/xtbC8QYh0mquhub-VQAA3K X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260919_055928_658847_8DA29742 X-CRM114-Status: GOOD ( 14.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Peilin He The software VLAN stripping logic in stmmac_rx_vlan() was originally introduced in 2014 by commit b93819854d6e ("stmmac: Add vlan rx for better GRO performance.") as a workaround to improve GRO performance, since at that time GRO could not handle frames with VLAN tags. However, this limitation was resolved in 2015 by commit 66e5133f19e9 ("vlan: Add GRO support for non hardware accelerated vlan"), which added GRO support for non-hardware-accelerated VLAN frames. Keeping a software fallback path for VLAN stripping is no longer necessary and only adds complexity. After removing it, VLAN tags remain in the packet. Adjust stmmac_has_ip_ethertype() to tolerate a single in-payload VLAN tag so that the MAC RX checksum offload result is still used for tagged IPv4/IPv6 frames on cores without MAC-level stripping. This intentionally changes the advertised features: - dwmac100/dwmac1000 no longer advertise NETIF_F_HW_VLAN_CTAG_RX; they have no hardware VLAN stripping. - NETIF_F_HW_VLAN_STAG_RX is no longer advertised, as the hardware reports stripped S-tags as C-tags. - On xmac cores NETIF_F_HW_VLAN_CTAG_RX is advertised only when the VLAN ops provide .set_hw_vlan_mode and .rx_hw_vlan, so DWXLGMAC no longer falsely advertises RX VLAN offload. With NETIF_F_VLAN_FEATURES possibly empty, EEE RX clock stop may be enabled on some platforms; the preceding selftests patch blocks RX clock stop while the ethtool selftests run. This depends on the preceding selftests fix. Suggested-by: Maxime Chevallier Signed-off-by: Peilin He Reviewed-by: xu xin Reviewed-by: Jiang Kun --- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 38 +++++-------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 9c9e95d66b09..6d4716b1a7ad 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -4752,7 +4752,11 @@ static bool stmmac_has_ip_ethertype(struct sk_buff *skb) proto = __vlan_get_protocol(skb, eth_header_parse_protocol(skb), &depth); - return (depth <= ETH_HLEN) && + /* Software VLAN stripping is gone, so a single VLAN tag may + * still be present. The MAC RX checksum result still applies + * to the inner IP packet. + */ + return (depth <= VLAN_ETH_HLEN) && (proto == htons(ETH_P_IP) || proto == htons(ETH_P_IPV6)); } @@ -5032,24 +5036,6 @@ static netdev_features_t stmmac_features_check(struct sk_buff *skb, return vlan_features_check(skb, features); } -static void stmmac_rx_vlan(struct net_device *dev, struct sk_buff *skb) -{ - struct vlan_ethhdr *veth = skb_vlan_eth_hdr(skb); - __be16 vlan_proto = veth->h_vlan_proto; - u16 vlanid; - - if ((vlan_proto == htons(ETH_P_8021Q) && - dev->features & NETIF_F_HW_VLAN_CTAG_RX) || - (vlan_proto == htons(ETH_P_8021AD) && - dev->features & NETIF_F_HW_VLAN_STAG_RX)) { - /* pop the vlan tag */ - vlanid = ntohs(veth->h_vlan_TCI); - memmove(skb->data + VLAN_HLEN, veth, ETH_ALEN * 2); - skb_pull(skb, VLAN_HLEN); - __vlan_hwaccel_put_tag(skb, vlan_proto, vlanid); - } -} - /** * stmmac_rx_refill - refill used skb preallocated buffers * @priv: driver private structure @@ -5418,9 +5404,7 @@ static void stmmac_dispatch_skb_zc(struct stmmac_priv *priv, u32 queue, if (priv->hw->hw_vlan_en) /* MAC level stripping. */ stmmac_rx_hw_vlan(priv, priv->hw, p, skb); - else - /* Driver level stripping. */ - stmmac_rx_vlan(priv->dev, skb); + skb->protocol = eth_type_trans(skb, priv->dev); if (unlikely(!coe) || !stmmac_has_ip_ethertype(skb)) @@ -5912,9 +5896,6 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) if (priv->hw->hw_vlan_en) /* MAC level stripping. */ stmmac_rx_hw_vlan(priv, priv->hw, p, skb); - else - /* Driver level stripping. */ - stmmac_rx_vlan(priv->dev, skb); skb->protocol = eth_type_trans(skb, priv->dev); @@ -7995,9 +7976,10 @@ static int __stmmac_dvr_probe(struct device *device, ndev->features |= ndev->hw_features | NETIF_F_HIGHDMA; ndev->watchdog_timeo = msecs_to_jiffies(watchdog); #ifdef STMMAC_VLAN_TAG_USED - /* Both mac100 and gmac support receive VLAN tag detection */ - ndev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX; - if (dwmac_is_xmac(priv->plat->core_type)) { + if (priv->hw->vlan && + priv->hw->vlan->set_hw_vlan_mode && + priv->hw->vlan->rx_hw_vlan) { + ndev->features |= NETIF_F_HW_VLAN_CTAG_RX; ndev->hw_features |= NETIF_F_HW_VLAN_CTAG_RX; priv->hw->hw_vlan_en = true; } -- 2.43.0