From nobody Wed Oct 05 23:12:23 2022 X-Original-To: dev-commits-src-main@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 4MjVhl5sfFz4fJJZ; Wed, 5 Oct 2022 23:12:23 +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 4MjVhl550Bz3PXX; Wed, 5 Oct 2022 23:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665011543; 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=cTLoTq8702ZzOt7I/cSzdSp2WVrIaZZk26lGww7r1pc=; b=tKAYyi1j47y81Lmc4p2ZBsWXTuf9sYxXMsq4ZX97MJgrI0gLw0C42luvsc6eWVPegheZVD EW93+3TtSM5OMuBVS9g+1RoVIdjR4+V9Df/N92NoctBXaTvfXtg4b/gii14JSzE4daIdZH Aj0Aa6+jg1n6VNrpJz7OjNahofU5m036MVF73Q8bJ17IPcAB1SJUGKRsB661qhOYuEAZsa E62qNi7mZ484ponmtEUzbULv94qMCY6LVTW3zkq3O20y1awgGbIsjX70ghIsj8C7RQPTZs zPvci/fA2DPMrjV+doPw88N6/qXqTb4rPRad48sSw1hWncpO5LeDr+uQa+ctag== 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 4MjVhl48y5z13vR; Wed, 5 Oct 2022 23:12:23 +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 295NCNbG048325; Wed, 5 Oct 2022 23:12:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 295NCNOx048324; Wed, 5 Oct 2022 23:12:23 GMT (envelope-from git) Date: Wed, 5 Oct 2022 23:12:23 GMT Message-Id: <202210052312.295NCNOx048324@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2220b66fe0d5 - main - Add mbuf_tstmp2timeval() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2220b66fe0d5c2dfdaf3c22dcec3771665874d69 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665011543; 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=cTLoTq8702ZzOt7I/cSzdSp2WVrIaZZk26lGww7r1pc=; b=I08MvPuBZs0z2IRl7BnEzYsFPZhySmf/YoGZaTHPh8rsOra3vtJWcRFBSCBo2pIZhjXcNe f0857IiLoTnyq4YFhb7bGIKP5CchMf7nS8mQRITwgjg5NG2tgoPTbZ660l9gpRV3hYm32e 8mRL/lbYI8Y3kdZECcRVQPJImUIH4llJmRiPoTqQDQ5/r3SRqBd5hqlRezvfkqe4deq2lG fOuTxB5AYklvQER20AAB6uCity7qAsefo8TxpRAd8L0ptffnh8cuWb4RLUeKEcm//AfyrN 9saXzzSR4pywpcgbgU0mSteIwpL2BhYmKT+lzxmoRqmcwGYSrWdvHQV+yyKIzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665011543; a=rsa-sha256; cv=none; b=PWm0Y/o1+P4cE1add89TM6wBq1sHTK4lIdq5pG4iRpj8M/XFefZKvJFHCyIIXx2mKUF6dn XRzGE4la4yW03rTSYareLG0R+QQvNr062CQgSEqIC6pcgO0Q2FGE2ktl6Gd1RMjEYDnNWL Y2GU5Vpr0dkI2bHbEXfO36XD1rLjrB5yGVCN68Y7Rl/Hmv8SrEdwntaHmD3tVnbikLI0/z HPeOLZyjW9agNmk/NAMBIi5fzvJLMCc6np0Nwl6Lp4c1ls/xJFfpHrj1zpepI+GTedvDw+ M/myXvzTtt1gl+tydfIDPoiYwbbDObTyBUPp9cKOgNoXpydmtvsYiZtKHdf1Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2220b66fe0d5c2dfdaf3c22dcec3771665874d69 commit 2220b66fe0d5c2dfdaf3c22dcec3771665874d69 Author: Konstantin Belousov AuthorDate: 2022-10-03 22:49:45 +0000 Commit: Konstantin Belousov CommitDate: 2022-10-05 21:38:13 +0000 Add mbuf_tstmp2timeval() Reviewed by: hselasky, jkim, rscheff Sponsored by: NVIDIA networking MFC after: 1 week Differential revision: https://reviews.freebsd.org/D36870 --- sys/netinet/tcp_stacks/bbr.c | 6 ++---- sys/netinet/tcp_stacks/rack.c | 3 +-- sys/sys/mbuf.h | 14 +++++++++++++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index dd6b823c6142..5c5c1a2f9986 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -2261,8 +2261,7 @@ bbr_log_ack_event(struct tcp_bbr *bbr, struct tcphdr *th, struct tcpopt *to, uin log.u_bbr.lt_epoch = 0; } if (m->m_flags & M_TSTMP_LRO) { - tv.tv_sec = m->m_pkthdr.rcv_tstmp / 1000000000; - tv.tv_usec = (m->m_pkthdr.rcv_tstmp % 1000000000) / 1000; + mbuf_tstmp2timeval(m, &tv); log.u_bbr.flex5 = tcp_tv_to_usectick(&tv); } else { /* No arrival timestamp */ @@ -11691,8 +11690,7 @@ bbr_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, } } if (m->m_flags & M_TSTMP_LRO) { - tv.tv_sec = m->m_pkthdr.rcv_tstmp /1000000000; - tv.tv_usec = (m->m_pkthdr.rcv_tstmp % 1000000000)/1000; + mbuf_tstmp2timeval(m, &tv); } else { /* Should not be should we kassert instead? */ tcp_get_usecs(&tv); diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index de88e47e5e41..813cf0a57c3f 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -14631,8 +14631,7 @@ rack_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, } } if (m->m_flags & M_TSTMP_LRO) { - tv.tv_sec = m->m_pkthdr.rcv_tstmp /1000000000; - tv.tv_usec = (m->m_pkthdr.rcv_tstmp % 1000000000)/1000; + mbuf_tstmp2timeval(m, &tv); } else { /* Should not be should we kassert instead? */ tcp_get_usecs(&tv); diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index fa72314f78ed..97bfd56536e0 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1675,12 +1675,24 @@ mbuf_tstmp2timespec(struct mbuf *m, struct timespec *ts) { KASSERT((m->m_flags & M_PKTHDR) != 0, ("mbuf %p no M_PKTHDR", m)); - KASSERT((m->m_flags & (M_TSTMP|M_TSTMP_LRO)) != 0, ("mbuf %p no M_TSTMP or M_TSTMP_LRO", m)); + KASSERT((m->m_flags & (M_TSTMP|M_TSTMP_LRO)) != 0, + ("mbuf %p no M_TSTMP or M_TSTMP_LRO", m)); ts->tv_sec = m->m_pkthdr.rcv_tstmp / 1000000000; ts->tv_nsec = m->m_pkthdr.rcv_tstmp % 1000000000; } #endif +static inline void +mbuf_tstmp2timeval(struct mbuf *m, struct timeval *tv) +{ + + KASSERT((m->m_flags & M_PKTHDR) != 0, ("mbuf %p no M_PKTHDR", m)); + KASSERT((m->m_flags & (M_TSTMP|M_TSTMP_LRO)) != 0, + ("mbuf %p no M_TSTMP or M_TSTMP_LRO", m)); + tv->tv_sec = m->m_pkthdr.rcv_tstmp / 1000000000; + tv->tv_usec = (m->m_pkthdr.rcv_tstmp % 1000000000) / 1000; +} + #ifdef DEBUGNET /* Invoked from the debugnet client code. */ void debugnet_mbuf_drain(void);