From nobody Wed Sep 20 04:05:49 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 4Rr4hF5MNgz4tVNZ; Wed, 20 Sep 2023 04:05:49 +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 4Rr4hF4jNBz3J5j; Wed, 20 Sep 2023 04:05:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695182749; 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=Vqnnoc8M8s7feWga0tTD/RPLf6GnKHPpkaNlhaniR4U=; b=AlXzewOOYDv6TdJ6I1OUYhmEK+2b70JxTOBeqLTS8oyYBP6jWdyiZJezTkLLoy0NxDwlR6 ifslCxDqdU3p1SE86ntK8C9IZEls9QNw3aUVAtPXMALK3sKw71IBw0El15OqPSdrDRBG7S tWECC4yejNlJ297BrYDyBxqqvngoD9XyLi47RQPvZPRWTQt9SV16gnytT38hYEUiE+4Nkz 5J5JrMq5DLZY2vfklQVhD9RtVmtRoe8J3ln6eBOlRERO60llYmFJANGzAiYRjMv8X4i9YI NQYAiS0fMMjukCHXbDZDtJ9Bu28+QtmrFY3XN8qZszUHX1sQ7ZFRjaghcRnBGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695182749; a=rsa-sha256; cv=none; b=H2W2BEyO2V7r8aUC11v6K2As7LPCZdHTMWNZrEgi5FYlMf8Mp7EXTSWJwnmNt7y8q8biAT 9LpXcRSYZidcd3VFz1RbTqUYzHtYlqnGjmHwiZoPbsx0z2idtD0rE5V/E1io/Lytj1OOVk t5SaZwhHTiZIRVt5kCmIISx2KoLhf8ruxfB4DRMe0zznQjECzL1aOJTKQEfnQgEJqRJfiY 2E9KallSrlX42bOpaskYdcQKa/Qc+rJCvhsvRS2HrtwxnxsqYEhPGfkAZGqndiO8c0nM5H cGxcN0rMpueNKPNxUsZAg3D1UVo0D5K5PvHIZ59I+Gd9I7SzPMi8iSiWj7H3Bw== 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=1695182749; 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=Vqnnoc8M8s7feWga0tTD/RPLf6GnKHPpkaNlhaniR4U=; b=T1vcQcSpAtW9NarwcLERf+Kx5i2aVd9CrSBLBr+rcu9mA65qCLMyhLXWjZBYy2WGCYfVQb 8aq37a9IfEjkycEDyzMf2Mg2rNTzIXp7IzfGk79QyYMDMl5Ej0yOJnVBNQ1YcmFbFz7Pb/ rGEeJpC1xIwc+Nb9u2Q6cJbdKksOEpHDCDgtzm8h38S+/EBd3Fe1uhskULzbfWxrOJBdwB JE/0aexY4SRg6yXWIRWnTXyB3F9nljCRWbDV6LNGWAKwX1bXUPzgbW62VkO+rpAhxUI5AZ e+XvR6TTTK19G7J1sGG21mNFhFl1VZqCjHK94oBKmsohkYuapz/M8vbsZsyWzw== 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 4Rr4hF3dtjzgnn; Wed, 20 Sep 2023 04:05:49 +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 38K45nMp055394; Wed, 20 Sep 2023 04:05:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38K45nfI055391; Wed, 20 Sep 2023 04:05:49 GMT (envelope-from git) Date: Wed, 20 Sep 2023 04:05:49 GMT Message-Id: <202309200405.38K45nfI055391@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: c750055382f7 - stable/14 - net: Check per-flow priority code point for untagged traffic 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/14 X-Git-Reftype: branch X-Git-Commit: c750055382f73db964c20f8eba855a9ac9e19591 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c750055382f73db964c20f8eba855a9ac9e19591 commit c750055382f73db964c20f8eba855a9ac9e19591 Author: Zhenlei Huang AuthorDate: 2023-09-06 10:15:14 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-20 04:04:57 +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) --- 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 ab274eeb88bf..2cbe0ea98f27 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -123,6 +123,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 @@ -470,11 +472,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)) @@ -1400,6 +1398,19 @@ SYSCTL_INT(_net_link_vlan, OID_AUTO, mtag_pcp, CTLFLAG_RW | CTLFLAG_VNET, &VNET_NAME(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 (V_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)