From nobody Tue Apr 11 17:23:27 2023 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 4Pwt3N0rDgz44DJm; Tue, 11 Apr 2023 17:23:28 +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 4Pwt3N0Czcz4TgH; Tue, 11 Apr 2023 17:23:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681233808; 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=Yq37lRfZUMGCUDNGSve8AvME/Wk61nIc6Arw3CkPtPg=; b=ViSNSRaiLMGq3fYe43TA5HSNpff1j6YkuiUwAFAq/B+h7IOaLvgld0lgJiomRQyorbOP2o dWrNnzZI1xVD3OvmgmmRW35mOi1fla+WtxeOZUYq3XkQi/LWXmAYOcSXl91slqWa7zP9aV b7pR0/8k1kLSn0cWNpJUZkaUApx8GEGd7fyY3CHVEI2QhgZmgNZwYODWTktP+15WjF6fU7 Wq8d3cA5mySkzMwSB772SKxguAmqdRgqkWlhkGYXQ/zbdCrD0b3WFqRMI3S9fymoMTPbjM F9uznym/bNQxOVLSfeeeFYB6uCSANWoqywRL4G+REKcGhohrDQCGM20+gNiCBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681233808; 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=Yq37lRfZUMGCUDNGSve8AvME/Wk61nIc6Arw3CkPtPg=; b=XJ+PQudRIy2tT7RUbTLVRqgmvMbQmNuOqaE+25OPyZ7DFyM784PqVzZYA74pgAvmcMjil+ +a+SL4rDgsvWgg4L9NFbSfanCBTT+p1cyBAj7Q0aaz8IGmGeO0EtxU1oS5XDGa57HTPcS5 I58tsiUEEhxtbahV4gLaojE6QHwvtt5LC8H/HCa0kdIjBtBr4dl/GIN8mYVBEiEGg0BZh1 xBGi/h8GOHQL7c43SjcaONYNOpI36pyf3pRa4lZwfam4vZYNti17zGbaFiPWlPxzgYg3V/ Vsc6on5xjYiOE2xmgXzC+vfmKymwzsWc5RLDlSY5i/SqcFq96ilRRkFl6yV/qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681233808; a=rsa-sha256; cv=none; b=pLzdFtIArPosKF9wbzPYchTd3F1y2Rk7jHZ9lnkv4W+ZOtsk4F12cMTK0YjaAXj5HAn2Cp +SYl+T2Fc3fxso4uq7DHAdBW+NzTa4jzUJcBI72nscH6zXuv6I5GdmD8QjQw6smqaD0TZq nTNEuLANkOIGj55RjAXNUAJmMWCQeX2hZRsZhSdltO4n2sOdLosZZouIu8pFd9vyroOPZT x2Mx4tEW0p4YYLLekKpOz9y4pdLFEQgCV2g0Pmpn1J+viI8DaMvpVEiB5VS5zCw/dE55xc Zc1RgidtF0B7fHKel3OADDWbrdAiilmMFj3hScYp+ibX3ru+N5vAPGmCRZCSSQ== 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 4Pwt3M665dzRWw; Tue, 11 Apr 2023 17:23:27 +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 33BHNRZM010989; Tue, 11 Apr 2023 17:23:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BHNRwF010988; Tue, 11 Apr 2023 17:23:27 GMT (envelope-from git) Date: Tue, 11 Apr 2023 17:23:27 GMT Message-Id: <202304111723.33BHNRwF010988@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 2169f71277b4 - main - tcp: use IPV6_FLOWLABEL_LEN 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: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2169f71277b4703606f97d2dfc703d1d0e2c9c9e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=2169f71277b4703606f97d2dfc703d1d0e2c9c9e commit 2169f71277b4703606f97d2dfc703d1d0e2c9c9e Author: Richard Scheffenegger AuthorDate: 2023-04-11 16:53:20 +0000 Commit: Richard Scheffenegger CommitDate: 2023-04-11 16:53:51 +0000 tcp: use IPV6_FLOWLABEL_LEN Avoid magic numbers when handling the IPv6 flow ID for DSCP and ECN fields and use the named variable instead. Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D39503 --- sys/netinet/ip6.h | 6 +++--- sys/netinet/tcp_output.c | 4 ++-- sys/netinet/tcp_subr.c | 2 +- sys/netinet/tcp_syncache.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h index 1bc79a98e689..6617e1ca7d00 100644 --- a/sys/netinet/ip6.h +++ b/sys/netinet/ip6.h @@ -106,9 +106,9 @@ struct ip6_hdr { #endif #define IPV6_FLOWLABEL_LEN 20 -#define IPV6_TRAFFIC_CLASS(ip6) ((ntohl((ip6)->ip6_flow) >> 20) & 0xff) -#define IPV6_DSCP(ip6) ((ntohl((ip6)->ip6_flow) >> 20) & 0xfc) -#define IPV6_ECN(ip6) ((ntohl((ip6)->ip6_flow) >> 20) & 0x03) +#define IPV6_TRAFFIC_CLASS(ip6) ((ntohl((ip6)->ip6_flow) >> IPV6_FLOWLABEL_LEN) & 0xff) +#define IPV6_DSCP(ip6) ((ntohl((ip6)->ip6_flow) >> IPV6_FLOWLABEL_LEN) & 0xfc) +#define IPV6_ECN(ip6) ((ntohl((ip6)->ip6_flow) >> IPV6_FLOWLABEL_LEN) & 0x03) /* * Extension Headers diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 09036d940815..abfab1a62176 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1204,8 +1204,8 @@ send: tp->t_flags2 &= ~TF2_ECN_SND_ECE; #ifdef INET6 if (isipv6) { - ip6->ip6_flow &= ~htonl(IPTOS_ECN_MASK << 20); - ip6->ip6_flow |= htonl(ect << 20); + ip6->ip6_flow &= ~htonl(IPTOS_ECN_MASK << IPV6_FLOWLABEL_LEN); + ip6->ip6_flow |= htonl(ect << IPV6_FLOWLABEL_LEN); } else #endif diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 80202bc3a416..36112a101fa8 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2005,7 +2005,7 @@ tcp_respond(struct tcpcb *tp, void *ipgen, struct tcphdr *th, struct mbuf *m, ulen = tlen - sizeof(struct ip6_hdr); uh->uh_ulen = htons(ulen); } - ip6->ip6_flow = htonl(ect << 20); + ip6->ip6_flow = htonl(ect << IPV6_FLOWLABEL_LEN); ip6->ip6_vfc = IPV6_VERSION; if (port) ip6->ip6_nxt = IPPROTO_UDP; diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 6a3561b179c2..96f57b9e0d95 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1866,7 +1866,7 @@ syncache_respond(struct syncache *sc, const struct mbuf *m0, int flags) ip6->ip6_nxt = IPPROTO_TCP; th = (struct tcphdr *)(ip6 + 1); } - ip6->ip6_flow |= htonl(sc->sc_ip_tos << 20); + ip6->ip6_flow |= htonl(sc->sc_ip_tos << IPV6_FLOWLABEL_LEN); } #endif #if defined(INET6) && defined(INET)