From nobody Fri Jan 13 04:33:37 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 4NtT7j2qWjz2qkQs; Fri, 13 Jan 2023 04:33:37 +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 4NtT7j2Pg3z46Ct; Fri, 13 Jan 2023 04:33:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673584417; 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=j0rx+WCt2iaGQhzC2MElTYj4iBU0rtR8PIehqZOM6tk=; b=PzestwG4Xw2ep05JAeQF43C88YNttnKfImMB0zx1y0p80DGDxqFcRtvt3XawJqpjkLxQ8b dM4xqh6u4wHho2z+dyrpxuu7i4hz7yTR1C00fqnyaj4Lar3GenqWlBdGG/NSOo6+Q6GIEi Xk0ZcjWINJtwaumZLSlgDm11ktSDw4vT/Q/7UkrCmBD54Zz+vwjrzSwDPnDuD1dQ5keT5X kWaEnykRWjCVdf+CtrBnQJi4G8mNwjvLnb54dqQTUui8yoQtVR1udrTNEQMd5as4ejxEqc ofk2OmpoRiOfGr/ZSQmi/IP971XtZTya1x2buxxELvzyA+AVtWBJy3ZG2rSbSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673584417; 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=j0rx+WCt2iaGQhzC2MElTYj4iBU0rtR8PIehqZOM6tk=; b=yeSX3MCfntpbfLWD3ks6d4yeG0qq2B1xx11dgzQgHnhVwZNP+VifLka0Cc/zpXkeg6G7TX JZWWCwIiNLcw3RAs5hQ64GEFUUhxsBERtho/zD9pdql3SNXV+lhRAz1iGysIJVi5xRGjZZ Lm6BK8GPThWERN/RTh8XhoJGuJ0l2ztF9wzsq1zhZxZ6WQnyg7Drkwxz7qw4imK9AEl4ya ZgTGiMsSf37GnZA6oNBQedWfTJ5TVaqo8q4945OqG9eClFhFq9y1BGuOfMU1Wib6m0DsU2 6pb1hzJaeNG/dcnhC1qmlGrWpFTndoED6XljwKuTYh2i0ZvjA1Ue43s3HH4a+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673584417; a=rsa-sha256; cv=none; b=iSRTI4RPtmRYy00jik8qrRAoE7VbkcHx9yUsQCNxwlhqfImbgZ0Rafp62q5UIEYwC/Fs8G aqnyWQl4AZxa8TphAovmLSqTMuQh9xhnMeC88bEjNIboxkDHLDjqCypftR8FgpnwLSDC1x lQpPC5cLBA2ymHlUOJZBMHZY6BJ5RoPytDUB3jIvrcJ3DDWAnj3zmeVvSb/mweJTeyC1dk Spdz40Nkn+d6NCtpEF1/7xvXCPOssIiQuW8Fla8pQQ3gIJRpgwdpyK318aX+pdo2Q+0Pd0 OQgbV7lcXbrLWRbb2W13pEW1s7XYNnTY8TMFt91DW/afPC1WriPM/gAbjTxqWw== 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 4NtT7j0yyCztsH; Fri, 13 Jan 2023 04:33:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30D4XbXD095242; Fri, 13 Jan 2023 04:33:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30D4XbB2095241; Fri, 13 Jan 2023 04:33:37 GMT (envelope-from git) Date: Fri, 13 Jan 2023 04:33:37 GMT Message-Id: <202301130433.30D4XbB2095241@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: b16d7d17d197 - stable/12 - if_vxlan(4): Correct the statistic for output bytes 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/12 X-Git-Reftype: branch X-Git-Commit: b16d7d17d197b22c775d7ac609e0f753cb975efc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=b16d7d17d197b22c775d7ac609e0f753cb975efc commit b16d7d17d197b22c775d7ac609e0f753cb975efc Author: Zhenlei Huang AuthorDate: 2022-10-07 11:37:12 +0000 Commit: Zhenlei Huang CommitDate: 2023-01-13 04:30:20 +0000 if_vxlan(4): Correct the statistic for output bytes The vxlan interface encapsulates the Ethernet frame by prepending IP/UDP and vxlan headers. For statistics, only the payload, i.e. the encapsulated (inner) frame should be counted. Event: Aberdeen Hackathon 2022 Reviewed by: kp Approved by: kp (mentor) Differential Revision: https://reviews.freebsd.org/D36855 (cherry picked from commit de1ea2d5171ec53acd69f93821b9507267ee44b7) (cherry picked from commit faa7d6c2f94aee09cdc92142d51a0b2eb12b3239) --- sys/net/if_vxlan.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index fc59e9fef820..f31b5dc5b2cd 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -2349,7 +2349,7 @@ vxlan_encap4(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, struct ip *ip; struct in_addr srcaddr, dstaddr; uint16_t srcport, dstport; - int len, mcast, error; + int plen, mcast, error; ifp = sc->vxl_ifp; srcaddr = sc->vxl_src_addr.in4.sin_addr; @@ -2357,6 +2357,7 @@ vxlan_encap4(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, dstaddr = fvxlsa->in4.sin_addr; dstport = fvxlsa->in4.sin_port; + plen = m->m_pkthdr.len; M_PREPEND(m, sizeof(struct ip) + sizeof(struct vxlanudphdr), M_NOWAIT); if (m == NULL) { @@ -2364,11 +2365,9 @@ vxlan_encap4(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, return (ENOBUFS); } - len = m->m_pkthdr.len; - ip = mtod(m, struct ip *); ip->ip_tos = 0; - ip->ip_len = htons(len); + ip->ip_len = htons(m->m_pkthdr.len); ip->ip_off = 0; ip->ip_ttl = sc->vxl_ttl; ip->ip_p = IPPROTO_UDP; @@ -2384,7 +2383,7 @@ vxlan_encap4(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, error = ip_output(m, NULL, NULL, 0, sc->vxl_im4o, NULL); if (error == 0) { if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1); - if_inc_counter(ifp, IFCOUNTER_OBYTES, len); + if_inc_counter(ifp, IFCOUNTER_OBYTES, plen); if (mcast != 0) if_inc_counter(ifp, IFCOUNTER_OMCASTS, 1); } else @@ -2406,7 +2405,7 @@ vxlan_encap6(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, struct ip6_hdr *ip6; const struct in6_addr *srcaddr, *dstaddr; uint16_t srcport, dstport; - int len, mcast, error; + int plen, mcast, error; ifp = sc->vxl_ifp; srcaddr = &sc->vxl_src_addr.in6.sin6_addr; @@ -2414,6 +2413,7 @@ vxlan_encap6(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, dstaddr = &fvxlsa->in6.sin6_addr; dstport = fvxlsa->in6.sin6_port; + plen = m->m_pkthdr.len; M_PREPEND(m, sizeof(struct ip6_hdr) + sizeof(struct vxlanudphdr), M_NOWAIT); if (m == NULL) { @@ -2421,8 +2421,6 @@ vxlan_encap6(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, return (ENOBUFS); } - len = m->m_pkthdr.len; - ip6 = mtod(m, struct ip6_hdr *); ip6->ip6_flow = 0; /* BMV: Keep in forwarding entry? */ ip6->ip6_vfc = IPV6_VERSION; @@ -2452,7 +2450,7 @@ vxlan_encap6(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, error = ip6_output(m, NULL, NULL, 0, sc->vxl_im6o, NULL, NULL); if (error == 0) { if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1); - if_inc_counter(ifp, IFCOUNTER_OBYTES, len); + if_inc_counter(ifp, IFCOUNTER_OBYTES, plen); if (mcast != 0) if_inc_counter(ifp, IFCOUNTER_OMCASTS, 1); } else