From nobody Wed Sep 20 10:02:07 2023 X-Original-To: dev-commits-src-branches@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 4RrDbM2SQLz4tR8J; Wed, 20 Sep 2023 10:02:07 +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 4RrDbM1sWJz4WKD; Wed, 20 Sep 2023 10:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695204127; 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=g/4wdy6iv81Gy/uDT56KZy1IMS07kGU/ESBryLTupJA=; b=QtvGI6LSUbJ0vsUP0KCY1Ie3cwoluhIUVrtJvMzJMkKz6SX5T2pLtRlUfMcjgsJb2UVRoa 1FcWs+O8JQ/gtom01fj7IGg++UQXUYMxv5Fgsyi0RCE5YfPrMtf8PTMlgprvb+N8kqCSau kYmIDgTWDal9nSgiXH2AIaVt7+unpINDZfC/udzXMvsvbhHga4R4kHbFIxK1+2LtGg3Uhr NtSXqBd3JWYu2W+WcGBHAg8LJ3XP0l6nxCRJK4owldqk7Jj4rO3QZLAwFnnjIfkHd9GB9E NY8HNXjvsFSyzAsNoRUk2EOoZ8R4lwtQTCvs5NazO8uJIZbh+bab6vAwsA4elQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695204127; a=rsa-sha256; cv=none; b=tSfrKHsNsBg7cpDNklKc3UaDqosoq1j0j6X38nWQmrXpDRRGySCj28XLl2SAdNLUUnBM0X gxpHyOHEPaMSy95u96YEObbDZWUR3bZbI+IkhgoO5qzvubwx/74IG00516+yLXfQdwOR6b 9IA3hx2eKYQc0AVyorcVb6fQcCl2AtElV+Az6BBWJBaYeNRk/OeaZa5/cV6U5bcX7Q7J7r RoPjpwbx89Gn70jwV/GQHLdoqWFo9RHaH9n9HeiLVwZ63HegX7FutotbLF6KW+99DAsmdK u0xlAdoqPLsbPoGWO8RhSy4Qud75yIGWx66HMExb7X+ibbRjAdKtLmTPleJUaw== 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=1695204127; 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=g/4wdy6iv81Gy/uDT56KZy1IMS07kGU/ESBryLTupJA=; b=oibKSiyGwdYiM3HmcmvfbRCOTUZLjDADtZW4Tdjl8YL+FNhdHR5Pmsghet9w7PHQPfOcV+ gjFKovNxcSpZRqK+a19z8HmNCoAdfuRtzBvNMled9/JOrfsMmWqNRy+48M1ERgaEHMabSb 3RE9DcVDxyDYpatLMVSbx4WR5jHwmCs202Dvzm/nP7ABgMw4Cdn7SKXsUnb1chhyDMkDyS varuvJXcWSPtYwGrGMYAyQQpIW2IezOy+oPXtxMURzYFURWwwiCx4wioSv10mbGejtobs2 fUKP/w67Q9bzLJ5zELcavwBKpzm7NmXmh1BnYtQ0X1gB/7I4d64MS1mxYi6xNg== 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 4RrDbM0cZvzrkM; Wed, 20 Sep 2023 10:02:07 +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 38KA27vH051691; Wed, 20 Sep 2023 10:02:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38KA27w1051688; Wed, 20 Sep 2023 10:02:07 GMT (envelope-from git) Date: Wed, 20 Sep 2023 10:02:07 GMT Message-Id: <202309201002.38KA27w1051688@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: 8303afca1765 - stable/13 - net: Check per-flow priority code point for untagged traffic List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 8303afca1765148d0069ce5144072b3ae9cab61e Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8303afca1765148d0069ce5144072b3ae9cab61e commit 8303afca1765148d0069ce5144072b3ae9cab61e Author: Zhenlei Huang AuthorDate: 2023-09-06 10:15:14 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-20 10:00:37 +0000 net: Check per-flow priority code point for untagged traffic Commit 868aabb4708d introduced per-flow priority. There's a defect in the logic for untagged traffic, it does not check M_VLANTAG set in the mbuf packet header or MTAG_8021Q/MTAG_8021Q_PCP_OUT tag set by firewall, then can result missing desired priority in the outbound packets. For mbuf packet with M_VLANTAG in header, some interfaces happen to work due to bug in the drivers mentioned in D39499. As modern interfaces have VLAN hardware offloading, the defect is barely noticeable unless the feature per-flow priority is widely tested. As a side effect of this defect, the soft padding to work around buggy bridges is bypassed. That may result in regression if soft padding is requested. PR: 273431 Discussed with: kib Fixes: 868aabb4708d Add IP(V6)_VLAN_PCP to set 802.1 priority per-flow MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39536 (cherry picked from commit 49d6743da15fe378782e43776df8b4fd4f84c8d0) (cherry picked from commit c750055382f73db964c20f8eba855a9ac9e19591) --- sys/net/if_ethersubr.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index d8043f0551ff..a3466c94d312 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -118,6 +118,8 @@ static int ether_resolvemulti(struct ifnet *, struct sockaddr **, struct sockaddr *); static int ether_requestencap(struct ifnet *, struct if_encap_req *); +static inline bool ether_do_pcp(struct ifnet *, struct mbuf *); + #define senderr(e) do { error = (e); goto bad;} while (0) static void @@ -466,11 +468,7 @@ ether_set_pcp(struct mbuf **mp, struct ifnet *ifp, uint8_t pcp) int ether_output_frame(struct ifnet *ifp, struct mbuf *m) { - uint8_t pcp; - - pcp = ifp->if_pcp; - if (pcp != IFNET_PCP_NONE && ifp->if_type != IFT_L2VLAN && - !ether_set_pcp(&m, ifp, pcp)) + if (ether_do_pcp(ifp, m) && !ether_set_pcp(&m, ifp, ifp->if_pcp)) return (0); if (PFIL_HOOKED_OUT(V_link_pfil_head)) @@ -1355,6 +1353,19 @@ SYSCTL_INT(_net_link_vlan, OID_AUTO, mtag_pcp, CTLFLAG_RW, &vlan_mtag_pcp, 0, "Retain VLAN PCP information as packets are passed up the stack"); +static inline bool +ether_do_pcp(struct ifnet *ifp, struct mbuf *m) +{ + if (ifp->if_type == IFT_L2VLAN) + return (false); + if (ifp->if_pcp != IFNET_PCP_NONE || (m->m_flags & M_VLANTAG) != 0) + return (true); + if (vlan_mtag_pcp && + m_tag_locate(m, MTAG_8021Q, MTAG_8021Q_PCP_OUT, NULL) != NULL) + return (true); + return (false); +} + bool ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, struct ifnet *p, const struct ether_8021q_tag *qtag)