From de1ea2d5171ec53acd69f93821b9507267ee44b7 Mon Sep 17 00:00:00 2001 From: Zhenlei Huang Date: Fri, 7 Oct 2022 13:37:12 +0200 Subject: [PATCH] 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 Differential Revision: https://reviews.freebsd.org/D36855 --- 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 500eb520cd1..27ad2ec0833 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -2504,7 +2504,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; struct route route, *ro; struct sockaddr_in *sin; uint32_t csum_flags; @@ -2517,6 +2517,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) { @@ -2524,11 +2525,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; @@ -2594,7 +2593,7 @@ vxlan_encap4(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, error = ip_output(m, NULL, ro, 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 @@ -2616,7 +2615,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; struct route_in6 route, *ro; struct sockaddr_in6 *sin6; uint32_t csum_flags; @@ -2629,6 +2628,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) { @@ -2636,8 +2636,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; @@ -2712,7 +2710,7 @@ vxlan_encap6(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, error = ip6_output(m, NULL, ro, 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 -- 2.45.0