From nobody Wed Sep 6 10:17:12 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 4RgdbD2vsdz4swKR; Wed, 6 Sep 2023 10:17:12 +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 4RgdbD2TGDz3fr9; Wed, 6 Sep 2023 10:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693995432; 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=t6EzBKDXcmK3qg++7+991IMM1OdXv9+lQinYNZmD6AU=; b=XqGjQ+JvcEat5n4bPvM9RIetDSiuUZXuyzKgQp+RvgQnte4Vu8vMwMsLVUEjo6pk+0H1z8 8VXiPBUddEB6kiry0m0RQj0cQf3Hk0bU4VY2i30I9eC+YhYq6oNJ3fTs4IKJ3azUpocGZc fot+85IbL++8kD1CQj9iSHv0z8AeAb4POZVH6SicnxKaQzT+krxTIycvu+I/P/h91d2fLG nxg3yl9XFpIPMJkV5RKIBIzrhtSjfYa/JlComg0hHTSAtFBqkHvCnQjv00vW3/ryeFE9nA UwiwP+clmks+i9SbQ5OsaJQGVAnCK3pcZvm6aSv0trSPnkyE0vXYoqTKjYPj6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693995432; a=rsa-sha256; cv=none; b=ljFKroulgZZKIFlGS3s6C43Jc3E9VH8ZLuLnyGQuKew7kXs2zVdGSXqOR2CWM7mQOMjq1O 7RrARZgEJJ1wBEjkz8DmE7Zq4A/G9CRtWwrw1cGjAbdZqFBxe59MjR/xExMxqsUoAeCO6u TDCAYaGC7crlGhw4FsFMb6cN4kH6C5vfTdzKxyIt1sy37mbu9I1RIxsX5g6kX/FfBqetPd EqtyL2F/pycpsWHQU9L81/bypl43kBM1U0sQGe+pVrp4KvDTWuqPlAwn4AhRYotq0EeQnL iVxR+EFPT6/ou2llZqbAblm07QHe9YmPLx19AE6J34AS/iULAzFiaoTIZIgspg== 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=1693995432; 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=t6EzBKDXcmK3qg++7+991IMM1OdXv9+lQinYNZmD6AU=; b=IUGs4npBvhVU4BmSXWxqy058zM3r0ArYHgrhr5vgRju68YLqc8Izmt8xASCd8TnJUgN3L4 NC0OUen8wc2c+oyxDtRG76ltCVTNV+P+Am8yq7MQ+3273DkIGTB8So+NHURKMdUtB7Ag/O u4vLJPkaJcaYulFw01EGWkorRH1nsVZp7PSJW5pplaiu3X2t3FHtyJEzldAKPIXSoRDwXf ymQenzM9GOPXOmn/ZRodvHlR3RXdhhuCUDl/p0bE3WNddjl/tRkuYm+yGX1FfOPTIEehKG hP+SbCELNUOr5ufpaDP7eC1jDnGUr+3M07cXX1RhmJ1BTqbRGuRhLcwkIjs6RA== 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 4RgdbD1Xbsz1BjV; Wed, 6 Sep 2023 10:17:12 +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 386AHCNR054985; Wed, 6 Sep 2023 10:17:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386AHCx4054982; Wed, 6 Sep 2023 10:17:12 GMT (envelope-from git) Date: Wed, 6 Sep 2023 10:17:12 GMT Message-Id: <202309061017.386AHCx4054982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 49d6743da15f - main - 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/main X-Git-Reftype: branch X-Git-Commit: 49d6743da15fe378782e43776df8b4fd4f84c8d0 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=49d6743da15fe378782e43776df8b4fd4f84c8d0 commit 49d6743da15fe378782e43776df8b4fd4f84c8d0 Author: Zhenlei Huang AuthorDate: 2023-09-06 10:15:14 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-06 10:15:14 +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 --- 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)