From nobody Wed Sep 06 04:19:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgTfl5x9Cz4s3Fs; Wed, 6 Sep 2023 04:19:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgTfl4wN2z3LRX; Wed, 6 Sep 2023 04:19:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693973983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Vw9wYOzY3G2aMmyEeMRqyyUO0crJS4te1fvkSXro4Q=; b=t0XDrzAQ0LOTeRpFTYMz0SZLK8fNpfeT7I5qCMn9b1mRMskQmkPGRhoiiekIncq1GgqRzO BrjcrASWL1B9PI7liotmuGwY/VcPn66lV5r91gs8Ju6RLRpIKjdXSM+fvScP3WaYXEjYsU IcWMfp04OtnteRz9je3KJwlLGYegbkgFiVcaZjQtgzjF+N89OBNFjbAbbbsnHp9uzqCj2H GhmXc5q5kmuviaoZ8QvU6OAZW74d7jZ5VWRbFht0X0x2YF7MamCKUorE4DsGBFWdioVKdm h/eMyxS2QXPYjcrePWI5jNMFVMlIHHqLzjOFwqO609N76nmWZqQA7twKeNgd/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693973983; a=rsa-sha256; cv=none; b=JS8cYeTEnhI63rjQzmRX9AVTw+SENdtk+7PaVUn/6iS51Ba/F7btY8REzw530VpLmDJK4r 4eMSkWanpvE3rkbDEIePHQWumqZtQe6MdiRntbDJMoCwD20lC1nPb+ihNp8XEnn+qkKEQb OWpqdA56xT4w+guDAbwhBeHdk8UYIRC1Wc1IqCgX4eyf9XXFyVgaylNM44cCLNV51E+r51 O9mBvryYWo9qSv5GXu3Euq7HsOedPQXn81RRLGreOvymiOYlw2pMf2XmwaSlzhsY+H6IhE 0+8XP151MGIR9Up8EXTwu0eFFcoO73RrfzeOT/QtPsxTEhJmVUM5eg1Cqhyd/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693973983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Vw9wYOzY3G2aMmyEeMRqyyUO0crJS4te1fvkSXro4Q=; b=QrYAF6Cm+7vga0qH5K40f5DIVEb3lgUf0IQsgAEQsv1yOeqcux+NWE+NYSl0upvF5CtQlJ ACHDA51EUDuhCyIwLSM/0MHD+pOVf1LoerBBIU4N7wmepJ3c5XSPsz9dT7ytPsBga8JSnC l4VBUduaQSppfrZCTb0s1ild3HbRfcpdNlIbrQLZoon/K6PDmEJ0ktzEySOzH7ZmGBF0SO bWc0KZ4ZMSdEMZh8ZvOTLWyzofNRQT2pnlNRtG6SAv0tJE5dYdZFEf+Dms1qHCiTBAVaqB EgMI/4RjmHdbCjvpmEvxPSK196g4lbleumxA+biPAryEqdnC6bPlCjZrCCw9xQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RgTfl3Xv6z127k; Wed, 6 Sep 2023 04:19:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3864Jhod057506; Wed, 6 Sep 2023 04:19:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3864JhvJ057503; Wed, 6 Sep 2023 04:19:43 GMT (envelope-from git) Date: Wed, 6 Sep 2023 04:19:43 GMT Message-Id: <202309060419.3864JhvJ057503@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 337475505b4c - stable/13 - net: Remove vlan metadata on pcp / vlan encapsulation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 337475505b4cdf40510bd2e2788fdce5c0c47367 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=337475505b4cdf40510bd2e2788fdce5c0c47367 commit 337475505b4cdf40510bd2e2788fdce5c0c47367 Author: Zhenlei Huang AuthorDate: 2023-08-30 09:36:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-06 04:18:13 +0000 net: Remove vlan metadata on pcp / vlan encapsulation For oubound traffic, the flag M_VLANTAG is set in mbuf packet header to indicate the underlaying interface do hardware VLAN tag insertion if capable, otherwise the net stack will do 802.1Q encapsulation instead. Commit 868aabb4708d introduced per-flow priority which set the priority ID in the mbuf packet header. There's a corner case that when the driver is disabled to do hardware VLAN tag insertion, and the net stack do 802.1Q encapsulation, then it will result double tagged packets if the driver do not check the enabled capability (hardware VLAN tag insertion). Unfortunately some drivers, currently known cxgbe(4) re(4) ure(4) igc(4) and vmx(4), have this issue. From a quick review for other interface drivers I believe a lot more drivers have the same issue. It makes more sense to fix in net stack than to try to change every single driver. PR: 270736 Reviewed by: kp Fixes: 868aabb4708d Add IP(V6)_VLAN_PCP to set 802.1 priority per-flow MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39499 (cherry picked from commit b22aae410bc7e4e9a6b43e556dc34be72deadb65) (cherry picked from commit 494de30b63de9ef31587dcc3fb8e7249535e840a) --- sys/net/if_ethersubr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 87faf9f26df4..d8043f0551ff 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -442,9 +442,11 @@ ether_set_pcp(struct mbuf **mp, struct ifnet *ifp, uint8_t pcp) struct ether_header *eh; eh = mtod(*mp, struct ether_header *); - if (ntohs(eh->ether_type) == ETHERTYPE_VLAN || - ntohs(eh->ether_type) == ETHERTYPE_QINQ) + if (eh->ether_type == htons(ETHERTYPE_VLAN) || + eh->ether_type == htons(ETHERTYPE_QINQ)) { + (*mp)->m_flags &= ~M_VLANTAG; return (true); + } qtag.vid = 0; qtag.pcp = pcp; @@ -1418,6 +1420,7 @@ ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, struct ifnet *p, if_printf(ife, "unable to prepend 802.1Q header"); return (false); } + (*mp)->m_flags &= ~M_VLANTAG; } return (true); }