From nobody Sat Jan 28 15:45:22 2023
X-Original-To: dev-commits-src-branches@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 4P3zKt70vHz3b8ys;
Sat, 28 Jan 2023 15:45:22 +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 4P3zKt6GW9z3yts;
Sat, 28 Jan 2023 15:45:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1674920722;
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=O3xZ1VPqHFrl7MkzeT+3aa3QHJV8vqv/Fx8JBC6VQdg=;
b=M2PyzxYZzQkLeE3UfAgV67rdLw0ydrzCym77MCJotVJOW326HLy3GGR4VlSUoFoQn0dBaJ
1iQG8HUKSjDchFe4dwfNdY9nFhkSeZ1hGthaUvp3MG2pi3D5DhwVFxblrddUvBFgQblhzc
6ZIg1XPBoaNd63P3KuxL5of5GYTrUBYHAx8vNu1ljvUqroYaXJUq8kH3U0j7m3Yv5vZ6ZT
wGT50WpQYPcCUr1tAV7Nttbux/vD4Pw77AoXtBRSKRpht+lmln1rghtW10jEYGJ9wCoY5S
m0iLsA7muoP34eevKgZ0pSdtteXwr7KCzdcv9PgENFKc2FGJwBtm1n67jaVzpw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1674920722;
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=O3xZ1VPqHFrl7MkzeT+3aa3QHJV8vqv/Fx8JBC6VQdg=;
b=cDYAFb+9WHFLusC8hkp7eBHUFFCjEQR8jcP6KLUlkayrkcDAKgrT85HHASxK/+lX/Gy/sE
YG5xiBTRPZ3ByVtPtrZGXdrC0D3ccFyafuJJSOf2txvTt2bZ8bhZy0HL9veyhVL8ssUM6D
ZWGjQvofbOLqCSzneHHFeQHV6LQUjJpp8tXjzSkM6RTbKqZp2ft+yP6aIdWjAmHl0N9NxI
WCOahXd+X2ywxBSH+EvL79jQ9+QnCxkIAd9uaknHMARPADdNWJeMq1CLR4KLt82xCtwv4Z
1ZjPCj12DcaZt4MKKmTVRSL01j1JO4teqbUljsIsiGOzVumZv0aXTBpzsHhfOg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674920722; a=rsa-sha256; cv=none;
b=xgyqPvqaaEdzqomOeiqiXhzOzjS2SNhAviA7wSUJmSaj3UnQEWDi9IdyqPPJnBv8Yp/Qj0
rdgFLl/Cn4oQDe01kDji80oGgRi99c6tBHfFvOlTCF21LoQ4oqe7HB7h9LS8hsImR6Hm8E
7ef3d/0UUMEjfOX8PhszEtevxePOelXyPb77UQXOORmR5N3H+UCvOkQIo7rzSLOZOYs6L9
41+/9wDs2dySpCLMOx0ZbDFhLcK7kUQWikYQnK+z9Jjtid3KAbNUyhaYR6ZeXy6Upd1Bz8
flGG3USklgcCfD4xjIXfhk5aeYXPwV83iY5WSFk05+nKUEiwZUgfPYo3adlppQ==
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 4P3zKt5D48zvND;
Sat, 28 Jan 2023 15:45:22 +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 30SFjM0b065800;
Sat, 28 Jan 2023 15:45:22 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30SFjMwA065799;
Sat, 28 Jan 2023 15:45:22 GMT
(envelope-from git)
Date: Sat, 28 Jan 2023 15:45:22 GMT
Message-Id: <202301281545.30SFjMwA065799@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kyle Evans <kevans@FreeBSD.org>
Subject: git: a1362d625340 - stable/13 - grep: properly switch EOL indicator with -z
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: kevans
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a1362d625340c96c3e95f470efec64c00cea3f6f
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kevans:
URL: https://cgit.FreeBSD.org/src/commit/?id=a1362d625340c96c3e95f470efec64c00cea3f6f
commit a1362d625340c96c3e95f470efec64c00cea3f6f
Author: Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2023-01-04 05:21:10 +0000
Commit: Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2023-01-28 15:45:05 +0000
grep: properly switch EOL indicator with -z
-z is supposed to use only the NUL byte as EOL, but we were
inadvertently using both newline and NUL due to REG_NEWLINE in cflags.
The odds of anyone relying on this bsdgrep-specific bug are quite low,
so let's just fix it. At least one port in the wild has been reported
to expect the intended behavior.
Reported by: Hill Ma <maahiuzeon@gmail.com>
Triaged by: the self-proclaimed peanut gallery on Discord
(cherry picked from commit e898a3af97f97f74c0fb22032bbd163f7cc92a05)
---
usr.bin/grep/grep.c | 1 +
usr.bin/grep/tests/grep_freebsd_test.sh | 13 +++++++++++++
2 files changed, 14 insertions(+)
diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c
index 6fbd6bee8ace..f8c38e70e6b3 100644
--- a/usr.bin/grep/grep.c
+++ b/usr.bin/grep/grep.c
@@ -562,6 +562,7 @@ main(int argc, char *argv[])
break;
case 'z':
fileeol = '\0';
+ cflags &= ~REG_NEWLINE;
break;
case BIN_OPT:
if (strcasecmp("binary", optarg) == 0)
diff --git a/usr.bin/grep/tests/grep_freebsd_test.sh b/usr.bin/grep/tests/grep_freebsd_test.sh
index 0d068d5d1c65..f6881791357c 100755
--- a/usr.bin/grep/tests/grep_freebsd_test.sh
+++ b/usr.bin/grep/tests/grep_freebsd_test.sh
@@ -92,9 +92,22 @@ gnuext_body()
}
+atf_test_case zflag
+zflag_body()
+{
+
+ # The -z flag should pick up 'foo' and 'bar' as on the same line with
+ # 'some kind of junk' in between; a bug was present that instead made
+ # it process this incorrectly.
+ printf "foo\nbar\0" > in
+
+ atf_check grep -qz "foo.*bar" in
+}
+
atf_init_test_cases()
{
atf_add_test_case grep_r_implied
atf_add_test_case rgrep
atf_add_test_case gnuext
+ atf_add_test_case zflag
}
From nobody Sun Jan 29 02:52:28 2023
X-Original-To: dev-commits-src-branches@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 4P4G7d2ndpz3c36n;
Sun, 29 Jan 2023 02:52:29 +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 4P4G7d1FFvz40sj;
Sun, 29 Jan 2023 02:52:29 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1674960749;
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=zuUsrDgNRn+M/JbMpVoCkWQww4BEK6ZelEbpleKrfEk=;
b=tgj5X8ZVa7ek3zGvJowdVUxWIcpsOdEdgnlhRBis91V+5aU3rjwJkEUn+VW9eqsz42Yln8
3p4Sff4H2CdMuJCl+F6TgeEihuryE5E0w3DrbXHSXiPyMG4lU+uOBqbcFMb/4ZgEC0equT
L2Xu5AFuybfHXcysbKM60CDOFYyuuE5imDoUPHX7Kz6Djfh+QlwoEYy7zRQqVxrDb9hAB3
YrDTdJD5NpZvIHmeoALROD998FMB6JBafDyLW1axrwdKqTd2Aya3bzX+8Vu4NkwvoVHXww
ZgFnvoyMEMANII9X5zswe288uCxDrIRt5pI4tMNYZZEwe5UV12TSiLZkutgMxw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1674960749;
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=zuUsrDgNRn+M/JbMpVoCkWQww4BEK6ZelEbpleKrfEk=;
b=lACcJM1dosR39vvYHe1kHPDx0dvjcPwYyfZtpc+bMR0zkGHNoSDg7Py2ALDIVp7RN4wNoH
PJ2isJwqZvPWApCI75xLCCNYk7MjzDa+G8hhKV+yAKKroC7j/YlFNM+bhtBnSEIvGsrACF
pLmfTdoLCmHwunChbPx5OG2dnTqZSvFCrxuB/v0dXee9Q4LYRh3LCnsnxBWlqT0EprooWY
bsz14eAmKOEkTsfpaPkO7z73KL6Gvey/XaH+LB2uCRRAbZDXFKRKJsjDrbPNhC27bpfTzc
3hEKMd5F+IigRTVa8brA5zDLj5kdcIP+3gzwCkkcokKu8ioEXr8NloPNTkqxRA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674960749; a=rsa-sha256; cv=none;
b=L518LCfU71CznC7S3JWlVcq7DE8LZ+JE+7dKIJccq/zepkDph3lKt6yswIAEzGV/HFDpmg
jzKM7dZ1hMla/ZXSFISycmLtk2IN3jEOT7Udc70ReDgp7+pyvDv59fnyu63a3qOUXWH13a
UHwkohnAGMjhjpc6+p1MyTRiv9PU3eVG9amKMZJ6Qlcj/oZzPclsIw2n5iP0Kfq/hxeODl
Ezv9lGrQGJf0tFZ7XLE9JWTeSDHgDzhhkVkHXv8wlgRyvrkWoU1QMhAkeMx5xrx7MajGIl
dL49DzJV7XZIPIO586xpID3hOZY/k+wcoTiiy1s+st9C3Q7wujT8gekwtadxsg==
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 4P4G7d03zWz1CYP;
Sun, 29 Jan 2023 02:52:29 +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 30T2qSQ5021427;
Sun, 29 Jan 2023 02:52:28 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30T2qSwa021426;
Sun, 29 Jan 2023 02:52:28 GMT
(envelope-from git)
Date: Sun, 29 Jan 2023 02:52:28 GMT
Message-Id: <202301290252.30T2qSwa021426@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Rick Macklem <rmacklem@FreeBSD.org>
Subject: git: c16c7b399645 - stable/13 - nfsserver: Fix handling of SP4_NONE
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: rmacklem
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: c16c7b399645519b3b5a3999a5283eed088d6fed
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by rmacklem:
URL: https://cgit.FreeBSD.org/src/commit/?id=c16c7b399645519b3b5a3999a5283eed088d6fed
commit c16c7b399645519b3b5a3999a5283eed088d6fed
Author: Rick Macklem <rmacklem@FreeBSD.org>
AuthorDate: 2023-01-15 22:07:40 +0000
Commit: Rick Macklem <rmacklem@FreeBSD.org>
CommitDate: 2023-01-29 02:51:02 +0000
nfsserver: Fix handling of SP4_NONE
For NFSv4.1/4.2, when the client specifies SP4_NONE for
state protection in the ExchangeID operation arguments,
the server MUST allow the state management operations for
any user credentials. (I misread the RFC and thought that
SP4_NONE meant "at the server's discression" and not MUST
be allowed.)
This means that the "sec=XXX" field of the "V4:" exports(5)
line only applies to NFSv4.0.
This patch fixes the server to always allow state management
operations for SP4_NONE, which is the only state management
option currently supported. (I have patches that add support
for SP4_MACH_CRED to the server. These will be in a future commit.)
In practice, this bug does not seem to have caused
interoperability problems.
(cherry picked from commit 5a0050e68a54353af53ac28df90854797ebbef16)
---
sys/fs/nfsserver/nfs_nfsdstate.c | 7 ++++++-
sys/fs/nfsserver/nfs_nfsdsubs.c | 8 ++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c
index d7dd69dad9d7..26bdeb1c641f 100644
--- a/sys/fs/nfsserver/nfs_nfsdstate.c
+++ b/sys/fs/nfsserver/nfs_nfsdstate.c
@@ -5867,12 +5867,17 @@ nfsrv_throwawayopens(NFSPROC_T *p)
/*
* This function checks to see if the credentials are the same.
- * Returns 1 for not same, 0 otherwise.
+ * The check for same credentials is needed for state management operations
+ * for NFSv4.0 where 1 is returned if not same, 0 is returned otherwise.
*/
static int
nfsrv_notsamecredname(struct nfsrv_descript *nd, struct nfsclient *clp)
{
+ /* For NFSv4.1/4.2, SP4_NONE always allows this. */
+ if ((nd->nd_flag & ND_NFSV41) != 0)
+ return (0);
+
if (nd->nd_flag & ND_GSS) {
if (!(clp->lc_flags & LCL_GSS))
return (1);
diff --git a/sys/fs/nfsserver/nfs_nfsdsubs.c b/sys/fs/nfsserver/nfs_nfsdsubs.c
index ca691941ed0d..20f62211f53e 100644
--- a/sys/fs/nfsserver/nfs_nfsdsubs.c
+++ b/sys/fs/nfsserver/nfs_nfsdsubs.c
@@ -2121,6 +2121,14 @@ nfsd_checkrootexp(struct nfsrv_descript *nd)
if (nfs_rootfhset == 0)
return (NFSERR_AUTHERR | AUTH_FAILED);
+ /*
+ * For NFSv4.1/4.2, if the client specifies SP4_NONE, then these
+ * operations are allowed regardless of the value of the "sec=XXX"
+ * field in the V4: exports line.
+ * As such, these Kerberos checks only apply to NFSv4.0 mounts.
+ */
+ if ((nd->nd_flag & ND_NFSV41) != 0)
+ goto checktls;
if ((nd->nd_flag & (ND_GSS | ND_EXAUTHSYS)) == ND_EXAUTHSYS)
goto checktls;
if ((nd->nd_flag & (ND_GSSINTEGRITY | ND_EXGSSINTEGRITY)) ==
From nobody Sun Jan 29 07:50:50 2023
X-Original-To: dev-commits-src-branches@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 4P4Nlt533yz3bVjt;
Sun, 29 Jan 2023 07:50:50 +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 4P4Nlt4XCqz4P7F;
Sun, 29 Jan 2023 07:50:50 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1674978650;
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=5hZkmjZ4Xc3/z2sxWd3lGGRcyHXOvQPNqz11k5Wn9co=;
b=r7tSg0SEM9xC0/2IZZZMNkWNtDEuKHL1Js7DAJW4/W8FqKd9FeNCNxqkkDnbYMFoqdpyyJ
3TigPvsKenysIKnx8iOxKlRUP03PXURQKxOa+Pxvc2IUohAWMga3wigwinF4qPLqkYLWrH
jlzHBsuLYYXtUcTwccUiYM17RWpm4e/Vv+MmwEvnGIIKXumj0dU2tF+3AKbW1eDUt2PWRC
ldBqlfmX0rK18uU2mvJOXzQxMaWj2I0DYPFB95JHwQvSMYEeoJTkmZNRwgC71Q4rRDrL3e
lTMlYlkDeot7fmfqAK+IOlgyAWKkuJ+0Np91YGqhDt+qpZPifYneQfxQy1IAkg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1674978650;
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=5hZkmjZ4Xc3/z2sxWd3lGGRcyHXOvQPNqz11k5Wn9co=;
b=lRyEseKW5VA3kL6IGXr1j4GHdYHjlx+Fdz4tKj8Jca8JePKsGLur78JSmtBHVK5niGlRaz
aQzvpvmr3Bh4zfzFXhi8BzVzIzs71NYBQZAs93VWdSG3ana3ej3a9JFwUwqiAbnQHeENff
ITkAUXnrJOiuIAjojlHS3xEQISe6tkrujs5Vr25awlhxqdCEjxM8eJc0S6PgfW4AF3L/nj
23UB2hoRA2akMVSJ4ctN4LqO0kL6Gz3STdWryzO1ylUvYSYxgS9aDt5nzt9mJrFGn/UeN2
rxAyukBF8jsfVi8YQzG4rTwGhgwYVY04G9Lf9pz93OSd6kAjmmTPzZDh9IKo2Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674978650; a=rsa-sha256; cv=none;
b=P8m/u1nHZeDMAOIM+2TnrE1397z/Lchwj+unGhmieMkh6pr5LBAADXDG3YgPntO5yjHaBL
OmZmt5mLAyReTx8SDopfOhD8o2bbOYN2t+Pqd5CV0VR2T/sPnhHdwyfjNOrPisjt7rqkhO
m+6kkFOqbSO5u4YitmiCeiJLuTjK7iNu/Rb5CuVp7C7JwFI1WAyjL8+janycWXIPev3OCq
3W7I+ND4gjTNEUnAjdwO+wIoJI5P5k47o3mXcjmX6WDWQQf6WpqpEt3Vej+3iyHwiNRze+
SClWxH14bzUEYNcx68s0qWk0Lc2vUNK/7wGJL31VpvPRCn+i0+A40pik/shizA==
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 4P4Nlt3bKNzLMZ;
Sun, 29 Jan 2023 07:50:50 +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 30T7ooSL046277;
Sun, 29 Jan 2023 07:50:50 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30T7oodC046263;
Sun, 29 Jan 2023 07:50:50 GMT
(envelope-from git)
Date: Sun, 29 Jan 2023 07:50:50 GMT
Message-Id: <202301290750.30T7oodC046263@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: 8968ad84e959 - stable/13 - netpfil tests: improve sniffer.py
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: kp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 8968ad84e959d31d059c4c2990fe2d7554613ac0
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=8968ad84e959d31d059c4c2990fe2d7554613ac0
commit 8968ad84e959d31d059c4c2990fe2d7554613ac0
Author: Kajetan Staszkiewicz <vegeta@tuxpowered.net>
AuthorDate: 2023-01-20 01:40:34 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2023-01-29 05:37:46 +0000
netpfil tests: improve sniffer.py
Multiple improvements to sniffer.py:
* Remove ambiguity of configuring recvif, it must be now explicitly specified.
* Don't catch exceptions around creating the sniffer, let it properly
fail and display the whole stack trace.
* Count correct packets so that duplicates can be found.
MFC after: 1 week
Sponsored by: InnoGames GmbH
Differential Revision: https://reviews.freebsd.org/D38120
(cherry picked from commit a39dedeb31052ec74b0cd394d56f8d7cc8534645)
---
tests/sys/net/pcp.py | 4 ++--
tests/sys/net/stp.py | 4 ++--
tests/sys/netpfil/common/pft_icmp_check.py | 4 ++--
tests/sys/netpfil/common/pft_ping.py | 10 +++++-----
tests/sys/netpfil/common/sniffer.py | 20 +++++++-------------
tests/sys/netpfil/pf/CVE-2019-5598.py | 4 ++--
6 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/tests/sys/net/pcp.py b/tests/sys/net/pcp.py
index cea88faaf438..c0b6d4efc3b0 100644
--- a/tests/sys/net/pcp.py
+++ b/tests/sys/net/pcp.py
@@ -61,11 +61,11 @@ def main():
args = parser.parse_args()
- sniffer = Sniffer(args, check_pcp, recvif=args.recvif[0], timeout=20)
+ sniffer = Sniffer(args, check_pcp, args.recvif[0], timeout=20)
sniffer.join()
- if sniffer.foundCorrectPacket:
+ if sniffer.correctPackets:
sys.exit(0)
sys.exit(1)
diff --git a/tests/sys/net/stp.py b/tests/sys/net/stp.py
index 3e7d011efdd1..dc6634fb7279 100644
--- a/tests/sys/net/stp.py
+++ b/tests/sys/net/stp.py
@@ -100,14 +100,14 @@ def main():
args = parser.parse_args()
- sniffer = Sniffer(args, check_stp)
+ sniffer = Sniffer(args, check_stp, args.recvif[0])
invalid_stp(args.sendif[0])
sniffer.join()
# The 'correct' packet is a corrupt STP packet, so it shouldn't turn up.
- if sniffer.foundCorrectPacket:
+ if sniffer.correctPackets:
sys.exit(1)
if __name__ == '__main__':
diff --git a/tests/sys/netpfil/common/pft_icmp_check.py b/tests/sys/netpfil/common/pft_icmp_check.py
index e3c5b927aa63..070465a198f7 100644
--- a/tests/sys/netpfil/common/pft_icmp_check.py
+++ b/tests/sys/netpfil/common/pft_icmp_check.py
@@ -96,14 +96,14 @@ def main():
args = parser.parse_args()
sniffer = None
if not args.recvif is None:
- sniffer = Sniffer(args, check_icmp_too_big)
+ sniffer = Sniffer(args, check_icmp_too_big, args.recvif[0])
ping(args.sendif[0], args.to[0], args)
if sniffer:
sniffer.join()
- if sniffer.foundCorrectPacket:
+ if sniffer.correctPackets:
sys.exit(0)
else:
sys.exit(1)
diff --git a/tests/sys/netpfil/common/pft_ping.py b/tests/sys/netpfil/common/pft_ping.py
index 9cc7c5d5c5c0..20d4164c6e3e 100644
--- a/tests/sys/netpfil/common/pft_ping.py
+++ b/tests/sys/netpfil/common/pft_ping.py
@@ -290,16 +290,16 @@ def main():
if args.tcpsyn:
checkfn=check_tcpsyn
- sniffer = Sniffer(args, checkfn)
+ sniffer = Sniffer(args, checkfn, args.recvif[0])
replysniffer = None
if not args.replyif is None:
checkfn=check_ping_reply
- replysniffer = Sniffer(args, checkfn, recvif=args.replyif[0])
+ replysniffer = Sniffer(args, checkfn, args.replyif[0])
dupsniffer = None
if args.checkdup is not None:
- dupsniffer = Sniffer(args, check_dup, recvif=args.checkdup[0])
+ dupsniffer = Sniffer(args, check_dup, args.checkdup[0])
if args.tcpsyn:
tcpsyn(args.sendif[0], args.to[0], args)
@@ -317,7 +317,7 @@ def main():
if sniffer:
sniffer.join()
- if sniffer.foundCorrectPacket:
+ if sniffer.correctPackets:
sys.exit(0)
else:
sys.exit(1)
@@ -325,7 +325,7 @@ def main():
if replysniffer:
replysniffer.join()
- if replysniffer.foundCorrectPacket:
+ if replysniffer.correctPackets:
sys.exit(0)
else:
sys.exit(1)
diff --git a/tests/sys/netpfil/common/sniffer.py b/tests/sys/netpfil/common/sniffer.py
index 5e09a2e4db37..cee6f73e22dc 100644
--- a/tests/sys/netpfil/common/sniffer.py
+++ b/tests/sys/netpfil/common/sniffer.py
@@ -31,18 +31,15 @@ import scapy.all as sp
import sys
class Sniffer(threading.Thread):
- def __init__(self, args, check_function, recvif=None, timeout=3):
+ def __init__(self, args, check_function, recvif, timeout=3):
threading.Thread.__init__(self)
self._sem = threading.Semaphore(0)
self._args = args
self._timeout = timeout
- if recvif is not None:
- self._recvif = recvif
- else:
- self._recvif = args.recvif[0]
+ self._recvif = recvif
self._check_function = check_function
- self.foundCorrectPacket = False
+ self.correctPackets = 0
self.start()
if not self._sem.acquire(timeout=30):
@@ -51,7 +48,7 @@ class Sniffer(threading.Thread):
def _checkPacket(self, packet):
ret = self._check_function(self._args, packet)
if ret:
- self.foundCorrectPacket = True
+ self.correctPackets += 1
return ret
def _startedCb(self):
@@ -59,9 +56,6 @@ class Sniffer(threading.Thread):
def run(self):
self.packets = []
- try:
- self.packets = sp.sniff(iface=self._recvif,
- stop_filter=self._checkPacket, timeout=self._timeout,
- started_callback=self._startedCb)
- except Exception as e:
- print(e, file=sys.stderr)
+ self.packets = sp.sniff(iface=self._recvif,
+ stop_filter=self._checkPacket, timeout=self._timeout,
+ started_callback=self._startedCb)
diff --git a/tests/sys/netpfil/pf/CVE-2019-5598.py b/tests/sys/netpfil/pf/CVE-2019-5598.py
index 603a1aef376f..b72c04c5e19b 100644
--- a/tests/sys/netpfil/pf/CVE-2019-5598.py
+++ b/tests/sys/netpfil/pf/CVE-2019-5598.py
@@ -72,7 +72,7 @@ def main():
sp.sendp(udp, iface=args.sendif[0], verbose=False)
# Start sniffing on recvif
- sniffer = Sniffer(args, check_icmp_error)
+ sniffer = Sniffer(args, check_icmp_error, args.recvif[0])
# Send the bad error packet
icmp_reachable = sp.Ether() / \
@@ -83,7 +83,7 @@ def main():
sp.sendp(icmp_reachable, iface=args.sendif[0], verbose=False)
sniffer.join()
- if sniffer.foundCorrectPacket:
+ if sniffer.correctPackets:
sys.exit(1)
sys.exit(0)
From nobody Sun Jan 29 07:50:50 2023
X-Original-To: dev-commits-src-branches@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 4P4Nlv2Jxhz3bVpt;
Sun, 29 Jan 2023 07:50:51 +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 4P4Nlv1KwBz4PWW;
Sun, 29 Jan 2023 07:50:51 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1674978651;
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=LMwpeRDGMgqfT0V4DooPlys7YrqxhS2Qf4uGzLjx/7k=;
b=uC528t5iyNUBFA2Wme3hzD0Jj8kjQ5nlwUyJ0OkLoaOa4ceoqtvF/M9gjfCdyHiLf4lgVY
MVMGrEpCPgVJHD6cFKJlTj72NL4kQgvJZNq49MEF86otfUPckz3K3vw240QvT4BdA/ncA5
0S7HOMMUfJwlh/pDWPuMHvoHHsIglQ+ZHt+kvkEQTStW7KJze8xDgwPMD6twytnzRhTf0H
eujO9od/2ZzMifQDybNpaxNObruAoPdVj/++J3XHov5LNREblE7/35N7RdgzxUgo5z6d8g
lFQGrPVULzJd6QiEz27xLOjfu0tTwgB2WIFZGmEOK4rNVKic11TOJ7CW1mEH4g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1674978651;
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=LMwpeRDGMgqfT0V4DooPlys7YrqxhS2Qf4uGzLjx/7k=;
b=TRrgCHXvKbI7c+vchkkpflUoaR4woIX+QJAPv2ginxaEujUOTc/NF6EtUuulXLgNjT7rbJ
MW/ik6eAL8bSIlXZ3YCEBVvXg5HplYNtBWZKMkUnk1H1yt4xLTntbsBL7Y3cXf+BX4URsM
9WtOph/rqr1iv7nzm7EPZO/i0mu9+uglibD7fyQ2co7x1DkDYWCq4+1ViyULob02nVMK2I
SrrsmYk2i3amWweXH2WzipNTNF5gw00MMZj8oFFWtpG0L5cxrrpZB1embvdN6vBuFt2Ffd
rYhsZTY8wSv2dtbnR3Aki+oTGbM/4NzvIz7yPmEYVZXgpFCSgKp0v15wk6jTcg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674978651; a=rsa-sha256; cv=none;
b=URwu6KWSh+t8Uou/BTlg50bt7ZmbYfYmqM98P+HacbwAkLtANjVGTrp8EfPT4YXD/xYGG7
bDSs5tDxhdzQ8fWIW5hfe88QicHF86Xju0YL4v/xgLFf+3i/ahCB9nFQr5Jl5iEDwFX4jI
h67tL5kCpERlM2uvT07ybB0oXggcWsLNenRjqA9iAwSw7wdRHN6lkWV92BCFGzDNhLCmFa
Dejb0OGYloejWofbQBpYaUatkZZ8TnJCpbQ/uTzD2bVnO95kvD2dMLYnPQ0fbS+NO2vyFz
FCFdnQ22UDa6nVYFkpSc5Q30bxxQOBFkVTeTdKgkC3cQiVGo2V/2MHUT25TArA==
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 4P4Nlv0RqXzLkX;
Sun, 29 Jan 2023 07:50:51 +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 30T7ooaN047131;
Sun, 29 Jan 2023 07:50:50 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30T7ooWl047119;
Sun, 29 Jan 2023 07:50:50 GMT
(envelope-from git)
Date: Sun, 29 Jan 2023 07:50:50 GMT
Message-Id: <202301290750.30T7ooWl047119@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: e2be74cff37a - stable/12 - netpfil tests: improve sniffer.py
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: kp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: e2be74cff37aa46695838bcede8eb4b7d32f31f2
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=e2be74cff37aa46695838bcede8eb4b7d32f31f2
commit e2be74cff37aa46695838bcede8eb4b7d32f31f2
Author: Kajetan Staszkiewicz <vegeta@tuxpowered.net>
AuthorDate: 2023-01-20 01:40:34 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2023-01-29 01:47:18 +0000
netpfil tests: improve sniffer.py
Multiple improvements to sniffer.py:
* Remove ambiguity of configuring recvif, it must be now explicitly specified.
* Don't catch exceptions around creating the sniffer, let it properly
fail and display the whole stack trace.
* Count correct packets so that duplicates can be found.
MFC after: 1 week
Sponsored by: InnoGames GmbH
Differential Revision: https://reviews.freebsd.org/D38120
(cherry picked from commit a39dedeb31052ec74b0cd394d56f8d7cc8534645)
---
tests/sys/net/pcp.py | 4 ++--
tests/sys/net/stp.py | 4 ++--
tests/sys/netpfil/common/pft_icmp_check.py | 4 ++--
tests/sys/netpfil/common/pft_ping.py | 10 +++++-----
tests/sys/netpfil/common/sniffer.py | 20 +++++++-------------
tests/sys/netpfil/pf/CVE-2019-5598.py | 4 ++--
6 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/tests/sys/net/pcp.py b/tests/sys/net/pcp.py
index cea88faaf438..c0b6d4efc3b0 100644
--- a/tests/sys/net/pcp.py
+++ b/tests/sys/net/pcp.py
@@ -61,11 +61,11 @@ def main():
args = parser.parse_args()
- sniffer = Sniffer(args, check_pcp, recvif=args.recvif[0], timeout=20)
+ sniffer = Sniffer(args, check_pcp, args.recvif[0], timeout=20)
sniffer.join()
- if sniffer.foundCorrectPacket:
+ if sniffer.correctPackets:
sys.exit(0)
sys.exit(1)
diff --git a/tests/sys/net/stp.py b/tests/sys/net/stp.py
index 3e7d011efdd1..dc6634fb7279 100644
--- a/tests/sys/net/stp.py
+++ b/tests/sys/net/stp.py
@@ -100,14 +100,14 @@ def main():
args = parser.parse_args()
- sniffer = Sniffer(args, check_stp)
+ sniffer = Sniffer(args, check_stp, args.recvif[0])
invalid_stp(args.sendif[0])
sniffer.join()
# The 'correct' packet is a corrupt STP packet, so it shouldn't turn up.
- if sniffer.foundCorrectPacket:
+ if sniffer.correctPackets:
sys.exit(1)
if __name__ == '__main__':
diff --git a/tests/sys/netpfil/common/pft_icmp_check.py b/tests/sys/netpfil/common/pft_icmp_check.py
index e3c5b927aa63..070465a198f7 100644
--- a/tests/sys/netpfil/common/pft_icmp_check.py
+++ b/tests/sys/netpfil/common/pft_icmp_check.py
@@ -96,14 +96,14 @@ def main():
args = parser.parse_args()
sniffer = None
if not args.recvif is None:
- sniffer = Sniffer(args, check_icmp_too_big)
+ sniffer = Sniffer(args, check_icmp_too_big, args.recvif[0])
ping(args.sendif[0], args.to[0], args)
if sniffer:
sniffer.join()
- if sniffer.foundCorrectPacket:
+ if sniffer.correctPackets:
sys.exit(0)
else:
sys.exit(1)
diff --git a/tests/sys/netpfil/common/pft_ping.py b/tests/sys/netpfil/common/pft_ping.py
index ff4f19f43af7..5421eb38e36c 100644
--- a/tests/sys/netpfil/common/pft_ping.py
+++ b/tests/sys/netpfil/common/pft_ping.py
@@ -264,16 +264,16 @@ def main():
if args.tcpsyn:
checkfn=check_tcpsyn
- sniffer = Sniffer(args, checkfn)
+ sniffer = Sniffer(args, checkfn, args.recvif[0])
replysniffer = None
if not args.replyif is None:
checkfn=check_ping_reply
- replysniffer = Sniffer(args, checkfn, recvif=args.replyif[0])
+ replysniffer = Sniffer(args, checkfn, args.replyif[0])
dupsniffer = None
if args.checkdup is not None:
- dupsniffer = Sniffer(args, check_dup, recvif=args.checkdup[0])
+ dupsniffer = Sniffer(args, check_dup, args.checkdup[0])
if args.tcpsyn:
tcpsyn(args.sendif[0], args.to[0], args)
@@ -291,7 +291,7 @@ def main():
if sniffer:
sniffer.join()
- if sniffer.foundCorrectPacket:
+ if sniffer.correctPackets:
sys.exit(0)
else:
sys.exit(1)
@@ -299,7 +299,7 @@ def main():
if replysniffer:
replysniffer.join()
- if replysniffer.foundCorrectPacket:
+ if replysniffer.correctPackets:
sys.exit(0)
else:
sys.exit(1)
diff --git a/tests/sys/netpfil/common/sniffer.py b/tests/sys/netpfil/common/sniffer.py
index 5e09a2e4db37..cee6f73e22dc 100644
--- a/tests/sys/netpfil/common/sniffer.py
+++ b/tests/sys/netpfil/common/sniffer.py
@@ -31,18 +31,15 @@ import scapy.all as sp
import sys
class Sniffer(threading.Thread):
- def __init__(self, args, check_function, recvif=None, timeout=3):
+ def __init__(self, args, check_function, recvif, timeout=3):
threading.Thread.__init__(self)
self._sem = threading.Semaphore(0)
self._args = args
self._timeout = timeout
- if recvif is not None:
- self._recvif = recvif
- else:
- self._recvif = args.recvif[0]
+ self._recvif = recvif
self._check_function = check_function
- self.foundCorrectPacket = False
+ self.correctPackets = 0
self.start()
if not self._sem.acquire(timeout=30):
@@ -51,7 +48,7 @@ class Sniffer(threading.Thread):
def _checkPacket(self, packet):
ret = self._check_function(self._args, packet)
if ret:
- self.foundCorrectPacket = True
+ self.correctPackets += 1
return ret
def _startedCb(self):
@@ -59,9 +56,6 @@ class Sniffer(threading.Thread):
def run(self):
self.packets = []
- try:
- self.packets = sp.sniff(iface=self._recvif,
- stop_filter=self._checkPacket, timeout=self._timeout,
- started_callback=self._startedCb)
- except Exception as e:
- print(e, file=sys.stderr)
+ self.packets = sp.sniff(iface=self._recvif,
+ stop_filter=self._checkPacket, timeout=self._timeout,
+ started_callback=self._startedCb)
diff --git a/tests/sys/netpfil/pf/CVE-2019-5598.py b/tests/sys/netpfil/pf/CVE-2019-5598.py
index 603a1aef376f..b72c04c5e19b 100644
--- a/tests/sys/netpfil/pf/CVE-2019-5598.py
+++ b/tests/sys/netpfil/pf/CVE-2019-5598.py
@@ -72,7 +72,7 @@ def main():
sp.sendp(udp, iface=args.sendif[0], verbose=False)
# Start sniffing on recvif
- sniffer = Sniffer(args, check_icmp_error)
+ sniffer = Sniffer(args, check_icmp_error, args.recvif[0])
# Send the bad error packet
icmp_reachable = sp.Ether() / \
@@ -83,7 +83,7 @@ def main():
sp.sendp(icmp_reachable, iface=args.sendif[0], verbose=False)
sniffer.join()
- if sniffer.foundCorrectPacket:
+ if sniffer.correctPackets:
sys.exit(1)
sys.exit(0)
From nobody Sun Jan 29 07:50:51 2023
X-Original-To: dev-commits-src-branches@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 4P4Nlv5Hxrz3blSm;
Sun, 29 Jan 2023 07:50:51 +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 4P4Nlv4mmNz4PJG;
Sun, 29 Jan 2023 07:50:51 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1674978651;
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=aGDffaUGxTYVwVqN90Lf53Nn69KgXML87bUTgXDHbdQ=;
b=iMahTaYUUrVtkrLZTuQ/bnjEouMwjXMB056TH42kuo3NPcMvHYRK+nYFPtbcO/Q96hQH+4
LDN44R6AeO3360AeZ4L/AKKytkftfDqMCR0TlDKb4QNcYg5P9ZEdPSbwQHWOnX8A0J9q1y
a4ighcqHJMYsX+F5infSK5VJhJZwJ69QK2/j4ughaLRUkmJ3yt5TlTu4tUMlY8lZtBtH5a
eMNk9tJGxGur4PZPeX6ngn14svhsergdQUx+MeU4fl0j6Nyzo6KfgCxihjVk6gbxz3uZTA
ur9410cWp5ZAu5wbJzVK2ivC7rQsdbQkYkAEcsColMd26abr0y8DpmgvTfRi1g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1674978651;
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=aGDffaUGxTYVwVqN90Lf53Nn69KgXML87bUTgXDHbdQ=;
b=dbO0zLQClsiI4U5oulHEP98Ut2gNtM6dTMC4BOK0hk7SDMtN1N9Fz4l7GHoYywRV2dicFJ
SeFVDOvs9rogplfZbi/JR41uM3F2WGZMoEcXKNjdrVu4CC+uJrhAQRd/Kz4xSZoSdbUmB1
w4tzQ+wC4pccnozQtgjknIgnyBGCoYkzYIzZXsa96r+fygCuKRurvG4rmzuScIizEKjBPL
AozjYZqQX4r1AktEEThNAZhCD9A7EYshYovWqfYhrs/GVBe8c34q3BlHsNlAHluXrNFw4g
GsHIBD1u6PBVl/gP9LA5YwuIuRm1IkuBJgQj4DTmAenTLTJXIAV1+tbh3qka/Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674978651; a=rsa-sha256; cv=none;
b=FIdDzb8eqMrZRrMiSzESPoV1hN97l4v37EpmsdYOIQVBsrNwMOeC1m1OBBmRE/5V9ES1Jy
a0+zwkd2Y7EUtBjJeXEfVczuFjngz+oaevizTuqFQJDyvsS1EA1OPlS/QmUG65t/iTKQ6D
d0SkYKQ+ZgM3tfEbJWQXyOAL2Ui2LRJDczUz2ECAtsez1LC9Cq7OQxaSuMMxxcAiLUMsum
q/di/eBO7ez+apzWQep6huXD/oqRgKpEWUnc5cn1HiOHmc1O5HlU76G+pFlZlmf5mgWvUz
QjUKkXSQAwfHxhPXEaVTLSa8UAVYu6rzU/yZ0lmIY8bgcx/1S2njo5FHFOZQNA==
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 4P4Nlv3sByzL7P;
Sun, 29 Jan 2023 07:50:51 +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 30T7opZZ047734;
Sun, 29 Jan 2023 07:50:51 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30T7opAY047702;
Sun, 29 Jan 2023 07:50:51 GMT
(envelope-from git)
Date: Sun, 29 Jan 2023 07:50:51 GMT
Message-Id: <202301290750.30T7opAY047702@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: 4c3c6c9271c0 - stable/13 - netpfil tests: improve pft_ping.py
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: kp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 4c3c6c9271c0d28da5e0d6832c06aa74c530f456
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=4c3c6c9271c0d28da5e0d6832c06aa74c530f456
commit 4c3c6c9271c0d28da5e0d6832c06aa74c530f456
Author: Kajetan Staszkiewicz <vegeta@tuxpowered.net>
AuthorDate: 2023-01-21 02:44:52 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2023-01-29 05:37:46 +0000
netpfil tests: improve pft_ping.py
Multiple improvements to pft_ping.py:
* Automatically use IPv6 when IPv6 addresses are used, --ip6 is not needed.
* Building of ping requests and parsing of ping replies is done layer by
layer. This way most arguments are available both for IPv6 and IPv4,
for ICMP and TCP.
* Use argument groups for improved readability.
* Change ToS and TTL argument name to TC and HL to reflect the modern
IPv6 nomenclature. The argument still set related IPv4 header fields
properly.
* Instead of sniffing for the very specific case of duplicated packets,
allow for sniffing on multiple interfaces.
* Report which sniffer has failed by setting bits of error code.
* Raise meaningful exceptions when irrecoverable errors happen.
* Make IPv4 fragmentation flags configurable.
* Make IPv6 HL / IPv4 TTL configurable.
* Make TCP MSS configurable.
* Make TCP sequence number configurable.
* Make ICMP payload size configurable.
* Add debug output.
* Move command line argument parsing out of network functions.
* Make the code somehow PEP-8 compliant.
MFC after: 1 week
Sponsored by: InnoGames GmbH
Differential Revision: https://reviews.freebsd.org/D38122
(cherry picked from commit f57218e469a7b1ab40521ea75ebfd45b493851ca)
---
tests/sys/netpfil/common/pft_ping.py | 780 ++++++++++++++++++++++-------------
tests/sys/netpfil/common/tos.sh | 10 +-
tests/sys/netpfil/pf/checksum.sh | 6 +-
tests/sys/netpfil/pf/dup.sh | 3 +-
tests/sys/netpfil/pf/forward.sh | 5 -
tests/sys/netpfil/pf/killstate.sh | 5 -
tests/sys/netpfil/pf/set_tos.sh | 16 +-
7 files changed, 505 insertions(+), 320 deletions(-)
diff --git a/tests/sys/netpfil/common/pft_ping.py b/tests/sys/netpfil/common/pft_ping.py
index 20d4164c6e3e..380b92a662c7 100644
--- a/tests/sys/netpfil/common/pft_ping.py
+++ b/tests/sys/netpfil/common/pft_ping.py
@@ -3,6 +3,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2017 Kristof Provost <kp@FreeBSD.org>
+# Copyright (c) 2023 Kajetan Staszkiewicz <vegeta@tuxpowered.net>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -29,306 +30,501 @@
import argparse
import logging
logging.getLogger("scapy").setLevel(logging.CRITICAL)
+import math
import scapy.all as sp
-import socket
import sys
+
+from copy import copy
from sniffer import Sniffer
-PAYLOAD_MAGIC = bytes.fromhex('42c0ffee')
+logging.basicConfig(format='%(message)s')
+LOGGER = logging.getLogger(__name__)
-dup_found = 0
-
-def check_dup(args, packet):
- """
- Verify that this is an ICMP packet, and that we only see one
- """
- global dup_found
-
- icmp = packet.getlayer(sp.ICMP)
- if not icmp:
- return False
-
- raw = packet.getlayer(sp.Raw)
- if not raw:
- return False
- if raw.load != PAYLOAD_MAGIC:
- return False
-
- dup_found = dup_found + 1
- return False
-
-def check_ping_request(args, packet):
- if args.ip6:
- return check_ping6_request(args, packet)
- else:
- return check_ping4_request(args, packet)
-
-def check_ping4_request(args, packet):
- """
- Verify that the packet matches what we'd have sent
- """
- dst_ip = args.to[0]
-
- ip = packet.getlayer(sp.IP)
- if not ip:
- return False
- if ip.dst != dst_ip:
- return False
-
- icmp = packet.getlayer(sp.ICMP)
- if not icmp:
- return False
- if sp.icmptypes[icmp.type] != 'echo-request':
- return False
-
- raw = packet.getlayer(sp.Raw)
- if not raw:
- return False
- if raw.load != PAYLOAD_MAGIC:
- return False
-
- # Wait to check expectations until we've established this is the packet we
- # sent.
- if args.expect_tos:
- if ip.tos != int(args.expect_tos[0]):
- print("Unexpected ToS value %d, expected %d" \
- % (ip.tos, int(args.expect_tos[0])))
- return False
-
- return True
-
-def check_ping6_request(args, packet):
- """
- Verify that the packet matches what we'd have sent
- """
- dst_ip = args.to[0]
-
- ip = packet.getlayer(sp.IPv6)
- if not ip:
- return False
- if ip.dst != dst_ip:
- return False
-
- icmp = packet.getlayer(sp.ICMPv6EchoRequest)
- if not icmp:
- return False
- if icmp.data != PAYLOAD_MAGIC:
- return False
-
- return True
-
-def check_ping_reply(args, packet):
- if args.ip6:
- return check_ping6_reply(args, packet)
- else:
- return check_ping4_reply(args, packet)
-
-def check_ping4_reply(args, packet):
- """
- Check that this is a reply to the ping request we sent
- """
- dst_ip = args.to[0]
-
- ip = packet.getlayer(sp.IP)
- if not ip:
- return False
- if ip.src != dst_ip:
- return False
-
- icmp = packet.getlayer(sp.ICMP)
- if not icmp:
- return False
- if sp.icmptypes[icmp.type] != 'echo-reply':
- return False
-
- raw = packet.getlayer(sp.Raw)
- if not raw:
- return False
- if raw.load != PAYLOAD_MAGIC:
- return False
-
- return True
-
-def check_ping6_reply(args, packet):
- """
- Check that this is a reply to the ping request we sent
- """
- dst_ip = args.to[0]
-
- ip = packet.getlayer(sp.IPv6)
- if not ip:
- return False
- if ip.src != dst_ip:
- return False
-
- icmp = packet.getlayer(sp.ICMPv6EchoReply)
- if not icmp:
- print("No echo reply!")
- return False
-
- if icmp.data != PAYLOAD_MAGIC:
- print("data mismatch")
- return False
-
- return True
-
-def ping(send_if, dst_ip, args):
- ether = sp.Ether()
- ip = sp.IP(dst=dst_ip)
- icmp = sp.ICMP(type='echo-request')
- raw = sp.raw(PAYLOAD_MAGIC)
-
- if args.send_tos:
- ip.tos = int(args.send_tos[0])
-
- if args.fromaddr:
- ip.src = args.fromaddr[0]
-
- req = ether / ip / icmp / raw
- sp.sendp(req, iface=send_if, verbose=False)
-
-def ping6(send_if, dst_ip, args):
- ether = sp.Ether()
- ip6 = sp.IPv6(dst=dst_ip)
- icmp = sp.ICMPv6EchoRequest(data=sp.raw(PAYLOAD_MAGIC))
-
- if args.fromaddr:
- ip.src = args.fromaddr[0]
-
- req = ether / ip6 / icmp
- sp.sendp(req, iface=send_if, verbose=False)
-
-def check_tcpsyn(args, packet):
- dst_ip = args.to[0]
-
- ip = packet.getlayer(sp.IP)
- if not ip:
- return False
- if ip.dst != dst_ip:
- return False
-
- tcp = packet.getlayer(sp.TCP)
- if not tcp:
- return False
-
- # Verify IP checksum
- chksum = ip.chksum
- ip.chksum = None
- new_chksum = sp.IP(sp.raw(ip)).chksum
- if chksum != new_chksum:
- print("Expected IP checksum %x but found %x\n" % (new_cshkum, chksum))
- return False
-
- # Verify TCP checksum
- chksum = tcp.chksum
- packet_raw = sp.raw(packet)
- tcp.chksum = None
- newpacket = sp.Ether(sp.raw(packet[sp.Ether]))
- new_chksum = newpacket[sp.TCP].chksum
- if chksum != new_chksum:
- print("Expected TCP checksum %x but found %x\n" % (new_chksum, chksum))
- return False
-
- return True
-
-def tcpsyn(send_if, dst_ip, args):
- opts=[('Timestamp', (1, 1)), ('MSS', 1280)]
-
- if args.tcpopt_unaligned:
- opts = [('NOP', 0 )] + opts
-
- ether = sp.Ether()
- ip = sp.IP(dst=dst_ip)
- tcp = sp.TCP(dport=666, flags='S', options=opts)
+PAYLOAD_MAGIC = bytes.fromhex('42c0ffee')
- req = ether / ip / tcp
- sp.sendp(req, iface=send_if, verbose=False)
+def build_payload(l):
+ pl = len(PAYLOAD_MAGIC)
+ ret = PAYLOAD_MAGIC * math.floor(l/pl)
+ ret += PAYLOAD_MAGIC[0:(l % pl)]
+ return ret
+
+
+def prepare_ipv6(dst_address, send_params):
+ src_address = send_params.get('src_address')
+ hlim = send_params.get('hlim')
+ tc = send_params.get('tc')
+ ip6 = sp.IPv6(dst=dst_address)
+ if src_address:
+ ip6.src = src_address
+ if hlim:
+ ip6.hlim = hlim
+ if tc:
+ ip6.tc = tc
+ return ip6
+
+
+def prepare_ipv4(dst_address, send_params):
+ src_address = send_params.get('src_address')
+ flags = send_params.get('flags')
+ tos = send_params.get('tc')
+ ttl = send_params.get('hlim')
+ ip = sp.IP(dst=dst_address)
+ if src_address:
+ ip.src = src_address
+ if flags:
+ ip.flags = flags
+ if tos:
+ ip.tos = tos
+ if ttl:
+ ip.ttl = ttl
+ return ip
+
+
+def send_icmp_ping(dst_address, sendif, send_params):
+ send_length = send_params['length']
+ ether = sp.Ether()
+ if ':' in dst_address:
+ ip6 = prepare_ipv6(dst_address, send_params)
+ icmp = sp.ICMPv6EchoRequest(data=sp.raw(build_payload(send_length)))
+ req = ether / ip6 / icmp
+ else:
+ ip = prepare_ipv4(dst_address, send_params)
+ icmp = sp.ICMP(type='echo-request')
+ raw = sp.raw(build_payload(send_length))
+ req = ether / ip / icmp / raw
+ sp.sendp(req, sendif, verbose=False)
+
+
+def send_tcp_syn(dst_address, sendif, send_params):
+ tcpopt_unaligned = send_params.get('tcpopt_unaligned')
+ seq = send_params.get('seq')
+ mss = send_params.get('mss')
+ ether = sp.Ether()
+ opts=[('Timestamp', (1, 1)), ('MSS', mss if mss else 1280)]
+ if tcpopt_unaligned:
+ opts = [('NOP', 0 )] + opts
+ if ':' in dst_address:
+ ip = prepare_ipv6(dst_address, send_params)
+ else:
+ ip = prepare_ipv4(dst_address, send_params)
+ tcp = sp.TCP(dport=666, flags='S', options=opts, seq=seq)
+ req = ether / ip / tcp
+ sp.sendp(req, iface=sendif, verbose=False)
+
+
+def send_ping(dst_address, sendif, ping_type, send_params):
+ if ping_type == 'icmp':
+ send_icmp_ping(dst_address, sendif, send_params)
+ elif ping_type == 'tcpsyn':
+ send_tcp_syn(dst_address, sendif, send_params)
+ else:
+ raise Exception('Unspported ping type')
+
+
+def check_ipv4(expect_params, packet):
+ src_address = expect_params.get('src_address')
+ dst_address = expect_params.get('dst_address')
+ flags = expect_params.get('flags')
+ tos = expect_params.get('tc')
+ ttl = expect_params.get('hlim')
+ ip = packet.getlayer(sp.IP)
+ if not ip:
+ LOGGER.debug('Packet is not IPv4!')
+ return False
+ if src_address and ip.src != src_address:
+ LOGGER.debug('Source IPv4 address does not match!')
+ return False
+ if dst_address and ip.dst != dst_address:
+ LOGGER.debug('Destination IPv4 address does not match!')
+ return False
+ chksum = ip.chksum
+ ip.chksum = None
+ new_chksum = sp.IP(sp.raw(ip)).chksum
+ if chksum != new_chksum:
+ LOGGER.debug(f'Expected IP checksum {new_chksum} but found {chksum}')
+ return False
+ if flags and ip.flags != flags:
+ LOGGER.debug(f'Wrong IP flags value {ip.flags}, expected {flags}')
+ return False
+ if tos and ip.tos != tos:
+ LOGGER.debug(f'Wrong ToS value {ip.tos}, expected {tos}')
+ return False
+ if ttl and ip.ttl != ttl:
+ LOGGER.debug(f'Wrong TTL value {ip.ttl}, expected {ttl}')
+ return False
+ return True
+
+
+def check_ipv6(expect_params, packet):
+ src_address = expect_params.get('src_address')
+ dst_address = expect_params.get('dst_address')
+ flags = expect_params.get('flags')
+ hlim = expect_params.get('hlim')
+ tc = expect_params.get('tc')
+ ip6 = packet.getlayer(sp.IPv6)
+ if not ip6:
+ LOGGER.debug('Packet is not IPv6!')
+ return False
+ if src_address and ip6.src != src_address:
+ LOGGER.debug('Source IPv6 address does not match!')
+ return False
+ if dst_address and ip6.dst != dst_address:
+ LOGGER.debug('Destination IPv6 address does not match!')
+ return False
+ # IPv6 has no IP-level checksum.
+ if flags:
+ raise Exception("There's no fragmentation flags in IPv6")
+ if hlim and ip6.hlim != hlim:
+ LOGGER.debug(f'Wrong Hop Limit value {ip6.hlim}, expected {hlim}')
+ return False
+ if tc and ip6.tc != tc:
+ LOGGER.debug(f'Wrong TC value {ip6.tc}, expected {tc}')
+ return False
+ return True
+
+def check_ping_4(expect_params, packet):
+ expect_length = expect_params['length']
+ if not check_ipv4(expect_params, packet):
+ return False
+ icmp = packet.getlayer(sp.ICMP)
+ if not icmp:
+ LOGGER.debug('Packet is not IPv4 ICMP!')
+ return False
+ raw = packet.getlayer(sp.Raw)
+ if not raw:
+ LOGGER.debug('Packet contains no payload!')
+ return False
+ if raw.load != build_payload(expect_length):
+ LOGGER.debug('Payload magic does not match!')
+ return False
+ return True
+
+def check_ping_request_4(expect_params, packet):
+ if not check_ping_4(expect_params, packet):
+ return False
+ icmp = packet.getlayer(sp.ICMP)
+ if sp.icmptypes[icmp.type] != 'echo-request':
+ LOGGER.debug('Packet is not IPv4 ICMP Echo Request!')
+ return False
+ return True
+
+
+def check_ping_reply_4(expect_params, packet):
+ if not check_ping_4(expect_params, packet):
+ return False
+ icmp = packet.getlayer(sp.ICMP)
+ if sp.icmptypes[icmp.type] != 'echo-reply':
+ LOGGER.debug('Packet is not IPv4 ICMP Echo Reply!')
+ return False
+ return True
+
+
+def check_ping_request_6(expect_params, packet):
+ expect_length = expect_params['length']
+ if not check_ipv6(expect_params, packet):
+ return False
+ icmp = packet.getlayer(sp.ICMPv6EchoRequest)
+ if not icmp:
+ LOGGER.debug('Packet is not IPv6 ICMP Echo Request!')
+ return False
+ if icmp.data != build_payload(expect_length):
+ LOGGER.debug('Payload magic does not match!')
+ return False
+ return True
+
+
+def check_ping_reply_6(expect_params, packet):
+ expect_length = expect_params['length']
+ if not check_ipv6(expect_params, packet):
+ return False
+ icmp = packet.getlayer(sp.ICMPv6EchoReply)
+ if not icmp:
+ LOGGER.debug('Packet is not IPv6 ICMP Echo Reply!')
+ return False
+ if icmp.data != build_payload(expect_length):
+ LOGGER.debug('Payload magic does not match!')
+ return False
+ return True
+
+
+def check_ping_request(expect_params, packet):
+ src_address = expect_params.get('src_address')
+ dst_address = expect_params.get('dst_address')
+ if not (src_address or dst_address):
+ raise Exception('Source or destination address must be given to match the ping request!')
+ if (
+ (src_address and ':' in src_address) or
+ (dst_address and ':' in dst_address)
+ ):
+ return check_ping_request_6(expect_params, packet)
+ else:
+ return check_ping_request_4(expect_params, packet)
+
+def check_ping_reply(expect_params, packet):
+ src_address = expect_params.get('src_address')
+ dst_address = expect_params.get('dst_address')
+ if not (src_address or dst_address):
+ raise Exception('Source or destination address must be given to match the ping reply!')
+ if (
+ (src_address and ':' in src_address) or
+ (dst_address and ':' in dst_address)
+ ):
+ return check_ping_reply_6(expect_params, packet)
+ else:
+ return check_ping_reply_4(expect_params, packet)
+
+def check_tcp(expect_params, packet):
+ tcp_flags = expect_params.get('tcp_flags')
+ mss = expect_params.get('mss')
+ seq = expect_params.get('seq')
+ tcp = packet.getlayer(sp.TCP)
+ if not tcp:
+ LOGGER.debug('Packet is not TCP!')
+ return False
+ chksum = tcp.chksum
+ tcp.chksum = None
+ newpacket = sp.Ether(sp.raw(packet[sp.Ether]))
+ new_chksum = newpacket[sp.TCP].chksum
+ if chksum != new_chksum:
+ LOGGER.debug(f'Wrong TCP checksum {chksum}, expected {new_chksum}!')
+ return False
+ if tcp_flags and tcp.flags != tcp_flags:
+ LOGGER.debug(f'Wrong TCP flags {tcp.flags}, expected {tcp_flags}!')
+ return False
+ if seq:
+ if tcp_flags == 'S':
+ tcp_seq = tcp.seq
+ elif tcp_flags == 'SA':
+ tcp_seq = tcp.ack - 1
+ if seq != tcp_seq:
+ LOGGER.debug(f'Wrong TCP Sequence Number {tcp_seq}, expected {seq}')
+ return False
+ if mss:
+ for option in tcp.options:
+ if option[0] == 'MSS':
+ if option[1] != mss:
+ LOGGER.debug(f'Wrong TCP MSS {option[1]}, expected {mss}')
+ return False
+ return True
+
+
+def check_tcp_syn_request_4(expect_params, packet):
+ if not check_ipv4(expect_params, packet):
+ return False
+ if not check_tcp(expect_params | {'tcp_flags': 'S'}, packet):
+ return False
+ return True
+
+
+def check_tcp_syn_reply_4(expect_params, packet):
+ if not check_ipv4(expect_params, packet):
+ return False
+ if not check_tcp(expect_params | {'tcp_flags': 'SA'}, packet):
+ return False
+ return True
+
+
+def check_tcp_syn_request_6(expect_params, packet):
+ if not check_ipv6(expect_params, packet):
+ return False
+ if not check_tcp(expect_params | {'tcp_flags': 'S'}, packet):
+ return False
+ return True
+
+
+def check_tcp_syn_reply_6(expect_params, packet):
+ if not check_ipv6(expect_params, packet):
+ return False
+ if not check_tcp(expect_params | {'tcp_flags': 'SA'}, packet):
+ return False
+ return True
+
+
+def check_tcp_syn_request(expect_params, packet):
+ src_address = expect_params.get('src_address')
+ dst_address = expect_params.get('dst_address')
+ if not (src_address or dst_address):
+ raise Exception('Source or destination address must be given to match the tcp syn request!')
+ if (
+ (src_address and ':' in src_address) or
+ (dst_address and ':' in dst_address)
+ ):
+ return check_tcp_syn_request_6(expect_params, packet)
+ else:
+ return check_tcp_syn_request_4(expect_params, packet)
+
+
+def check_tcp_syn_reply(expect_params, packet):
+ src_address = expect_params.get('src_address')
+ dst_address = expect_params.get('dst_address')
+ if not (src_address or dst_address):
+ raise Exception('Source or destination address must be given to match the tcp syn reply!')
+ if (
+ (src_address and ':' in src_address) or
+ (dst_address and ':' in dst_address)
+ ):
+ return check_tcp_syn_reply_6(expect_params, packet)
+ else:
+ return check_tcp_syn_reply_4(expect_params, packet)
+
+
+def setup_sniffer(recvif, ping_type, sniff_type, expect_params):
+ if ping_type == 'icmp' and sniff_type == 'request':
+ checkfn = check_ping_request
+ elif ping_type == 'icmp' and sniff_type == 'reply':
+ checkfn = check_ping_reply
+ elif ping_type == 'tcpsyn' and sniff_type == 'request':
+ checkfn = check_tcp_syn_request
+ elif ping_type == 'tcpsyn' and sniff_type == 'reply':
+ checkfn = check_tcp_syn_reply
+ else:
+ raise Exception('Unspported ping or sniff type')
+
+ return Sniffer(expect_params, checkfn, recvif)
+
+
+def parse_args():
+ parser = argparse.ArgumentParser("pft_ping.py",
+ description="Ping test tool")
+
+ # Parameters of sent ping request
+ parser.add_argument('--sendif', nargs=1,
+ required=True,
+ help='The interface through which the packet(s) will be sent')
+ parser.add_argument('--to', nargs=1,
+ required=True,
+ help='The destination IP address for the ping request')
+ parser.add_argument('--ping-type',
+ choices=('icmp', 'tcpsyn'),
+ help='Type of ping: ICMP (default) or TCP SYN',
+ default='icmp')
+ parser.add_argument('--fromaddr', nargs=1,
+ help='The source IP address for the ping request')
+
+ # Where to look for packets to analyze.
+ # The '+' format is ugly as it mixes positional with optional syntax.
+ # But we have no positional parameters so I guess it's fine to use it.
+ parser.add_argument('--recvif', nargs='+',
+ help='The interfaces on which to expect the ping request')
+ parser.add_argument('--replyif', nargs='+',
+ help='The interfaces which to expect the ping response')
+
+ # Packet settings
+ parser_send = parser.add_argument_group('Values set in transmitted packets')
+ parser_send.add_argument('--send-flags', nargs=1, type=str,
+ help='IPv4 fragmentation flags')
+ parser_send.add_argument('--send-hlim', nargs=1, type=int,
+ help='IPv6 Hop Limit or IPv4 Time To Live')
+ parser_send.add_argument('--send-mss', nargs=1, type=int,
+ help='TCP Maximum Segment Size')
+ parser_send.add_argument('--send-seq', nargs=1, type=int,
+ help='TCP sequence number')
+ parser_send.add_argument('--send-length', nargs=1, type=int,
+ default=[len(PAYLOAD_MAGIC)], help='ICMP Echo Request payload size')
+ parser_send.add_argument('--send-tc', nargs=1, type=int,
+ help='IPv6 Traffic Class or IPv4 DiffServ / ToS')
+ parser_send.add_argument('--send-tcpopt-unaligned', action='store_true',
+ help='Include unaligned TCP options')
+
+ # Expectations
+ parser_expect = parser.add_argument_group('Values expected in sniffed packets')
+ parser_expect.add_argument('--expect-flags', nargs=1, type=str,
+ help='IPv4 fragmentation flags')
+ parser_expect.add_argument('--expect-hlim', nargs=1, type=int,
+ help='IPv6 Hop Limit or IPv4 Time To Live')
+ parser_expect.add_argument('--expect-mss', nargs=1, type=int,
+ help='TCP Maximum Segment Size')
+ parser_send.add_argument('--expect-seq', nargs=1, type=int,
+ help='TCP sequence number')
+ parser_expect.add_argument('--expect-tc', nargs=1, type=int,
+ help='IPv6 Traffic Class or IPv4 DiffServ / ToS')
+
+ parser.add_argument('-v', '--verbose', action='store_true',
+ help=('Enable verbose logging. Apart of potentially useful information '
+ 'you might see warnings from parsing packets like NDP or other '
+ 'packets not related to the test being run. Use only when '
+ 'developing because real tests expect empty stderr and stdout.'))
+
+ return parser.parse_args()
def main():
- parser = argparse.ArgumentParser("pft_ping.py",
- description="Ping test tool")
- parser.add_argument('--sendif', nargs=1,
- required=True,
- help='The interface through which the packet(s) will be sent')
- parser.add_argument('--recvif', nargs=1,
- help='The interface on which to expect the ICMP echo request')
- parser.add_argument('--replyif', nargs=1,
- help='The interface on which to expect the ICMP echo response')
- parser.add_argument('--checkdup', nargs=1,
- help='The interface on which to expect the duplicated ICMP packets')
- parser.add_argument('--ip6', action='store_true',
- help='Use IPv6')
- parser.add_argument('--to', nargs=1,
- required=True,
- help='The destination IP address for the ICMP echo request')
- parser.add_argument('--fromaddr', nargs=1,
- help='The source IP address for the ICMP echo request')
-
- # TCP options
- parser.add_argument('--tcpsyn', action='store_true',
- help='Send a TCP SYN packet')
- parser.add_argument('--tcpopt_unaligned', action='store_true',
- help='Include unaligned TCP options')
-
- # Packet settings
- parser.add_argument('--send-tos', nargs=1,
- help='Set the ToS value for the transmitted packet')
-
- # Expectations
- parser.add_argument('--expect-tos', nargs=1,
- help='The expected ToS value in the received packet')
-
- args = parser.parse_args()
-
- # We may not have a default route. Tell scapy where to start looking for routes
- sp.conf.iface6 = args.sendif[0]
-
- sniffer = None
- if not args.recvif is None:
- checkfn=check_ping_request
- if args.tcpsyn:
- checkfn=check_tcpsyn
-
- sniffer = Sniffer(args, checkfn, args.recvif[0])
-
- replysniffer = None
- if not args.replyif is None:
- checkfn=check_ping_reply
- replysniffer = Sniffer(args, checkfn, args.replyif[0])
-
- dupsniffer = None
- if args.checkdup is not None:
- dupsniffer = Sniffer(args, check_dup, args.checkdup[0])
-
- if args.tcpsyn:
- tcpsyn(args.sendif[0], args.to[0], args)
- else:
- if args.ip6:
- ping6(args.sendif[0], args.to[0], args)
- else:
- ping(args.sendif[0], args.to[0], args)
-
- if dupsniffer:
- dupsniffer.join()
- if dup_found != 1:
- sys.exit(1)
-
- if sniffer:
- sniffer.join()
-
- if sniffer.correctPackets:
- sys.exit(0)
- else:
- sys.exit(1)
-
- if replysniffer:
- replysniffer.join()
-
- if replysniffer.correctPackets:
- sys.exit(0)
- else:
- sys.exit(1)
+ args = parse_args()
+
+ if args.verbose:
+ LOGGER.setLevel(logging.DEBUG)
+
+ # Dig out real values of program arguments
+ send_if = args.sendif[0]
+ reply_ifs = args.replyif
+ recv_ifs = args.recvif
+ dst_address = args.to[0]
+
+ # Standardize parameters which have nargs=1.
+ send_params = {}
+ expect_params = {}
+ for param_name in ('flags', 'hlim', 'length', 'mss', 'seq', 'tc'):
+ param_arg = vars(args).get(f'send_{param_name}')
+ send_params[param_name] = param_arg[0] if param_arg else None
+ param_arg = vars(args).get(f'expect_{param_name}')
+ expect_params[param_name] = param_arg[0] if param_arg else None
+
+ expect_params['length'] = send_params['length']
+ send_params['tcpopt_unaligned'] = args.send_tcpopt_unaligned
+ send_params['src_address'] = args.fromaddr[0] if args.fromaddr else None
+
+ # We may not have a default route. Tell scapy where to start looking for routes
+ sp.conf.iface6 = send_if
+
+ # Configuration sanity checking.
+ if not (reply_ifs or recv_ifs):
+ raise Exception('With no reply or recv interface specified no traffic '
+ 'can be sniffed and verified!'
+ )
+
+ sniffers = []
+
+ if recv_ifs:
+ sniffer_params = copy(expect_params)
+ sniffer_params['src_address'] = None
+ sniffer_params['dst_address'] = dst_address
+ for iface in recv_ifs:
+ LOGGER.debug(f'Installing receive sniffer on {iface}')
+ sniffers.append(
+ setup_sniffer(iface, args.ping_type, 'request', sniffer_params,
+ ))
+
+ if reply_ifs:
+ sniffer_params = copy(expect_params)
+ sniffer_params['src_address'] = dst_address
+ sniffer_params['dst_address'] = None
+ for iface in reply_ifs:
+ LOGGER.debug(f'Installing reply sniffer on {iface}')
+ sniffers.append(
+ setup_sniffer(iface, args.ping_type, 'reply', sniffer_params,
+ ))
+
+ LOGGER.debug(f'Installed {len(sniffers)} sniffers')
+
+ send_ping(dst_address, send_if, args.ping_type, send_params)
+
+ err = 0
+ sniffer_num = 0
+ for sniffer in sniffers:
+ sniffer.join()
+ if sniffer.correctPackets == 1:
+ LOGGER.debug(f'Expected ping has been sniffed on {sniffer._recvif}.')
+ else:
+ # Set a bit in err for each failed sniffer.
+ err |= 1<<sniffer_num
+ if sniffer.correctPackets > 1:
+ LOGGER.debug(f'Duplicated ping has been sniffed on {sniffer._recvif}!')
+ else:
+ LOGGER.debug(f'Expected ping has not been sniffed on {sniffer._recvif}!')
+ sniffer_num += 1
+
+ return err
+
if __name__ == '__main__':
- main()
+ sys.exit(main())
diff --git a/tests/sys/netpfil/common/tos.sh b/tests/sys/netpfil/common/tos.sh
index 452c6a002bbf..bd5e657ecf72 100644
--- a/tests/sys/netpfil/common/tos.sh
+++ b/tests/sys/netpfil/common/tos.sh
@@ -68,7 +68,7 @@ tos_body()
--sendif ${epair_send}a \
--to 198.51.100.3 \
--recvif ${epair_recv}a \
- --expect-tos 36
+ --expect-tc 36
# Check if the firewall is able to set the ToS bits
# and persists the EN bits (if already set)
@@ -82,8 +82,8 @@ tos_body()
--sendif ${epair_send}a \
--to 198.51.100.3 \
--recvif ${epair_recv}a \
- --send-tos 3 \
- --expect-tos 39
+ --send-tc 3 \
+ --expect-tc 39
# Check if the firewall is able to filter the
# packets based on the ToS value
@@ -97,13 +97,13 @@ tos_body()
--sendif ${epair_send}a \
--to 198.51.100.3 \
--recvif ${epair_recv}a \
- --send-tos 36
+ --send-tc 36
atf_check -s exit:0 $(atf_get_srcdir)/pft_ping.py \
--sendif ${epair_send}a \
--to 198.51.100.3 \
--recvif ${epair_recv}a \
- --send-tos 32
+ --send-tc 32
}
tos_cleanup()
diff --git a/tests/sys/netpfil/pf/checksum.sh b/tests/sys/netpfil/pf/checksum.sh
index 836bc1233963..9060e763d18d 100644
--- a/tests/sys/netpfil/pf/checksum.sh
+++ b/tests/sys/netpfil/pf/checksum.sh
@@ -64,15 +64,15 @@ unaligned_body()
--sendif ${epair_in}a \
--to 198.51.100.2 \
--recvif ${epair_out}b \
- --tcpsyn
+ --ping-type tcpsyn
# And unaligned
atf_check -s exit:0 ${common_dir}/pft_ping.py \
--sendif ${epair_in}a \
--to 198.51.100.2 \
--recvif ${epair_out}b \
- --tcpsyn \
- --tcpopt_unaligned
+ --ping-type tcpsyn \
+ --send-tcpopt-unaligned
}
unaligned_cleanup()
diff --git a/tests/sys/netpfil/pf/dup.sh b/tests/sys/netpfil/pf/dup.sh
index 3b3bef976fc2..83ef57760eef 100644
--- a/tests/sys/netpfil/pf/dup.sh
+++ b/tests/sys/netpfil/pf/dup.sh
@@ -67,8 +67,7 @@ dup_to_body()
atf_check -s exit:0 ${common_dir}/pft_ping.py \
--sendif ${epair_send}a \
--to 198.51.100.3 \
- --recv ${epair_recv}a \
- --checkdup ${epair_dupto}a
+ --recv ${epair_recv}a ${epair_dupto}a
}
dup_to_cleanup()
diff --git a/tests/sys/netpfil/pf/forward.sh b/tests/sys/netpfil/pf/forward.sh
index 7d5bde00d137..0f00a366878b 100644
--- a/tests/sys/netpfil/pf/forward.sh
+++ b/tests/sys/netpfil/pf/forward.sh
@@ -118,7 +118,6 @@ v6_body()
# Sanity check, can we forward ICMP echo requests without pf?
atf_check -s exit:0 ${common_dir}/pft_ping.py \
- --ip6 \
--sendif ${epair_send}a \
--to 2001:db8:43::3 \
--recvif ${epair_recv}a
@@ -129,7 +128,6 @@ v6_body()
pft_set_rules alcatraz \
"block in inet6 proto icmp6 icmp6-type echoreq"
atf_check -s exit:1 ${common_dir}/pft_ping.py \
- --ip6 \
--sendif ${epair_send}a \
--to 2001:db8:43::3 \
--recvif ${epair_recv}a
@@ -138,7 +136,6 @@ v6_body()
pft_set_rules alcatraz \
"block out inet6 proto icmp6 icmp6-type echoreq"
atf_check -s exit:1 -e ignore ${common_dir}/pft_ping.py \
- --ip6 \
--sendif ${epair_send}a \
--to 2001:db8:43::3 \
--recvif ${epair_recv}a
@@ -148,7 +145,6 @@ v6_body()
"block out" \
"pass out inet6 proto icmp6"
atf_check -s exit:0 ${common_dir}/pft_ping.py \
- --ip6 \
--sendif ${epair_send}a \
--to 2001:db8:43::3 \
--recvif ${epair_recv}a
@@ -158,7 +154,6 @@ v6_body()
"block out inet6 proto icmp6 icmp6-type echoreq" \
"pass in proto icmp"
atf_check -s exit:1 ${common_dir}/pft_ping.py \
- --ip6 \
--sendif ${epair_send}a \
--to 2001:db8:43::3 \
--recvif ${epair_recv}a
diff --git a/tests/sys/netpfil/pf/killstate.sh b/tests/sys/netpfil/pf/killstate.sh
index 91fa9b42c8be..c2942aab41f2 100644
--- a/tests/sys/netpfil/pf/killstate.sh
+++ b/tests/sys/netpfil/pf/killstate.sh
@@ -127,7 +127,6 @@ v6_body()
# Note: use pft_ping so we always use the same ID, so pf considers all
# echo requests part of the same flow.
atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \
- --ip6 \
--sendif ${epair}a \
*** 95 LINES SKIPPED ***
From nobody Sun Jan 29 07:50:52 2023
X-Original-To: dev-commits-src-branches@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 4P4Nlw3VSyz3bVmd;
Sun, 29 Jan 2023 07:50:52 +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 4P4Nlw2j92z4PPh;
Sun, 29 Jan 2023 07:50:52 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1674978652;
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=rxMqdQmr0H11PTc7PSE6+N9x4/3UhL99yC76pQnrrlk=;
b=PZVyYF4geXaQJRRkxd0mWLgZ/BGYAHGTgCZowWMsngKhj03FbaC8cTtA0xp+nDwkqZunN3
4sePgLIdqIK3AyxXx7/6a3twem5Kceho7eLr3zB1a1kiMo0FKYww67Gh9doFPls+RoAGZb
YnqcX4T3UX559CyIISHHc1P87RZ61DUjxIJumlrM/e1u6r6ywo4G3uQRwW45OzFl88bDTz
er8/AAnAm8JBxQjl+Z11vwc0sZxT3Jw5vTei3nei0eYdy+IW2+z+Brh0HM/wGmSrT5Y23z
pneKTxUCNNom/UnCzZAZVwgrjRVwr5hzwPIplw9PIkxK920YXrOBrS1yW+i6Bw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1674978652;
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=rxMqdQmr0H11PTc7PSE6+N9x4/3UhL99yC76pQnrrlk=;
b=wnhRY3KwQmpJYJHsHA0MGpOVFz/TwWYDd6QMnT+d2bP+BO6iYTt6yCYaRhsBoMFwJTmaan
qvheO2kdEk15Vfzkm0RYeF4O9XjGns2o+DOJgGStFLeDuvaTAsQLSBHZzZFzi9lPf1OYep
X0KooZeOnkbpAyhq09FHKYwZDsUV3vAc/XgNkLrgiOWOdWUE5DsnIPKhI0+lm9J18Vt5qi
Ij3SR35Zt0Z83X+QtfXJR7qYTrJ4Xb2reaudEWiiFfF/dnHTm+2JHnvJJwhlJ9E+VqXA+R
+mRcbgx/bSGQ/6m+1sm6CnrhUiWO5pL0CD4LiqwJe4epbbvmTNqdLmSKft5qYg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674978652; a=rsa-sha256; cv=none;
b=UIrJGn7KcDvy3I/eTt/FjsOKoCctawZTi6OgMNU4zJRPJaB7AuSdShd0LeL0I65wuaX7Ii
M74yWVpOLKhq9JAzdUofP2gYkeG1U/g0wxxVqm9vc863FkBt6xMF2cD8hhg393mPvw45OV
7V42ViZtHR6XV8rRhTU/Kyp2u6dWKfBiCJPr3NQjBzN1bMuiFdnJWpZ/tRV32uSI4qt24E
gEZ2QFIYDjRLNsti8+U+OOzAMeJAtwtd05KQnEDEc1pbqVnWhugb/xFjqAC9sL8gS9wRdL
WEAwltbxgyHlrna7ds4zLDi77e1ZNbAoxnPFeDPimNDsZBdvxKis76W1VegdeQ==
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 4P4Nlw1P7MzLL1;
Sun, 29 Jan 2023 07:50:52 +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 30T7oq0D047776;
Sun, 29 Jan 2023 07:50:52 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30T7oqb6047775;
Sun, 29 Jan 2023 07:50:52 GMT
(envelope-from git)
Date: Sun, 29 Jan 2023 07:50:52 GMT
Message-Id: <202301290750.30T7oqb6047775@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: 668a32ab231d - stable/12 - netpfil tests: improve pfsync_defer.py
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: kp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 668a32ab231df18dba8b70f7a13f736dbb486210
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=668a32ab231df18dba8b70f7a13f736dbb486210
commit 668a32ab231df18dba8b70f7a13f736dbb486210
Author: Kajetan Staszkiewicz <vegeta@tuxpowered.net>
AuthorDate: 2023-01-20 09:43:02 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2023-01-29 02:34:56 +0000
netpfil tests: improve pfsync_defer.py
Return different exit code depending on which failure was encountered.
The pfsync test expect a very particular failure, not just any.
MFC after: 1 week
Sponsored by: InnoGames GmbH
Differential Revision: https://reviews.freebsd.org/D38123
(cherry picked from commit 06012728beff45e94d58410eae7cda2ea980ef77)
---
tests/sys/netpfil/pf/pfsync.sh | 2 +-
tests/sys/netpfil/pf/pfsync_defer.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh
index bbe3fbcb1d2a..737753103683 100755
--- a/tests/sys/netpfil/pf/pfsync.sh
+++ b/tests/sys/netpfil/pf/pfsync.sh
@@ -168,7 +168,7 @@ defer_body()
"set skip on ${epair_sync}a" \
"pass keep state"
- atf_check -s exit:1 env PYTHONPATH=${common_dir} \
+ atf_check -s exit:3 env PYTHONPATH=${common_dir} \
$(atf_get_srcdir)/pfsync_defer.py \
--syncdev ${epair_sync}b \
--indev ${epair_in}b \
diff --git a/tests/sys/netpfil/pf/pfsync_defer.py b/tests/sys/netpfil/pf/pfsync_defer.py
index 4a691240b466..c1d90d4483c4 100644
--- a/tests/sys/netpfil/pf/pfsync_defer.py
+++ b/tests/sys/netpfil/pf/pfsync_defer.py
@@ -117,15 +117,15 @@ def main():
sys.exit(1)
if not got_ping:
- sys.exit(1)
+ sys.exit(2)
if got_pfsync > got_ping:
- sys.exit(1)
+ sys.exit(3)
# Deferred packets are delayed up to 20ms (unless the pfsync peer, which we
# don't have here, acks their state update earlier)
if (sent_ping + 0.020) > got_ping:
- sys.exit(1)
+ sys.exit(4)
if __name__ == '__main__':
main()
From nobody Sun Jan 29 07:50:52 2023
X-Original-To: dev-commits-src-branches@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 4P4Nlw6xDMz3bVpy;
Sun, 29 Jan 2023 07:50:52 +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 4P4Nlw60cFz4PK2;
Sun, 29 Jan 2023 07:50:52 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1674978652;
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=nbUEhtAfbqWIM9X1hZqVNjQ2FnDG1+ULoWWVkUlxn+Y=;
b=ji/CEDdFNFGjXndyKA2nLsV86MPKGNR99bkEAqALBjSvC1tRzyzvkzf1xqoAmlvkzI3/Ck
o+EoKuRhRiyPsCpZN0JYOfPE/jzLt5B/YZ86c715CnYVuEkUb7IWb9O3An1yoeA+0yfAwI
++pyhah1cDVJU8mTPku6Qsh/uED/MSMBM6fPh+B8vnmKsoABs/OJ2Md4tmYdFkWU0thDzt
ELJr+C5OvuUtY09aZT1UXsYqjhGyEnZgbYqGm8TNb6DHyT3xIiOR9Qp8mRqrIzclQLATEl
6Rb304Q7twaj8ByksK0DZAbE+jMkyU6xk+zRRcYuDWTenMc4Wa9lg7huz9oDWA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1674978652;
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=nbUEhtAfbqWIM9X1hZqVNjQ2FnDG1+ULoWWVkUlxn+Y=;
b=T29Ar+58emX5bTH7zJc+//jJKTZSn8vANAlgYKFo5qhjmsqkKhKRPVtXtKto3pHZN2gscn
azkLANZOVpeD4P0axJ8x2o9oouPzXpTCsI8aVFEkS4lIxO1houEvvZq+4+riYaaC3rb305
Frf4A7FRSl0/yCctoUUQSER6khYBe83JUJpkyB3Pr9aNzcj90Aw6cVDVOOfbBjvxcOtiuG
v28lOaibnmN5MOt5A1havZC0gWE8KhV6xOB/+5GqgOxraZeRwHWot8RSjj30kTF4awgxmM
aSy1us16kzS1Ist/zD0zm7YYdHDSSiioUh9T8RIYqW9heFaEPI4jNTjpPCdeWg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674978652; a=rsa-sha256; cv=none;
b=LA9Osp1YjSAw++cU/gBH5b48ddgH7lXVo/U/Y7fLXc9q2Z3lfBVXSp856AtgDOtmCw/9Gx
mxoyJ7IRs9wFMxQ3z2jT3fA9LKLf76qH/7KZe2NIL9WTBIj/EhRWskP4NqEhYKO7ZtfwVh
po9xLTQ4t4+3VfomrI3St2kP+o3vkaNlMTQUmRpgpZDfmVgC7ckXBV8MhaDQ6R6+RkfKvc
dJOM+5aub27QOo0XECVtOd483j6vy0+1sdiSyQjJxJYnQIy/UIvWJ+OUv2L9/juwR7zDFH
AeAsnEnHSt3g/JaGiE41Z0TQQh/2DihDLiaBj1+ETY2qJoDRfoR30G66MRXSDA==
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 4P4Nlw4pYLzLL2;
Sun, 29 Jan 2023 07:50:52 +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 30T7oq4g047800;
Sun, 29 Jan 2023 07:50:52 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30T7oqUO047799;
Sun, 29 Jan 2023 07:50:52 GMT
(envelope-from git)
Date: Sun, 29 Jan 2023 07:50:52 GMT
Message-Id: <202301290750.30T7oqUO047799@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: 3c37c1ea1989 - stable/13 - netpfil tests: improve pfsync_defer.py
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: kp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 3c37c1ea19892d672325657905ffb4c27dd81472
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=3c37c1ea19892d672325657905ffb4c27dd81472
commit 3c37c1ea19892d672325657905ffb4c27dd81472
Author: Kajetan Staszkiewicz <vegeta@tuxpowered.net>
AuthorDate: 2023-01-20 09:43:02 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2023-01-29 05:37:46 +0000
netpfil tests: improve pfsync_defer.py
Return different exit code depending on which failure was encountered.
The pfsync test expect a very particular failure, not just any.
MFC after: 1 week
Sponsored by: InnoGames GmbH
Differential Revision: https://reviews.freebsd.org/D38123
(cherry picked from commit 06012728beff45e94d58410eae7cda2ea980ef77)
---
tests/sys/netpfil/pf/pfsync.sh | 2 +-
tests/sys/netpfil/pf/pfsync_defer.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh
index bbe3fbcb1d2a..737753103683 100644
--- a/tests/sys/netpfil/pf/pfsync.sh
+++ b/tests/sys/netpfil/pf/pfsync.sh
@@ -168,7 +168,7 @@ defer_body()
"set skip on ${epair_sync}a" \
"pass keep state"
- atf_check -s exit:1 env PYTHONPATH=${common_dir} \
+ atf_check -s exit:3 env PYTHONPATH=${common_dir} \
$(atf_get_srcdir)/pfsync_defer.py \
--syncdev ${epair_sync}b \
--indev ${epair_in}b \
diff --git a/tests/sys/netpfil/pf/pfsync_defer.py b/tests/sys/netpfil/pf/pfsync_defer.py
index 4a691240b466..c1d90d4483c4 100644
--- a/tests/sys/netpfil/pf/pfsync_defer.py
+++ b/tests/sys/netpfil/pf/pfsync_defer.py
@@ -117,15 +117,15 @@ def main():
sys.exit(1)
if not got_ping:
- sys.exit(1)
+ sys.exit(2)
if got_pfsync > got_ping:
- sys.exit(1)
+ sys.exit(3)
# Deferred packets are delayed up to 20ms (unless the pfsync peer, which we
# don't have here, acks their state update earlier)
if (sent_ping + 0.020) > got_ping:
- sys.exit(1)
+ sys.exit(4)
if __name__ == '__main__':
main()
From nobody Sun Jan 29 14:38:24 2023
X-Original-To: dev-commits-src-branches@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 4P4Yp90F09z3cgPg;
Sun, 29 Jan 2023 14:38:25 +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 4P4Yp86sNNz48Kx;
Sun, 29 Jan 2023 14:38:24 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675003105;
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=MEl205dhQ1amRe9YqT/It37i9mHDYsRy+h7DDo3ga20=;
b=gFpqmTrYy29/ENdKSvuhUbd2c4TNtWCSP2xhmqIMUALn1H+t4lnQJD0ZHMz9mwAdNAkLa6
PLRBQjaJfUAvCfL+fW9Lt/HbwHNos0VB4Hx1ZgUylmctnPdBaGtdyWyqC+p/x+tYm3fv+2
x/5l0zR6ExGTyN1ctH1KUCG3Q0NvPpIl7HRpVvZLcZKNXYURzI+yGFHQsGlduCdH+qeCBC
FLVeXHtavCW281ixGORLsQKsczs9wq6d7oh+yQnGeK5hQaX9rffkYxyOyEYPCG4Tc3nwHN
eaDztTjHC/3zQ8T+Q+VPuj6V2OaAwg9n/9GsE7B6+OE+OqUPgVEH4gUjtMRRWA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675003105;
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=MEl205dhQ1amRe9YqT/It37i9mHDYsRy+h7DDo3ga20=;
b=CV+JhqR4KKxYQ5xJCOxRST51FxmXBegKPOrt9O60MFOMCGYfFsx1j/ysi1aK2m02CtjKbj
3W6B6VBC5tsbBxnbrDWXydObDGnQknUumd2LBuT0cQuc4hOq8F9+z8bS3wSMcTZYIsF2i9
EZ4hhegSFwAGjKvyoZlBOXcaCG0NoBTKqjaFrIG1mbGrPq9VC6hZARZoS7iezC5e2fDdC2
uktDBRBuv0BXX/gdDobpe+Z2Yxqele4wwUeiPdCnIme11AxM+Lwnt9c0FMRBJ6QNTgbk8k
HLtCCteu9lI+BbYBKNhtb4MnMT6niE7Ql9YWFUcjDXwaCPKmWWTRMd/v5otraQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675003105; a=rsa-sha256; cv=none;
b=jt7ULMl4HDiRp99/g6rM/o5loen7HqXf4+3wL8axYh2TRWc9FAnCUGMBSXQHwvNeb0c4dd
mB/LNWrSblcwPWCh548yGibXPou0TnqCc41iJrUEhz0g32FI6B97Px4NYxKsFPMg+TK3hh
b+v4yTaBX82POHox/QnXyZaVj6N4TvwgRetgiOAElXQF35soW1zj2a8601JcdbiEUrEdhQ
IT4bsaz+sDnFAjPFYMrFXAA1CedfMslmXUyjs9YhCpM0gYPhNcWasTHEeaRVJV5P2OIIl8
5CBJWfkE4yp3CEFJZNXc1FJnqpip0oG2I5fNGlLZFpRfznf+pttaIS+0VpChgQ==
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 4P4Yp85vjxzXCJ;
Sun, 29 Jan 2023 14:38:24 +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 30TEcO1F021481;
Sun, 29 Jan 2023 14:38:24 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30TEcOe3021480;
Sun, 29 Jan 2023 14:38:24 GMT
(envelope-from git)
Date: Sun, 29 Jan 2023 14:38:24 GMT
Message-Id: <202301291438.30TEcOe3021480@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mateusz Guzik <mjg@FreeBSD.org>
Subject: git: ba1fc13882d1 - stable/13 - Add kf_file_nlink field to kf_file and populate it
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mjg
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: ba1fc13882d126a986f629b095ed6bab7378a8f4
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by mjg:
URL: https://cgit.FreeBSD.org/src/commit/?id=ba1fc13882d126a986f629b095ed6bab7378a8f4
commit ba1fc13882d126a986f629b095ed6bab7378a8f4
Author: Jiajie Chen <c@jia.je>
AuthorDate: 2023-01-23 16:36:59 +0000
Commit: Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2023-01-29 14:37:08 +0000
Add kf_file_nlink field to kf_file and populate it
This will allow user-space programs (e.g. lsof) to locate deleted files
whose nlink equals zero. Prior to this commit, programs has to use
stat(kf_path) to get nlink, but that will fail if the file is deleted.
[mjg: s/fail/file in the commit message]
Reviewed by: mjg
Differential Revision: https://reviews.freebsd.org/D38169
(cherry picked from commit dec7db49602df75119f6b57d32f1eb58e0040abc)
---
sys/kern/vfs_vnops.c | 1 +
sys/sys/user.h | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index a54d2c463dc7..f4274ee38689 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -2774,6 +2774,7 @@ vn_fill_kinfo_vnode(struct vnode *vp, struct kinfo_file *kif)
kif->kf_un.kf_file.kf_file_rdev = va.va_rdev;
kif->kf_un.kf_file.kf_file_rdev_freebsd11 =
kif->kf_un.kf_file.kf_file_rdev; /* truncate */
+ kif->kf_un.kf_file.kf_file_nlink = va.va_nlink;
return (0);
}
diff --git a/sys/sys/user.h b/sys/sys/user.h
index 433e44c0f19e..6309c708be95 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -389,7 +389,9 @@ struct kinfo_file {
int kf_file_type;
/* Space for future use */
int kf_spareint[3];
- uint64_t kf_spareint64[30];
+ uint64_t kf_spareint64[29];
+ /* Number of references to file. */
+ uint64_t kf_file_nlink;
/* Vnode filesystem id. */
uint64_t kf_file_fsid;
/* File device. */
From nobody Sun Jan 29 18:55:51 2023
X-Original-To: dev-commits-src-branches@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 4P4gWD1HGZz3bnff;
Sun, 29 Jan 2023 18:55:52 +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 4P4gWD0kCZz4lQ3;
Sun, 29 Jan 2023 18:55:52 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675018552;
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=WzFvi20sRkKvXzjCeLzTg362uLTQc3MnTgL1Hf73Htg=;
b=fqyed3cpZaPOlRDW9kILyJiIbBpZnzHoaaPSXQ9zYspA57OPcSEYfWfD9rLoh0aDumQYfE
Y2ljeq8ra43HTdNzgqJ5OCBEvJcgiGKbM6XXuSrIyMYgYfLRsDo82E/gK4dUHREhsjKMeG
rwx8D19LcvPPI9XxrxTlDFc6vEnhPMHEq1DhF1mK3xoIwSNbBB0p2lO/Ts8uJhJhqlO1Qm
rTD7b0YQCB07Qgt/JNOzvmv/nueCOlJlbGH5EVsKxS84Hy/WASZTts7AGfj0xvr5OWMs7E
prde9eFeg0F1fngj4qQKWqeDW3gZKFAksAC/GP8yXpBnRBAv+BvyWTP3CHdsng==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675018552;
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=WzFvi20sRkKvXzjCeLzTg362uLTQc3MnTgL1Hf73Htg=;
b=lOfo6lpv7W43Hnv+YdwexRHWOlUbATSNoZ6jCp2mQM26VzJUF5Bo0snZxDenZDQLkj7GBu
U547iKsB67qKMMilDjqx/AGjvme8d9THFVKYuG+AfSwBB3gEl0Z7CZ2ScbdNu04nkogqUo
hdtkAN9++c2BN0diA6rREJ0xHK45DELMXSPo6086QQJBiJDBN0J//aSJucvE7hF9nmUQrm
vAdkvLeChuPDBUruWAp9/Fxzk/aQZV8LEDeuvEhGZTmzT2JZ+JAN2EcrTCL2adcXJBY0KV
STuILQLLdGCk4WsV6wb6E4ilaiyUzlbfptdo41FEryuK3ZxhVWc0bSuCvoA6qg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675018552; a=rsa-sha256; cv=none;
b=EfEKoBXhuNxdtt0fgzmGXk1rSJhYKzMC+u/nG3ss9JpB7+dE38xtKT7qM/3qSyxAqby5nI
b4jToGVaEKo6+zy1cceV4FvGG2GLjxij77w+G6hUEwI7glF17eVipEZeST9dTJk0goFTx4
prJC5PUSGYz2TKJfKezR+I4a6FFlZicFuV7oFUAXQoODZcdSsiW+bekA/No5nJuDbUybij
G7zFqiXEoRJTFQTQdA8cwmPBO6b6s1Ld78GhEVkHDVRmdHAcKScWtvSub0EIXNPKPyVVXv
tTgPgyLuoLbQT6qWQrMVM06Dcv1vw1/HTs5Ax5u9K3OqhaMBFEm4bto5eiYcrw==
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 4P4gWC6sMQzfk5;
Sun, 29 Jan 2023 18:55:51 +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 30TItpYc092696;
Sun, 29 Jan 2023 18:55:51 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30TItpNP092695;
Sun, 29 Jan 2023 18:55:51 GMT
(envelope-from git)
Date: Sun, 29 Jan 2023 18:55:51 GMT
Message-Id: <202301291855.30TItpNP092695@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 8497b431f19e - stable/13 - kvmclock: Fix initialization when EARLY_AP_STARTUP is not defined
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 8497b431f19efac28a1f1f64f78037f37d7c671e
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=8497b431f19efac28a1f1f64f78037f37d7c671e
commit 8497b431f19efac28a1f1f64f78037f37d7c671e
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-01-13 15:01:00 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-01-29 18:55:42 +0000
kvmclock: Fix initialization when EARLY_AP_STARTUP is not defined
To attach to the hypervisor, kvmclock needs to write a per-CPU MSR.
When EARLY_AP_STARTUP is not defined, device attach happens too early:
APs are not yet spun up, so smp_rendezvous only runs the callback on the
local CPU. As a result, the timecounter only gets initialized on the
BSP, and then timekeeping is broken on SMP systems.
Implement handling for !EARLY_AP_STARTUP kernels: keep track of the CPU
on which device attach ran, and then use a SI_SUB_SMP SYSINIT to
register the rest of the CPUs with the hypervisor.
Reported by: Shrikanth R Kamath <kshrikanth@juniper.net>
Reviewed by: kib, jhb (earlier versions)
Sponsored by: Klara, Inc.
Sponsored by: Juniper Networks, Inc.
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D37705
(cherry picked from commit 568f552b0410f4f72db9ce710f7803acca23f79f)
---
sys/dev/kvm_clock/kvm_clock.c | 46 ++++++++++++++++++++++++++++++++++++++-----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/sys/dev/kvm_clock/kvm_clock.c b/sys/dev/kvm_clock/kvm_clock.c
index 1a76432e417d..982a345a74c7 100644
--- a/sys/dev/kvm_clock/kvm_clock.c
+++ b/sys/dev/kvm_clock/kvm_clock.c
@@ -70,12 +70,16 @@ struct kvm_clock_softc {
struct pvclock_vcpu_time_info *timeinfos;
u_int msr_tc;
u_int msr_wc;
+#ifndef EARLY_AP_STARTUP
+ int firstcpu;
+#endif
};
static devclass_t kvm_clock_devclass;
static struct pvclock_wall_clock *kvm_clock_get_wallclock(void *arg);
-static void kvm_clock_system_time_enable(struct kvm_clock_softc *sc);
+static void kvm_clock_system_time_enable(struct kvm_clock_softc *sc,
+ const cpuset_t *cpus);
static void kvm_clock_system_time_enable_pcpu(void *arg);
static struct pvclock_wall_clock *
@@ -88,9 +92,10 @@ kvm_clock_get_wallclock(void *arg)
}
static void
-kvm_clock_system_time_enable(struct kvm_clock_softc *sc)
+kvm_clock_system_time_enable(struct kvm_clock_softc *sc, const cpuset_t *cpus)
{
- smp_rendezvous(NULL, kvm_clock_system_time_enable_pcpu, NULL, sc);
+ smp_rendezvous_cpus(*cpus, NULL, kvm_clock_system_time_enable_pcpu,
+ NULL, sc);
}
static void
@@ -104,6 +109,32 @@ kvm_clock_system_time_enable_pcpu(void *arg)
wrmsr(sc->msr_tc, vtophys(&(sc->timeinfos)[curcpu]) | 1);
}
+#ifndef EARLY_AP_STARTUP
+static void
+kvm_clock_init_smp(void *arg __unused)
+{
+ devclass_t kvm_clock_devclass;
+ cpuset_t cpus;
+ struct kvm_clock_softc *sc;
+
+ kvm_clock_devclass = devclass_find(KVM_CLOCK_DEVNAME);
+ sc = devclass_get_softc(kvm_clock_devclass, 0);
+ if (sc == NULL || mp_ncpus == 1)
+ return;
+
+ /*
+ * Register with the hypervisor on all CPUs except the one that
+ * registered in kvm_clock_attach().
+ */
+ cpus = all_cpus;
+ KASSERT(CPU_ISSET(sc->firstcpu, &cpus),
+ ("%s: invalid first CPU %d", __func__, sc->firstcpu));
+ CPU_CLR(sc->firstcpu, &cpus);
+ kvm_clock_system_time_enable(sc, &cpus);
+}
+SYSINIT(kvm_clock, SI_SUB_SMP, SI_ORDER_ANY, kvm_clock_init_smp, NULL);
+#endif
+
static void
kvm_clock_identify(driver_t *driver, device_t parent)
{
@@ -150,7 +181,12 @@ kvm_clock_attach(device_t dev)
/* Set up 'struct pvclock_vcpu_time_info' page(s): */
sc->timeinfos = (struct pvclock_vcpu_time_info *)kmem_malloc(mp_ncpus *
sizeof(struct pvclock_vcpu_time_info), M_WAITOK | M_ZERO);
- kvm_clock_system_time_enable(sc);
+#ifdef EARLY_AP_STARTUP
+ kvm_clock_system_time_enable(sc, &all_cpus);
+#else
+ sc->firstcpu = curcpu;
+ kvm_clock_system_time_enable_pcpu(sc);
+#endif
/*
* Init pvclock; register KVM clock wall clock, register KVM clock
@@ -191,7 +227,7 @@ kvm_clock_resume(device_t dev)
* conservatively assume that the system time must be re-inited in
* suspend/resume scenarios.
*/
- kvm_clock_system_time_enable(device_get_softc(dev));
+ kvm_clock_system_time_enable(device_get_softc(dev), &all_cpus);
pvclock_resume();
inittodr(time_second);
return (0);
From nobody Sun Jan 29 18:56:14 2023
X-Original-To: dev-commits-src-branches@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 4P4gWg0vpRz3bntH;
Sun, 29 Jan 2023 18:56:15 +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 4P4gWf5FMfz4kss;
Sun, 29 Jan 2023 18:56:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675018574;
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=3K3DOKencWLoxKQc2KMt0I9LF4msr1uLrc2POxFogeA=;
b=huGApnGRDAoATm6ygHupDE7bOmJEaq9rGgkqpxwCkr14R+QOiZdBp9+bfjdBtkMdKmptdH
einwsNw3K0eX0ZPicAvhTY2MxzX6l2GHHdil2cZ2aMC4PAb7LpVZfxl0+zoe9zbe68+B9F
+Sl/eHlFLJBP706poPrZcVzaD6xJ+Orx1pw3mjOn4WoOf2Xretkd/n10bszHb4OIPycq/Q
I5/JO1nlojaCqJJCxlCj4OAJl2LNrhrlxhY9vFFkoNi3BQ0nhOZSzuhm8DHQIz25VRmRZq
3+g69AE50cLyjlw69uWjFc1JoqN/eTOpeEZ0+YAvjytSfik7B4XdwXLOu8vo5A==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675018574;
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=3K3DOKencWLoxKQc2KMt0I9LF4msr1uLrc2POxFogeA=;
b=e3OFsZzswi0ESFkDRkq9u2oGE7McZxSz7Y3AdA7NLSKtSToyuwoxIcRNAiDnhwoabN9InD
fpblb2jus9pRA5dBJD7kmdBuda4DRTeyPyy9x/RxoOAWnyht7YzVv5llNkucwbDy64NY+G
G3+tXtrtwqhrW1cQ6km2ISMvRlGQOyNdbieFXbHCHBJRA2vlbD2IImbfe+8Tbe8jZGcnp+
eEsLVSSu+LIzmhz4ix4GyRkCf4D/1IkNGmG/gDEz7ktV8cHPbMDYknn5RwsoVUAHH0GpBo
g0CC9VOW1kajgQnawYyvlZTLigrmmV+DGeNN8lzWf96plZWmmAFqWU5xZN/rVA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675018574; a=rsa-sha256; cv=none;
b=IAmhjQRnrw8+MR2c7UcBeqspy48pjwORORVxkz4T3Lc4/IdX9sYESpMdc4FaBOqGas21GI
2Egl9wFgcN5hVfz5Bxki93jJZFO1pX77NLT5+m8stBzGirRQOkijnHBRN12hOEIdpkj+m2
iWPzEqeDRreIIOeCn+jqJySv/T7PY7v1LHH6viOGJ14qP6JIEiwNvl4qEqHAZlYb1TPvOI
mPgEJKEXQTOx89UdCMRp+BXBsJjosChh0ZArcj+GOgmBQh2Fx/4PuTDuKwtcRNRWv1xwaa
9C+2QoekocQXYTGS6R+K7fHUBQtkZOXxpD6Bv16B/a6J9p8uEnLeQhd5yVm2fQ==
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 4P4gWf4Jc5zfhN;
Sun, 29 Jan 2023 18:56:14 +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 30TIuE8Y092862;
Sun, 29 Jan 2023 18:56:14 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30TIuEWu092861;
Sun, 29 Jan 2023 18:56:14 GMT
(envelope-from git)
Date: Sun, 29 Jan 2023 18:56:14 GMT
Message-Id: <202301291856.30TIuEWu092861@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 870464f11f3c - stable/12 - kvmclock: Fix initialization when EARLY_AP_STARTUP is not defined
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 870464f11f3c53fcc7114ea406f95655b9821263
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=870464f11f3c53fcc7114ea406f95655b9821263
commit 870464f11f3c53fcc7114ea406f95655b9821263
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-01-13 15:01:00 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-01-29 18:56:06 +0000
kvmclock: Fix initialization when EARLY_AP_STARTUP is not defined
To attach to the hypervisor, kvmclock needs to write a per-CPU MSR.
When EARLY_AP_STARTUP is not defined, device attach happens too early:
APs are not yet spun up, so smp_rendezvous only runs the callback on the
local CPU. As a result, the timecounter only gets initialized on the
BSP, and then timekeeping is broken on SMP systems.
Implement handling for !EARLY_AP_STARTUP kernels: keep track of the CPU
on which device attach ran, and then use a SI_SUB_SMP SYSINIT to
register the rest of the CPUs with the hypervisor.
Reported by: Shrikanth R Kamath <kshrikanth@juniper.net>
Reviewed by: kib, jhb (earlier versions)
Sponsored by: Klara, Inc.
Sponsored by: Juniper Networks, Inc.
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D37705
(cherry picked from commit 568f552b0410f4f72db9ce710f7803acca23f79f)
---
sys/dev/kvm_clock/kvm_clock.c | 46 ++++++++++++++++++++++++++++++++++++++-----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/sys/dev/kvm_clock/kvm_clock.c b/sys/dev/kvm_clock/kvm_clock.c
index 1a76432e417d..982a345a74c7 100644
--- a/sys/dev/kvm_clock/kvm_clock.c
+++ b/sys/dev/kvm_clock/kvm_clock.c
@@ -70,12 +70,16 @@ struct kvm_clock_softc {
struct pvclock_vcpu_time_info *timeinfos;
u_int msr_tc;
u_int msr_wc;
+#ifndef EARLY_AP_STARTUP
+ int firstcpu;
+#endif
};
static devclass_t kvm_clock_devclass;
static struct pvclock_wall_clock *kvm_clock_get_wallclock(void *arg);
-static void kvm_clock_system_time_enable(struct kvm_clock_softc *sc);
+static void kvm_clock_system_time_enable(struct kvm_clock_softc *sc,
+ const cpuset_t *cpus);
static void kvm_clock_system_time_enable_pcpu(void *arg);
static struct pvclock_wall_clock *
@@ -88,9 +92,10 @@ kvm_clock_get_wallclock(void *arg)
}
static void
-kvm_clock_system_time_enable(struct kvm_clock_softc *sc)
+kvm_clock_system_time_enable(struct kvm_clock_softc *sc, const cpuset_t *cpus)
{
- smp_rendezvous(NULL, kvm_clock_system_time_enable_pcpu, NULL, sc);
+ smp_rendezvous_cpus(*cpus, NULL, kvm_clock_system_time_enable_pcpu,
+ NULL, sc);
}
static void
@@ -104,6 +109,32 @@ kvm_clock_system_time_enable_pcpu(void *arg)
wrmsr(sc->msr_tc, vtophys(&(sc->timeinfos)[curcpu]) | 1);
}
+#ifndef EARLY_AP_STARTUP
+static void
+kvm_clock_init_smp(void *arg __unused)
+{
+ devclass_t kvm_clock_devclass;
+ cpuset_t cpus;
+ struct kvm_clock_softc *sc;
+
+ kvm_clock_devclass = devclass_find(KVM_CLOCK_DEVNAME);
+ sc = devclass_get_softc(kvm_clock_devclass, 0);
+ if (sc == NULL || mp_ncpus == 1)
+ return;
+
+ /*
+ * Register with the hypervisor on all CPUs except the one that
+ * registered in kvm_clock_attach().
+ */
+ cpus = all_cpus;
+ KASSERT(CPU_ISSET(sc->firstcpu, &cpus),
+ ("%s: invalid first CPU %d", __func__, sc->firstcpu));
+ CPU_CLR(sc->firstcpu, &cpus);
+ kvm_clock_system_time_enable(sc, &cpus);
+}
+SYSINIT(kvm_clock, SI_SUB_SMP, SI_ORDER_ANY, kvm_clock_init_smp, NULL);
+#endif
+
static void
kvm_clock_identify(driver_t *driver, device_t parent)
{
@@ -150,7 +181,12 @@ kvm_clock_attach(device_t dev)
/* Set up 'struct pvclock_vcpu_time_info' page(s): */
sc->timeinfos = (struct pvclock_vcpu_time_info *)kmem_malloc(mp_ncpus *
sizeof(struct pvclock_vcpu_time_info), M_WAITOK | M_ZERO);
- kvm_clock_system_time_enable(sc);
+#ifdef EARLY_AP_STARTUP
+ kvm_clock_system_time_enable(sc, &all_cpus);
+#else
+ sc->firstcpu = curcpu;
+ kvm_clock_system_time_enable_pcpu(sc);
+#endif
/*
* Init pvclock; register KVM clock wall clock, register KVM clock
@@ -191,7 +227,7 @@ kvm_clock_resume(device_t dev)
* conservatively assume that the system time must be re-inited in
* suspend/resume scenarios.
*/
- kvm_clock_system_time_enable(device_get_softc(dev));
+ kvm_clock_system_time_enable(device_get_softc(dev), &all_cpus);
pvclock_resume();
inittodr(time_second);
return (0);
From nobody Mon Jan 30 20:07:13 2023
X-Original-To: dev-commits-src-branches@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 4P5K362KDNz3cQ1b;
Mon, 30 Jan 2023 20:07:14 +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 4P5K361g3qz3nsV;
Mon, 30 Jan 2023 20:07:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675109234;
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=NezkjV/NjSATTat2YGcSRzQIQfxEI4iDJ4PU6GzQl28=;
b=CA9VwagJj5TJYi0lKnbgvqrVXc344sg3lJJ3BTOPfuCLagw9e3vnAGXNdAyBEL4cMlgo2u
l2ZvAJTLg2LImqE8SBJhOUMsUvwPiWczxi0CfYSee7wp4y4pBKPZfAhXeRu6SmRqqDXZNW
a/Rshz5sWpt+XBdld+6gzJHoRwaspoxW5PDrzoQwKJr98u6m7IJVj/bwqjzaSXGfW8r5n/
jlpQraxWmNNERRcd6rdsSBrEO7hMxtqd7honuz89ouj5RotXwER3uV7a5VmsK+mTR2PrI1
l2cPEoQf3MoVHPlaQhWNSu+yI55tvv5efc0ZvP9iYZkBHuB8qUZqmzfervK5IA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675109234;
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=NezkjV/NjSATTat2YGcSRzQIQfxEI4iDJ4PU6GzQl28=;
b=cLvwoX0PyTwHGsBmsbzkzO777SBAMvyWYvtGhE+K8PJ8g0Z8OL/Ali08Tk59rPKfvsH9wN
K+AOfmSBNsrJuK7r70lQY4MMF9osRxRKsUESrluYs9SX9UkrpuUcCp/dxgDfXKb9gS41a7
FSnGDapDACDeUe5IDvekPvRIndeiUMtIxYwYPBvP36rCiV3fmuBcaL9Sgj5yCiHdEATlsK
2wdAZiKHkcRjO89dl7cX3piJBJGjQz6GDlanaGBitzuy2o8C1bi3S/zw6CfUPra6xF6BaL
iNFuYXyg4CecBMcOYBPYGeMObqLR+nOdOihUaJAq8xfN243TuzY2A4FuYZ1t5A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675109234; a=rsa-sha256; cv=none;
b=rna0ulPRpmrDolU/gAzSaB8+gLAg3fQy8QLs5YgRVNG/I00PKbAKRxAPJQUY5xKVMpQvLp
Z94LqqERzggMdcYIQKGQ4uGw9YUTklIE3evDRuEMt7X5CdFzQh/Sm/hCU4KJRW81A6FRu3
JQgDimOqjKHIaEMZQtd0HPgM1aImGSFF7S8njNQGHyz7UzsMrB4gMaGLtJXXO+qcl7boui
4SLN8Ad+Z/Ev7aUvmR5TERmh7c4hunyF+H7QJ8kxNCftTuOkrXLiLRKOlsK9TWQKDUMU1O
hQiGJNiVcIX7jW7XXUsGPLfas0tWV2OZFx7AHt0JsU+rUv+MBy8czIWFh17GmA==
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 4P5K360gVMzLN5;
Mon, 30 Jan 2023 20:07:14 +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 30UK7D4v074183;
Mon, 30 Jan 2023 20:07:13 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30UK7DGT074182;
Mon, 30 Jan 2023 20:07:13 GMT
(envelope-from git)
Date: Mon, 30 Jan 2023 20:07:13 GMT
Message-Id: <202301302007.30UK7DGT074182@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Brooks Davis <brooks@FreeBSD.org>
Subject: git: 435a2e04f06b - stable/13 - freebsd32_sendmsg: fix control message ABI
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: brooks
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 435a2e04f06b4cb74f41a9805d1eb0f4c30bee00
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=435a2e04f06b4cb74f41a9805d1eb0f4c30bee00
commit 435a2e04f06b4cb74f41a9805d1eb0f4c30bee00
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2022-08-24 17:34:39 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-01-30 19:22:30 +0000
freebsd32_sendmsg: fix control message ABI
When a freebsd32 caller uses all or most allowed space for control
messages (MCLBYTES == 2K) then the message may no longer fit when
the messages are padded for 64-bit alignment. Historically we've just
shrugged and said there is no ABI guarantee. We ran into this on
CheriBSD where a capsicumized 64-bit nm would fail when called with more
than 64 files.
Fix this by not gratutiously capping size of mbuf data we'll allocate
to MCLBYTES and let m_get2 allocate up to MJUMPAGESIZE (4K or larger).
Instead of hard-coding a length check, let m_get2 do it and check for a
NULL return.
Reviewed by: markj, jhb, emaste
Sponsored by: DARPA, AFRL
Differential Revision: https://reviews.freebsd.org/D36322
(cherry picked from commit c46697b9cb97a14f61ac0a58758aab081b9e48c5)
---
sys/compat/freebsd32/freebsd32_misc.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c
index da49b4b7b415..416cb8fe902e 100644
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -1504,6 +1504,7 @@ freebsd32_copyin_control(struct mbuf **mp, caddr_t buf, u_int buflen)
u_int msglen, outlen;
int error;
+ /* Enforce the size limit of the native implementation. */
if (buflen > MCLBYTES)
return (EINVAL);
@@ -1539,20 +1540,20 @@ freebsd32_copyin_control(struct mbuf **mp, caddr_t buf, u_int buflen)
outlen += CMSG_ALIGN(sizeof(*cm)) +
CMSG_ALIGN(msglen - FREEBSD32_ALIGN(sizeof(*cm)));
}
- if (error == 0 && outlen > MCLBYTES) {
- /*
- * XXXMJ This implies that the upper limit on 32-bit aligned
- * control messages is less than MCLBYTES, and so we are not
- * perfectly compatible. However, there is no platform
- * guarantee that mbuf clusters larger than MCLBYTES can be
- * allocated.
- */
- error = EINVAL;
- }
if (error != 0)
goto out;
+ /*
+ * Allocate up to MJUMPAGESIZE space for the re-aligned and
+ * re-padded control messages. This allows a full MCLBYTES of
+ * 32-bit sized and aligned messages to fit and avoids an ABI
+ * mismatch with the native implementation.
+ */
m = m_get2(outlen, M_WAITOK, MT_CONTROL, 0);
+ if (m == NULL) {
+ error = EINVAL;
+ goto out;
+ }
m->m_len = outlen;
md = mtod(m, void *);
From nobody Mon Jan 30 20:07:15 2023
X-Original-To: dev-commits-src-branches@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 4P5K373P7jz3cPW8;
Mon, 30 Jan 2023 20:07:15 +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 4P5K372rMJz3nfC;
Mon, 30 Jan 2023 20:07:15 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675109235;
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=TaRiIab8WV7/VZPCvMslOD10/ZzXRL1Nw3roUepw8yw=;
b=wlPyJQ5FZm2o1Bjss9Y7y58cKI9p8EVwxVcc2zCzYU7JJhAOdahg0YBuJxL+BNMPGp8VIZ
7IGGQNCuvRhqzfVPb/62CIacRZzQNkRk7uoDJHCQYamM2fs3PH9CNlZ40dSuAWgTHG0/2e
m0KYh1sb6YB2l3isrpYfJ8njO/QxnfdLzFU+dXXR7z9XXXy5S7ylS2rCTSP4P541ig+Fsj
x9OwPSnX6dIUPyj2TBdVELTWVtQ0PrlstMr1mOt79akbG24R5cLYd39MsmQxMWQvy7CT0U
47QR2vsa+2RVTPdSnelFj8sjeYpRTRQxwW44xxXiI80+nmlSB5AAIKNJBHVocw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675109235;
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=TaRiIab8WV7/VZPCvMslOD10/ZzXRL1Nw3roUepw8yw=;
b=pJ8Vl3J+AJMB84X9xFn8MXcsXKWG4hqkaN1TMFWjYGp5AHN0vlEVlhLX0PfbLEcgXXoSlS
YSVRpdkrg2Gv5lXKMrITMA2FYr8UOYc5K1ST47zymxOLqMdCU1xdG3CK+lxyk8XLDk9gmV
BQx825Pdj2741HkydS49g5r8odXLZR8EQbw1XizG5q2tMXZCUc97p4nbGZoc6k5eX1Ols8
1HejN5NdcldIM8gsHkrw+Q4aC3UOCM+NzN3KMEu2OF0yaUrx9Ar5/ylRTxNxtcVJcMwm2K
D4FAgE8TONlVZQ0yKiM4tzAFxtU5kIpRo30+K6oVY5HmqnjcwdW0GRr1w8+BMA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675109235; a=rsa-sha256; cv=none;
b=wzbo83KXgkYgs75uCU1nj7I1WgI4VLiJl4nXVg0wRGrdYEpvaH9U4WkItgTjbCdKnlXrXK
DT43rAG/HfQ9QPQ5Xd9lnwU9KtH6wiCQJI/up2tRgoQTQC+ZvR520RUE3G96UM1iLrSdhM
1WCUUclql/tQs0IRRZxDU+p9qMcom9TX7IEUSQ/Kve5susyzh2TtffxPhTh6Yoi1w8FBuN
hRXv1yMP41i+O30eaGy/sOQ0xqV2su7Vq/OvbM4qPyrm0kqRC+JCmjkOCDO/Ydzb/QbV62
1bdsXFYuCvOLInOSO0ObjPqRgj0o53vQiJk0glsmrsxz2wldquXbrnAhh0BUCg==
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 4P5K371LHqzLxC;
Mon, 30 Jan 2023 20:07:15 +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 30UK7FI1074207;
Mon, 30 Jan 2023 20:07:15 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30UK7FKr074206;
Mon, 30 Jan 2023 20:07:15 GMT
(envelope-from git)
Date: Mon, 30 Jan 2023 20:07:15 GMT
Message-Id: <202301302007.30UK7FKr074206@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Brooks Davis <brooks@FreeBSD.org>
Subject: git: 31068ff99c43 - stable/13 - freebsd32: Make sendmsg match native ABI for unpadded final control message
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: brooks
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 31068ff99c4354cc75fd96786da78931dc1012fd
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=31068ff99c4354cc75fd96786da78931dc1012fd
commit 31068ff99c4354cc75fd96786da78931dc1012fd
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2022-09-15 16:16:22 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-01-30 19:35:53 +0000
freebsd32: Make sendmsg match native ABI for unpadded final control message
The API says that CMSG_SPACE should be used for msg_controllen, but in
practice the native ABI allows you to only use CMSG_LEN for the final
(typically only) control message, and real-world software does this,
including Wayland. For freebsd32, this is in practice mostly harmless,
since control messages are generally used to carry file descriptors,
which are already 4 bytes in size and thus no padding is needed, but
they can carry other quantities that may not result in an aligned
length. This was discovered after CheriBSD's freebsd64 equivalent was
updated to match the freebsd32 implementation, as that uses 8 byte
alignment which does break the file descriptor use case, and thus
Wayland.
This used to be addressed by aligning buflen before the first iteration,
but that allowed unwanted invalid inputs and was lost in 1b1428dcc82b,
with no safer equivalent put in its place.
Reviewed by: brooks, kib, markj
Obtained from: CheriBSD
Fixes: 1b1428dcc82b ("Fix a TOCTOU vulnerability in freebsd32_copyin_control().")
Differential Revision: https://reviews.freebsd.org/D36554
(cherry picked from commit 7b673a2c73d0577e2c006aeb110295a522b98135)
---
sys/compat/freebsd32/freebsd32_misc.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c
index 416cb8fe902e..70eece0311f4 100644
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -1525,15 +1525,19 @@ freebsd32_copyin_control(struct mbuf **mp, caddr_t buf, u_int buflen)
break;
}
cm = (struct cmsghdr *)in1;
- if (cm->cmsg_len < FREEBSD32_ALIGN(sizeof(*cm))) {
+ if (cm->cmsg_len < FREEBSD32_ALIGN(sizeof(*cm)) ||
+ cm->cmsg_len > buflen) {
error = EINVAL;
break;
}
msglen = FREEBSD32_ALIGN(cm->cmsg_len);
- if (msglen > buflen || msglen < cm->cmsg_len) {
+ if (msglen < cm->cmsg_len) {
error = EINVAL;
break;
}
+ /* The native ABI permits the final padding to be omitted. */
+ if (msglen > buflen)
+ msglen = buflen;
buflen -= msglen;
in1 = (char *)in1 + msglen;
From nobody Tue Jan 31 00:39:06 2023
X-Original-To: dev-commits-src-branches@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 4P5R4p6Z1Pz3btGb;
Tue, 31 Jan 2023 00:39:06 +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 4P5R4p5nKnz4Vvd;
Tue, 31 Jan 2023 00:39:06 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675125546;
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=dyFmbVsqvIb3HZlFhV40FY7zSx7Rob4nQS9TuMGguQw=;
b=Ry/AmRxxvAeIi9/c0EUp8Dq3kSYxChWsbKrVKdsAxP0gYfxSzgllGHILj9aYWTSYImeA01
R+lt0AKjcKHWk02kh/FjIDhmKFgVcj0lZ0zrZjyLyVrAtBfgNJnGLxgs8vpjgC9EgPkPXB
A8obkMS8AVyz0P5v16448btLoMIg8oU/LE0FMDZaL/BXEAzfw6iqq2s549fcPSWOkQwwkd
NSmElrx9DjvhvRsGaeQ2VQivgJKtiwYpzxeTU3sJ2yLiN1u9qbiVfwFVc9pg9qkxfCZeWS
wGWWcVBkESMzqq7kUq1SaWV54TIemVMAbytnjNOQQN+9mCuErGteBlOsHMAMmA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675125546;
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=dyFmbVsqvIb3HZlFhV40FY7zSx7Rob4nQS9TuMGguQw=;
b=JALddFE9F80N7dlxurQzT1UmG9ShpPGGxmDsan1c52jLmdgN0tsAsfPRh/hWm91jqk4WXU
gmWESvip6rZjAdDgegbHo7YaLkfGNJRRGmYOEwdR++goda+GhawOFIbsij2sTdjoovUmbk
GDCWkfZXYufUP6Lq1QRITEj4wlErUU4/MxhI4RX8ICid75NmskrP8IsFqMlq0P7zi2g82T
6Mrbhn0hgbn7SfwU+Qt3u2bppLV1St91tEtV4a5tf5fyq3Buc01HE54k6AVcSya1OlW6mh
g3ymNNO9qhx5FtnDczOO5qdB/bZPNVV1DcW88flD7ceDFHkZD+9PG/8LMmUeMg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675125546; a=rsa-sha256; cv=none;
b=fzJ8qm16961Gqgse3WMBaZewnn30Wjgwf+I7AEt2dxROtaNi26Gy5IAux0ppxMSXo9Ure8
L3RjD3zMy+E/ezSXOXxfR6Qg4MyknndvPcpbZiWPrO/H5aJMmumPzz3jeebdx2hOIKGMQy
S3OCcm0IzhQNs0DEpnoJU5KhJIS+3GWzjSgqGJhxWOUeZsGC0WbkT2zm6OK/WzAS2VO82F
59jA4yKFlv0axkgcGzut80J2G4LqZZ0JtkE+YYe9z4FCl1VhPRvdYw66JSsYIU1EqogD7E
dCU9OtRMvGUKtAv3jQIOVJwY2JAFpHl7WCS49zHa80yvu//UZIl+/UOghBeQ6w==
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 4P5R4p4r7ZzTcS;
Tue, 31 Jan 2023 00:39:06 +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 30V0d6aM059496;
Tue, 31 Jan 2023 00:39:06 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V0d6sv059495;
Tue, 31 Jan 2023 00:39:06 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 00:39:06 GMT
Message-Id: <202301310039.30V0d6sv059495@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 17262e08af4e - stable/13 - libcxx: Implement atomic::wait/notify using _umtx_op(2) for 64bit arches
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@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/stable/13
X-Git-Reftype: branch
X-Git-Commit: 17262e08af4e65a75484625417eb4ca0b916502e
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=17262e08af4e65a75484625417eb4ca0b916502e
commit 17262e08af4e65a75484625417eb4ca0b916502e
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-01-20 02:57:26 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-01-31 00:38:18 +0000
libcxx: Implement atomic::wait/notify using _umtx_op(2) for 64bit arches
(cherry picked from commit 9c996882b0ed279ca314d995f2eb1d538b94e3f8)
---
contrib/llvm-project/libcxx/src/atomic.cpp | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/contrib/llvm-project/libcxx/src/atomic.cpp b/contrib/llvm-project/libcxx/src/atomic.cpp
index 250d33e98b02..e7496fa43666 100644
--- a/contrib/llvm-project/libcxx/src/atomic.cpp
+++ b/contrib/llvm-project/libcxx/src/atomic.cpp
@@ -26,6 +26,11 @@
# define SYS_futex SYS_futex_time64
#endif
+#elif defined(__FreeBSD__)
+
+#include <sys/types.h>
+#include <sys/umtx.h>
+
#else // <- Add other operating systems here
// Baseline needs no new headers
@@ -72,6 +77,22 @@ static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const vo
const_cast<__cxx_atomic_contention_t*>(__ptr), 0);
}
+#elif defined(__FreeBSD__) && defined(__LP64__)
+
+static void __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr,
+ __cxx_contention_t __val)
+{
+ _umtx_op(const_cast<__cxx_atomic_contention_t*>(__ptr),
+ UMTX_OP_WAIT, __val, NULL, NULL);
+}
+
+static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const volatile* __ptr,
+ bool __notify_one)
+{
+ _umtx_op(const_cast<__cxx_atomic_contention_t*>(__ptr),
+ UMTX_OP_WAKE, __notify_one ? 1 : INT_MAX, NULL, NULL);
+}
+
#else // <- Add other operating systems here
// Baseline is just a timed backoff
From nobody Tue Jan 31 00:39:07 2023
X-Original-To: dev-commits-src-branches@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 4P5R4q75Ttz3btGg;
Tue, 31 Jan 2023 00:39:07 +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 4P5R4q6hNJz4WJQ;
Tue, 31 Jan 2023 00:39:07 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675125547;
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=RYiU/iqtQcXCBgld1e5ddrXfuzqD4+LoFPDtHfuRSSs=;
b=tP1X5AJ/hj+YI33+lnsnKneLEv5zdw1mqZBR9hE//KLx+yVkHcsrFyylQHnu2tlrsi4/0c
QWM5AiitiNagCbEHN0SL799jJQ0jZlP2OmlkZsIc6mscF2VacROWgEsBHBpsjI44J7kBZe
oSpRnKJxYgA4WSoDfsp3SGP1bXsImeLYzyMgQ3dkVTh9ZpqbBhRtGEU568wDhY2QTWB0pT
5bRQASEjGlkQds9ccWdg8Z5oZfEjnuchTwEZ0gsJ9mjujrg3UqFXQdePp0OPTB3erevfc/
8pXN3eFU00pan9xgS779ooTfoAJeL91DUr8Vn18y/vHPAsyh5/rQb0hPz16nNA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675125547;
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=RYiU/iqtQcXCBgld1e5ddrXfuzqD4+LoFPDtHfuRSSs=;
b=LkmhOATWfLzvszaFwFdYQa590BpQ1AMQfa4KHfqA7UjYNtnBtpz4oMeJow4bgRSEyIOfYM
B6ARFbvqqDK0QnqXswVNpQaywJJDNcA1Yr8cmcbZ5TTKsk9uhPxmA5hviKGlte0hxe2CoU
FcyupAwtULEYbqdutciUxKiIEyHGd/+2XE/bqu6FMgWVOo5NH9F4yt0jb9LGoazEjW1Zn8
xuYjny/mReHorSUz6Rw/P3F8HqJ8xzGb0Om/Zqu+zVBCinruBRW+T8uobADqBsalRPSU0V
r3oW6t2YwOu6e7MLjpxdh/cXmQ80rdxTzPoWZ7Pq8xJczrmWNpprTTvWTJfv5Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675125547; a=rsa-sha256; cv=none;
b=em8/gGvyPN1T8NPCtFgWMlPo0aDx5FMp7qsu1Bkbx38bbdZcenJ+kJ2PRAGwyFB8Tlx0NV
iOzGrOmuI1sUTJ8dlkeqBVjmXWotYqVt6FPk5/42J+r4VxpZHuGT9KoHR2EhFVt1cqLF6K
tBUEw6sKcOb0TRoyPak84Chb0hW8DygIqvpFpwRMTs+I0sKnaGGG1db5kKTnthC0Izj3hI
mAbSUNi2dj4gEiHh0c6BqzlbMwcM81Y29L0S6As+MIs7QZAo90oOBIb1v46VAmOqBpPozC
K7pw1k54TCr+/DXAmqt7bru//kGmzssozrxG5OnxQ33L0niU6SgyQe9rz0++DQ==
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 4P5R4q5mQ4zTy3;
Tue, 31 Jan 2023 00:39:07 +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 30V0d7kb059526;
Tue, 31 Jan 2023 00:39:07 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V0d78t059525;
Tue, 31 Jan 2023 00:39:07 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 00:39:07 GMT
Message-Id: <202301310039.30V0d78t059525@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: a140a745c4da - stable/13 - libcxx: use __SIZEOF_LONG__ == 8 instead of __LP64__
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@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/stable/13
X-Git-Reftype: branch
X-Git-Commit: a140a745c4da50111b0b7ef995b4f0fc75eeca1a
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=a140a745c4da50111b0b7ef995b4f0fc75eeca1a
commit a140a745c4da50111b0b7ef995b4f0fc75eeca1a
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-01-24 10:03:45 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-01-31 00:38:18 +0000
libcxx: use __SIZEOF_LONG__ == 8 instead of __LP64__
For MFC, 64bit mips is excluded from the new mode of wait/wake, because
it uses 32bit __cxx_contention_t, as noted by jrtc27.
(cherry picked from commit 25b18d8935a5ee933d5465f5db41ad58c26590f9)
---
contrib/llvm-project/libcxx/src/atomic.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/llvm-project/libcxx/src/atomic.cpp b/contrib/llvm-project/libcxx/src/atomic.cpp
index e7496fa43666..6f85c86aad8f 100644
--- a/contrib/llvm-project/libcxx/src/atomic.cpp
+++ b/contrib/llvm-project/libcxx/src/atomic.cpp
@@ -77,7 +77,7 @@ static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const vo
const_cast<__cxx_atomic_contention_t*>(__ptr), 0);
}
-#elif defined(__FreeBSD__) && defined(__LP64__)
+#elif defined(__FreeBSD__) && __SIZEOF_LONG__ == 8 && !defined(__mips__)
static void __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr,
__cxx_contention_t __val)
From nobody Tue Jan 31 00:39:08 2023
X-Original-To: dev-commits-src-branches@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 4P5R4s0zhBz3bt9c;
Tue, 31 Jan 2023 00:39:09 +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 4P5R4s0JZNz4WK2;
Tue, 31 Jan 2023 00:39:09 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675125549;
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=93/Lj8YlAJuLAyQHgG1wMYpaSdX1l3tFKA2pxr+qLaw=;
b=aFKFajollQgCUSqgb+08NK8OImefMoO2Lwk5QVCdmqfNwlVvokizEO8ag1GPZvFLtWxU35
czAq/qZ4aJI6r0KNNFc3hQPoamWFJvkcGZwf+zz2rfogHN3BtsqIrNyrEGQNuitZZYjM0W
jEGzATXhwY8i6n3tXV14YfxeZxxgQqTg03pUK99/ONLPmcbi3pTz+bneA1Twam0kRwKbJD
mGXT0vVFPdZPF9ENQlf7d2dZgdJk4pSikSvMrb0FxRrRmIOKzGuthAxFl2NbEmfiTlrDGq
8Vp5jKhEdKfm45DEjZNEs7vTEdlIboiW0ICc3WBb6WnpjtiXxbb+hs10JodsZg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675125549;
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=93/Lj8YlAJuLAyQHgG1wMYpaSdX1l3tFKA2pxr+qLaw=;
b=U9cY6tcRjie2VJR1X5SLhjwqFoCTvzPvnAWAqlmfcVh9dQGn+Ui76hFDdx2qSMldfq6jIy
mmODhSFaRV3lcSR1rTlN9t+QwYCF3jy8O7epHvpAjWpfoCaatCG2NYiOyNhtftg6uQV4Zl
Gge/Iu/RyT8wKTMJsTiZ3z+MruDlWlt3tEvTWZLxR91Ol5RbzqjzbdnhoL0tUgcIf9ZEzK
eDCgH6zG7aeEtxhCJZB2LIASVjPUV7Px+obKw05i3PB8KuxvOvlK8Fc6FynIlzzoYak11N
Y3XfHJxZjh7M4nOHGcTO31V66otJ5BFBa3QIIdd0uSRTykRXiCkv8bYscZ01AA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675125549; a=rsa-sha256; cv=none;
b=iQzP7ATaU20zP4sNLdLt7NRRESe3wJoQkYMWQCpaMX+BxyMlMmq+PpKcRk2x522kftPnAl
0kC8Wa44HfpflNAn68VWaCj4YwnQAHhCo4P9gW06QbLYA+YHXkC1ybL4GegcPRvYkG9iIp
YJ58YKlhlqn9Nhe51Z/BZ/ZFA/a40++AP8AzlZ/pcteLLpYVW686fU7kpJUiEfl40EeIHD
wkOvvtColVWraPrmYwGAJPtzwydQ7+dn6UFKEc7dJnlHase9oi2hk2ZongltClyXCZC1u7
mF1c5XhIv8s1gtXacpynu4WJvBP4Olc80BM/Y1SbeOZhMX2zS4f1nQWzrXIw5w==
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 4P5R4r6WKyzTxh;
Tue, 31 Jan 2023 00:39:08 +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 30V0d8dT059550;
Tue, 31 Jan 2023 00:39:08 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V0d8Hl059549;
Tue, 31 Jan 2023 00:39:08 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 00:39:08 GMT
Message-Id: <202301310039.30V0d8Hl059549@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: c8d8e959b51a - stable/13 - libcxx: add comment explaining why umtx is only used for 64bits
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@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/stable/13
X-Git-Reftype: branch
X-Git-Commit: c8d8e959b51a47a623a0c46d5966009455912f04
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=c8d8e959b51a47a623a0c46d5966009455912f04
commit c8d8e959b51a47a623a0c46d5966009455912f04
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-01-24 15:36:24 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-01-31 00:38:18 +0000
libcxx: add comment explaining why umtx is only used for 64bits
(cherry picked from commit 4c4a29267cbdd05471322e03bfd5eff8eb68e750)
---
contrib/llvm-project/libcxx/src/atomic.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/contrib/llvm-project/libcxx/src/atomic.cpp b/contrib/llvm-project/libcxx/src/atomic.cpp
index 6f85c86aad8f..7bd9205a963b 100644
--- a/contrib/llvm-project/libcxx/src/atomic.cpp
+++ b/contrib/llvm-project/libcxx/src/atomic.cpp
@@ -78,6 +78,11 @@ static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const vo
}
#elif defined(__FreeBSD__) && __SIZEOF_LONG__ == 8 && !defined(__mips__)
+/*
+ * Since __cxx_contention_t is int64_t even on 32bit FreeBSD
+ * platforms, we have to use umtx ops that work on the long type, and
+ * limit its use to architectures where long and int64_t are synonyms.
+ */
static void __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr,
__cxx_contention_t __val)
From nobody Tue Jan 31 00:39:09 2023
X-Original-To: dev-commits-src-branches@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 4P5R4t20j4z3bt4q;
Tue, 31 Jan 2023 00:39:10 +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 4P5R4t1HNRz4WGy;
Tue, 31 Jan 2023 00:39:10 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675125550;
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=NoGVGNaBW3mn1XbiaCRBLIkGwyp4sJ3u7ZrjDUizHnQ=;
b=Z/BWVeriMrXk8X6BTgAMzsFoPr1E6tbG8vt3u38Ioi1TLOXXcv3tEgVsBh6bCJdL1c8zYg
wU+TgiFZHsKjumU6m1c3AZEP+290L0zyqnXV4s/72zpELdXzGfaI4el7L923oGhoFTmqy7
n96QNmQcCnA+ebL3AoZLJF6v8Mmz0xhC6Jx8udpt7Dcj6eu2A83elNeUHcn+o1n7UclFAP
1JEfatEbyvLnpPj5lUN9Jb68Wql4ay0kIUIBtlkaG2vsCmzFGDEYwpRqfC16YB6Pasokh8
uQrx3MxSsAHWs3lAAHbm9SsDo1Klk6a6HH7Uf0FcSh4fHOgpJHzydyMeQu7oFw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675125550;
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=NoGVGNaBW3mn1XbiaCRBLIkGwyp4sJ3u7ZrjDUizHnQ=;
b=ApXEiDBkAHKAEhd5gatliJgRqPUJTyRdeLj3aCIrUrvK5DE1sJ3Yo81/BdDt7wqPYNAUs2
6mN5ZLZ6Cp+x4nP8iTcUYaZLeCTidL0KydoctwxULl3IOhrY5qwmlagfg6fY693wk0dKw8
3vY0rs+H22Pm5HAtvPKgtodkOflO7Ln0bhF/JiGhC0SlDlviR2Tt+7T02lncuEEJ6D1CiS
byuettlUm2IdE2n28xbgQZdd4a/8kaRFdysv4VXmYIxobq6UPhGdhLIVFhh6hAFbQpbZuJ
01THsStKM7TxsR3fRLQj0cIlCAnzSoHQEXJmBL9/iMqiRfLHEueRuhxsUACcNA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675125550; a=rsa-sha256; cv=none;
b=kY07l1NcmW67uN2Z6mRvfHF9bC+sqNRQILlIpZTwC218CTAA68SQI3XXL29Q1KGVXP3OP4
s/ig0A2zO0SersikEytFH0o7z7eJ1Hq4JMNOsmQg4YcPCoiFthUVwjKRaXWOkKi+uwXtFD
76shX4NKgAx1J53y3ayPHPBqCwvwCuigJvSKlXk1U1cI0G9PJ8tHGwek0lGJieB7892c2B
FKKX72zgrjmGnBqAX+K2z/452vLxFSD44L7/xEtHbXHWf6P2hUavZbSJqEbkualKF5AXmc
R836fY8SSVg3U9R39Z0RJelLv4VErz6Jd9rPIETYTNdPkStBwMrleamKmII1fA==
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 4P5R4t0NjDzTy4;
Tue, 31 Jan 2023 00:39:10 +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 30V0d96S059574;
Tue, 31 Jan 2023 00:39:09 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V0d9Qs059573;
Tue, 31 Jan 2023 00:39:09 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 00:39:09 GMT
Message-Id: <202301310039.30V0d9Qs059573@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 9149830359bf - stable/13 - strfmon(3): Add an EXAMPLES section
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@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/stable/13
X-Git-Reftype: branch
X-Git-Commit: 9149830359bfc816e916d24fab4acd5c0e70e13d
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=9149830359bfc816e916d24fab4acd5c0e70e13d
commit 9149830359bfc816e916d24fab4acd5c0e70e13d
Author: Jose Luis Duran <jlduran@gmail.com>
AuthorDate: 2022-11-08 20:36:57 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-01-31 00:38:19 +0000
strfmon(3): Add an EXAMPLES section
(cherry picked from commit cdd9d92dade61a6b5c37b758e9533a076bb5a2de)
---
lib/libc/stdlib/strfmon.3 | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/lib/libc/stdlib/strfmon.3 b/lib/libc/stdlib/strfmon.3
index 924c82109a68..1ddfb77cb0ac 100644
--- a/lib/libc/stdlib/strfmon.3
+++ b/lib/libc/stdlib/strfmon.3
@@ -149,6 +149,31 @@ The
.Fn strfmon_l
function returns the same values as
.Fn strfmon .
+.Sh EXAMPLES
+The following example will format the value
+.Dq Li 1234567.89
+to the string
+.Dq Li $1,234,567.89 :
+.Bd -literal -offset indent
+#include <stdio.h>
+#include <monetary.h>
+#include <xlocale.h>
+
+int
+main()
+{
+ char string[100];
+ double money = 1234567.89;
+
+ if (setlocale(LC_MONETARY, "en_US.UTF-8") == NULL) {
+ fprintf(stderr, "Unable to setlocale().\\n");
+ return (1);
+ }
+
+ strfmon(string, sizeof(string) - 1, "%n", money);
+ printf("%s\\n", string);
+}
+.Ed
.Sh ERRORS
The
.Fn strfmon
From nobody Tue Jan 31 00:39:11 2023
X-Original-To: dev-commits-src-branches@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 4P5R4v2tWSz3bt9h;
Tue, 31 Jan 2023 00:39:11 +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 4P5R4v2Fmdz4WXT;
Tue, 31 Jan 2023 00:39:11 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675125551;
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=3plkugU7IvX1z/HhJ9d15A1hhLBwntMg3KsJJIuq6/I=;
b=mM1xj5r7PhgrGMwBaxVU+BmGlfLKL7cPQnVer4yJeDy3KGqgDNdPc4JnMJ4h/4lMXdP04I
PYWESAOPLDdBd3aasLqvw82OGs51rbA+EvLO7h264O4BfoXrtBhjwhx/OVaaBP1vC3jO5L
Xl3EUuyBXlQa4e5sz601lhFoQQ3vsYLapkUJwPq03l0Pd8WtcBuHdBBJRjhzt9e90oYn4p
nquvla7RZ/Tsbjrm2gcVYJ0JlxVdebvvNd8P9jmd0JPk6tSIpyVzjxvhqMP797gJkumgFc
NF4gCY8XD9ydFxgRsgBlNo5Oa9tYtmSpVtWbsGf6Cl8QtZ+YfKpAjavUhYEXWQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675125551;
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=3plkugU7IvX1z/HhJ9d15A1hhLBwntMg3KsJJIuq6/I=;
b=wyYzqfQyvHsCnCcPcBUU0hhCXneXAcOubIQM1LSfPqHrPR7BbpKZ8xuk/NgCKg6zuwpt1f
PXMcVNP0Nq+gLgjRhIo5rqo7dm4YGpi7v/aVEGAlHsq7Uv3QRWKHAGKjnEB2CvehX0ad/k
y9kCd/e9GgGRxj6/RlwHarneSiIzpDvZ8M6AERYKfEatwc7IBO+oGzcJ+U3WUoKTG4hXN4
3Yju8s23VbqccPFXEBQMIjC7sV3aSl/JOuUPK6HVTmC5OEIqcug/AeYgnCXlyaJO9hT4bg
qKQU+vIEJ+M8OwP6m63QPWhMTFIy1qKDozwweZU/x9hqqEbN6spjHH0l+qf86Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675125551; a=rsa-sha256; cv=none;
b=QkR7RMtfjaIxpzpw/CpBCrHOuFEy6yK2Nm+hMzV/fpV/X4XfS80tzHeNnbgvPyXV7hsSIt
w2KAvCuh9ilYLX6eSfOmvfrjJhwwKqviCHGiTzV968Atjxqz9T0ipiPbKD08kG4Pw/oL/1
vzh31StdME8MYX8cFMmUQp8wDRG/phIm6FMhcQZT1kiB+zbrrvrYskHD+ssT9/8ACJrVAo
yCcCWlvN42cN+zfb5jo0675xK40DqaIq6+Ix+r4S5EV7MsMoNONtYeCq0dSRppN6j6Dh7M
ICE63sPCxjBpmDg2Q9snYhD9HxwGlcGD9IMKbBYDoI0zAWmMjf1oLX51bXPT/A==
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 4P5R4v1LMgzTy1;
Tue, 31 Jan 2023 00:39:11 +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 30V0dBUj059601;
Tue, 31 Jan 2023 00:39:11 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V0dBn0059600;
Tue, 31 Jan 2023 00:39:11 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 00:39:11 GMT
Message-Id: <202301310039.30V0dBn0059600@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 4e1231260731 - stable/13 - strfmon(3): Wording improvements
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@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/stable/13
X-Git-Reftype: branch
X-Git-Commit: 4e1231260731067a5bba2bcbd92cca8b4f78152a
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=4e1231260731067a5bba2bcbd92cca8b4f78152a
commit 4e1231260731067a5bba2bcbd92cca8b4f78152a
Author: Jose Luis Duran <jlduran@gmail.com>
AuthorDate: 2022-11-08 20:53:17 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-01-31 00:38:19 +0000
strfmon(3): Wording improvements
(cherry picked from commit 59cc636d94a6c9b28147304fa59351224f801e92)
---
lib/libc/stdlib/strfmon.3 | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/lib/libc/stdlib/strfmon.3 b/lib/libc/stdlib/strfmon.3
index 1ddfb77cb0ac..5c110a8987dc 100644
--- a/lib/libc/stdlib/strfmon.3
+++ b/lib/libc/stdlib/strfmon.3
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 28, 2022
+.Dd January 25, 2023
.Dt STRFMON 3
.Os
.Sh NAME
@@ -37,13 +37,15 @@
.In monetary.h
.Ft ssize_t
.Fn strfmon "char * restrict s" "size_t maxsize" "const char * restrict format" "..."
+.In monetary.h
+.In xlocale.h
.Ft ssize_t
.Fn strfmon_l "char * restrict s" "size_t maxsize" "locale_t loc" "const char * restrict format" "..."
.Sh DESCRIPTION
The
.Fn strfmon
function places characters into the array pointed to by
-.Fa s
+.Fa s ,
as controlled by the string pointed to by
.Fa format .
No more than
@@ -52,9 +54,9 @@ bytes are placed into the array.
.Pp
The
.Fn strfmon_l
-function does the same as
+function takes an explicit locale argument, whereas the
.Fn strfmon
-but takes an explicit locale rather than using the current locale.
+function uses the current global or per-thread locale.
.Pp
The format string is composed of zero or more directives:
ordinary characters (not
@@ -129,12 +131,14 @@ character is written.
.El
.El
.Sh RETURN VALUES
-If the total number of resulting bytes including the terminating
+If the total number of resulting bytes, including the terminating
.Dv NUL
-byte is not more than
+byte, is not more than
.Fa maxsize ,
.Fn strfmon
-returns the number of bytes placed into the array pointed to by
+and
+.Fn strfmon_l
+return the number of bytes placed into the array pointed to by
.Fa s ,
not including the terminating
.Dv NUL
@@ -144,11 +148,6 @@ the contents of the array are indeterminate,
and
.Va errno
is set to indicate the error.
-.Pp
-The
-.Fn strfmon_l
-function returns the same values as
-.Fn strfmon .
.Sh EXAMPLES
The following example will format the value
.Dq Li 1234567.89
From nobody Tue Jan 31 00:39:12 2023
X-Original-To: dev-commits-src-branches@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 4P5R4w4jxPz3bt7Z;
Tue, 31 Jan 2023 00:39: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 4P5R4w36xnz4WbK;
Tue, 31 Jan 2023 00:39:12 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675125552;
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=euzWWBk+WSXuMIpIu24RqYSGJMYg8Ony5ZkLX+INxdM=;
b=xZZ3Ee9DX6UEUO3uLJhiBI1lmdar6pD0dAspB+EuEtkRT2tpqDI6S84GuotQhv2Xe4sgmF
S8aJlnpQMu89PTt0tOhOFyUnH443ByQIwu7tXHUhNPODwfxL/DFNJGSt9GJ6UUOXZBeCll
Z8Sps2KWOJqfQADQkxka45hjUNZcu297MAFs3WOtd2qxZttSff/SvfE+izcGQ9OsbfDjwQ
R83z9WXbOI4LlHruBJFz4jo9Kwm021uyUsTBPGN66NfFflnjQSszszd/1yQyFh8/agZl5E
TFeLiJnRqlkQvPFwRVOxYxoeF8kmVzsGBZqEJTyIs4SAJRVk0BWPklIpIfpRFQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675125552;
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=euzWWBk+WSXuMIpIu24RqYSGJMYg8Ony5ZkLX+INxdM=;
b=x5Siz1KjnnaGX/Le6cnHwIpGv7GBwp/6wxTINxlyQCDS10x5lsUWmJVxOL8i6DPiqqLtZk
XhgXc9P6MhzMOUaL2Lk7sa9fLfztYkNUgsquxoXS2msuUgTS5/ASUJ7sSaLseT1QCNMkQZ
5rHEioG5IysPJnu3NI+PCqolQWeqZ0Is0b1v777VwNufGVJ7RdGOLVvKTtj2obQEH+s+zD
MpJk62S7guBuJr016mIZKSTW1StF4gNP2OLby6evSjqCzJoUlJzMwG+uAb0hHcnFwdn/cV
Tj7QT86jsggBQaP0Uzr5kprD7LMmVwJWfOhRu1VhoZDh9y7dRMIdX4BNEibHJA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675125552; a=rsa-sha256; cv=none;
b=H9o4XmlYmV5mKNnHN3RGaw6U5Px539T8a7qtXCf7YntYlF2sfzoM1PAsp4/5Ql46lAGzxE
kl4eK8cu5tP0mwUHpRv3FtELtwZIQ4K11Bo2bNBwQ205594rgiVQwvuLUfkJ8AvFgOfgZW
0CidFGEln7wC9Z4WCN/M1IWkoWLvWaNd4jj8LRIhXhD3NrBjclmttNgCOVe1jcPggaRnMc
QeQgNTK9kciOClWVASW729K0WVm/7+fU6GPloa2/CNGlFDCQ+MOplSPsMmBxwulJy6kwT6
eT/hNO3ms4J6Bd9196krN0LaU1i8XHQLb62WNeU5L+o6pvTy5lsQfQBNwAAiqA==
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 4P5R4w1sg2zTy5;
Tue, 31 Jan 2023 00:39:12 +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 30V0dCH4059626;
Tue, 31 Jan 2023 00:39:12 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V0dC15059625;
Tue, 31 Jan 2023 00:39:12 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 00:39:12 GMT
Message-Id: <202301310039.30V0dC15059625@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: fd22978f860c - stable/13 - strfmon(3): Match the return type
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@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/stable/13
X-Git-Reftype: branch
X-Git-Commit: fd22978f860c03543b7b951c6a0886ef3b883c5e
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=fd22978f860c03543b7b951c6a0886ef3b883c5e
commit fd22978f860c03543b7b951c6a0886ef3b883c5e
Author: Jose Luis Duran <jlduran@gmail.com>
AuthorDate: 2022-11-08 20:16:49 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-01-31 00:38:19 +0000
strfmon(3): Match the return type
(cherry picked from commit f5924ad8fde4d5e9c233b821cb6097c6a46740b5)
---
lib/libc/stdlib/strfmon.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/libc/stdlib/strfmon.c b/lib/libc/stdlib/strfmon.c
index b50d08400cbb..0e3cd53fff2f 100644
--- a/lib/libc/stdlib/strfmon.c
+++ b/lib/libc/stdlib/strfmon.c
@@ -645,7 +645,7 @@ ssize_t
strfmon(char * __restrict s, size_t maxsize, const char * __restrict format,
...)
{
- size_t ret;
+ ssize_t ret;
va_list ap;
va_start(ap, format);
@@ -659,7 +659,7 @@ ssize_t
strfmon_l(char * __restrict s, size_t maxsize, locale_t loc,
const char * __restrict format, ...)
{
- size_t ret;
+ ssize_t ret;
va_list ap;
va_start(ap, format);
From nobody Tue Jan 31 01:47:11 2023
X-Original-To: dev-commits-src-branches@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 4P5SbM3TZhz3c3TZ;
Tue, 31 Jan 2023 01:47:11 +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 4P5SbM2yZYz4dJM;
Tue, 31 Jan 2023 01:47:11 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675129631;
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=Uec4dg3gi6Sf0FzVjTkEuBlyob+yzcyCxwaG/tapJuU=;
b=GCiHhfXg3lbXROsE40meWJsMOBB6Rgn6wMXjiEvpORfs+taBrs2PbHZNIoB1QG1Ox+d24o
q7jFCoqaKC3BoMC0+l1bvxvqOAajq/om9eKZlD94EiMaw6Y8fsonj+VKGrx1HbxONpjKXd
qObFzwhoR/RNlLiw4X+m3LlfEkAjTmh24vDKjc0h8ObSIMNaHcU8LUMRaNrchShogJxx4m
mCDRssKwciIgJZrM4g/kqvn5SOlqT0ajzgZUHrborsTTfTci5aeREl0EhHjIEdAVgo0Lw+
ofk/rCnxaW4i02cmjjRw0TQkT5v4GTXTuxqvoCUyLAe48CEaYGN4tZWNTuGxWQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675129631;
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=Uec4dg3gi6Sf0FzVjTkEuBlyob+yzcyCxwaG/tapJuU=;
b=AOSRX6uNwn1o1rLAIxlxvYxy0FAimFnjimx0eLB7wSMJO1VJAPSg8rNRUVReB5Z03QYN22
jWHg5CbmnFKeXfAEp8+AAfU+dlHztpCSXjLmEm9b44SsLZg8b3Jj6c5THYXjXRPidM1CZq
DsafaUvSgJX4gNIj97frFs1rWDQxfQlAzuB41ZsZ7c+rmwh0SN1EO4ylNMKWXrZN0hd1n+
nCgco8FOiOMLt4IDifKGjAThWyPvQya0gijAYuvMhHmeRFTrcGbUNRPYMK2tL4ZkxtB/RA
gfnNrRr4Wv2MG3RdRcwt91f/mysIsoFG2SAutlqF+z42ZyAJAwVeqFRDIq3M3A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675129631; a=rsa-sha256; cv=none;
b=eYr1XCBkQp88ZE5tLYU+f06FJe7ieTMI7Jv6hA37bEzba+qtTA2HBHruPvBxwAk/Acb9RP
7Pbj4NYbFAJhEKqiEsSsN/zCmprkmmEokwc3WHu1KiFDvZFE6/LZ2ZkYfU9KWh/m67k7Hk
h/q34H3QlfWn6OvNrF8vAEi2TdqMXGoPDakRlhPGzjwi3T1I00Y1ei0vXU46dWsVEAm24O
Y5opNsmi1UygwpIE0WZKIvcpMv7MwDSbSd7addd//DRBi6ja44UvlIJQUl/qkK28tPFFkV
y2KL1mT8myWKwSPl0rGvpIpEKZDq2gPEzqg4/1w4g5CXf2mTh7gfeKxMHCSPmQ==
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 4P5SbM23N7zWfh;
Tue, 31 Jan 2023 01:47:11 +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 30V1lBNJ058641;
Tue, 31 Jan 2023 01:47:11 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V1lBcX058640;
Tue, 31 Jan 2023 01:47:11 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 01:47:11 GMT
Message-Id: <202301310147.30V1lBcX058640@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Jessica Clarke <jrtc27@FreeBSD.org>
Subject: git: 6879fc89425f - stable/13 - Makefile: Avoid sanitizing PATH on non-FreeBSD systems
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jrtc27
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 6879fc89425f57880fa327a1c528f657f80cf68e
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=6879fc89425f57880fa327a1c528f657f80cf68e
commit 6879fc89425f57880fa327a1c528f657f80cf68e
Author: Jake Freeland <jfree@FreeBSD.org>
AuthorDate: 2023-01-19 22:24:44 +0000
Commit: Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2023-01-31 01:46:18 +0000
Makefile: Avoid sanitizing PATH on non-FreeBSD systems
Allow the build process to find host binaries during the host-symlinks target when
cross-building on non-FreeBSD systems. Whilst most non-FreeBSD systems have all
the needed tools in /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin (the final
path added by host-symlinks itself), Homebrew for macOS on Arm defaults to
/opt/homebrew/bin, other more niche systems may also deviate and users may
expect tools in a customised PATH to be picked up, unlike on FreeBSD where we
want to ensure everything comes from base. In particular, (un)xz are needed
from Homebrew on macOS, and thus cannot be found on Arm without this.
Note that non-FreeBSD builds enforce BUILD_WITH_STRICT_TMPPATH, and so the
actual main build steps will still use a sanitised PATH.
Reviewed by: jrtc27, arichardson
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D37991
(cherry picked from commit 16fbf0191243e7c9dff6615b1424b5d39186b36c)
---
Makefile | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Makefile b/Makefile
index e16557f83371..5dac4a3e9ee3 100644
--- a/Makefile
+++ b/Makefile
@@ -216,7 +216,12 @@ META_TGT_WHITELIST+= \
.ORDER: buildkernel reinstallkernel
.ORDER: buildkernel reinstallkernel.debug
+# Only sanitize PATH on FreeBSD.
+# PATH may include tools that are required to cross-build
+# on non-FreeBSD systems.
+.if ${.MAKE.OS} == "FreeBSD"
PATH= /sbin:/bin:/usr/sbin:/usr/bin
+.endif
MAKEOBJDIRPREFIX?= /usr/obj
_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} MK_AUTO_OBJ=no \
${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
From nobody Tue Jan 31 01:47:12 2023
X-Original-To: dev-commits-src-branches@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 4P5SbP0BS3z3c3ZY;
Tue, 31 Jan 2023 01:47:13 +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 4P5SbN5BLnz4dPq;
Tue, 31 Jan 2023 01:47:12 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675129632;
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=mPrX6noN91dI1sRl3A/bGuOEY4aBg9vEZu7Hqi3RY7Y=;
b=UhIYhZzItYAGWH6PHgc+CPLc7HqZOnWxoDesloankFlrBQvQ0Akpxz3MaDXF34EtesTO1b
fKtmXE4Wn1XKOZJDVuhUDfuZzkd0O9TVngXEJ5GoTPKb9q/P/ZxqwqnZ+boCUQpc+QBI3u
jn77M3YD57HnTdjjxyu1NBDu2cRey8y/HCXxqZgDFuIEmZRiEs53I5BVukyLAFrmtBrrMV
nmTMiKbmRBOS+ltJbBYJnUIqno3XoyPQdrqsiuxIXBQf3NqgbXCkbNjakmNmY1bdaL/YmI
PCsMswvaUlJQS7SH4V06gxJtkNX/hW9/X3rSpVCZI+ind0yPNPDPr1Wwp+6yLg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675129632;
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=mPrX6noN91dI1sRl3A/bGuOEY4aBg9vEZu7Hqi3RY7Y=;
b=sAarrxQwjQDTpXjEAzN8LvpaH7EZTSF0qXC0Ot03PMjFCusqzED4D0kt08vY0JrW6riRFz
VjJ/WXBU0LL25LMR1/p8JeDi6y5RVQ6+FudSz4D0EBkEkyZ7KfgYHV4QdQez6vYjmJnry4
yvI6rVr1dggYoVvitgMUUctRKMdSQrqp/Lye4K1IaNvcXN7q5cQBhyp4nER3K8hX2WeXmc
NAgg+nwc7iEsEp3uDCEvtt9I48yllMNCsY3pnnfo3mUDulzD6PkA2bVwOZLbGOo9RKx4f6
EnFT14U5Weh36JcAyFxJO6bfzbcHIVWfO96+GDeovJJ1FI0iesXvmT439cGOhg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675129632; a=rsa-sha256; cv=none;
b=VmuBg6rU+hacSzwgqWStAE0nc8XNwpfk5nxBF7JryOeIy9SNDDow5uCz9IR75/9C3LwGmP
IyKxC3GGhW/7X4o5vN+zMIrlgswOHmzU54zi3nipSDXMMMWxpnLTeQdMxlTNLM4P8kifxs
ksuWx6mYrtLjsTBvCKx2B3ge7qT2IX1MgP20SwMlaqdXcZTRGGMaJu5OhO/UUpO39+DD7g
c3tUfnNJbQJ6KmfzvUViTUtru2GLXk91SoQrZZ9PHJ1JXIJ67ZRg8nbZ/IkQW4QKgVsU4a
T8BooD4JCa8kse1Kk/K/pgh0qXYfIYaeXA8uXm96DYsYJz2WJSBWM1rx9Ok18Q==
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 4P5SbN3KxnzW5h;
Tue, 31 Jan 2023 01:47:12 +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 30V1lCt6058665;
Tue, 31 Jan 2023 01:47:12 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V1lC64058664;
Tue, 31 Jan 2023 01:47:12 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 01:47:12 GMT
Message-Id: <202301310147.30V1lC64058664@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Jessica Clarke <jrtc27@FreeBSD.org>
Subject: git: cc58b7123be2 - stable/13 - libc: Fix longjmp/_longjmp(buf, 0) for AArch64 and RISC-V
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jrtc27
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: cc58b7123be2862237746a37c1d658d0d5ca8b13
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=cc58b7123be2862237746a37c1d658d0d5ca8b13
commit cc58b7123be2862237746a37c1d658d0d5ca8b13
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2023-01-09 18:34:43 +0000
Commit: Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2023-01-31 01:46:18 +0000
libc: Fix longjmp/_longjmp(buf, 0) for AArch64 and RISC-V
These architectures fail to handle this special case, and will cause the
corresponding setjmp/_setjmp to return 0 rather than 1. Fix this and add
regression tests (also committed upstream).
PR: 268684
Reviewed by: arichardson, jhb
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D29363
(cherry picked from commit 9fb118bebced1452a46756a13be0161021b10905)
---
contrib/netbsd-tests/lib/libc/setjmp/t_setjmp.c | 50 ++++++++++++++++++++++---
lib/libc/aarch64/gen/_setjmp.S | 3 +-
lib/libc/aarch64/gen/setjmp.S | 3 +-
lib/libc/riscv/gen/_setjmp.S | 3 ++
lib/libc/riscv/gen/setjmp.S | 3 ++
5 files changed, 55 insertions(+), 7 deletions(-)
diff --git a/contrib/netbsd-tests/lib/libc/setjmp/t_setjmp.c b/contrib/netbsd-tests/lib/libc/setjmp/t_setjmp.c
index 1f0f1ed5ea89..1b1baa584468 100644
--- a/contrib/netbsd-tests/lib/libc/setjmp/t_setjmp.c
+++ b/contrib/netbsd-tests/lib/libc/setjmp/t_setjmp.c
@@ -70,6 +70,7 @@ __RCSID("$NetBSD: t_setjmp.c,v 1.2 2017/01/14 21:08:17 christos Exp $");
#include <errno.h>
#include <setjmp.h>
#include <signal.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -83,6 +84,8 @@ __RCSID("$NetBSD: t_setjmp.c,v 1.2 2017/01/14 21:08:17 christos Exp $");
#define TEST_U_SETJMP 1
#define TEST_SIGSETJMP_SAVE 2
#define TEST_SIGSETJMP_NOSAVE 3
+#define TEST_LONGJMP_ZERO 4
+#define TEST_U_LONGJMP_ZERO 5
static int expectsignal;
@@ -101,12 +104,16 @@ h_check(int test)
sigjmp_buf sjb;
sigset_t ss;
int i, x;
+ volatile bool did_longjmp;
i = getpid();
+ did_longjmp = false;
- if (test == TEST_SETJMP || test == TEST_SIGSETJMP_SAVE)
+ if (test == TEST_SETJMP || test == TEST_SIGSETJMP_SAVE ||
+ test == TEST_LONGJMP_ZERO)
expectsignal = 0;
- else if (test == TEST_U_SETJMP || test == TEST_SIGSETJMP_NOSAVE)
+ else if (test == TEST_U_SETJMP || test == TEST_SIGSETJMP_NOSAVE ||
+ test == TEST_U_LONGJMP_ZERO)
expectsignal = 1;
else
atf_tc_fail("unknown test");
@@ -119,26 +126,37 @@ h_check(int test)
REQUIRE_ERRNO(sigaddset(&ss, SIGABRT) != -1);
REQUIRE_ERRNO(sigprocmask(SIG_BLOCK, &ss, NULL) != -1);
- if (test == TEST_SETJMP)
+ if (test == TEST_SETJMP || test == TEST_LONGJMP_ZERO)
x = setjmp(jb);
- else if (test == TEST_U_SETJMP)
+ else if (test == TEST_U_SETJMP || test == TEST_U_LONGJMP_ZERO)
x = _setjmp(jb);
else
x = sigsetjmp(sjb, !expectsignal);
if (x != 0) {
- ATF_REQUIRE_MSG(x == i, "setjmp returned wrong value");
+ if (test == TEST_LONGJMP_ZERO || test == TEST_U_LONGJMP_ZERO)
+ ATF_REQUIRE_MSG(x == 1, "setjmp returned wrong value");
+ else
+ ATF_REQUIRE_MSG(x == i, "setjmp returned wrong value");
+
kill(i, SIGABRT);
ATF_REQUIRE_MSG(!expectsignal, "kill(SIGABRT) failed");
atf_tc_pass();
+ } else if (did_longjmp) {
+ atf_tc_fail("setjmp returned zero after longjmp");
}
REQUIRE_ERRNO(sigprocmask(SIG_UNBLOCK, &ss, NULL) != -1);
+ did_longjmp = true;
if (test == TEST_SETJMP)
longjmp(jb, i);
+ else if (test == TEST_LONGJMP_ZERO)
+ longjmp(jb, 0);
else if (test == TEST_U_SETJMP)
_longjmp(jb, i);
+ else if (test == TEST_U_LONGJMP_ZERO)
+ _longjmp(jb, 0);
else
siglongjmp(sjb, i);
@@ -185,12 +203,34 @@ ATF_TC_BODY(sigsetjmp_nosave, tc)
h_check(TEST_SIGSETJMP_NOSAVE);
}
+ATF_TC(longjmp_zero);
+ATF_TC_HEAD(longjmp_zero, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Checks longjmp(3) with a zero value");
+}
+ATF_TC_BODY(longjmp_zero, tc)
+{
+ h_check(TEST_LONGJMP_ZERO);
+}
+
+ATF_TC(_longjmp_zero);
+ATF_TC_HEAD(_longjmp_zero, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Checks _longjmp(3) with a zero value");
+}
+ATF_TC_BODY(_longjmp_zero, tc)
+{
+ h_check(TEST_U_LONGJMP_ZERO);
+}
+
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, setjmp);
ATF_TP_ADD_TC(tp, _setjmp);
ATF_TP_ADD_TC(tp, sigsetjmp_save);
ATF_TP_ADD_TC(tp, sigsetjmp_nosave);
+ ATF_TP_ADD_TC(tp, longjmp_zero);
+ ATF_TP_ADD_TC(tp, _longjmp_zero);
return atf_no_error();
}
diff --git a/lib/libc/aarch64/gen/_setjmp.S b/lib/libc/aarch64/gen/_setjmp.S
index 49bf4df4f524..94a58d774f2b 100644
--- a/lib/libc/aarch64/gen/_setjmp.S
+++ b/lib/libc/aarch64/gen/_setjmp.S
@@ -91,7 +91,8 @@ ENTRY(_longjmp)
#endif
/* Load the return value */
- mov x0, x1
+ cmp x1, #0
+ csinc x0, x1, xzr, ne
ret
botch:
diff --git a/lib/libc/aarch64/gen/setjmp.S b/lib/libc/aarch64/gen/setjmp.S
index b302594ff549..e6cdba801e19 100644
--- a/lib/libc/aarch64/gen/setjmp.S
+++ b/lib/libc/aarch64/gen/setjmp.S
@@ -113,7 +113,8 @@ ENTRY(longjmp)
ldp d14, d15, [x0]
/* Load the return value */
- mov x0, x1
+ cmp x1, #0
+ csinc x0, x1, xzr, ne
ret
botch:
diff --git a/lib/libc/riscv/gen/_setjmp.S b/lib/libc/riscv/gen/_setjmp.S
index ded6705ef7ee..94b4e90b6f42 100644
--- a/lib/libc/riscv/gen/_setjmp.S
+++ b/lib/libc/riscv/gen/_setjmp.S
@@ -131,6 +131,9 @@ ENTRY(_longjmp)
/* Load the return value */
mv a0, a1
+ bnez a1, 1f
+ li a0, 1
+1:
ret
botch:
diff --git a/lib/libc/riscv/gen/setjmp.S b/lib/libc/riscv/gen/setjmp.S
index c0458e907ce0..1d5b4d5fc0ca 100644
--- a/lib/libc/riscv/gen/setjmp.S
+++ b/lib/libc/riscv/gen/setjmp.S
@@ -161,6 +161,9 @@ ENTRY(longjmp)
/* Load the return value */
mv a0, a1
+ bnez a1, 1f
+ li a0, 1
+1:
ret
botch:
From nobody Tue Jan 31 01:47:13 2023
X-Original-To: dev-commits-src-branches@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 4P5SbP5nZ5z3c3CK;
Tue, 31 Jan 2023 01:47:13 +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 4P5SbP4c5Qz4krm;
Tue, 31 Jan 2023 01:47:13 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675129633;
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=UGoWElrKQlErHsmoDUNLrM1Pdhuux+Jl5myt1KiHhDM=;
b=fpLXFigozIwiUNvOa5/cuH/45Ns1y7BTj1q9WFzUKld316ru5KwgDZxmpuClVIkT1kHM6t
pPRu386tn6RzE9D7NuJ4zrlrvM96SbyJ7pqBn8XbjwiqyrQb2NLv17HqtlT1ph0ntlKnG2
Z6SUBHLN9Wgzb/MdnzgdsVCRXjAtuuG4n/EmG1CHG/uLydqRBRty7ZRsPSx6dt88RfS6pk
gLnju6oOwiPDMKj4RJFbfGFRaz1e0lX9C7u/Lt8TFhg7J97nbmEd9+M1R63tKkVA8jPrZe
rwUPuqyEfp89HlsvwSyj4HsaM6HjU0Om2D6MA6R3DvaTbAZf5LJGc0QTYh/uGg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675129633;
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=UGoWElrKQlErHsmoDUNLrM1Pdhuux+Jl5myt1KiHhDM=;
b=CwbyKYBlXHFtaVGPHSU9eF/DJo+KedKHYk7jNCU1gWXmSFYNi/sQaZqlF42ABNeJ+dQh72
CvgmiyjWp8B6GzVjLBkd0Gg1ecDioRXfun6vz9i5vzdqnk2ziOqPMoQPWfJ995PsNnzm2t
XyT6jLZgrJoQ64TWgzMTttPPQedriL9Y1oglrrOpTJxwK9w2urgH/jHwJ0cd0we4497rFC
xZY2mgoUJ0R7vjdtrwbz/PCprKSjBwqQetCerGBwtSih2eeqRxcirkrQwVxy/pE1UycjDm
ZT1AMEBIxH4hN+Ge+S+JW3QTLROaUhF3PxrJb6ozuu05EnsEsK4ipRmGO+YKlA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675129633; a=rsa-sha256; cv=none;
b=XU5ZC9FkUiXhRPQ4XsuN6sBKvBiSZP+iWCHV7Y5dOuQ1X1HTYfql4ITNz9PcbIrUmd9Yje
v9CX1muVih7NJ3YcSk0u/6jpdBTA3LFw8MmqFn2pmS6LkyiHntnCHHcndt0n1sPNIQ86Cd
sNsNDt6If+Fxy//9oIQU0ThaECsQ/ePcJp/GIn4hgQYkIdlcEXBuFsk6MD6DpDJc0GeL+8
8kMUsf+4HLzB4O+BEOtZudeCnjZ7zSpTHKHpRoiuxs53SB6bBjtpo8IVJ3eRTClH4vmlno
fgVp/uyNJK6PYnc7EjS5ubPzVDMEa/CNyfhTkwpm8XFoO+Kgi9R9lrMTclrSBw==
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 4P5SbP3k9zzWhh;
Tue, 31 Jan 2023 01:47:13 +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 30V1lDqv058689;
Tue, 31 Jan 2023 01:47:13 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V1lDEX058688;
Tue, 31 Jan 2023 01:47:13 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 01:47:13 GMT
Message-Id: <202301310147.30V1lDEX058688@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Jessica Clarke <jrtc27@FreeBSD.org>
Subject: git: a82b1ca60381 - stable/13 - libc: Fix longjmp/_longjmp(buf, 0) for MIPS
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jrtc27
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a82b1ca6038152eb5740552507534842acebede2
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=a82b1ca6038152eb5740552507534842acebede2
commit a82b1ca6038152eb5740552507534842acebede2
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2023-01-30 23:55:03 +0000
Commit: Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2023-01-31 01:46:18 +0000
libc: Fix longjmp/_longjmp(buf, 0) for MIPS
Like AArch64 and RISC-V in the past, MIPS fails to handle this special
case, and will cause the corresponding setjmp/_setjmp to return 0 rather
than 1. Fix this so the newly-added regression tests pass.
This is a direct commit to stable/13 as mips no longer exists in main.
Reviewed by: arichardson, jhb
Differential Revision: https://reviews.freebsd.org/D29363
---
lib/libc/mips/gen/_setjmp.S | 3 +++
lib/libc/mips/gen/setjmp.S | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/libc/mips/gen/_setjmp.S b/lib/libc/mips/gen/_setjmp.S
index 10c4cda5e0c1..ba9b89f208c4 100644
--- a/lib/libc/mips/gen/_setjmp.S
+++ b/lib/libc/mips/gen/_setjmp.S
@@ -183,7 +183,10 @@ LEAF(_longjmp)
#endif /* ! __mips_soft_float */
REG_EPILOGUE
+ bne a1, zero, 1f
move v0, a1 # get return value in 1st arg
+ REG_LI v0, 1 # return 1 if arg is 0
+1:
j ra
nop
diff --git a/lib/libc/mips/gen/setjmp.S b/lib/libc/mips/gen/setjmp.S
index 3ef6878bb608..6b8f196735c4 100644
--- a/lib/libc/mips/gen/setjmp.S
+++ b/lib/libc/mips/gen/setjmp.S
@@ -220,7 +220,10 @@ NESTED(longjmp, LONGJMP_FRAME_SIZE, ra)
#endif
#endif /* ! __mips_soft_float */
- move v0, a1
+ move v0, a1 # get return value in 1st arg
+ bne a1, zero, 1f # NB: no .set noreorder
+ REG_LI v0, 1 # return 1 if arg is 0
+1:
j ra
nop
From nobody Tue Jan 31 01:47:14 2023
X-Original-To: dev-commits-src-branches@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 4P5SbQ65Svz3c3Zd;
Tue, 31 Jan 2023 01:47:14 +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 4P5SbQ5bX1z4l1Z;
Tue, 31 Jan 2023 01:47:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675129634;
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=BOXY2CD3dsdlHVFGFqMh7U9kbBE8KhBNsn5vPgXl7Kg=;
b=F1jAPODKeole5W82DCJzHvFmDkY0ke/rgXq2d2HzkmezmKq1T9xqa0wClIpfx92/fI5ga2
TvXthPZ6xqZt7RlNwVUrvJ82BgARNXKS8tkG2/F28NZOU1CnolpRHq5Op20TyYp02vGjdZ
XVZ3gDPimiwv1BkTUqGvlD0t+9rSCt4wzENixGt27WHCYS2AkMkdq5xRLKdAqx/OxylneV
zUgK0jCYnb4Zj3DTe3kwNV78mknhSibYkmOYn+z0pTLUsetcDwpFvPu8MW6puPKB0QAl5H
6Zk0UQE4IAWeBITBTuq5HKvlT5h7MeZijQg/R8MGG87fN7jY1XpgnGIMl67OBw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675129634;
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=BOXY2CD3dsdlHVFGFqMh7U9kbBE8KhBNsn5vPgXl7Kg=;
b=YJoCgBdVNUBB9OPjmlaE6kijKfg4NRNXUP4EAB/NLzcnY05ERihsvlONXIrk7ZMNwDqE7Z
xTzWmMH0aKiKQRj3Geof9iY93STdjM+NOnVLeyn2PiWcfkXSmlNx4sxZWsa3aVQf3BE3ZO
sq1Ben8s0Rg1ppnUGLnGqVhHxlY9ynTKD1XkcWGwSO1LApivKDDz42oZRcAUCNwiNuMzY9
o1vSqsWCc0CqQGXlr/oEOVew9LuyCNjE/8z0m7qPQ479Ad4s+op+WIP7QK47KIBBujmdHB
rwJFi3Mn2CDmKMOxxheqw/GFaZXJGFxjgxeN9gnvN6gsxFd4byICozWiUVfWwg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675129634; a=rsa-sha256; cv=none;
b=xs5uS0B7ec2IITU0co4nC4B8tQUMk3zrLl7LO/Jp9o9ikSQ6TT8NDVEaJyiYIvdyMvMdqz
E8/zle5Pea59g8hZ/YHa6KcB01RjnDYV+ravZU2UYm0OCrv6l6YlnWcTmyUDZl7LbTbo6g
8PrWSVlXKAt5nVO4MOOI1isWPfQbBnEDgRq8pCRtFTvna9AFTmqxATInV03usgJKesgXV3
mTuLxj6D3R4zgdBA6OOxNIL2kXVB7nggXHCoe8cR82vF5Ychef03pG+d5T4JV+l4dZi2r4
En3K/Rlk9QqV1UokdUP3iijwrtRaikuRnQv2utf3U8NM2+n/PrtVHqGbeIHDOg==
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 4P5SbQ4jc5zWHV;
Tue, 31 Jan 2023 01:47:14 +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 30V1lEEf058713;
Tue, 31 Jan 2023 01:47:14 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V1lEHr058712;
Tue, 31 Jan 2023 01:47:14 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 01:47:14 GMT
Message-Id: <202301310147.30V1lEHr058712@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Jessica Clarke <jrtc27@FreeBSD.org>
Subject: git: d00a638bfd66 - stable/13 - mips: Fix sendsig for stack layout randomisation
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jrtc27
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: d00a638bfd668fea9608fa14cbcea3df783e9be5
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=d00a638bfd668fea9608fa14cbcea3df783e9be5
commit d00a638bfd668fea9608fa14cbcea3df783e9be5
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2023-01-31 01:27:50 +0000
Commit: Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2023-01-31 01:46:18 +0000
mips: Fix sendsig for stack layout randomisation
PS_STRINGS doesn't account for the stack gap, we need to use the new
PROC_PS_STRINGS macro to correctly point at the trampoline.
This is a direct commit to stable/13 as mips no longer exists in main.
Fixes: d247611467e0 ("exec: Introduce the PROC_PS_STRINGS() macro")
---
sys/mips/mips/pm_machdep.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys/mips/mips/pm_machdep.c b/sys/mips/mips/pm_machdep.c
index 7a9db29b6ff6..9fcbef14f606 100644
--- a/sys/mips/mips/pm_machdep.c
+++ b/sys/mips/mips/pm_machdep.c
@@ -175,7 +175,8 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
/*
* Signal trampoline code is at base of user stack.
*/
- regs->ra = (register_t)(intptr_t)PS_STRINGS - *(p->p_sysent->sv_szsigcode);
+ regs->ra = (register_t)(intptr_t)PROC_PS_STRINGS(p) -
+ *(p->p_sysent->sv_szsigcode);
PROC_LOCK(p);
mtx_lock(&psp->ps_mtx);
}
From nobody Tue Jan 31 01:51:51 2023
X-Original-To: dev-commits-src-branches@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 4P5Shm1RC8z3c3tp;
Tue, 31 Jan 2023 01:51:52 +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 4P5Shm0w6cz3CqK;
Tue, 31 Jan 2023 01:51:52 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675129912;
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=nSC0OBsXX191X4E799eaAf3Dvc+Xx6WNzZ4N6INgwEk=;
b=uQ8KX/cBmW++akouiNLm9cAoOhSrpLeInmTkFVdnWHujgPtwUnkYSGWmcJ6sIdAKuQtnIO
HXpgw7gBEapgsqIQ0k9LsQ3CewqDPCxx6PfufnrPzWPJr34UnxpadEQ/doKFcQPtev0gMM
ioMsNVSNVR1OKbiRS+1lCr/++BWgzn0Gtxwx7xZED5YGLXDtAUuYghD40jypkIiLQm4ckK
vxpQCnlaw68P7UERs9RSmpaYKmIC+ryWRN3d9ce72k3m+yIXBEPWuKLA4OpGtTQOUb57ai
FRqb1UlltNR5v4RrmFFhimIVqBPNJ4t512yLiXVSfTLUxzKzB70245QywWorcQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675129912;
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=nSC0OBsXX191X4E799eaAf3Dvc+Xx6WNzZ4N6INgwEk=;
b=F25ufs5hkISIYlWWjrOQnJCyWCyv5kUF0wfh6r26gbYphAQXeKo70dJOtgPzg6C3+SDGfm
PPq/al6QgFaPC0qWoJGrWgDSzJ5TX/wOo/46oMVNPgTBsMF/uQFWVvvkyf/ZJgg5XFU+oO
jJ7tIgz4scYYRYsCjumuTAADjzxLYa9siK7HWIxJQJv9q2mHqC9Qactx/1H2QYr9B2ggD+
vcaval2CB/rfV49pDPU5UzvKpIeO8hjCYGj8kUUVDBwGgpGe9ASV9QseDcWy6KBxS48gRV
sLGumTUBBoX7Ki9Mbc1xkHriyJV2MQgD42Th0ydNL2allYvdisZyTHUkwq+LQw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675129912; a=rsa-sha256; cv=none;
b=mbWdSySutAmgFCmpqo6xa4Az9ar/cvnBlpfES6ApoRzDstkSAZGqkknmYirTTC4jWQp27E
eNHh1u3itLQNGfoOPhl7wMcoZx4S4yStXMD2zkiWjJPmunkJdKb5eyouIn2vif5t728qxY
3jjHkXWTRl8B8YISHq256M2HcRKm7UMT/yyvMtdAEzXFlUyYbtKFe4MoMCvMSUlVWoeHhr
Eo95AUOBHmrREpRBuqbR069BMKzUcuiAPq19I4X5OUTiGAyZfL2Y8Q29kyEZZX2DZO/Rnp
pBxn0tw/nzJOVd0cjQOwXsehTfaQzhfagFmP1CH/8PlqvlYduZpcYNt+IsRNYQ==
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 4P5Shl75kDzWtT;
Tue, 31 Jan 2023 01:51:51 +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 30V1ppCY069440;
Tue, 31 Jan 2023 01:51:51 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V1ppvu069439;
Tue, 31 Jan 2023 01:51:51 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 01:51:51 GMT
Message-Id: <202301310151.30V1ppvu069439@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Jessica Clarke <jrtc27@FreeBSD.org>
Subject: git: 2b7b51c479c4 - stable/13 - libcrypto: Work around strict aliasing violations in bn_nist.c
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jrtc27
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 2b7b51c479c44e60b37821783487bfc5dc0471f4
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=2b7b51c479c44e60b37821783487bfc5dc0471f4
commit 2b7b51c479c44e60b37821783487bfc5dc0471f4
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2022-07-25 17:17:50 +0000
Commit: Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2023-01-31 01:50:27 +0000
libcrypto: Work around strict aliasing violations in bn_nist.c
This file is full of strict aliasing violations. Previously it was only
optimised in ways that broke the code by CHERI LLVM, but now it appears
that the in-tree LLVM also breaks it for RISC-V, resulting in broken
ECDSA signature validation with error messages like the following:
root@unmatched:/usr/src # ssh-keygen -l -f /etc/ssh/ssh_host_ecdsa_key
/etc/ssh/ssh_host_ecdsa_key is not a key file.
root@unmatched:/usr/src # git fetch
fatal: unable to access 'https://git.FreeBSD.org/src.git/': error:1012606B:elliptic curve routines:EC_POINT_set_affine_coordinates:point is not on curve
Reviewed by: dim, jkim
Obtained from: CheriBSD
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D35885
(cherry picked from commit 3b41ae32124ad7b61b2297b2e7f3aa5d76b30c53)
---
secure/lib/libcrypto/Makefile | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 8a38f0f563a0..d8b8f454122c 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -122,6 +122,11 @@ SRCS+= ppc.S ppc-mont.S
SRCS+= bn_asm.c
.endif
+# Full of strict aliasing violations that LLVM has been seen to break with
+# optimisations, which can lead to ECDSA signatures not working. See
+# https://github.com/openssl/openssl/issues/12247 for the upstream bug report.
+CFLAGS.bn_nist.c+= -fno-strict-aliasing
+
# buffer
SRCS+= buf_err.c buffer.c
From nobody Tue Jan 31 01:51:53 2023
X-Original-To: dev-commits-src-branches@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 4P5Shn31fMz3c3r3;
Tue, 31 Jan 2023 01:51:53 +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 4P5Shn28wrz3Cm0;
Tue, 31 Jan 2023 01:51:53 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675129913;
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=aHmdb7bbq5Mh3chaiUubbvZybx/Xcalyb8BrO/ZRosE=;
b=FiW01RLlcj+jCYT1vGtM9sLJseQplpSSCyDMZbeGxgiPOm9QIwnlVCLIqs/T0XN91He2ld
4+ItH39YAIW4rNPAt8PCi05tMwOf73vdO0ldSmvKTEJ3RxPmt04z5TtrOUExZ4sEpkq+/R
B5AWauKARMBY/CmXfdQOT8rP9uI9UALNSHf8SqryvINsC/jS1uu24qzoUzcDlOB25K7sZU
p7tBTGY2kwAfvXEDs8iSq/Wlj6z9T3IORdCdGcrnW48t2gYn4v4K/tYf1vMg/TWrZ2wG+j
haQfPQmY26q7krNL83FRMoaBf/nQq37nVStGXLYxYuXB44DOf5vREWm2QTAXhQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675129913;
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=aHmdb7bbq5Mh3chaiUubbvZybx/Xcalyb8BrO/ZRosE=;
b=X1NO5AzifiUAvnr8Y1x72NSKp6cB2qXnPjwAA96oywmpRRbuJySJKmtgBMgAd3NnL6NM8W
vksitC6J4w5n6yw3Z8Eew2IIHu8voqPy2rbqKH2m7ctLcbnvZlacAbJxviq3soZjP1YtFB
y/vEAOCuVXPG6kpt5TAUWXQqMKYyKEK0/RNjbeS8lvomN+JSAjQSsVctw+Bl1m+AYWqFUv
ZY9V0VPSybWdOXx0ltV/SiingZldArf6qageTqsdbgkYLwwrG4anfc7hwIstizC4wafMUk
lHakRwwc2DWNraDYhncoD3SCOg+lIZczjI8xpXxc104524ZNxQSNeNCrzey78A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675129913; a=rsa-sha256; cv=none;
b=qO3/0/9rQGUcIdz4V5EykL3kg+bVOFb+yBKpooHOtggUXUCxcqoe8bvyzsevDVAK1JxoIA
Eb6SsChr6L2ztrpfHtVbNy/VO6zW8z7pwjzi7E4MLqUVdK19Yp5KRA7CjJRIgwVZjUmbu5
9yMXH6jDGBeJn3HdBDEFQ5ObqHkIOch24urFhQ55MAELjvK+HOS8vT8/vBMw7uHglIRRan
gQwF26gO44aahn8emkGdPsr/lRRXcYQCcZiy4pX8QK9RL6zUBgDSjpXWG6Lz/GCUrx6bFa
1KN1Trp7MeUkLSgpbhwONKGyw0XBkrXrseq8KiSak4Yfnzf+OMPRO77scSPCEA==
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 4P5Shn0xRzzWW5;
Tue, 31 Jan 2023 01:51:53 +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 30V1prl9069471;
Tue, 31 Jan 2023 01:51:53 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V1prI3069470;
Tue, 31 Jan 2023 01:51:53 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 01:51:53 GMT
Message-Id: <202301310151.30V1prI3069470@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Jessica Clarke <jrtc27@FreeBSD.org>
Subject: git: 0eda98025d37 - stable/13 - goldfish_rtc: Fix handling a local time RTC
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jrtc27
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 0eda98025d37f2546722c1256074062f3b93a5c0
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=0eda98025d37f2546722c1256074062f3b93a5c0
commit 0eda98025d37f2546722c1256074062f3b93a5c0
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2022-08-14 18:50:22 +0000
Commit: Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2023-01-31 01:50:27 +0000
goldfish_rtc: Fix handling a local time RTC
The default QEMU config is to have the RTC in UTC. However, if run with
-rtc base=localtime (and wall_cmos_clock is set to match), the driver
fails to account for adjkerntz due to the use of CLOCKF_SETTIME_NO_ADJ.
Copy the same code used by other CLOCKF_SETTIME_NO_ADJ-using drivers
to fix this, namely manually subtracting utc_offset().
Fixes: d63a631e7244 ("Add Goldfish RTC device driver for RISC-V")
MFC after: 1 week
(cherry picked from commit 762dcf10641251c55dda2e6950fef8bb698027ad)
---
sys/dev/goldfish/goldfish_rtc.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/sys/dev/goldfish/goldfish_rtc.c b/sys/dev/goldfish/goldfish_rtc.c
index d1c2b6627ae2..081ea37bb8ef 100644
--- a/sys/dev/goldfish/goldfish_rtc.c
+++ b/sys/dev/goldfish/goldfish_rtc.c
@@ -151,6 +151,11 @@ goldfish_rtc_settime(device_t dev, struct timespec *ts)
sc = device_get_softc(dev);
+ /*
+ * We request a timespec with no resolution-adjustment. That also
+ * disables utc adjustment, so apply that ourselves.
+ */
+ ts->tv_sec -= utc_offset();
nsec = (uint64_t)ts->tv_sec * 1000000000 + ts->tv_nsec;
mtx_lock(&sc->mtx);
From nobody Tue Jan 31 09:31:13 2023
X-Original-To: dev-commits-src-branches@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 4P5ftp0wCMz3bxX3;
Tue, 31 Jan 2023 09:31:14 +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 4P5ftp05lgz4CMP;
Tue, 31 Jan 2023 09:31:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675157474;
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=naMDB7IkVj/NxWrCvzygz0u2qZBH3WVu0l0cOLKQSbc=;
b=XnETuquS/SJ0or5VejrfaG/s2vrV9eXrYMpnK/hoKY2RYRmav+a2indp5AqyUTxKQFQvHy
gkuB4S+Uwhyix5vldFTFLuP1vuCJqHs7nwgh62nXu452jFBU3MIRH1LxXcN4dou2jzu8O8
61aMKomD9+Nr77dsBJ68KTgYAuBgcfPkJ8F10GxYBnqL8TVvVhvIHwQWQ90RdsSIctEjhJ
3HTM8bnIkbT71ArL4rOqWYEgNdTyfFVq/EUuXgbQoD4u/oRgA87kNVZAiMgRelB2KpdwhX
0Zbd22Yl1VIOZT62NTgdIob2qAfcEbSXr0IA+sFdtmUPF7AsakVtGKHSF67D4Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675157474;
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=naMDB7IkVj/NxWrCvzygz0u2qZBH3WVu0l0cOLKQSbc=;
b=IwHXwb3HsvfsODIxzkntBOJOQ5tOY+/n+xhe1IiZh1x4bwqUS41Kdvb/HI5uw+krxh/E3r
gsb/ECQALMakFqy/TEiFuLTP1mq10gk+q98yT8f3n5mMTKEVr+wolAKP8Y5fk7UNyQrmwJ
uKy/2/Jx5N2f2hBkNw2ILYLCpU8ZTGzRxdmzmsFD5ZVnxTGX7RnCRpZdbiBnQ5k2nWpBMH
d4l08qkXHG6xBOw+gm7DDjbOtjQ4oAwU6w3BaM7zgZuS1cNCAF91/uD+GoiAru9/UPMJgU
rx+gf2dlGK/ggrvgwa4Sc4c1iAFV5Sk3Qe9lRi85WDijapKfL5UQtTXEgsoAtw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675157474; a=rsa-sha256; cv=none;
b=wlfZG6PRyMngqW5QeOHT3i5mRwOPuA312UpE3gd9ph8j/1XRBxoDb/bij69LqK7eyVbFNX
KDjCA/jqI0dxRJZuSRlWB7yzX8xU+zfZFTGFzlmb3iwo1c8tqiZhhHNf788VzInjZFPWzv
VN2aP3mwnfwe/coTJ89NysibDDlqgH7a11LHdvI4s3qk15u3DyKBo0+yt+lfZSg2G5hOyB
O8qBxsD+nlxs7Sv/0W46DQ3a5j5kQ7vng0h6BpP6uHLRKbRBfd/7Cwudf1kCq07gB6xKHO
YOWnSzGc+H/kbe+D0ixXh0QOz01Es3Get+b+75/pU9+Q2s9zA00v5UyCoeIGCw==
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 4P5ftn6FxQzk3k;
Tue, 31 Jan 2023 09:31:13 +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 30V9VDj3022980;
Tue, 31 Jan 2023 09:31:13 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V9VDI0022979;
Tue, 31 Jan 2023 09:31:13 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 09:31:13 GMT
Message-Id: <202301310931.30V9VDI0022979@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: f8986380049a - stable/13 - pfctl: rule.label is a two-dimensional array
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: kp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: f8986380049a998e78acf08a19db3c92edc78a88
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=f8986380049a998e78acf08a19db3c92edc78a88
commit f8986380049a998e78acf08a19db3c92edc78a88
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2023-01-24 06:46:46 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2023-01-31 03:29:47 +0000
pfctl: rule.label is a two-dimensional array
Fix checking for a non-empty first string.
PR: 269075
MFC after: 1 week
Reported by: nreilly@blackberry.com
(cherry picked from commit cd80c52cade3e38d273eecec6f9b0a7cba23bcc8)
---
sbin/pfctl/pfctl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index 5b170219e2ab..6fb7aeb45d00 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -1130,7 +1130,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format,
case PFCTL_SHOW_LABELS:
break;
case PFCTL_SHOW_RULES:
- if (rule.label[0] && (opts & PF_OPT_SHOWALL))
+ if (rule.label[0][0] && (opts & PF_OPT_SHOWALL))
labels = 1;
print_rule(&rule, anchor_call, rule_numbers, numeric);
printf("\n");
@@ -1184,7 +1184,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format,
break;
}
case PFCTL_SHOW_RULES:
- if (rule.label[0] && (opts & PF_OPT_SHOWALL))
+ if (rule.label[0][0] && (opts & PF_OPT_SHOWALL))
labels = 1;
INDENT(depth, !(opts & PF_OPT_VERBOSE));
print_rule(&rule, anchor_call, rule_numbers, numeric);
From nobody Tue Jan 31 09:46:01 2023
X-Original-To: dev-commits-src-branches@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 4P5gCs4yMCz3c0n1;
Tue, 31 Jan 2023 09:46:01 +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 4P5gCs4HWwz4Dj3;
Tue, 31 Jan 2023 09:46:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675158361;
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=KYFTZdcDBvffw1jbcujNFxorGDRQTqFyaJjgvkJOejY=;
b=wT14F2sreoDYS3DTro5T2+rYcyQJvtWWVPQ4ISMCKaAkZ/8tfcZlu5Y6dWcsDt2E1zEqIX
gFyFjPZPzeTjVagscbQuUnyZAZP7miAMTBvv6V7Y9nyWX7QvX5GMh3cNHvnXfjYWxTccFN
iLx6OyYu8W79Mx/+Px7rYF0Jq+beAZogPpOtIVFXfA/BEKzRmsb+yTNvkiKxDUv3lgIUdO
Airhwbw9QvnWGRTePkMyRRjddxWZHv1K9Nmec7DxsQ99lal4t3wNf7xF5d7BmZ2oXEDOFo
5BcUhurso1Chlm7gH4d7Jho1wyQj7wtYkbGyLFKwY5mcQG7GePQIUaTytjq2Ig==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675158361;
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=KYFTZdcDBvffw1jbcujNFxorGDRQTqFyaJjgvkJOejY=;
b=nb5l52DSGOouM96PpXpmcaIlNOSJmMKdnmv6tNUbPZ57dmaXjNF/rPbBqWLXSod8TioBdQ
lYAoyfVGw7kMBUCBHVAROBbzLiPKiMlZOCJYlRw3N+gvNBZPYVb/7Sd2EL4HwBYj2/M5uw
U3Ykzro88Y9OjvJ6HgC0SSyMAJLGEp5bU1PwHQ82s0lzh3yWBq4+yiyTCgs0idglbYZGej
ktwoJaeNSPyGLWG/KxiIEg0ZpEd02HonnpNwWt4QzpyJEQdGdEDvi/vwyYuFQxso9zP8N7
QbiU0L1szuI9Lc07flgpeNif4Zm0sRE4NKubHNdDDa9LJrPGmmmZT9zwWpt8Qw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675158361; a=rsa-sha256; cv=none;
b=EOzaFm1mQvbbRjBYud2N4yv969Vgtv+PMv0s9USHp5hhsIVGIPiod3pez6zWm5XbOJ6SHm
k1q3wqHU//y/2/DKeWquH71kO3jAYD9FwilmqIiQhj1BGsWT1a1jTFT6a/mRld0g83wn2t
VCyQ1lbF6g529pSR3MavU0HBg5M7edUzhSZvWOc+RZyzEn7aYN6k1L7yJkyKVrlUoH0YYd
OW8kk/buz8YTyyQ/HXKuGSEwRfUsMrJtxcmtdzzvjItcQbyEfGoFot2rPfPb7JyW18AGmM
OKp3/u7HNTk0c/A14+XcdqRz0vput/0/8m8zfXOFosWQsEiMkUA3K9ZKZaYrAw==
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 4P5gCs3DrYzkZp;
Tue, 31 Jan 2023 09:46:01 +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 30V9k1XZ040966;
Tue, 31 Jan 2023 09:46:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V9k14G040965;
Tue, 31 Jan 2023 09:46:01 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 09:46:01 GMT
Message-Id: <202301310946.30V9k14G040965@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: 5a0cbbcaca6d - stable/12 - pfctl: rule.label is a two-dimensional array
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: kp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 5a0cbbcaca6dcb656cb9d7b50de3a81654d02020
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=5a0cbbcaca6dcb656cb9d7b50de3a81654d02020
commit 5a0cbbcaca6dcb656cb9d7b50de3a81654d02020
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2023-01-24 06:46:46 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2023-01-31 03:29:52 +0000
pfctl: rule.label is a two-dimensional array
Fix checking for a non-empty first string.
PR: 269075
MFC after: 1 week
Reported by: nreilly@blackberry.com
(cherry picked from commit cd80c52cade3e38d273eecec6f9b0a7cba23bcc8)
---
sbin/pfctl/pfctl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index 5b170219e2ab..6fb7aeb45d00 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -1130,7 +1130,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format,
case PFCTL_SHOW_LABELS:
break;
case PFCTL_SHOW_RULES:
- if (rule.label[0] && (opts & PF_OPT_SHOWALL))
+ if (rule.label[0][0] && (opts & PF_OPT_SHOWALL))
labels = 1;
print_rule(&rule, anchor_call, rule_numbers, numeric);
printf("\n");
@@ -1184,7 +1184,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format,
break;
}
case PFCTL_SHOW_RULES:
- if (rule.label[0] && (opts & PF_OPT_SHOWALL))
+ if (rule.label[0][0] && (opts & PF_OPT_SHOWALL))
labels = 1;
INDENT(depth, !(opts & PF_OPT_VERBOSE));
print_rule(&rule, anchor_call, rule_numbers, numeric);
From nobody Tue Jan 31 09:46:44 2023
X-Original-To: dev-commits-src-branches@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 4P5gDj1NHFz3c0ss;
Tue, 31 Jan 2023 09:46:45 +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 4P5gDj0v4xz4FP5;
Tue, 31 Jan 2023 09:46:45 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675158405;
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=Kjor2RKIRPKwvxkLUSaynyd63sGlrldO1ceAHRlbO/8=;
b=EUF0J4l8VrXpIL39jNUPGC54OhhvvZJg72ZtIq00HvfXbdeI3ti4Mh1jKYS1Vh1Eb5wvqa
PcXApDNv4NkzqlvQ+xjC0Z1lQvsS606ZPZ7Xe+xKF+aE75wODoo9KRGbdoTqCSWgFoEp+I
N0Cq2ddykg3qTrf3WdLOobJUE4kjDSj90gT9xWeJNrpx2F5JhUD2OiXmbkUVkhow+InxDk
6u/ralNoSEIAYGGvrJ/fCPT5i0P98pyXCTsrK4KHt9MhAopzBf5XK980iAZ4i+MFR4Bu3C
bDWYQ0JNhz8s5lGE9c0SFY4Ch/v7Ps1vASIQEmzMvR91SpzjODewyOSKufqNkQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675158405;
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=Kjor2RKIRPKwvxkLUSaynyd63sGlrldO1ceAHRlbO/8=;
b=V06q2HlqZpyStchLSlISs9I+PZBxiwBhwW5SxX8fIN81e2PnrrL7S8hKXjYQx1HoC/z0jK
ZxsX+3xWnKMiRiP50SlTd71HvK0wDlqqKKLda0VIvxFUPf6m/uYnkhRJroN8ux59YXxz2B
gZnqhvrtT6csM4cxyDIob97v2zzx7kosfLnSXPzyNGlSyH5ZaCxUPdaruM8c8DkxETBxI/
vE4u/R9KraX7ou5qq3NQQ9KwrOpVqa6be+n7uN/j3ISnr81q+wDwhQ2qLp1EMH69+CJD1Z
hku5iO+oxBSGnB5wQsHvwmNCPbBB0ghPldbFAPkvcldNVbbn69/kaqUGlY90Fg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675158405; a=rsa-sha256; cv=none;
b=jJncLc03a/IfDw9S94mCvW13guQ9Iv8PERWx6+S9LpvmzLOG7HiEniAhakUmNY5XtnbLmM
8GMQBpa57SB2fozGDS8vDpYprC/EGNzMHMnn7Ye+j1lsnFuVn46xHWgtsF3HwXeIJbaTcO
Pzs5D+8aziFisOFl1+XhyyUCyzWpVl7bYcYdlJju+gnBJQpintwilNTYI+FHq4T5JoPKpm
ubNZ6G+PUG789w9ZL0GNAak1aw36jOggsk1QRwPFQKkXxpOhRTYxkFQs6XKDetlAEMcKnR
01Sx3C5JyyhJ39wOcP+irD6WeHKwW73EOMhQLUC40X6YBRipuL/1u5my7iBFsQ==
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 4P5gDh6nbTzkm9;
Tue, 31 Jan 2023 09:46:44 +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 30V9kiao041214;
Tue, 31 Jan 2023 09:46:44 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V9ki5D041213;
Tue, 31 Jan 2023 09:46:44 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 09:46:44 GMT
Message-Id: <202301310946.30V9ki5D041213@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Subject: git: d3ed105942bb - stable/13 - tzcode: Implement timezone change detection
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: des
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: d3ed105942bbd8457e0c307ddc9d8ac95b365c2b
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=d3ed105942bbd8457e0c307ddc9d8ac95b365c2b
commit d3ed105942bbd8457e0c307ddc9d8ac95b365c2b
Author: Edward Tomasz Napierala <trasz@FreeBSD.org>
AuthorDate: 2021-09-12 03:07:26 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2023-01-31 09:44:18 +0000
tzcode: Implement timezone change detection
Implement optional timezone change detection for local time libc
functions. This is disabled by default; set WITH_DETECT_TZ_CHANGES
to build it.
Reviewed By: imp
Sponsored by: NetApp, Inc.
Sponsored by: Klara, Inc.
X-NetApp-PR: #47
Differential Revision: https://reviews.freebsd.org/D30183
(cherry picked from commit ddedf2a11eb20af1ee52cb3da70a57c21904af8f)
tzcode: Fix operation without WITH_DETECT_TZ_CHANGES
Reviewed By: bdrewery, kevans, cy
Reported By: lwhsu, bdrewery
Fixes: ddedf2a11eb
Sponsored by: NetApp, Inc.
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D31961
(cherry picked from commit 6f43f86bf36dba158355593bab5f81a7f8e2773c)
tzcode: fix tz change detection logic
clock_gettime() returns 0 if it succeeds, so don't capture that into the
fail logic. With this, WITH_DETECT_TZ_CHANGES successfully detects a
change after 61 seconds.
Reviewed by: imp, trasz
Differential Revision: https://reviews.freebsd.org/D33494
(cherry picked from commit a2c51da6581dbc38c60c9fc41d1b624ff2c8de97)
---
contrib/tzcode/stdtime/localtime.c | 89 +++++++++++++++++++++++++++++-
lib/libc/stdtime/Makefile.inc | 4 ++
share/mk/src.opts.mk | 1 +
tools/build/options/WITH_DETECT_TZ_CHANGES | 2 +
4 files changed, 95 insertions(+), 1 deletion(-)
diff --git a/contrib/tzcode/stdtime/localtime.c b/contrib/tzcode/stdtime/localtime.c
index e221c1fa3964..6a0e0ce4fe4b 100644
--- a/contrib/tzcode/stdtime/localtime.c
+++ b/contrib/tzcode/stdtime/localtime.c
@@ -354,6 +354,45 @@ settzname(void)
}
}
+#ifdef DETECT_TZ_CHANGES
+/*
+ * Determine if there's a change in the timezone since the last time we checked.
+ * Returns: -1 on error
+ * 0 if the timezone has not changed
+ * 1 if the timezone has changed
+ */
+static int
+change_in_tz(const char *name)
+{
+ static char old_name[PATH_MAX];
+ static struct stat old_sb;
+ struct stat sb;
+ int error;
+
+ error = stat(name, &sb);
+ if (error != 0)
+ return -1;
+
+ if (strcmp(name, old_name) != 0) {
+ strlcpy(old_name, name, sizeof(old_name));
+ old_sb = sb;
+ return 1;
+ }
+
+ if (sb.st_dev != old_sb.st_dev ||
+ sb.st_ino != old_sb.st_ino ||
+ sb.st_ctime != old_sb.st_ctime ||
+ sb.st_mtime != old_sb.st_mtime) {
+ old_sb = sb;
+ return 1;
+ }
+
+ return 0;
+}
+#else /* !DETECT_TZ_CHANGES */
+#define change_in_tz(X) 1
+#endif /* !DETECT_TZ_CHANGES */
+
static int
differ_by_repeat(const time_t t1, const time_t t0)
{
@@ -379,6 +418,7 @@ register const int doextend;
int stored;
int nread;
int res;
+ int ret;
union {
struct tzhead tzhead;
char buf[2 * sizeof(struct tzhead) +
@@ -427,6 +467,22 @@ register const int doextend;
(void) strcat(fullname, name);
name = fullname;
}
+ if (doextend == TRUE) {
+ /*
+ * Detect if the timezone file has changed. Check
+ * 'doextend' to ignore TZDEFRULES; the change_in_tz()
+ * function can only keep state for a single file.
+ */
+ ret = change_in_tz(name);
+ if (ret <= 0) {
+ /*
+ * Returns -1 if there was an error,
+ * and 0 if the timezone had not changed.
+ */
+ free(fullname);
+ return ret;
+ }
+ }
if ((fid = _open(name, OPEN_MODE)) == -1) {
free(fullname);
return -1;
@@ -1209,12 +1265,43 @@ gmtload(struct state *const sp)
(void) tzparse(gmt, sp, TRUE);
}
+#ifdef DETECT_TZ_CHANGES
+static int
+recheck_tzdata()
+{
+ static time_t last_checked;
+ struct timespec now;
+ time_t current_time;
+ int error;
+
+ /*
+ * We want to recheck the timezone file every 61 sec.
+ */
+ error = clock_gettime(CLOCK_MONOTONIC, &now);
+ if (error < 0) {
+ /* XXX: Can we somehow report this? */
+ return 0;
+ }
+
+ current_time = now.tv_sec;
+ if ((current_time - last_checked > 61) ||
+ (last_checked > current_time)) {
+ last_checked = current_time;
+ return 1;
+ }
+
+ return 0;
+}
+#else /* !DETECT_TZ_CHANGES */
+#define recheck_tzdata() 0
+#endif /* !DETECT_TZ_CHANGES */
+
static void
tzsetwall_basic(int rdlocked)
{
if (!rdlocked)
_RWLOCK_RDLOCK(&lcl_rwlock);
- if (lcl_is_set < 0) {
+ if (lcl_is_set < 0 && recheck_tzdata() == 0) {
if (!rdlocked)
_RWLOCK_UNLOCK(&lcl_rwlock);
return;
diff --git a/lib/libc/stdtime/Makefile.inc b/lib/libc/stdtime/Makefile.inc
index fb0d2b934148..3d483469bc97 100644
--- a/lib/libc/stdtime/Makefile.inc
+++ b/lib/libc/stdtime/Makefile.inc
@@ -12,6 +12,10 @@ CFLAGS+= -I${SRCTOP}/contrib/tzcode/stdtime -I${LIBC_SRCTOP}/stdtime
CFLAGS.localtime.c= -fwrapv
+.if ${MK_DETECT_TZ_CHANGES} != "no"
+CFLAGS+= -DDETECT_TZ_CHANGES
+.endif
+
MAN+= ctime.3 strftime.3 strptime.3 time2posix.3
MAN+= tzfile.5
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 962b58b82a25..76185a2bca49 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -201,6 +201,7 @@ __DEFAULT_NO_OPTIONS = \
BHYVE_SNAPSHOT \
CLANG_EXTRAS \
CLANG_FORMAT \
+ DETECT_TZ_CHANGES \
DTRACE_TESTS \
EXPERIMENTAL \
HESIOD \
diff --git a/tools/build/options/WITH_DETECT_TZ_CHANGES b/tools/build/options/WITH_DETECT_TZ_CHANGES
new file mode 100644
index 000000000000..6a2d18473892
--- /dev/null
+++ b/tools/build/options/WITH_DETECT_TZ_CHANGES
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Make the time handling code detect changes to the timezone files.
From nobody Tue Jan 31 09:46:46 2023
X-Original-To: dev-commits-src-branches@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 4P5gDk4K1sz3c0t4;
Tue, 31 Jan 2023 09:46:46 +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 4P5gDk3bYtz4Fkx;
Tue, 31 Jan 2023 09:46:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675158406;
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=O29eXCxDHmVnoXnG0x3t1KNxzJ5nvi55QjlkG8m80GY=;
b=KwQh2LfbiNhHDSgErFStQr9S09v/QAmHe4CHXJSD6bSmHRlzkCPl+iceYIwVyYG4DiZVHZ
N7Vmn1MIsKyiOnnIcx3fgcGDHavYpFQEvw2kZdVXqUC8LSSqEkd/r/jWeUM2eqlG6QWVHj
9UIS6FygoEbf4W5DR9Q97ZgrXvOIhkwLyiKo8GuFw+NmFMr7OHnHxywfNFiqWwwPaIM8Q1
xBC+a1HIkm9IkhbPoQGFyBPaFnzDbeqcHXNy2IwfU0QqHcWOOuQwr5RdkhCqFhJ7cGdr8F
nOSg0jn8QBVBGCR00TsJgl+56v/7iAEYtLJ10oil4bnCvQdqPTkEI39sHg9jTA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675158406;
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=O29eXCxDHmVnoXnG0x3t1KNxzJ5nvi55QjlkG8m80GY=;
b=l5ceX1LoQ6g6pqgCSUF3eFfHVtNS1AHD1BWOT5yaniX+bcBgK88eFOdcfeGAKg6BrKW/8q
lfmL+e4y2RSBDNWmWFO77uEPddCtxyLrSgiihbhLIT10Fzg4vbYWgrjExkUxUsg7FKr3HZ
rnl+Tpp1f82cf32N+z9l6iVJL2QV+0SpYvwfu/0nFtKGUQZ1YIdYyIt6kp3eRvAupzg6e2
fYKsLsMxaGErCpUPFhf4iDcSNkajZM4om+JF0kcFUO3OszrFuOOWFcByGzo5xldfC9pv13
nuhxho+/IKNjk5s1Z+CzrjRE4aDudtNPL7xqBQd3aUWFFVmg5pnJTmQrh39QMg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675158406; a=rsa-sha256; cv=none;
b=LEpgz+X2ayyYU/uyeU+WmShyz7eW/n5oPrjt7xvm21OORLqb/1DUN5DJZdqjEGJQWk3fUS
KlwGlT3qQq3VHr6ymEj7PMJjXmrly31M7fH9aDBYVGP3QBBvfJWxvzpASg1m/96YOq/aPB
QroVXln2AKlQTNvzD/SLJSVlAXxI/lxT+H2kP6ryCgSDLCfxzImiU8omkQ6j4zBHdE9krC
37zio1J0YNVDr4ZCXG5XsGW6KEXQ+p8jtCUiAgPWBJ5VEbj0Kti0bLfNffP1i80p8GeYlB
SoWx6VktovfMKGksVYi+sgq8wIiIMteFewUIMoJuERbcoIXKmZkm4LPm8zjKtw==
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 4P5gDk2fwpzkmB;
Tue, 31 Jan 2023 09:46:46 +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 30V9kkrq041244;
Tue, 31 Jan 2023 09:46:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V9kkYu041243;
Tue, 31 Jan 2023 09:46:46 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 09:46:46 GMT
Message-Id: <202301310946.30V9kkYu041243@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Subject: git: 93cc70bf9ca7 - stable/13 - Bring our tzcode up to date.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: des
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 93cc70bf9ca755bdfc43cf34cd762549fd9cba51
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=93cc70bf9ca755bdfc43cf34cd762549fd9cba51
commit 93cc70bf9ca755bdfc43cf34cd762549fd9cba51
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2023-01-10 15:14:27 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2023-01-31 09:44:19 +0000
Bring our tzcode up to date.
* Replay 2010[acflm] which had been merged but not recorded.
* Merge 2010n.
* Reorganize (unsplit) the code to match the upstream layout.
* Merge 2022[cdefg].
MFC after: 1 week
Sponsored by: Klara, Inc.
(cherry picked from commit bc42155199b5b0b479311e05b07aee7f6f9c5172)
tzcode: Address some compiler warnings.
MFC after: 1 week
Sponsored by: Klara, Inc.
(cherry picked from commit d5c85ac6526dcd0ac25ebdb71969c8c788d5e13b)
tzcode: Move configuration into separate header.
MFC after: 1 week
Sponsored by: Klara, Inc.
(cherry picked from commit 394cf6719a3c665eabe24d96669409e0c5a78076)
tzcode: Remove access() again, cf. 02ba1d993fa9.
Reported by: Coverity (CID 1250126)
MFC after: 1 week
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D38035
(cherry picked from commit 3e2e5eebfaa0aebb2790bbde7f35d4c6c52e2596)
tzcode: Avoid memory leak if pthread_setspecific() fails.
Reported by: Coverity (CID 1018472, 1018474)
MFC after: 1 week
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D38036
(cherry picked from commit 96e68c393f65046c0cf69d29f89efcfee949e5de)
tzcode: Fully initialize structs before use.
Reported by: Coverity (CID 1502542, 1502548)
MFC after: 1 week
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D38037
(cherry picked from commit 55572cff58c4208a9e532356a245676b8eed6a3e)
tzcode: Silence warnings.
* Ignore failure to remove our temp file.
* Avoid a minor memory leak in the -D case.
Reported by: Coverity (CID 1502534, 1502535, 1502538)
MFC after: 1 week
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D38038
(cherry picked from commit 2aad7570f4e11ac94bb06c44cdc83ad1962fb97e)
depend-cleanup.sh: handle zic moving one level up.
MFC after: 1 week
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D38044
(cherry picked from commit 4a158fc030b5a31efdbad8b30c9a859df553ae3c)
libc: Update mktime(3) / timegm(3) tests.
Sponsored by: Klara, Inc.
Reviewed by: ngie
Differential Revision: https://reviews.freebsd.org/D38177
(cherry picked from commit d8c9f80891872a54d0b21933136644d915096fe3)
zoneinfo: On amd64, include 32-bit data.
While there, drop the unnecessary posixrules option.
Sponsored by: Klara, Inc.
Reviewed by: imp, allanjude
Differential Revision: https://reviews.freebsd.org/D38142
(cherry picked from commit 783c318fd1181d46554c31a5039db10e7f5eef49)
tzcode: Document zic's -D option.
Sponsored by: Klara, Inc.
Reviewed by: allanjude
Differential Revision: https://reviews.freebsd.org/D38141
(cherry picked from commit a7b1b73935f21a3dcd6fc8d86a37b92f0c9ba93f)
zoneinfo: Always produce fat zoneinfo files.
These aren't just needed for compatibility with i386 binaries (which need
the 32-bit section), but potentially also for compatibility with older
binaries on all platforms.
Sponsored by: Klara, Inc.
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D38194
(cherry picked from commit f1021d27f73efb821213a973e1ab9366278c78f1)
Fix cross-build from STABLE or older CURRENT.
Previously, zic and tzsetup were both listed as install tools and basic
bootstrap tools. Actually, tzsetup is an install tool while zic is a
non-basic bootstrap tool.
Fixes: 783c318fd118
Sponsored by: Klara, Inc.
Reviewed by: jrtc27, emaste
Differential Revision: https://reviews.freebsd.org/D38195
(cherry picked from commit 7a4a520064cb7fbff79560113682d6fe1a1ae9ee)
Makefile.inc1: Restore adding tzsetup to _basic_bootstrap_tools
ITOOLS is only the list of programs to make a copy of during install, it
doesn't cause anything to be bootstrapped. Thus, by removing tzsetup
from _basic_bootstrap_tools, we end up without it on non-FreeBSD, and so
we error out trying to copy it to INSTALLTMP.
Note that _basic_bootstrap_tools is only used for BOOTSTRAP_ALL_TOOLS
(which is why zic was moved away from it). Should tzsetup evolve such
that the host version is insufficient on older FreeBSD it can be moved
to be more like zic, but that seems unnecessary for what is likely to
remain a simple tool.
This partially reverts commit 7a4a520064cb7fbff79560113682d6fe1a1ae9ee.
Fixes: 7a4a520064cb ("Fix cross-build from STABLE or older CURRENT.")
(cherry picked from commit d4fdfd3f9077216e52f38f7364974959c9e43168)
---
Makefile.inc1 | 22 +-
contrib/netbsd-tests/lib/libc/time/t_mktime.c | 21 +-
contrib/tzcode/CONTRIBUTING | 97 +
contrib/tzcode/LICENSE | 5 +
contrib/tzcode/Makefile | 1250 ++++++
contrib/tzcode/NEWS | 5902 +++++++++++++++++++++++++
contrib/tzcode/README | 52 +
contrib/tzcode/SECURITY | 15 +
contrib/tzcode/{stdtime => }/asctime.c | 71 +-
contrib/tzcode/calendars | 173 +
contrib/tzcode/date.1 | 167 +
contrib/tzcode/date.c | 216 +
contrib/tzcode/difftime.c | 62 +
contrib/tzcode/localtime.c | 2654 +++++++++++
contrib/tzcode/newctime.3 | 344 ++
contrib/tzcode/newstrftime.3 | 290 ++
contrib/tzcode/newtzset.3 | 350 ++
contrib/tzcode/private.h | 938 ++++
contrib/tzcode/stdtime/difftime.c | 67 -
contrib/tzcode/stdtime/localtime.c | 2317 ----------
contrib/tzcode/stdtime/private.h | 327 --
contrib/tzcode/stdtime/tzfile.5 | 152 -
contrib/tzcode/stdtime/tzfile.h | 184 -
contrib/tzcode/strftime.c | 657 +++
contrib/tzcode/theory.html | 1479 +++++++
contrib/tzcode/{stdtime => }/time2posix.3 | 74 +-
contrib/tzcode/tz-art.html | 636 +++
contrib/tzcode/tz-how-to.html | 719 +++
contrib/tzcode/tz-link.html | 1175 +++++
contrib/tzcode/tzconfig.h | 19 +
contrib/tzcode/tzfile.5 | 492 +++
contrib/tzcode/tzfile.h | 125 +
contrib/tzcode/tzselect.8 | 125 +
contrib/tzcode/tzselect.ksh | 586 +++
contrib/tzcode/version | 1 +
contrib/tzcode/version.h | 3 +
contrib/tzcode/workman.sh | 41 +
contrib/tzcode/zdump.8 | 231 +
contrib/tzcode/zdump.c | 1256 ++++++
contrib/tzcode/zic.8 | 858 ++++
contrib/tzcode/zic.c | 4049 +++++++++++++++++
contrib/tzcode/zic/README | 88 -
contrib/tzcode/zic/Theory | 570 ---
contrib/tzcode/zic/ialloc.c | 91 -
contrib/tzcode/zic/private.h | 272 --
contrib/tzcode/zic/scheck.c | 68 -
contrib/tzcode/zic/zdump.8 | 63 -
contrib/tzcode/zic/zdump.c | 668 ---
contrib/tzcode/zic/zdump/Makefile | 15 -
contrib/tzcode/zic/zic.8 | 468 --
contrib/tzcode/zic/zic.c | 2756 ------------
contrib/tzcode/zic/zic/Makefile | 16 -
lib/libc/gen/Makefile.inc | 2 +
lib/libc/stdtime/Makefile.inc | 21 +-
{contrib/tzcode => lib/libc}/stdtime/ctime.3 | 0
lib/libc/stdtime/strftime.c | 1 +
lib/libc/stdtime/strptime.c | 1 +
share/zoneinfo/Makefile | 8 +-
tools/build/depend-cleanup.sh | 6 +
usr.sbin/Makefile | 1 +
usr.sbin/zdump/Makefile | 11 +
usr.sbin/{zic => }/zdump/Makefile.depend | 0
usr.sbin/zic/Makefile | 10 +-
usr.sbin/zic/{zic => }/Makefile.depend | 0
usr.sbin/zic/Makefile.inc | 3 -
usr.sbin/zic/README | 88 -
usr.sbin/zic/zdump/Makefile | 15 -
usr.sbin/zic/zic/Makefile | 22 -
68 files changed, 25107 insertions(+), 8359 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index 6975ce7d843f..a3858b25d154 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1324,10 +1324,6 @@ __installcheck_sh_check: .PHONY
#
# Required install tools to be saved in a scratch dir for safety.
#
-.if ${MK_ZONEINFO} != "no"
-_zoneinfo= zic tzsetup
-.endif
-
.if !defined(CROSSBUILD_HOST)
_sysctl=sysctl
.endif
@@ -1335,14 +1331,19 @@ _sysctl=sysctl
ITOOLS= [ awk cap_mkdb cat chflags chmod chown cmp cp \
date echo egrep find grep id install ${_install-info} \
ln make mkdir mtree mv pwd_mkdb \
- rm sed services_mkdb sh sort strip ${_sysctl} test true uname wc \
- ${_zoneinfo} ${LOCAL_ITOOLS}
+ rm sed services_mkdb sh sort strip ${_sysctl} test true uname wc
+
+.if ${MK_ZONEINFO} != "no"
+ITOOLS+=tzsetup
+.endif
# Needed for share/man
.if ${MK_MAN_UTILS} != "no"
ITOOLS+=makewhatis
.endif
+ITOOLS+=${LOCAL_ITOOLS}
+
#
# distributeworld
#
@@ -2222,6 +2223,11 @@ _strfile= usr.bin/fortune/strfile
# C source for loader built in font (8x16.c).
_vtfontcvt= usr.bin/vtfontcvt
+# zic is used to compile timezone data
+.if ${MK_ZONEINFO} != "no"
+_zic= usr.sbin/zic
+.endif
+
# If we are not building the bootstrap because BOOTSTRAPPING is sufficient
# we symlink the host version to $WORLDTMP instead. By doing this we can also
# detect when a bootstrap tool is being used without the required MK_FOO.
@@ -2437,8 +2443,9 @@ _basic_bootstrap_tools+=usr.bin/jot
_basic_bootstrap_tools+=sbin/md5
.endif
+# tzsetup is needed as an install tool
.if ${MK_ZONEINFO} != "no"
-_basic_bootstrap_tools+=usr.sbin/zic usr.sbin/tzsetup
+_basic_bootstrap_tools+=usr.sbin/tzsetup
.endif
.if defined(BOOTSTRAP_ALL_TOOLS)
@@ -2525,6 +2532,7 @@ bootstrap-tools: ${_bt}-links .PHONY
${_localedef} \
${_mkcsmapper} \
${_mkesdb} \
+ ${_zic} \
${LOCAL_BSTOOL_DIRS}
${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE
${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \
diff --git a/contrib/netbsd-tests/lib/libc/time/t_mktime.c b/contrib/netbsd-tests/lib/libc/time/t_mktime.c
index 1080b77eda80..63905b8bad54 100644
--- a/contrib/netbsd-tests/lib/libc/time/t_mktime.c
+++ b/contrib/netbsd-tests/lib/libc/time/t_mktime.c
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mktime.c,v 1.5 2012/03/18 07:33:58 jruoho Exp $ */
+/* $NetBSD: t_mktime.c,v 1.6 2017/10/27 00:55:27 kre Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -64,18 +64,16 @@ ATF_TC_HEAD(mktime_negyear, tc)
ATF_TC_BODY(mktime_negyear, tc)
{
-#ifdef __FreeBSD__
- atf_tc_expect_fail("needs work");
-#endif
struct tm tms;
time_t t;
(void)memset(&tms, 0, sizeof(tms));
- tms.tm_year = ~0;
+ tms.tm_year = -1;
+ tms.tm_mday = 1;
errno = 0;
t = mktime(&tms);
- ATF_REQUIRE_ERRNO(0, t != (time_t)-1);
+ ATF_REQUIRE(t != (time_t)-1);
}
ATF_TC(timegm_epoch);
@@ -95,7 +93,7 @@ ATF_TC_BODY(timegm_epoch, tc)
tms.tm_year = 1970 - 1900;
tms.tm_mday = 1;
t = timegm(&tms);
- ATF_REQUIRE_ERRNO(0, t == (time_t)0);
+ ATF_REQUIRE(t == (time_t)0);
/* one second after midnight on 1 Jan 1970 */
(void)memset(&tms, 0, sizeof(tms));
@@ -104,7 +102,7 @@ ATF_TC_BODY(timegm_epoch, tc)
tms.tm_mday = 1;
tms.tm_sec = 1;
t = timegm(&tms);
- ATF_REQUIRE_ERRNO(0, t == (time_t)1);
+ ATF_REQUIRE(t == (time_t)1);
/*
* 1969-12-31 23:59:59 = one second before the epoch.
@@ -119,7 +117,8 @@ ATF_TC_BODY(timegm_epoch, tc)
tms.tm_min = 59;
tms.tm_sec = 59;
t = timegm(&tms);
- ATF_REQUIRE_ERRNO(0, t == (time_t)-1);
+ ATF_REQUIRE(t == (time_t)-1);
+ /* ATF_REQUIRE(errno == 0); does not work, errno is kept clear */
/*
* Another way of getting one second before the epoch:
@@ -131,7 +130,7 @@ ATF_TC_BODY(timegm_epoch, tc)
tms.tm_mday = 1;
tms.tm_sec = -1;
t = timegm(&tms);
- ATF_REQUIRE_ERRNO(0, t == (time_t)-1);
+ ATF_REQUIRE(t == (time_t)-1);
/*
* Two seconds before the epoch.
@@ -142,7 +141,7 @@ ATF_TC_BODY(timegm_epoch, tc)
tms.tm_mday = 1;
tms.tm_sec = -2;
t = timegm(&tms);
- ATF_REQUIRE_ERRNO(0, t == (time_t)-2);
+ ATF_REQUIRE(t == (time_t)-2);
}
diff --git a/contrib/tzcode/CONTRIBUTING b/contrib/tzcode/CONTRIBUTING
new file mode 100644
index 000000000000..4c0f56a50265
--- /dev/null
+++ b/contrib/tzcode/CONTRIBUTING
@@ -0,0 +1,97 @@
+# Contributing to the tz code and data
+
+Please do not create issues or pull requests on GitHub, as the
+proper procedure for proposing and distributing patches is via
+email as described below.
+
+The time zone database is by no means authoritative: governments
+change timekeeping rules erratically and sometimes with little
+warning, the data entries do not cover all of civil time before
+1970, and undoubtedly errors remain in the code and data. Feel
+free to fill gaps or fix mistakes, and please email improvements
+to <tz@iana.org> for use in the future. In your email, please give
+reliable sources that reviewers can check.
+
+## Contributing technical changes
+
+To email small changes, please run a POSIX shell command like
+'diff -u old/europe new/europe >myfix.patch', and attach
+'myfix.patch' to the email.
+
+For more-elaborate or possibly-controversial changes,
+such as renaming, adding or removing zones, please read
+"Theory and pragmatics of the tz code and data"
+<https://www.iana.org/time-zones/repository/theory.html>.
+It is also good to browse the mailing list archives
+<https://mm.icann.org/pipermail/tz/> for examples of patches that tend
+to work well. Additions to data should contain commentary citing
+reliable sources as justification. Citations should use "https:" URLs
+if available.
+
+For changes that fix sensitive security-related bugs, please see the
+distribution's 'SECURITY' file.
+
+Please submit changes against either the latest release
+<https://www.iana.org/time-zones> or the main branch of the development
+repository. The latter is preferred.
+
+## Sample Git workflow for developing contributions
+
+If you use Git the following workflow may be helpful:
+
+ * Copy the development repository.
+
+ git clone https://github.com/eggert/tz.git
+ cd tz
+
+ * Get current with the main branch.
+
+ git checkout main
+ git pull
+
+ * Switch to a new branch for the changes. Choose a different
+ branch name for each change set.
+
+ git checkout -b mybranch
+
+ * Sleuth by using 'git blame'. For example, when fixing data for
+ Africa/Sao_Tome, if the command 'git blame africa' outputs a line
+ '2951fa3b (Paul Eggert 2018-01-08 09:03:13 -0800 1068) Zone
+ Africa/Sao_Tome 0:26:56 - LMT 1884', commit 2951fa3b should
+ provide some justification for the 'Zone Africa/Sao_Tome' line.
+
+ * Edit source files. Include commentary that justifies the
+ changes by citing reliable sources.
+
+ * Debug the changes, e.g.:
+
+ make check
+ make install
+ ./zdump -v America/Los_Angeles
+
+ * For each separable change, commit it in the new branch, e.g.:
+
+ git add northamerica
+ git commit
+
+ See recent 'git log' output for the commit-message style.
+
+ * Create patch files 0001-..., 0002-..., ...
+
+ git format-patch main
+
+ * After reviewing the patch files, send the patches to <tz@iana.org>
+ for others to review.
+
+ git send-email main
+
+ For an archived example of such an email, see
+ "[PROPOSED] Fix off-by-1 error for Jamaica and T&C before 1913"
+ <https://mm.icann.org/pipermail/tz/2018-February/026122.html>.
+
+ * Start anew by getting current with the main branch again
+ (the second step above).
+
+-----
+
+This file is in the public domain.
diff --git a/contrib/tzcode/LICENSE b/contrib/tzcode/LICENSE
new file mode 100644
index 000000000000..8ba4399c622d
--- /dev/null
+++ b/contrib/tzcode/LICENSE
@@ -0,0 +1,5 @@
+Unless specified below, all files in the tz code and data (including
+this LICENSE file) are in the public domain.
+
+If the files date.c, newstrftime.3, and strftime.c are present, they
+contain material derived from BSD and use the BSD 3-clause license.
diff --git a/contrib/tzcode/Makefile b/contrib/tzcode/Makefile
new file mode 100644
index 000000000000..afb9d538a203
--- /dev/null
+++ b/contrib/tzcode/Makefile
@@ -0,0 +1,1250 @@
+# Make and install tzdb code and data.
+
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
+
+# Package name for the code distribution.
+PACKAGE= tzcode
+
+# Version number for the distribution, overridden in the 'tarballs' rule below.
+VERSION= unknown
+
+# Email address for bug reports.
+BUGEMAIL= tz@iana.org
+
+# DATAFORM selects the data format.
+# Available formats represent essentially the same data, albeit
+# possibly with minor discrepancies that users are not likely to notice.
+# To get new features and the best data right away, use:
+# DATAFORM= vanguard
+# To wait a while before using new features, to give downstream users
+# time to upgrade zic (the default), use:
+# DATAFORM= main
+# To wait even longer for new features, use:
+# DATAFORM= rearguard
+# Rearguard users might also want "ZFLAGS = -b fat"; see below.
+DATAFORM= main
+
+# Change the line below for your timezone (after finding the one you want in
+# one of the $(TDATA) source files, or adding it to a source file).
+# Alternatively, if you discover you've got the wrong timezone, you can just
+# 'zic -l -' to remove it, or 'zic -l rightzone' to change it.
+# Use the command
+# make zonenames
+# to get a list of the values you can use for LOCALTIME.
+
+LOCALTIME= Factory
+
+# The POSIXRULES macro controls interpretation of nonstandard and obsolete
+# POSIX-like TZ settings like TZ='EET-2EEST' that lack DST transition rules.
+# Such a setting uses the rules in a template file to determine
+# "spring forward" and "fall back" days and times; the environment
+# variable itself specifies UT offsets of standard and daylight saving time.
+#
+# If POSIXRULES is '-', no template is installed; this is the default.
+#
+# Any other value for POSIXRULES is obsolete and should not be relied on, as:
+# * It does not work correctly in popular implementations such as GNU/Linux.
+# * It does not work even in tzcode, except for historical timestamps
+# that precede the last explicit transition in the POSIXRULES file.
+# Hence it typically does not work for current and future timestamps.
+# In short, software should avoid ruleless settings like TZ='EET-2EEST'
+# and so should not depend on the value of POSIXRULES.
+#
+# If, despite the above, you want a template for handling these settings,
+# you can change the line below (after finding the timezone you want in the
+# one of the $(TDATA) source files, or adding it to a source file).
+# Alternatively, if you discover you've got the wrong timezone, you can just
+# 'zic -p -' to remove it, or 'zic -p rightzone' to change it.
+# Use the command
+# make zonenames
+# to get a list of the values you can use for POSIXRULES.
+
+POSIXRULES= -
+
+# Also see TZDEFRULESTRING below, which takes effect only
+# if the time zone files cannot be accessed.
+
+
+# Installation locations.
+#
+# The defaults are suitable for Debian, except that if REDO is
+# posix_right or right_posix then files that Debian puts under
+# /usr/share/zoneinfo/posix and /usr/share/zoneinfo/right are instead
+# put under /usr/share/zoneinfo-posix and /usr/share/zoneinfo-leaps,
+# respectively. Problems with the Debian approach are discussed in
+# the commentary for the right_posix rule (below).
+
+# Destination directory, which can be used for staging.
+# 'make DESTDIR=/stage install' installs under /stage (e.g., to
+# /stage/etc/localtime instead of to /etc/localtime). Files under
+# /stage are not intended to work as-is, but can be copied by hand to
+# the root directory later. If DESTDIR is empty, 'make install' does
+# not stage, but installs directly into production locations.
+DESTDIR =
+
+# Everything is installed into subdirectories of TOPDIR, and used there.
+# TOPDIR should be empty (meaning the root directory),
+# or a directory name that does not end in "/".
+# TOPDIR should be empty or an absolute name unless you're just testing.
+TOPDIR =
+
+# The default local timezone is taken from the file TZDEFAULT.
+TZDEFAULT = $(TOPDIR)/etc/localtime
+
+# The subdirectory containing installed program and data files, and
+# likewise for installed files that can be shared among architectures.
+# These should be relative file names.
+USRDIR = usr
+USRSHAREDIR = $(USRDIR)/share
+
+# "Compiled" timezone information is placed in the "TZDIR" directory
+# (and subdirectories).
+# TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty.
+TZDIR_BASENAME= zoneinfo
+TZDIR = $(TOPDIR)/$(USRSHAREDIR)/$(TZDIR_BASENAME)
+
+# The "tzselect" and (if you do "make INSTALL") "date" commands go in:
+BINDIR = $(TOPDIR)/$(USRDIR)/bin
+
+# The "zdump" command goes in:
+ZDUMPDIR = $(BINDIR)
+
+# The "zic" command goes in:
+ZICDIR = $(TOPDIR)/$(USRDIR)/sbin
+
+# Manual pages go in subdirectories of. . .
+MANDIR = $(TOPDIR)/$(USRSHAREDIR)/man
+
+# Library functions are put in an archive in LIBDIR.
+LIBDIR = $(TOPDIR)/$(USRDIR)/lib
+
+
+# Types to try, as an alternative to time_t.
+TIME_T_ALTERNATIVES = $(TIME_T_ALTERNATIVES_HEAD) $(TIME_T_ALTERNATIVES_TAIL)
+TIME_T_ALTERNATIVES_HEAD = int_least64_t
+TIME_T_ALTERNATIVES_TAIL = int_least32_t uint_least32_t uint_least64_t
+
+# What kind of TZif data files to generate. (TZif is the binary time
+# zone data format that zic generates; see Internet RFC 8536.)
+# If you want only POSIX time, with time values interpreted as
+# seconds since the epoch (not counting leap seconds), use
+# REDO= posix_only
+# below. If you want only "right" time, with values interpreted
+# as seconds since the epoch (counting leap seconds), use
+# REDO= right_only
+# below. If you want both sets of data available, with leap seconds not
+# counted normally, use
+# REDO= posix_right
+# below. If you want both sets of data available, with leap seconds counted
+# normally, use
+# REDO= right_posix
+# below. POSIX mandates that leap seconds not be counted; for compatibility
+# with it, use "posix_only" or "posix_right". Use POSIX time on systems with
+# leap smearing; this can work better than unsmeared "right" time with
+# applications that are not leap second aware, and is closer to unsmeared
+# "right" time than unsmeared POSIX time is (e.g., 0.5 vs 1.0 s max error).
+
+REDO= posix_right
+
+# Whether to put an "Expires" line in the leapseconds file.
+# Use EXPIRES_LINE=1 to put the line in, 0 to omit it.
+# The EXPIRES_LINE value matters only if REDO's value contains "right".
+# If you change EXPIRES_LINE, remove the leapseconds file before running "make".
+# zic's support for the Expires line was introduced in tzdb 2020a,
+# and was modified in tzdb 2021b to generate version 4 TZif files.
+# EXPIRES_LINE defaults to 0 for now so that the leapseconds file
+# can be given to pre-2020a zic implementations and so that TZif files
+# built by newer zic implementations can be read by pre-2021b libraries.
+EXPIRES_LINE= 0
+
+# To install data in text form that has all the information of the TZif data,
+# (optionally incorporating leap second information), use
+# TZDATA_TEXT= tzdata.zi leapseconds
+# To install text data without leap second information (e.g., because
+# REDO='posix_only'), use
+# TZDATA_TEXT= tzdata.zi
+# To avoid installing text data, use
+# TZDATA_TEXT=
+
+TZDATA_TEXT= leapseconds tzdata.zi
+
+# For backward-compatibility links for old zone names, use
+# BACKWARD= backward
+# To omit these links, use
+# BACKWARD=
+
+BACKWARD= backward
+
+# If you want out-of-scope and often-wrong data from the file 'backzone',
+# but only for entries listed in the backward-compatibility file zone.tab, use
+# PACKRATDATA= backzone
+# PACKRATLIST= zone.tab
+# If you want all the 'backzone' data, use
+# PACKRATDATA= backzone
+# PACKRATLIST=
+# To omit this data, use
+# PACKRATDATA=
+# PACKRATLIST=
+
+PACKRATDATA=
+PACKRATLIST=
+
+# The name of a locale using the UTF-8 encoding, used during self-tests.
+# The tests are skipped if the name does not appear to work on this system.
+
+UTF8_LOCALE= en_US.utf8
+
+# Non-default libraries needed to link.
+# On some hosts, this should have -lintl unless CFLAGS has -DHAVE_GETTEXT=0.
+LDLIBS=
+
+# Add the following to the end of the "CFLAGS=" line as needed to override
+# defaults specified in the source code. "-DFOO" is equivalent to "-DFOO=1".
+# -DDEPRECATE_TWO_DIGIT_YEARS for optional runtime warnings about strftime
+# formats that generate only the last two digits of year numbers
+# -DEPOCH_LOCAL if the 'time' function returns local time not UT
+# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater
+# than what POSIX specifies, assuming local time is UT.
+# For example, N is 252460800 on AmigaOS.
+# -DHAVE_DECL_ASCTIME_R=0 if <time.h> does not declare asctime_r
+# -DHAVE_DECL_ENVIRON if <unistd.h> declares 'environ'
+# -DHAVE_DECL_TIMEGM=0 if <time.h> does not declare timegm
+# -DHAVE_DIRECT_H if mkdir needs <direct.h> (MS-Windows)
+# -DHAVE_GENERIC=0 if _Generic does not work*
+# -DHAVE_GETRANDOM if getrandom works (e.g., GNU/Linux),
+# -DHAVE_GETRANDOM=0 to avoid using getrandom
+# -DHAVE_GETTEXT if gettext works (e.g., GNU/Linux, FreeBSD, Solaris),
+# where LDLIBS also needs to contain -lintl on some hosts;
+# -DHAVE_GETTEXT=0 to avoid using gettext
+# -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares
+# ctime_r and asctime_r incompatibly with the POSIX standard
+# (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined).
+# -DHAVE_INTTYPES_H=0 if <inttypes.h> does not work*
+# -DHAVE_LINK=0 if your system lacks a link function
+# -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function
+# -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz
+# localtime_rz can make zdump significantly faster, but is nonstandard.
+# -DHAVE_MALLOC_ERRNO=0 if malloc etc. do not set errno on failure.
+# -DHAVE_POSIX_DECLS=0 if your system's include files do not declare
+# functions like 'link' or variables like 'tzname' required by POSIX
+# -DHAVE_SETENV=0 if your system lacks the setenv function
+# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function
+# -DHAVE_STDCKDINT_H=0 if neither <stdckdint.h> nor substitutes like
+# __builtin_add_overflow work*
+# -DHAVE_STDINT_H=0 if <stdint.h> does not work*
+# -DHAVE_STRFTIME_L if <time.h> declares locale_t and strftime_l
+# -DHAVE_STRDUP=0 if your system lacks the strdup function
+# -DHAVE_STRTOLL=0 if your system lacks the strtoll function
+# -DHAVE_SYMLINK=0 if your system lacks the symlink function
+# -DHAVE_SYS_STAT_H=0 if <sys/stat.h> does not work*
+# -DHAVE_TZSET=0 if your system lacks a tzset function
+# -DHAVE_UNISTD_H=0 if <unistd.h> does not work*
+# -DHAVE_UTMPX_H=0 if <utmpx.h> does not work*
+# -Dlocale_t=XXX if your system uses XXX instead of locale_t
+# -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers
+# with external linkage, e.g., applications cannot define 'localtime'.
+# -Dssize_t=long on hosts like MS-Windows that lack ssize_t
+# -DSUPPRESS_TZDIR to not prepend TZDIR to file names; this has
+# security implications and is not recommended for general use
+# -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires;
+# not needed by the main-program tz code, which is single-threaded.
+# Append other compiler flags as needed, e.g., -pthread on GNU/Linux.
+# -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t
+# This is intended for internal use only; it mangles external names.
+# -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz"
+# -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory;
+# the default is system-supplied, typically "/usr/lib/locale"
+# -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified
+# DST transitions if the time zone files cannot be accessed
+# -DUNINIT_TRAP if reading uninitialized storage can cause problems
+# other than simply getting garbage data
+# -DUSE_LTZ=0 to build zdump with the system time zone library
+# Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below.
+# -DZIC_BLOAT_DEFAULT=\"fat\" to default zic's -b option to "fat", and
+# similarly for "slim". Fat TZif files work around incompatibilities
+# and bugs in some TZif readers, notably older ones that
+# ignore or otherwise mishandle 64-bit data in TZif files;
+# however, fat TZif files may trigger bugs in newer TZif readers.
+# Slim TZif files are more efficient, and are the default.
+# -DZIC_MAX_ABBR_LEN_WO_WARN=3
+# (or some other number) to set the maximum time zone abbreviation length
+# that zic will accept without a warning (the default is 6)
+# $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking
+#
+# * Options marked "*" can be omitted if your compiler is C23 compatible.
+#
+# Select instrumentation via "make GCC_INSTRUMENT='whatever'".
+GCC_INSTRUMENT = \
+ -fsanitize=undefined -fsanitize-address-use-after-scope \
+ -fsanitize-undefined-trap-on-error -fstack-protector
+# Omit -fanalyzer from GCC_DEBUG_FLAGS, as it makes GCC too slow.
+GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \
+ $(GCC_INSTRUMENT) \
+ -Wall -Wextra \
+ -Walloc-size-larger-than=100000 -Warray-bounds=2 \
+ -Wbad-function-cast -Wbidi-chars=any,ucn -Wcast-align=strict -Wdate-time \
+ -Wdeclaration-after-statement -Wdouble-promotion \
+ -Wduplicated-branches -Wduplicated-cond \
+ -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \
+ -Wimplicit-fallthrough=5 -Winit-self -Wlogical-op \
+ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
+ -Wnull-dereference \
+ -Wold-style-definition -Woverlength-strings -Wpointer-arith \
+ -Wshadow -Wshift-overflow=2 -Wstrict-overflow \
+ -Wstrict-prototypes -Wstringop-overflow=4 \
+ -Wstringop-truncation -Wsuggest-attribute=cold \
+ -Wsuggest-attribute=const -Wsuggest-attribute=format \
+ -Wsuggest-attribute=malloc \
+ -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \
+ -Wtrampolines -Wundef -Wuninitialized -Wunused-macros -Wuse-after-free=3 \
+ -Wvariadic-macros -Wvla -Wwrite-strings \
+ -Wno-address -Wno-format-nonliteral -Wno-sign-compare \
+ -Wno-type-limits
+#
+# If your system has a "GMT offset" field in its "struct tm"s
+# (or if you decide to add such a field in your system's "time.h" file),
+# add the name to a define such as
+# -DTM_GMTOFF=tm_gmtoff
+# to the end of the "CFLAGS=" line. If not defined, the code attempts to
+# guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this.
+# Similarly, if your system has a "zone abbreviation" field, define
+# -DTM_ZONE=tm_zone
+# and define NO_TM_ZONE to suppress any guessing. Although these two fields
+# not required by POSIX, a future version of POSIX is planned to require them
+# and they are widely available on GNU/Linux and BSD systems.
+#
+# The next batch of options control support for external variables
+# exported by tzcode. In practice these variables are less useful
+# than TM_GMTOFF and TM_ZONE. However, most of them are standardized.
+# #
+# # To omit or support the external variable "tzname", add one of:
+# # -DHAVE_TZNAME=0 # do not support "tzname"
+# # -DHAVE_TZNAME=1 # support "tzname", which is defined by system library
+# # -DHAVE_TZNAME=2 # support and define "tzname"
+# # to the "CFLAGS=" line. "tzname" is required by POSIX 1988 and later.
+# # If not defined, the code attempts to guess HAVE_TZNAME from other macros.
+# # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause
+# # crashes when combined with some platforms' standard libraries,
+# # presumably due to memory allocation issues.
+# #
+# # To omit or support the external variables "timezone" and "daylight", add
+# # -DUSG_COMPAT=0 # do not support
+# # -DUSG_COMPAT=1 # support, and variables are defined by system library
+# # -DUSG_COMPAT=2 # support and define variables
+# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by
+# # Unix Systems Group code and are required by POSIX 2008 (with XSI) and later.
+# # If not defined, the code attempts to guess USG_COMPAT from other macros.
+# #
+# # To support the external variable "altzone", add
+# # -DALTZONE=0 # do not support
+# # -DALTZONE=1 # support "altzone", which is defined by system library
+# # -DALTZONE=2 # support and define "altzone"
+# # to the end of the "CFLAGS=" line; although "altzone" appeared in
+# # System V Release 3.1 it has not been standardized.
+# # If not defined, the code attempts to guess ALTZONE from other macros.
+#
+# If you want functions that were inspired by early versions of X3J11's work,
+# add
+# -DSTD_INSPIRED
+# to the end of the "CFLAGS=" line. This arranges for the following
+# functions to be added to the time conversion library.
+# "offtime" is like "gmtime" except that it accepts a second (long) argument
+# that gives an offset to add to the time_t when converting it.
+# "timelocal" is equivalent to "mktime".
+# "timeoff" is like "timegm" except that it accepts a second (long) argument
+# that gives an offset to use when converting to a time_t.
+# "posix2time" and "time2posix" are described in an included manual page.
+# X3J11's work does not describe any of these functions.
+# These functions may well disappear in future releases of the time
+# conversion package.
+#
+# If you don't want functions that were inspired by NetBSD, add
+# -DNETBSD_INSPIRED=0
+# to the end of the "CFLAGS=" line. Otherwise, the functions
+# "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the
+# time library, and if STD_INSPIRED is also defined the functions
+# "posix2time_z" and "time2posix_z" are added as well.
+# The functions ending in "_z" (or "_rz") are like their unsuffixed
+# (or suffixed-by-"_r") counterparts, except with an extra first
+# argument of opaque type timezone_t that specifies the timezone.
+# "tzalloc" allocates a timezone_t value, and "tzfree" frees it.
+#
+# If you want to allocate state structures in localtime, add
+# -DALL_STATE
+# to the end of the "CFLAGS=" line. Storage is obtained by calling malloc.
+#
+# NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put
+# out by the National Institute of Standards and Technology
+# which claims to test C and Posix conformance. If you want to pass PCTS, add
+# -DPCTS
+# to the end of the "CFLAGS=" line.
+#
+# If you want strict compliance with XPG4 as of 1994-04-09, add
+# -DXPG4_1994_04_09
+# to the end of the "CFLAGS=" line. This causes "strftime" to always return
+# 53 as a week number (rather than 52 or 53) for January days before
+# January's first Monday when a "%V" format is used and January 1
+# falls on a Friday, Saturday, or Sunday.
+
+CFLAGS=
+
+# Linker flags. Default to $(LFLAGS) for backwards compatibility
+# to release 2012h and earlier.
+
+LDFLAGS= $(LFLAGS)
+
+# For leap seconds, this Makefile uses LEAPSECONDS='-L leapseconds' in
+# submake command lines. The default is no leap seconds.
+
+LEAPSECONDS=
+
+# The zic command and its arguments.
+
+zic= ./zic
+ZIC= $(zic) $(ZFLAGS)
+
+# To shrink the size of installed TZif files,
+# append "-r @N" to omit data before N-seconds-after-the-Epoch.
+# To grow the files and work around bugs in older applications,
+# possibly at the expense of introducing bugs in newer ones,
+# append "-b fat"; see ZIC_BLOAT_DEFAULT above.
+# See the zic man page for more about -b and -r.
+ZFLAGS=
+
+# How to use zic to install TZif files.
+
+ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS)
+
+# The name of a Posix-compliant 'awk' on your system.
+# mawk 1.3.3 and Solaris 10 /usr/bin/awk do not work.
+# Also, it is better (though not essential) if 'awk' supports UTF-8,
+# and unfortunately mawk and busybox awk do not support UTF-8.
+# Try AWK=gawk or AWK=nawk if your awk has the abovementioned problems.
+AWK= awk
+
+# The full path name of a Posix-compliant shell, preferably one that supports
+# the Korn shell's 'select' statement as an extension.
+# These days, Bash is the most popular.
+# It should be OK to set this to /bin/sh, on platforms where /bin/sh
+# lacks 'select' or doesn't completely conform to Posix, but /bin/bash
+# is typically nicer if it works.
+KSHELL= /bin/bash
+
+# Name of curl <https://curl.haxx.se/>, used for HTML validation.
+CURL= curl
+
+# Name of GNU Privacy Guard <https://gnupg.org/>, used to sign distributions.
+GPG= gpg
+
+# This expensive test requires USE_LTZ.
+# To suppress it, define this macro to be empty.
+CHECK_TIME_T_ALTERNATIVES = check_time_t_alternatives
+
+# SAFE_CHAR is a regular expression that matches a safe character.
+# Some parts of this distribution are limited to safe characters;
+# others can use any UTF-8 character.
+# For now, the safe characters are a safe subset of ASCII.
+# The caller must set the shell variable 'sharp' to the character '#',
+# since Makefile macros cannot contain '#'.
+# TAB_CHAR is a single tab character, in single quotes.
+TAB_CHAR= ' '
+SAFE_CHARSET1= $(TAB_CHAR)' !\"'$$sharp'$$%&'\''()*+,./0123456789:;<=>?@'
+SAFE_CHARSET2= 'ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\^_`'
+SAFE_CHARSET3= 'abcdefghijklmnopqrstuvwxyz{|}~'
+SAFE_CHARSET= $(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3)
+SAFE_CHAR= '[]'$(SAFE_CHARSET)'-]'
+
+# These characters are Latin-1, and so are likely to be displayable
+# even in editors with limited character sets.
+UNUSUAL_OK_LATIN_1 = «°±»½¾×
+# This IPA symbol is represented in Unicode as the composition of
+# U+0075 and U+032F, and U+032F is not considered alphabetic by some
+# grep implementations that do not grok composition.
+UNUSUAL_OK_IPA = u̯
+# Non-ASCII non-letters that OK_CHAR allows, as these characters are
+# useful in commentary.
+UNUSUAL_OK_CHARSET= $(UNUSUAL_OK_LATIN_1)$(UNUSUAL_OK_IPA)
+
+# Put this in a bracket expression to match spaces.
+s = [:space:]
+
+# OK_CHAR matches any character allowed in the distributed files.
+# This is the same as SAFE_CHAR, except that UNUSUAL_OK_CHARSET and
+# multibyte letters are also allowed so that commentary can contain a
+# few safe symbols and people's names and can quote non-English sources.
+# Other non-letters are limited to ASCII renderings for the
+# convenience of maintainers using XEmacs 21.5.34, which by default
+# mishandles Unicode characters U+0100 and greater.
+OK_CHAR= '[][:alpha:]$(UNUSUAL_OK_CHARSET)'$(SAFE_CHARSET)'-]'
+
+# SAFE_LINE matches a line of safe characters.
+# SAFE_SHARP_LINE is similar, except any OK character can follow '#';
+# this is so that comments can contain non-ASCII characters.
+# OK_LINE matches a line of OK characters.
+SAFE_LINE= '^'$(SAFE_CHAR)'*$$'
+SAFE_SHARP_LINE='^'$(SAFE_CHAR)'*('$$sharp$(OK_CHAR)'*)?$$'
+OK_LINE= '^'$(OK_CHAR)'*$$'
+
+# Flags to give 'tar' when making a distribution.
+# Try to use flags appropriate for GNU tar.
+GNUTARFLAGS= --format=pax --pax-option='delete=atime,delete=ctime' \
+ --numeric-owner --owner=0 --group=0 \
+ --mode=go+u,go-w --sort=name
+TARFLAGS= `if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; \
+ then echo $(GNUTARFLAGS); \
+ else :; \
+ fi`
+
+# Flags to give 'gzip' when making a distribution.
*** 33390 LINES SKIPPED ***
From nobody Tue Jan 31 09:46:47 2023
X-Original-To: dev-commits-src-branches@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 4P5gDl5HTnz3c0lR;
Tue, 31 Jan 2023 09:46:47 +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 4P5gDl4k2Kz4FtQ;
Tue, 31 Jan 2023 09:46:47 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675158407;
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=KZ33vU7R/xpwFlPe1tUd3MwAkpEF6I1vC8FAQAIC83Q=;
b=VFTbyIp8ThJdSDODe0wzHVwJE1hLDxveZtZ9v6AY8UEydVNtfJYwhxD1IXzQPzXp9vasl+
KWdnZeNl90G4bQcceMLKuhKm87MYkXFDpVzo55iEhRyr5Lje8sqXl/YAbOLOy2hb8UWGJ4
grliQukLKai5FjFKxnEeeghipghyGwRrGkckJ+Z997ugnmQP8a9+gQI7lMXDxyAyyTV3NM
g3FHhMFeekECTKeLFcDMldpYxjk4wGlWzHuYlTsrMQQlKre5zrSeuByppdH8g/SybiNhaX
0k6snkAittHwzdUSDycPyCMHhAW2Up7WGsf/sbOfC05wvwTyjZGa8kt8jCf+/Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675158407;
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=KZ33vU7R/xpwFlPe1tUd3MwAkpEF6I1vC8FAQAIC83Q=;
b=Rf//wVwzSB2zJTgio2NDKWHmaZByTcSeSCwx/+yZC0KVoP3c0nvauvSdHBXgFZahXzlZXS
mc7jv7S2rV/zNUpeDMEsrnNm45+fxEblLK4CT8By23Cs+bLAsqnuuz/1ZmZUJSPmyfJ9BT
tf4saHyG87bWko9xWz9fOQ9Iz3fzYMV0bgWSnBpu1zSlF/vwBh+VNt0cCTAgc6BPSMypcZ
2LqyjH3uauuez3Jt0RoHkBXg+pSqbxEkq40TxgECY0VbGPc0A+RUZQce3+cj3rfouYYIMP
bbVsmcSxt/hogoFGUJozIu7jheqvpSFcUlpGZLuxPssP6WP5TRbn9MFB+9NvzQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675158407; a=rsa-sha256; cv=none;
b=PM854X89m5iqbO72zPhkTxcu1FJvRdMUWXwUqC+kczXIoZwHRNWENYa+Cqg7CR74lLaeQE
QXQ8c1Ec1sY/V8euoNfwdbjoh0dkm23qvzuHud3tH/slQDipkFdGh3ZCdy0WKPfSRJYVUY
5xU6tmniO0uyD+mBIXkxBwlOQRH12Gp5Lfn2/2lTN63HP9eQNcOyvC0VP5BQ3Zk/2DxJkh
WunPT1jd/p79Jekvc+qVoRLQDH4yXnj85KHAIwhmv0eENatfrHQ0YziKcljIK5VxaOo9pv
UOmu1SQFbM1QrPe8IS/0X1y2SEIGZxYRiasgPQE/1dnmF0vxaGZpk2jFphTFUQ==
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 4P5gDl3dTzzkZt;
Tue, 31 Jan 2023 09:46:47 +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 30V9klB4041274;
Tue, 31 Jan 2023 09:46:47 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V9klA2041273;
Tue, 31 Jan 2023 09:46:47 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 09:46:47 GMT
Message-Id: <202301310946.30V9klA2041273@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Subject: git: 3901be6a14ce - stable/13 - Makefile.inc1: Print the right PATH for missing install tool error
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: des
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 3901be6a14ceff43e502903e56eee98e86a1af0a
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=3901be6a14ceff43e502903e56eee98e86a1af0a
commit 3901be6a14ceff43e502903e56eee98e86a1af0a
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2023-01-29 23:45:49 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2023-01-31 09:44:19 +0000
Makefile.inc1: Print the right PATH for missing install tool error
We override PATH for which but then go and print the non-overridden
PATH, which leads to rather confusing messages.
Fixes: 5bb9250e0af4 ("Add necessary Makefile.inc1 infrastructure for building on non-FreeBSD")
(cherry picked from commit 4ebd18cf357af71941675ff3ae7fb3bf56a37e0e)
---
Makefile.inc1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index a3858b25d154..86f59040ac1d 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1376,7 +1376,7 @@ distributeworld installworld stageworld: _installcheck_world .PHONY
if progpath=`env PATH=${TMPPATH} which $$prog`; then \
echo $$progpath; \
else \
- echo "Required tool $$prog not found in PATH ($$PATH)." >&2; \
+ echo "Required tool $$prog not found in PATH ("${TMPPATH:Q}")." >&2; \
exit 1; \
fi; \
done); \
From nobody Tue Jan 31 13:18:05 2023
X-Original-To: dev-commits-src-branches@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 4P5lwY4dZLz3cVCn;
Tue, 31 Jan 2023 13:18:05 +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 4P5lwY44Zwz3R8R;
Tue, 31 Jan 2023 13:18:05 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675171085;
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=27UGtjcwAXA7gKJgvPc4nlvQSvnONVetWLeL/DOQ4jw=;
b=gjrWG6ouwYwwM6WqzH2bitylnIgnoejzToQ3pcErtZ98oPNS1eW1YwQyr7q4gJETWXsyD6
meZD7xWo1PhdcTNSCl+oQyT22bm441P0sbuwOoj5FkYO6stpgCp3AYXmi8u4pJRtO2+M6T
E1xXYTVjdn5yR6ZAuoGGISzdzFgikogpzPCCaSqvXmNdSiaPG5TT7hcneuI9OvD45MoFDH
TztsRcj6OPPmKaJIeLe/3pDbDnvoZgZ80P0pY5EgPFDkYdr1KEkcIL0b6bttQlj5utXwbA
uypppb56NnFV6Aus9B0BAsraU5hlJW5fHXaC/CPNyKwGJI8a/7wZeM4W3fFCSQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675171085;
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=27UGtjcwAXA7gKJgvPc4nlvQSvnONVetWLeL/DOQ4jw=;
b=IoPZbAocNaaBzly4cLI0/Rs3Ul4FWk9ICl7h2bYpWIzQ9lRPMxqjrHPS4yAXeP3d2mqcnn
Y7F3Mld4ODmuyYFSpaSjvKZBRMz96q3RmD2sSTsIGt7FswMou/EZwFkq1P+/o5p93LvGFy
m/AEW0VN7j0tCpaA4w9CuuzTheqnJaBMrgcK5uWWU/jZx9y/Mowal6P9GyXClaZOM5fXDi
mGGxmuIjSIxgSApYQisjWGkqAinHI0+6f/9JsuFnG9h/NM8qTIhgx3moechHIbCjb9X1N1
nWwLalxz2UsaGtwviRPBYeoJYcx/96+XWVdnLnHHO1/7a4/OG0W+kIezDY9qXw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675171085; a=rsa-sha256; cv=none;
b=nl1QZKZkR8fh4P2zXrr7newkAXOnsCXpQSauXVf9UOqXeuFLu1t+gKtFSOc0b9vXPOwTLM
AlEuGbXzkxKxYteBPWkFjfFCy2eKoK1+CAFZOnrmIjBJdsIvi1TAXbK1pJMjvRRGgxT2iV
YMvHyi2KG6LLOUx5p+YegZ9BlsbtAuqmavLvMxyTT/zyeJfC3MBDjEkH9O8MrS4Knze/HK
HCQlVv+tilDrwgZEFzBfNP4AAVTkHUEPDg8mXE9PAbOp39VTGsOTSMmN+XDQRm7SziYaBI
S4gYWJ8CdACJgo2YaAOT42ea7LocuBEadZUHzxcHQNR7GbAhZPj+ozpqgI6FIg==
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 4P5lwY369Nzpt2;
Tue, 31 Jan 2023 13:18:05 +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 30VDI5gL040964;
Tue, 31 Jan 2023 13:18:05 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30VDI5K3040963;
Tue, 31 Jan 2023 13:18:05 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 13:18:05 GMT
Message-Id: <202301311318.30VDI5K3040963@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Marcin Wojtas <mw@FreeBSD.org>
Subject: git: 98091db83d98 - stable/12 - ena: Remove unused variable.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mw
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 98091db83d98f983a7696e3e1b16078f97ebadf6
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by mw:
URL: https://cgit.FreeBSD.org/src/commit/?id=98091db83d98f983a7696e3e1b16078f97ebadf6
commit 98091db83d98f983a7696e3e1b16078f97ebadf6
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-04-06 23:45:28 +0000
Commit: Marcin Wojtas <mw@FreeBSD.org>
CommitDate: 2023-01-31 12:46:49 +0000
ena: Remove unused variable.
(cherry picked from commit 4dab99b936920cf0c8f3fcf63754985906714a40)
---
sys/dev/ena/ena_netmap.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sys/dev/ena/ena_netmap.c b/sys/dev/ena/ena_netmap.c
index 228db0cb31ab..e1244ffc8a44 100644
--- a/sys/dev/ena/ena_netmap.c
+++ b/sys/dev/ena/ena_netmap.c
@@ -503,10 +503,8 @@ ena_netmap_copy_data(struct netmap_adapter *na, struct netmap_slot *slots,
{
struct netmap_slot *nm_slot;
void *slot_vaddr;
- uint16_t packet_size;
uint16_t data_amount;
- packet_size = 0;
do {
nm_slot = &slots[slot_index];
slot_vaddr = NMB(na, nm_slot);
From nobody Tue Jan 31 13:18:06 2023
X-Original-To: dev-commits-src-branches@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 4P5lwZ5Wpfz3cVJf;
Tue, 31 Jan 2023 13:18:06 +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 4P5lwZ4xBrz3h31;
Tue, 31 Jan 2023 13:18:06 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675171086;
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=+6pcQv2Q7CZklJudPYBaY90pbjpDA9AD4qIa6/qhyHM=;
b=qrjxgigx3hxFuJfgrSDkcg6a3WTH8Nf6Orc55xEmPMwGWGi997528uZrxCX9xZw07CceuP
z5ppNTAf8vvz2FXMLrvUFKERwIAqwbdFoQv24vg8lEVR8c0JPtzUcHMJSCptmoIH6IsOd7
9J+Ra5XBhVRT/tEToycy3JLBx9kpV78Opj6fvD3itbwEccaL1B+Ah2FDTCSOd+UnVt0cgU
VshOFw//QBsygbq1frXRh7N8Vp/nJTBMfuO3X7A0GWEsoYdbOt5T+NUL0q6xn3+OoTDEd8
sKZsXzJTlgOHMoxXB459FUi2gTLmOeb3VJcDLhVkPK+cCEx7mUpPPwPOSrnfIw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675171086;
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=+6pcQv2Q7CZklJudPYBaY90pbjpDA9AD4qIa6/qhyHM=;
b=Uf7TSGPeXGgozyUwSkYDL+H4gQJvJ6q582apd3kNnLC+u53HPsIOwpaq1YfvsbXXkmS8qK
T1Ryl1Q6MiHkXTpl59/lBEp73Br5pW9+JLSXebzoB20uAO1B4aMkBAfOx1kzqG2DXZ0sGI
nNReyXBu6oHouBw+7CdG9SXpr8QK41O3lr/PSZ7PQilJjjQZKngQZBMSSeieFB+dqQYSFI
yPLtg4QYj2GpvgEygRpVPSmaYt8jJ/MKQ0bfKd2gMVEwTaMquNrD6/vSwPByzku6rLzdqV
hGhq6132675lprmyf91lQGI/jMzHaULB7hxgdgF65hxzAE4P4ihChtIM4O4Q1A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675171086; a=rsa-sha256; cv=none;
b=xwAFxMv0t1c4i7k5nd0Q7tdq8DfP7HHEymSoXTPp3vBh24ct9YJES7Dz9GZ+n+WBiW4M2o
uautdrGEmNgEWpl9Gs6Q1H55EY8aPKoT3GyuatYrh+zP0h+R1xRIGeQILko9kS7xtj99Mk
qxtyHC0rrcHbPdOIw5pgc5pg1jMXPAWpwQJgH0dOsBWDG9zMc+ZTxUQyp0Fnt5BEJP80V9
rrn2R+SYZBdbL88Mdgra4Las+gx158MQhHaJjXwQRvXwrs4iuzt/i2ctlva/rYO9pXHbiM
zUUY8VoDV94xaZ6yQKXEV1XV9/kqZ0tL6nWGkcXbEooom9eDBlH/Ay+SiRcbew==
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 4P5lwZ3gzXzqh9;
Tue, 31 Jan 2023 13:18:06 +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 30VDI6CS040991;
Tue, 31 Jan 2023 13:18:06 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30VDI6gZ040990;
Tue, 31 Jan 2023 13:18:06 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 13:18:06 GMT
Message-Id: <202301311318.30VDI6gZ040990@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Marcin Wojtas <mw@FreeBSD.org>
Subject: git: ffcc58a767bd - stable/12 - ena: Remove write only variables
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mw
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: ffcc58a767bd6396191ea075a422316e97f8b6de
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by mw:
URL: https://cgit.FreeBSD.org/src/commit/?id=ffcc58a767bd6396191ea075a422316e97f8b6de
commit ffcc58a767bd6396191ea075a422316e97f8b6de
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-04-06 01:58:03 +0000
Commit: Marcin Wojtas <mw@FreeBSD.org>
CommitDate: 2023-01-31 12:46:49 +0000
ena: Remove write only variables
Sponsored by: Netflix
(cherry picked from commit 094b2a2379c1c92f134fac22be78517c71470ca6)
---
sys/dev/ena/ena_sysctl.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/sys/dev/ena/ena_sysctl.c b/sys/dev/ena/ena_sysctl.c
index db426ae89aeb..68b956d2654a 100644
--- a/sys/dev/ena/ena_sysctl.c
+++ b/sys/dev/ena/ena_sysctl.c
@@ -466,11 +466,9 @@ ena_sysctl_add_rss(struct ena_adapter *adapter)
void
ena_sysctl_update_queue_node_nb(struct ena_adapter *adapter, int old, int new)
{
- device_t dev;
struct sysctl_oid *oid;
int min, max, i;
- dev = adapter->pdev;
min = MIN(old, new);
max = MIN(MAX(old, new), adapter->max_num_io_queues);
@@ -815,7 +813,6 @@ ena_sysctl_rss_indir_table(SYSCTL_HANDLER_ARGS)
{
int num_queues, error;
struct ena_adapter *adapter = arg1;
- struct ena_com_dev *ena_dev;
struct ena_indir *indir;
char *msg, *buf, *endp;
uint32_t idx, value;
@@ -831,7 +828,6 @@ ena_sysctl_rss_indir_table(SYSCTL_HANDLER_ARGS)
goto unlock;
}
- ena_dev = adapter->ena_dev;
indir = adapter->rss_indir;
msg = indir->sysctl_buf;
From nobody Tue Jan 31 13:18:07 2023
X-Original-To: dev-commits-src-branches@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 4P5lwb5vGzz3cV5X;
Tue, 31 Jan 2023 13:18:07 +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 4P5lwb5VK0z3h88;
Tue, 31 Jan 2023 13:18:07 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675171087;
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=UndPfoWcoa6RSlO3MBfee+tCpFU6xnhI9kzPMKUCyzA=;
b=rj7/YsTZijj3TBALWbXBPGF5nQAHIyuTVftzc7OWHDD/79tHBImnpfUjpGZ1Ie0RAbJu9x
FfhQUsRltP2vSP78wLwyDnK00M1s82q5gFh5TzaFHMZYsMVWGgqn64wvLq6PWRo9NYsHIi
e3zMCiehuQagxhAB2aS1obVPNpWh+r9nRpXaKzf+hAf45IRlD1rtLdhLinSBxitgYxGHpm
IlJOJk2qWJ4a+/dv/2kQlWca5Lh9YbbSPG/lzxdF8UP0zZFdlc0fu0bbftmlZRKRKmCApX
0UjElnCsJNHxV1I+Yqddd/pokfpO49LYqizqdZMCh8Thy/1NZD+EO9n7dI4HqQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675171087;
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=UndPfoWcoa6RSlO3MBfee+tCpFU6xnhI9kzPMKUCyzA=;
b=GcambEKo1h0Ii31Vp+djyPc8rePRmEPXRDH+UyZveekcHQu8c64mqg4fJTEcjDbI407t3N
JARvre8z3YhCiQQHdZpOWNyOOTIx8mmRJsLXLIBYg9wMxeTNqXmtrQqKiHAHWbhsY/FLaz
OxTiHUsazqg4l/hLQLQAhqkFKnOcjmB6gPuNs2MkJcD8SPJ2mn4s+YLduk+9tVpOcCkPgF
YxI2VOadd3Jc3I6pR1t6OJQU9HGsgrHxwtl5M7K9HKRAve5gMEDcOMYhFU1H0Fkmw4/WU6
kwPa1Tsif9r3UYJVD8lDeB5sf9iQ8ZXdMxwVEgKXSoi2HSH/AtQ7cRh4e7HrsA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675171087; a=rsa-sha256; cv=none;
b=x1OT/MOW9FgzFVn+E/L2oEVFlzGx5ayrIZGZaFMUamv4hATsnU+VgbdNrkleo6BSmtXUch
j07l4hzyeHLFwxGgR5mGbtGcu41+SDNNk7EkRyq7hlVtRme/pPKKJtoVh7Uay585ZPo8em
BW+npYPdH9LIbl5bmPvdtaTKqR2tTBSF36QY3GgPJsuH3gOX7wjyiGAzvPI2qZ9yXV7vX9
HQuIP+8TQdnRGhpwGUNX4o5hqBBksLhD8rEpVCamtmu9Vp7mn5CCmX3YSmI6BGEriJo8im
+cXs84oV9kl0UVLof5EqPGB2DHgAUVLvdZu4exy9UdqFvZoktLxzeVFnHqm9cw==
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 4P5lwb4cRRzpt3;
Tue, 31 Jan 2023 13:18:07 +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 30VDI75Z041020;
Tue, 31 Jan 2023 13:18:07 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30VDI7OT041019;
Tue, 31 Jan 2023 13:18:07 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 13:18:07 GMT
Message-Id: <202301311318.30VDI7OT041019@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Marcin Wojtas <mw@FreeBSD.org>
Subject: git: 113c730edcca - stable/12 - ena: Re-Enable per-packet missing tx completion print
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mw
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 113c730edcca8244bd14e6c23916dcdfda5da944
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by mw:
URL: https://cgit.FreeBSD.org/src/commit/?id=113c730edcca8244bd14e6c23916dcdfda5da944
commit 113c730edcca8244bd14e6c23916dcdfda5da944
Author: Arthur Kiyanovski <akiyano@amazon.com>
AuthorDate: 2022-12-19 13:56:44 +0000
Commit: Marcin Wojtas <mw@FreeBSD.org>
CommitDate: 2023-01-31 12:46:50 +0000
ena: Re-Enable per-packet missing tx completion print
Commit [1] first added the ena_tx_buffer.print_once member,
so that a message about a missing tx completion is printed only
once per packet (and not every second when the watchdog runs).
In this commit print_once is initialized to true, and is set back
to false after detecting a missing tx completion and printing
a warning about it to dmesg.
Commit [2] incorrectly reverses the values assigned to print_once.
The variable is initialized to be true but is checked to be false
when a missing tx completion is detected. This is never true, and
therefore the warning print for each missing tx completion is never
printed since this commit.
Commit [3] added time passed since last TX cleanup to the missing
tx completions per-packet print. However, due to the issue in commit
[2], this time is never printed.
This commit reverses back the values assigned to ena_tx_buffer.print_once
erroneously by commit [2], bringing back to life the missing tx
completion per-packet print.
Also add a space after "." in the missing tx completion print.
[1] - 9b8d05b8ac78 ("Add support for Amazon Elastic Network Adapter (ENA) NIC")
[2] - 74dba3ad7851 ("Split function checking for missing TX completion in ENA driver")
[3] - d8aba82b5ca7 ("ena: Store ticks of last Tx cleanup")
Fixes: 74dba3ad7851 ("Split function checking for missing TX completion in ENA driver")
Fixes: d8aba82b5ca7 ("ena: Store ticks of last Tx cleanup")
MFC after: 2 weeks
Sponsored by: Amazon, Inc.
(cherry picked from commit f01b2cd98e93ef5ac3698b97bbaa45ac9c50fe5d)
---
sys/dev/ena/ena.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c
index a93e55e36bde..fe9c411f125a 100644
--- a/sys/dev/ena/ena.c
+++ b/sys/dev/ena/ena.c
@@ -3023,19 +3023,19 @@ check_missing_comp_in_tx_queue(struct ena_adapter *adapter,
/* Check again if packet is still waiting */
if (unlikely(time_offset > adapter->missing_tx_timeout)) {
- if (!tx_buf->print_once) {
+ if (tx_buf->print_once) {
time_since_last_cleanup = TICKS_2_USEC(ticks -
tx_ring->tx_last_cleanup_ticks);
missing_tx_comp_to = sbttoms(
adapter->missing_tx_timeout);
ena_log(pdev, WARN,
- "Found a Tx that wasn't completed on time, qid %d, index %d."
+ "Found a Tx that wasn't completed on time, qid %d, index %d. "
"%d usecs have passed since last cleanup. Missing Tx timeout value %d msecs.\n",
tx_ring->qid, i, time_since_last_cleanup,
missing_tx_comp_to);
}
- tx_buf->print_once = true;
+ tx_buf->print_once = false;
missed_tx++;
}
}
From nobody Tue Jan 31 13:18:08 2023
X-Original-To: dev-commits-src-branches@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 4P5lwc70P6z3cVJq;
Tue, 31 Jan 2023 13:18:08 +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 4P5lwc6SrJz3hDh;
Tue, 31 Jan 2023 13:18:08 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675171088;
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=MZbCh9JwAKFU0kHUR7R52qIGU8tovfkk9INLVWD8+pU=;
b=na9WHN+TENuiwyvuPAzrPnF3ARrQPBa0kPloOP7EfJhc4aIVFVzUDhPFOTRAknaQobEaVU
xtAyXS0VTYRKi+4GWnFkytOHvs9RR2MEvnnOztJlNYQnBHqHFbgl3/NHFGYWUzKCvQeeS1
bz0rWOOm2ApiQrqnvPT8sGKL4Yz99QoZ3pDHHa9UbNQR5Pq1UqvsKxiaNPG0N+v1J8xMhN
0MxR27fqvei1WVsmQF9WLjz4wpuucpfZZLmE53tPn9mTdbQ2ElTiAWzTEqxZT4Q03I7aqZ
4HZaT3Qg1ETQVg3BC8YcZc6t15dQrIPfSpC/NMPUNWmT3hj64BFlgzhhpfBHyQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675171088;
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=MZbCh9JwAKFU0kHUR7R52qIGU8tovfkk9INLVWD8+pU=;
b=sh5O7N5fqXmsXwqK9evZfnPS428RLoEJaXBUcJugINTB2ZaXJDNCaAmk7prGhX2reFllNK
yhFQNrhE/gLfOmpPswrcPXcvhQAOjCqeO0KS/c3qKAVstkjhmllOMncgaheKorZ1HIe+9V
Zu/I38wjxfr1oXpEZsaw5zlpqrzzWtB5H6HvTbUJQ0ikqn0Ww+62qMUbWJcXKpOqNjV1yM
oS4RlwWOW5KopAUaYtgRdkrWFrPO+0G/M+Sm55kAlWCuzdx4is637qbj+Xy8ET5TjVxqyK
31jRb0tbdKF9WEUvtH+Q2XFvmeSWvEDZYfbyLJmHeW1H0rHLVhgjfuEJMfWqUA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675171088; a=rsa-sha256; cv=none;
b=FpePn6tflbcgv4FoGAZcEsc9NmziUEN7694WMNNIufMwpL0D80rDF+6efY4CmC216phTic
vip5n/mug+GJb+MsvdKcKDL24VzZbpzDv1KL6GrPLQvpxxf3WwXagvECMmyRDKREwR1Boo
lqzVma3Wx29w/FgNnvwCXS4mYMDHiKyvwOww1AOucmfYOvWyKDUpNj/sIyr6NYqBOzizOQ
qrApOzp3CHQmyn6AriJ+Kgdp1lNNIlTcbkLX3zb+R+d0EJTFDhh6uTAZPkpbfz60kUmUOr
z4/ZJeFR9ipEIGLaeFximWEZEcjTBAUgxkjf/s6WBJ9pQzowedpLExc57cUSaw==
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 4P5lwc5ZYNzqhB;
Tue, 31 Jan 2023 13:18:08 +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 30VDI8fx041044;
Tue, 31 Jan 2023 13:18:08 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30VDI8hG041043;
Tue, 31 Jan 2023 13:18:08 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 13:18:08 GMT
Message-Id: <202301311318.30VDI8hG041043@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Marcin Wojtas <mw@FreeBSD.org>
Subject: git: b1f4275bfe86 - stable/12 - ena: Remove timer service re-arm on ena_restore_device failure
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mw
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: b1f4275bfe866345091d8e62a744d01295141370
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by mw:
URL: https://cgit.FreeBSD.org/src/commit/?id=b1f4275bfe866345091d8e62a744d01295141370
commit b1f4275bfe866345091d8e62a744d01295141370
Author: David Arinzon <darinzon@amazon.com>
AuthorDate: 2022-12-04 10:37:32 +0000
Commit: Marcin Wojtas <mw@FreeBSD.org>
CommitDate: 2023-01-31 12:46:50 +0000
ena: Remove timer service re-arm on ena_restore_device failure
In case the reset sequence fails (ena_destroy_device() followed by
ena_restore_device() calls) during ena_restore_device(), the driver
resources are being freed. After the clean-up, the timer service is
re-armed in order to try and re-initialize the driver state.
But, such an attempt would fail given that the resources are freed.
Moreover, this would actually cause either the system to fail or a
panic.
When the driver fails in ena_restore_device() procedure, the only
recovery is either unloading and loading the driver or instance
reboot.
This change removes the timer service re-arm in case of failure
in ena_restore_device().
MFC after: 2 weeks
Sponsored by: Amazon, Inc.
Fixes: 78554d0c707c ("ena: start timer service on attach")
(cherry picked from commit c4a85b8d684d3db9dc4d3d01d966130e21390529)
---
sys/dev/ena/ena.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c
index fe9c411f125a..15c8d39d8fb5 100644
--- a/sys/dev/ena/ena.c
+++ b/sys/dev/ena/ena.c
@@ -3454,8 +3454,6 @@ err:
ENA_FLAG_CLEAR_ATOMIC(ENA_FLAG_ONGOING_RESET, adapter);
ena_log(dev, ERR, "Reset attempt failed. Can not reset the device\n");
- ENA_TIMER_RESET(adapter);
-
return (rc);
}
From nobody Tue Jan 31 13:18:09 2023
X-Original-To: dev-commits-src-branches@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 4P5lwf31MXz3cV5f;
Tue, 31 Jan 2023 13:18:10 +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 4P5lwf091pz3hBQ;
Tue, 31 Jan 2023 13:18:10 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675171090;
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=21Pxx9Fr3dU5u9qjTw9aqiEv29hEuULWRe7rXqLXcvM=;
b=NcUOaKX/yJSA433XKzg4Iyrk0/9uKpyCsfEFnjM/xmWcgyJXpIdh7GgAUSnl2NOdMAo/fQ
Ax7rJkq6qS/klYDK8z1IFfHQ3H+W5ejokY+QysANHbAcAl+bq07kIHfZa2Yy7OXbwIrCXy
U1yTcqVjrSTxcrQEay57ZBFBNyu4mD8pWIJs5qcp7vCYTS7cTQPrlIjy72htjJa8ugiGZa
rEQkm6QOw0sUnTnm1VCAAPLQMcC7cknWl4nQI4Av0/7L394SPiBeoXkSKK0n4moFS9Wmq4
vc1KUekdhJQwG3GElKcKJYOWU1VuHztF4a3nCG+nuARYS/e/cZzGWzG8v58t2w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675171090;
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=21Pxx9Fr3dU5u9qjTw9aqiEv29hEuULWRe7rXqLXcvM=;
b=y0T5UIMD0QAMiNmsuxqdxjpZfS/92QE5Ytbl0Ss0/Uk9VWzO9erOhdzC/7EykF50O/pZVa
rhcVf6/esHAxYEhNOKZWgXLTOd83113ILpsUwh25Do1hoTJPOz5ZSgE+6At1MAV5guN8JC
Mazy13Gr6LCSRjMOteZwy/+nh8hQ1cyujC6ym75nzadUDrVhm9k4DjrmuHIIVcxGD50cXc
Nqv5Cl1wRxNpKpPstALoP/337pAJZql7+3ig/NUXLS70BVtH/1FK5P3kbXZeezIF+uVtx+
QsIl/nqFZswXGIzlma7getRiMVlcqnwIjSXZHaqe3oIn7rYTrocFXn/MUxB29A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675171090; a=rsa-sha256; cv=none;
b=o0pwLIlOteYtY5GP+aPFCEytOiofedjXyB9YOef+Gr07cxIENkU+ahlw+QFoCAra9PVG0+
rgNEgcALQRcfs48rOlOga4Ee31IPdcpyIueTso8Yh/1An8tBFIYpBXcQyoYX2+WuGav46H
b6BXlFTOCR3h3F41M8B2SPfsNXGLvcC7QI2bdtVZ/9E8y3+e20tcsWXBYAYyjSNMSzDzZn
ewZXgHlUr7Gs0CTFXqnS9wcnRH7OLEBfmYYXYP8BTPC+yq8hNNaLR3k89ryQ2DGgsEoeHe
bsOKqzerwWuvVJbzQJtsBJS9lFM1A787CC1IjNUPFXibk+IvYwr18CwR9RJ8HQ==
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 4P5lwd6JmyzqVb;
Tue, 31 Jan 2023 13:18:09 +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 30VDI9jv041070;
Tue, 31 Jan 2023 13:18:09 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30VDI9PQ041069;
Tue, 31 Jan 2023 13:18:09 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 13:18:09 GMT
Message-Id: <202301311318.30VDI9PQ041069@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Marcin Wojtas <mw@FreeBSD.org>
Subject: git: 235f2ddf9dff - stable/12 - ena: Switch driver owners from semihalf to amazon in man file
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mw
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 235f2ddf9dff5e2377589814927df9bf5a50b4aa
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by mw:
URL: https://cgit.FreeBSD.org/src/commit/?id=235f2ddf9dff5e2377589814927df9bf5a50b4aa
commit 235f2ddf9dff5e2377589814927df9bf5a50b4aa
Author: Arthur Kiyanovski <akiyano@amazon.com>
AuthorDate: 2022-12-13 12:34:08 +0000
Commit: Marcin Wojtas <mw@FreeBSD.org>
CommitDate: 2023-01-31 12:46:50 +0000
ena: Switch driver owners from semihalf to amazon in man file
1. Update ena.4 manual file to include amazon owner emails.
2. State that the driver is developed by amazon but leave
that it was originally written by Semihalf, similarly to other
drivers in the /share/man/ directory of the FreeBSD source code.
3. Advance year in copyright notice to 2022.
MFC after: 2 weeks
Sponsored by: Amazon, Inc.
(cherry picked from commit fb47286c38a5315bdd93389b0547b8ccccdc7327)
---
share/man/man4/ena.4 | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/share/man/man4/ena.4 b/share/man/man4/ena.4
index 6b41a50cf41d..80d82a639a8c 100644
--- a/share/man/man4/ena.4
+++ b/share/man/man4/ena.4
@@ -1,6 +1,6 @@
.\" SPDX-License-Identifier: BSD-2-Clause
.\"
-.\" Copyright (c) 2015-2020 Amazon.com, Inc. or its affiliates.
+.\" Copyright (c) 2015-2022 Amazon.com, Inc. or its affiliates.
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -519,10 +519,10 @@ for more details.
.Sh SUPPORT
If an issue is identified with the released source code with a supported
adapter, please email the specific information related to the issue to
-.Aq Mt mk@semihalf.com ,
-.Aq Mt dgr@semihalf.com
+.Aq Mt akiyano@amazon.com ,
+.Aq Mt osamaabb@amazon.com
and
-.Aq Mt mw@semihalf.com .
+.Aq Mt darinzon@amazon.com .
.Sh SEE ALSO
.Xr netmap 4 ,
.Xr vlan 4 ,
@@ -535,5 +535,5 @@ driver first appeared in
.Sh AUTHORS
The
.Nm
-driver was written by
+driver was developed by Amazon and originally written by
.An Semihalf.
From nobody Tue Jan 31 13:18:10 2023
X-Original-To: dev-commits-src-branches@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 4P5lwg2BW2z3cVBy;
Tue, 31 Jan 2023 13:18:11 +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 4P5lwg1Bv2z3hBj;
Tue, 31 Jan 2023 13:18:11 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675171091;
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=3hPUc8jh+bgYSb3EyoGQ51hQPFquIjnbnk8xyt5O85I=;
b=marVssGIYZDzwbbkUogsITGWhLfJU9SnjdgEWSxYbIe+byetTscDWWiWb7ZsjLL6e9mjgj
w9odRfTvLzWJfGQ1qDX6iTvgvf7GuPVEg7apUjqG+CFMIL5hXhQiVJyixdtCqDld4mC0f5
ZiP0+FgCGIKMsbzcd9d7zVCv7hkGLVKEjkYGbf/wI/c528Tfdl3JJ0wufuVRB0lp02mu73
Gq79KpvqIhnk3EK1Pym6BfrlQXxwL8yLDLQieP771zj735p/D0yixAAIsYqIr94YOU5DQo
iDIphZ5OYOfkZqQWrRZWZijLsutKQPH4ex1npPx29g04qT9BHviTi2kM3wObdA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675171091;
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=3hPUc8jh+bgYSb3EyoGQ51hQPFquIjnbnk8xyt5O85I=;
b=tlJajj+pOfvLFRibtL2XomzdzsusUqyKUDJfrDpe1u9TkHJS5imk7jRPpSgAv5ZSh9pBul
LYKtvCk5WHHzerqkwSNaWKR1d58KjAciavPn70/Wwkc6QLBd7YVNLts4XTdTsypNlwAaQ9
MfwdmxwwLvyCMtc4UaFiSLYnM3L63BsdBR2Upg7FFzX1Y9XFuzadzP8m0AUtz81S5m2Xa3
LpNcQ7v2QBJgK0YOYyz0cpwfNGEx5IGYGt/3pQ9e3C5BdmHMogsC7JHhYnMhOQrLaEX+tQ
G3i8pL5HndvzxiYQAsP9V0qfo+DpcAIlAnBetblVEQLV0NvfJT9He7A92duw0A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675171091; a=rsa-sha256; cv=none;
b=nWp3V1Ey3MVgUOqgAmOwKIaQt+QAkuTEBaLnCQhrkxPipucn2LD4nfAzYzYKgSRK8g9fXV
/JFB4M+5n7fkqPaNxA3eRoK870jmCIQ50BNabz+XM3Rd4TrpUxH2lWqjGhgvkkQuCm2k0f
SfNI7VV7ZGuFHGB3/5ojmjFoo3QRlgK5nXAsi15BJYe9mM9S8nCWWGultZK3Sz/ZyLpDlx
TIV3gCbwrD1fRKcVgAdTZBOZ7eLKvRkkBgfgl0IQliyMsVGAADppDB+XKpKy46EAeKRFuU
q6oAzUkA1sjoJihuOaD9Nw9bZRmVH8F0uMhFn/vQmttO/rSi7918DEbpMrA+rw==
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 4P5lwg0J3RzqVc;
Tue, 31 Jan 2023 13:18:11 +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 30VDIAJP041097;
Tue, 31 Jan 2023 13:18:10 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30VDIAh1041096;
Tue, 31 Jan 2023 13:18:10 GMT
(envelope-from git)
Date: Tue, 31 Jan 2023 13:18:10 GMT
Message-Id: <202301311318.30VDIAh1041096@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Marcin Wojtas <mw@FreeBSD.org>
Subject: git: 00a6bb16fb6c - stable/12 - ena: Update driver version to v2.6.2
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mw
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 00a6bb16fb6cea9d6d1091ba0f8aaff43eeb33c3
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by mw:
URL: https://cgit.FreeBSD.org/src/commit/?id=00a6bb16fb6cea9d6d1091ba0f8aaff43eeb33c3
commit 00a6bb16fb6cea9d6d1091ba0f8aaff43eeb33c3
Author: Arthur Kiyanovski <akiyano@amazon.com>
AuthorDate: 2022-12-13 16:58:25 +0000
Commit: Marcin Wojtas <mw@FreeBSD.org>
CommitDate: 2023-01-31 12:46:50 +0000
ena: Update driver version to v2.6.2
Bug Fixes:
* Remove timer service re-arm on ena_restore_device failure.
* Re-Enable per-packet missing tx completion print
Minor Changes:
* Switch driver owners from Semihalf to Amazon in man file.
MFC after: 2 weeks
Sponsored by: Amazon, Inc.
Pull Request: https://github.com/freebsd/freebsd-src/pull/637
(cherry picked from commit e5de1d8dad25308f3a332f9386e05b851a36c507)
---
sys/dev/ena/ena.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/dev/ena/ena.h b/sys/dev/ena/ena.h
index aa945d91baf0..75fb00652460 100644
--- a/sys/dev/ena/ena.h
+++ b/sys/dev/ena/ena.h
@@ -41,7 +41,7 @@
#define ENA_DRV_MODULE_VER_MAJOR 2
#define ENA_DRV_MODULE_VER_MINOR 6
-#define ENA_DRV_MODULE_VER_SUBMINOR 1
+#define ENA_DRV_MODULE_VER_SUBMINOR 2
#define ENA_DRV_MODULE_NAME "ena"
From nobody Wed Feb 1 02:42:11 2023
X-Original-To: dev-commits-src-branches@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 4P65mN157Xz3bnPw;
Wed, 1 Feb 2023 02:42: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 4P65mN0nrrz4GlR;
Wed, 1 Feb 2023 02:42:12 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675219332;
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=uBraRNnNdsNM1b9DB3VV94usoZPXqcsD2k9BDHxvQZM=;
b=bL1YhPgUxQDXdeXo9YVIpE9RgQOi0h8BggaDbJ5JvIOr/3MXu5KAfqTdGgg/G+kb+pDn8q
yIJznJHSHeu9Bylo3KCjHYQCUYcs6IFjmjMgrTf6Z40TFxuBC4Fd1oO4hRUY5q5SjQtAj4
jXGPw876WG2/UmCht3Rfw7ukS+bvcbtE3kDClbOgUlLBEyIATfLlyZ2QzhCbJn1I+1mC7j
+lOgQlt6mOzP6wRfMlBXxcZLp1bcdaVA5oyKXO/D3xasyZMSeXCMHYf7I9UydXLcM/y9By
BR/oswuI1k6iMq0KuQjzHbMehki9yTbXl5P2CWqG0ZOTwaaHAEcA4ixDdv0UsA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675219332;
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=uBraRNnNdsNM1b9DB3VV94usoZPXqcsD2k9BDHxvQZM=;
b=BkFhGmYsh5tW38TQLQTiC9JNaP6JRzvNzORl/dIrgRnx1yBuM9rJeqLLcIpilUe3ijv3Tw
JPNWyPRhXOfT/yZYGGP4LKpmwZAs5hnl3Y0rfV+6fhahV+0UlX2qk7CcKH9T5ilvdW064c
KFTxlbvXTNedQJ3B0fmCSz6T9j3Q508Mppv1FUCOs/Ty4cWKCdcWz4i/xu8AN+mMkSmYdg
6kL4JDk/gzghWMoI3T0f40Qb0E1pEd63wTHGH+OOaT1ZOCTUlpUdm+0R4vhYx6m3F8wPZs
rw0lLerYqOBy8JxMIEeaInnpq5++qcKhweTUOex8kMwswq8IXlKUOTpPRegY+w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675219332; a=rsa-sha256; cv=none;
b=AqaagPSMHps2VoKQNofGpc6mzhiS/ZlFC1bAR4gFUxpRQLkKNewz4k3iJl/1NFRcXMaovT
8dt9ilMzxKfu/IsLzqVoKUwlptOsFj8TsPRWRhsqyLFyZsUFp14rW5iPsY9cFgJHRTkuX0
pUd3HqfqgmA2YQA7+22Yb+I2QjL6H5c8RHGfrWwCBpglVaWjBzvnkSibEWK0Vq+JuNk/WE
SnzclCi3BvqgD7zOz3jDAUYVfn1GCpgBeEm0KB2smZyCKg2BCYmXAZDHp4Et1dy6oFdSYW
pR+bgHGg+UzTZchPgjMwO6qlejjjKyDWUP34vswXC/NpcWz8Ffmdumw/sLNh9A==
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 4P65mM6y2Tz1Bwb;
Wed, 1 Feb 2023 02:42:11 +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 3112gBAZ091530;
Wed, 1 Feb 2023 02:42:11 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3112gBbo091529;
Wed, 1 Feb 2023 02:42:11 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 02:42:11 GMT
Message-Id: <202302010242.3112gBbo091529@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Subject: git: 68e86d5265bc - stable/13 - Merge commit '28fbd2825d216dafca4d991ad96d05b312f4f9a3'
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gshapiro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 68e86d5265bc841d28f466411c8eb28fbc32225a
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by gshapiro:
URL: https://cgit.FreeBSD.org/src/commit/?id=68e86d5265bc841d28f466411c8eb28fbc32225a
commit 68e86d5265bc841d28f466411c8eb28fbc32225a
Author: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
AuthorDate: 2023-01-15 21:20:22 +0000
Commit: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
CommitDate: 2023-02-01 02:29:59 +0000
Merge commit '28fbd2825d216dafca4d991ad96d05b312f4f9a3'
Merge vendor sendmail 8.17.1 into HEAD
(cherry picked from commit 2fb4f839f3fc72ce2bab12f9ba4760f97f73e97f)
---
contrib/sendmail/CACerts | 148 ++---
contrib/sendmail/KNOWNBUGS | 8 +
contrib/sendmail/Makefile | 16 +-
contrib/sendmail/PGPKEYS | 177 +++++-
contrib/sendmail/README | 5 -
contrib/sendmail/RELEASE_NOTES | 139 ++++-
contrib/sendmail/cf/README | 79 ++-
contrib/sendmail/cf/cf/Makefile | 29 +-
contrib/sendmail/cf/cf/submit.cf | 39 +-
contrib/sendmail/cf/cf/submit.mc | 3 +
contrib/sendmail/cf/feature/check_cert_altnames.m4 | 2 +-
contrib/sendmail/cf/feature/check_other.m4 | 46 ++
contrib/sendmail/cf/feature/delay_checks.m4 | 2 +-
contrib/sendmail/cf/feature/dnsbl.m4 | 2 +-
contrib/sendmail/cf/feature/enhdnsbl.m4 | 2 +-
contrib/sendmail/cf/feature/nopercenthack.m4 | 2 +-
contrib/sendmail/cf/feature/nouucp.m4 | 2 +-
contrib/sendmail/cf/feature/sts.m4 | 19 +
contrib/sendmail/cf/m4/cfhead.m4 | 8 +-
contrib/sendmail/cf/m4/proto.m4 | 338 +++++++++--
contrib/sendmail/cf/m4/version.m4 | 2 +-
contrib/sendmail/cf/mailer/local.m4 | 2 +-
contrib/sendmail/contrib/AuthRealm.p0 | 17 +-
contrib/sendmail/contrib/cidrexpand | 77 ++-
contrib/sendmail/contrib/doublebounce.pl | 0
contrib/sendmail/contrib/link_hash.sh | 0
contrib/sendmail/contrib/re-mqueue.pl | 0
contrib/sendmail/doc/op/op.me | 216 ++++++-
contrib/sendmail/editmap/editmap.8 | 22 +-
contrib/sendmail/editmap/editmap.c | 13 +-
contrib/sendmail/include/libmilter/mfapi.h | 2 +-
contrib/sendmail/include/libsmdb/smdb.h | 6 +-
contrib/sendmail/include/sendmail/pathnames.h | 2 +-
contrib/sendmail/include/sm/bdb.h | 4 +-
contrib/sendmail/include/sm/conf.h | 1 +
contrib/sendmail/include/sm/gen.h | 12 +
contrib/sendmail/include/sm/ixlen.h | 43 ++
contrib/sendmail/include/sm/notify.h | 5 +-
contrib/sendmail/include/sm/os/sm_os_freebsd.h | 5 +
contrib/sendmail/include/sm/os/sm_os_openbsd.h | 20 +-
contrib/sendmail/include/sm/rpool.h | 10 +-
contrib/sendmail/include/sm/sem.h | 2 +-
contrib/sendmail/include/sm/sendmail.h | 24 +-
contrib/sendmail/include/sm/shm.h | 2 +-
contrib/sendmail/include/sm/sysexits.h | 4 +
contrib/sendmail/include/sm/time.h | 2 -
contrib/sendmail/libmilter/docs/overview.html | 3 +-
.../sendmail/libmilter/docs/smfi_setmlreply.html | 24 +-
contrib/sendmail/libmilter/engine.c | 48 +-
contrib/sendmail/libmilter/listener.c | 26 +-
contrib/sendmail/libmilter/sm_gethost.c | 4 +-
contrib/sendmail/libsm/Makefile.m4 | 12 +-
contrib/sendmail/libsm/cf.c | 3 +-
contrib/sendmail/libsm/clock.c | 79 +--
contrib/sendmail/libsm/config.c | 4 +-
contrib/sendmail/libsm/heap.c | 27 +-
contrib/sendmail/libsm/ilenx.c | 40 ++
contrib/sendmail/libsm/ldap.c | 66 +--
contrib/sendmail/libsm/lowercase.c | 162 ++++++
contrib/sendmail/libsm/makebuf.c | 2 +-
contrib/sendmail/libsm/mbdb.c | 54 +-
contrib/sendmail/libsm/memstat.c | 4 +-
contrib/sendmail/libsm/niprop.c | 20 +-
contrib/sendmail/libsm/notify.c | 65 ++-
contrib/sendmail/libsm/refill.c | 2 +-
contrib/sendmail/libsm/rpool.c | 29 +-
contrib/sendmail/libsm/sem.c | 16 +-
contrib/sendmail/libsm/shm.c | 8 +-
contrib/sendmail/libsm/signal.c | 76 +--
contrib/sendmail/libsm/strcaseeq.c | 114 ++++
contrib/sendmail/libsm/string.c | 3 -
contrib/sendmail/libsm/stringf.c | 2 +-
contrib/sendmail/libsm/t-ixlen.c | 105 ++++
contrib/sendmail/libsm/t-ixlen.sh | 41 ++
contrib/sendmail/libsm/t-notify.c | 128 ++--
contrib/sendmail/libsm/t-qic.c | 31 +-
contrib/sendmail/libsm/t-sem.c | 9 +-
contrib/sendmail/libsm/t-shm.c | 1 +
contrib/sendmail/libsm/t-str2prt.c | 64 ++
contrib/sendmail/libsm/t-streq.c | 77 +++
contrib/sendmail/libsm/t-streq.sh | 29 +
contrib/sendmail/libsm/utf8_valid.c | 104 ++++
contrib/sendmail/libsm/util.c | 60 +-
contrib/sendmail/libsm/uxtext_unquote.c | 204 +++++++
contrib/sendmail/libsm/vasprintf.c | 2 +-
contrib/sendmail/libsm/vfprintf.c | 7 +-
contrib/sendmail/libsm/vprintf.c | 2 +-
contrib/sendmail/libsm/vsnprintf.c | 2 +-
contrib/sendmail/libsm/xleni.c | 43 ++
contrib/sendmail/libsmdb/smcdb.c | 21 +-
contrib/sendmail/libsmdb/smdb2.c | 10 +-
contrib/sendmail/libsmutil/Makefile.m4 | 6 +
contrib/sendmail/libsmutil/cf.c | 3 +
contrib/sendmail/libsmutil/safefile.c | 60 +-
contrib/sendmail/libsmutil/t-lockfile-0.sh | 70 +++
contrib/sendmail/libsmutil/t-lockfile.c | 351 +++++++++++
contrib/sendmail/libsmutil/t-maplock-0.sh | 111 ++++
contrib/sendmail/mail.local/mail.local.c | 114 ++--
contrib/sendmail/mailstats/mailstats.8 | 26 +-
contrib/sendmail/makemap/makemap.c | 69 ++-
contrib/sendmail/praliases/praliases.8 | 6 +-
contrib/sendmail/praliases/praliases.c | 7 +-
contrib/sendmail/rmail/rmail.8 | 30 +-
contrib/sendmail/smrsh/smrsh.c | 4 +-
contrib/sendmail/src/README | 68 ++-
contrib/sendmail/src/TRACEFLAGS | 8 +
contrib/sendmail/src/alias.c | 76 ++-
contrib/sendmail/src/aliases.5 | 66 +--
contrib/sendmail/src/collect.c | 9 +-
contrib/sendmail/src/conf.c | 596 ++++++++++---------
contrib/sendmail/src/conf.h | 4 +-
contrib/sendmail/src/control.c | 23 +-
contrib/sendmail/src/convtime.c | 3 +-
contrib/sendmail/src/daemon.c | 131 ++++-
contrib/sendmail/src/deliver.c | 529 +++++++++++++----
contrib/sendmail/src/domain.c | 106 +++-
contrib/sendmail/src/envelope.c | 57 +-
contrib/sendmail/src/err.c | 77 ++-
contrib/sendmail/src/headers.c | 183 ++++--
contrib/sendmail/src/helpfile | 8 +-
contrib/sendmail/src/macro.c | 22 +-
contrib/sendmail/src/mailq.1 | 36 +-
contrib/sendmail/src/main.c | 278 ++++++---
contrib/sendmail/src/map.c | 643 ++++++++++++---------
contrib/sendmail/src/mci.c | 14 +-
contrib/sendmail/src/milter.c | 96 +--
contrib/sendmail/src/mime.c | 27 +-
contrib/sendmail/src/parseaddr.c | 111 ++--
contrib/sendmail/src/queue.c | 562 +++++++++++-------
contrib/sendmail/src/ratectrl.c | 18 +-
contrib/sendmail/src/readcf.c | 502 ++++++++++------
contrib/sendmail/src/recipient.c | 67 ++-
contrib/sendmail/src/savemail.c | 48 +-
contrib/sendmail/src/sendmail.8 | 359 ++++++------
contrib/sendmail/src/sendmail.h | 188 ++++--
contrib/sendmail/src/sfsasl.c | 34 +-
contrib/sendmail/src/sm_resolve.c | 148 +++--
contrib/sendmail/src/sm_resolve.h | 1 -
contrib/sendmail/src/srvrsmtp.c | 408 +++++++++----
contrib/sendmail/src/stab.c | 25 +-
contrib/sendmail/src/stats.c | 2 +-
contrib/sendmail/src/tls.c | 54 +-
contrib/sendmail/src/tls.h | 29 +-
contrib/sendmail/src/tlsh.c | 11 +-
contrib/sendmail/src/trace.c | 2 +-
contrib/sendmail/src/udb.c | 32 +-
contrib/sendmail/src/usersmtp.c | 347 +++++++----
contrib/sendmail/src/util.c | 232 ++++++--
contrib/sendmail/src/version.c | 2 +-
contrib/sendmail/test/t_dropgid.c | 17 +-
contrib/sendmail/test/t_exclopen.c | 5 +-
contrib/sendmail/test/t_pathconf.c | 6 +-
contrib/sendmail/test/t_seteuid.c | 5 +-
contrib/sendmail/test/t_setgid.c | 15 +-
contrib/sendmail/test/t_setreuid.c | 5 +-
contrib/sendmail/test/t_setuid.c | 3 +-
contrib/sendmail/test/t_snprintf.c | 2 +-
contrib/sendmail/vacation/vacation.1 | 10 +-
contrib/sendmail/vacation/vacation.c | 17 +-
159 files changed, 7657 insertions(+), 2919 deletions(-)
diff --git a/contrib/sendmail/CACerts b/contrib/sendmail/CACerts
index 630707555657..5e3b5ee084c7 100644
--- a/contrib/sendmail/CACerts
+++ b/contrib/sendmail/CACerts
@@ -1,7 +1,7 @@
# This file contains some CA certificates that are used to sign the
# certificates of mail servers of members of the sendmail consortium
-# who may reply to questions etc sent to sendmail.org.
-# It is useful to allow connections from those MTAs that can present
+# who may reply to questions etc sent to support.sendmail.org.
+# It is useful to allow connections from those MTAs which can present
# a certificate signed by one of these CA certificates.
#
@@ -9,92 +9,92 @@ Certificate:
Data:
Version: 3 (0x2)
Serial Number:
- 81:9d:41:0f:40:55:ac:4a
- Signature Algorithm: sha1WithRSAEncryption
- Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=CA/emailAddress=ca+ca-rsa2018@esmtp.org
+ 92:a1:3b:d3:90:0b:ea:a7
+ Signature Algorithm: sha256WithRSAEncryption
+ Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=CA/emailAddress=ca+ca-rsa2021@esmtp.org
Validity
- Not Before: Feb 27 02:30:55 2018 GMT
- Not After : Feb 26 02:30:55 2021 GMT
- Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=CA/emailAddress=ca+ca-rsa2018@esmtp.org
+ Not Before: Feb 25 17:44:02 2021 GMT
+ Not After : Feb 25 17:44:02 2024 GMT
+ Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=CA/emailAddress=ca+ca-rsa2021@esmtp.org
Subject Public Key Info:
Public Key Algorithm: rsaEncryption
Public-Key: (2048 bit)
Modulus:
- 00:b8:a3:8d:79:28:c1:1f:9c:11:74:43:26:e1:3b:
- cc:14:87:5b:6b:64:4c:ed:79:1b:7f:2a:03:d0:7b:
- ef:9e:88:b0:64:36:ee:58:ef:fd:d9:c7:20:b3:71:
- e9:6d:1e:a7:bc:c1:7c:3b:fe:2a:e4:16:2f:bc:d6:
- 2c:f5:98:f9:c4:21:1c:ca:c3:7e:57:89:c8:a9:2f:
- da:6b:9b:52:d6:c9:9d:98:97:6d:08:7c:a6:37:4e:
- d4:26:bb:db:73:b0:38:ef:7d:1e:dd:8e:dd:8e:17:
- 2f:a0:3d:a9:0e:4d:f0:2b:b8:14:23:33:ad:c8:a0:
- e5:9d:0f:27:ad:83:a2:78:90:05:ec:29:06:91:07:
- 45:6c:5f:ba:8e:1d:f1:d7:1b:2d:f9:99:ba:2e:27:
- e1:03:7d:e9:d2:54:35:cc:39:79:07:83:d8:93:9b:
- d6:ef:72:ab:d4:63:8e:6b:f7:00:66:5f:77:e8:b6:
- bc:de:5f:8c:d0:ce:1a:c4:db:03:9d:e4:ee:0a:ec:
- 77:c5:f2:30:69:7e:70:12:e5:c2:4a:28:3f:e7:19:
- eb:af:41:fb:e6:a6:1d:b5:fd:2b:99:03:f5:20:90:
- 38:73:bd:43:70:da:cf:1f:34:5d:ab:17:4b:73:cf:
- f9:3d:e1:a2:79:14:de:d8:40:85:82:c4:5a:84:82:
- 32:f1
+ 00:cc:8c:39:bd:cf:55:4f:66:2a:78:c7:65:47:81:
+ dd:d1:3f:08:12:4b:87:40:48:95:5c:24:52:65:a1:
+ 82:1c:f4:90:a1:7c:f7:27:8f:02:e5:cb:ac:89:ae:
+ b8:25:4e:26:da:14:20:07:29:a4:59:03:61:b4:44:
+ ae:45:55:b4:72:7d:66:9a:88:de:59:bf:6f:31:23:
+ 06:29:ab:c2:b9:a0:6c:6a:5d:d0:ac:e6:b8:ac:8a:
+ 6f:5e:bb:f3:19:b5:8d:e1:df:2e:d1:7f:1a:bc:2c:
+ 13:10:65:46:7f:68:c7:60:49:c6:30:4e:a0:24:ed:
+ d4:a8:27:cf:b2:d0:c5:7c:96:47:82:b6:f1:17:0a:
+ 5a:35:82:0b:85:0f:17:71:a9:bd:3a:4c:e6:32:95:
+ 3e:68:f7:3d:f5:04:33:16:19:1e:4c:0a:04:c3:1f:
+ 9e:ba:db:e2:0d:29:c8:3f:29:cf:47:cb:11:db:d2:
+ cd:d0:26:2f:35:eb:7d:a2:60:18:e7:7b:a2:43:15:
+ 59:d7:ea:9d:38:60:f1:48:df:57:54:df:8a:50:b9:
+ e3:5c:72:82:51:b7:05:78:c2:14:08:71:71:1c:06:
+ 44:4a:85:73:08:a8:49:50:b2:d2:fb:da:a2:a5:5a:
+ 36:49:a8:4b:38:56:f6:67:0f:12:34:39:cc:fb:9c:
+ bd:d3
Exponent: 65537 (0x10001)
X509v3 extensions:
- X509v3 Subject Key Identifier:
- 42:37:75:E7:8F:12:CF:D9:EB:21:22:7D:8A:E8:49:21:FD:E2:3A:3A
- X509v3 Authority Key Identifier:
- keyid:42:37:75:E7:8F:12:CF:D9:EB:21:22:7D:8A:E8:49:21:FD:E2:3A:3A
- DirName:/C=US/ST=California/L=Berkeley/O=Endmail Org/OU=MTA/CN=CA/emailAddress=ca+ca-rsa2018@esmtp.org
- serial:81:9D:41:0F:40:55:AC:4A
- X509v3 Basic Constraints:
+ X509v3 Subject Key Identifier:
+ 86:F0:F9:7A:CD:66:A9:16:CC:A3:26:08:3D:B3:B2:42:C2:E5:A9:13
+ X509v3 Authority Key Identifier:
+ keyid:86:F0:F9:7A:CD:66:A9:16:CC:A3:26:08:3D:B3:B2:42:C2:E5:A9:13
+ DirName:/C=US/ST=California/L=Berkeley/O=Endmail Org/OU=MTA/CN=CA/emailAddress=ca+ca-rsa2021@esmtp.org
+ serial:92:A1:3B:D3:90:0B:EA:A7
+ X509v3 Basic Constraints:
CA:TRUE
- X509v3 Subject Alternative Name:
- email:ca+ca-rsa2018@esmtp.org
- X509v3 Issuer Alternative Name:
- email:ca+ca-rsa2018@esmtp.org
- Signature Algorithm: sha1WithRSAEncryption
- 0b:4c:e5:c2:ed:0a:e5:7b:95:29:22:d4:8f:5f:cb:1b:b1:e3:
- 4c:fc:90:e7:2e:97:87:87:a2:63:0d:6d:4d:f0:1f:0d:84:11:
- dc:df:b7:fa:c3:c6:2e:07:e9:a0:e9:a6:9f:54:17:ad:1a:d0:
- 36:be:31:cc:a5:85:a0:45:4a:87:45:80:7e:de:ea:97:68:e0:
- 2b:09:5d:9a:31:6f:f5:78:22:c5:66:2a:99:70:9e:6d:c4:ab:
- f6:90:01:70:53:07:66:6c:a6:b5:ce:4b:36:05:83:87:0c:a7:
- e0:1e:34:d0:5e:76:a4:20:71:cd:9d:c1:ae:82:27:e0:6f:16:
- 57:74:e7:63:9f:d0:3d:72:91:6d:97:a4:82:23:84:dd:6e:0d:
- da:43:00:a7:ce:2f:f8:79:04:67:6a:e5:b0:ab:30:d8:f1:90:
- 10:43:3b:09:77:27:34:a4:d4:c0:25:4e:21:32:a3:ab:60:1c:
- 9d:6e:e2:65:39:51:7f:cd:9f:88:3a:7e:f4:38:af:7b:5b:a7:
- bb:7b:70:97:21:59:fc:5c:55:a1:db:74:0a:37:1e:33:97:5f:
- 70:32:98:b3:d9:99:4e:08:3c:de:01:82:17:9b:49:d7:fa:c9:
- 45:8d:93:cc:42:d6:36:f2:39:3a:47:28:3f:6f:6a:e5:23:f3:
- 5c:d4:a3:1b
+ X509v3 Subject Alternative Name:
+ email:ca+ca-rsa2021@esmtp.org
+ X509v3 Issuer Alternative Name:
+ email:ca+ca-rsa2021@esmtp.org
+ Signature Algorithm: sha256WithRSAEncryption
+ 41:14:09:49:01:5f:51:ff:20:7b:c2:41:79:9d:11:3c:7c:48:
+ d6:43:d4:c6:0d:55:e6:76:bb:2c:c7:fb:dd:10:53:79:30:1a:
+ 35:64:2c:d0:64:b6:5a:fd:a9:d3:e3:09:8c:7d:22:81:b7:71:
+ a6:7d:bf:80:24:79:24:c1:61:6d:54:ab:14:4b:5a:54:cb:75:
+ 47:2e:e5:51:6f:cb:91:b6:a7:e8:aa:8d:78:c5:7e:05:56:3b:
+ 31:02:bd:0c:e4:af:78:27:7d:6d:bf:fd:0f:0d:2a:00:1d:cc:
+ a2:34:4d:a3:9e:70:45:89:56:2d:d2:35:ee:26:ea:0f:9d:fc:
+ c0:2c:64:f6:55:af:de:e0:72:64:e2:20:8f:e2:f2:e9:e2:6c:
+ 3a:0c:45:23:dd:80:57:25:fa:18:bb:25:f8:7e:3c:3b:a7:ef:
+ 40:f0:ba:6f:ce:b1:eb:f9:14:03:04:34:3d:e0:43:a6:8d:95:
+ d0:a4:dc:df:e4:79:ce:8d:e2:1e:30:ff:55:0c:e6:9d:e4:1d:
+ 62:cc:a5:4f:9a:6f:c0:b4:1f:05:7c:a7:c7:b1:72:58:98:ad:
+ 2f:f9:8a:41:0c:48:d5:78:ad:af:eb:ff:59:0b:4a:99:26:5b:
+ e8:8c:e3:e5:6b:01:d9:a0:db:a2:1b:d8:8e:f1:82:38:58:ba:
+ 8c:11:65:36
-----BEGIN CERTIFICATE-----
-MIIE4jCCA8qgAwIBAgIJAIGdQQ9AVaxKMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+MIIE4jCCA8qgAwIBAgIJAJKhO9OQC+qnMA0GCSqGSIb3DQEBCwUAMIGOMQswCQYD
VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTERMA8GA1UEBwwIQmVya2VsZXkx
FDASBgNVBAoMC0VuZG1haWwgT3JnMQwwCgYDVQQLDANNVEExCzAJBgNVBAMMAkNB
-MSYwJAYJKoZIhvcNAQkBFhdjYStjYS1yc2EyMDE4QGVzbXRwLm9yZzAeFw0xODAy
-MjcwMjMwNTVaFw0yMTAyMjYwMjMwNTVaMIGOMQswCQYDVQQGEwJVUzETMBEGA1UE
+MSYwJAYJKoZIhvcNAQkBFhdjYStjYS1yc2EyMDIxQGVzbXRwLm9yZzAeFw0yMTAy
+MjUxNzQ0MDJaFw0yNDAyMjUxNzQ0MDJaMIGOMQswCQYDVQQGEwJVUzETMBEGA1UE
CAwKQ2FsaWZvcm5pYTERMA8GA1UEBwwIQmVya2VsZXkxFDASBgNVBAoMC0VuZG1h
aWwgT3JnMQwwCgYDVQQLDANNVEExCzAJBgNVBAMMAkNBMSYwJAYJKoZIhvcNAQkB
-FhdjYStjYS1yc2EyMDE4QGVzbXRwLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALijjXkowR+cEXRDJuE7zBSHW2tkTO15G38qA9B7756IsGQ27ljv
-/dnHILNx6W0ep7zBfDv+KuQWL7zWLPWY+cQhHMrDfleJyKkv2mubUtbJnZiXbQh8
-pjdO1Ca723OwOO99Ht2O3Y4XL6A9qQ5N8Cu4FCMzrcig5Z0PJ62DoniQBewpBpEH
-RWxfuo4d8dcbLfmZui4n4QN96dJUNcw5eQeD2JOb1u9yq9Rjjmv3AGZfd+i2vN5f
-jNDOGsTbA53k7grsd8XyMGl+cBLlwkooP+cZ669B++amHbX9K5kD9SCQOHO9Q3Da
-zx80XasXS3PP+T3honkU3thAhYLEWoSCMvECAwEAAaOCAT8wggE7MB0GA1UdDgQW
-BBRCN3XnjxLP2eshIn2K6Ekh/eI6OjCBwwYDVR0jBIG7MIG4gBRCN3XnjxLP2esh
-In2K6Ekh/eI6OqGBlKSBkTCBjjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlm
+FhdjYStjYS1yc2EyMDIxQGVzbXRwLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMyMOb3PVU9mKnjHZUeB3dE/CBJLh0BIlVwkUmWhghz0kKF89yeP
+AuXLrImuuCVOJtoUIAcppFkDYbRErkVVtHJ9ZpqI3lm/bzEjBimrwrmgbGpd0Kzm
+uKyKb1678xm1jeHfLtF/GrwsExBlRn9ox2BJxjBOoCTt1Kgnz7LQxXyWR4K28RcK
+WjWCC4UPF3GpvTpM5jKVPmj3PfUEMxYZHkwKBMMfnrrb4g0pyD8pz0fLEdvSzdAm
+LzXrfaJgGOd7okMVWdfqnThg8UjfV1TfilC541xyglG3BXjCFAhxcRwGREqFcwio
+SVCy0vvaoqVaNkmoSzhW9mcPEjQ5zPucvdMCAwEAAaOCAT8wggE7MB0GA1UdDgQW
+BBSG8Pl6zWapFsyjJgg9s7JCwuWpEzCBwwYDVR0jBIG7MIG4gBSG8Pl6zWapFsyj
+Jgg9s7JCwuWpE6GBlKSBkTCBjjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlm
b3JuaWExETAPBgNVBAcMCEJlcmtlbGV5MRQwEgYDVQQKDAtFbmRtYWlsIE9yZzEM
MAoGA1UECwwDTVRBMQswCQYDVQQDDAJDQTEmMCQGCSqGSIb3DQEJARYXY2ErY2Et
-cnNhMjAxOEBlc210cC5vcmeCCQCBnUEPQFWsSjAMBgNVHRMEBTADAQH/MCIGA1Ud
-EQQbMBmBF2NhK2NhLXJzYTIwMThAZXNtdHAub3JnMCIGA1UdEgQbMBmBF2NhK2Nh
-LXJzYTIwMThAZXNtdHAub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQALTOXC7Qrle5Up
-ItSPX8sbseNM/JDnLpeHh6JjDW1N8B8NhBHc37f6w8YuB+mg6aafVBetGtA2vjHM
-pYWgRUqHRYB+3uqXaOArCV2aMW/1eCLFZiqZcJ5txKv2kAFwUwdmbKa1zks2BYOH
-DKfgHjTQXnakIHHNncGugifgbxZXdOdjn9A9cpFtl6SCI4Tdbg3aQwCnzi/4eQRn
-auWwqzDY8ZAQQzsJdyc0pNTAJU4hMqOrYBydbuJlOVF/zZ+IOn70OK97W6e7e3CX
-IVn8XFWh23QKNx4zl19wMpiz2ZlOCDzeAYIXm0nX+slFjZPMQtY28jk6Ryg/b2rl
-I/Nc1KMb
+cnNhMjAyMUBlc210cC5vcmeCCQCSoTvTkAvqpzAMBgNVHRMEBTADAQH/MCIGA1Ud
+EQQbMBmBF2NhK2NhLXJzYTIwMjFAZXNtdHAub3JnMCIGA1UdEgQbMBmBF2NhK2Nh
+LXJzYTIwMjFAZXNtdHAub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQBBFAlJAV9R/yB7
+wkF5nRE8fEjWQ9TGDVXmdrssx/vdEFN5MBo1ZCzQZLZa/anT4wmMfSKBt3Gmfb+A
+JHkkwWFtVKsUS1pUy3VHLuVRb8uRtqfoqo14xX4FVjsxAr0M5K94J31tv/0PDSoA
+HcyiNE2jnnBFiVYt0jXuJuoPnfzALGT2Va/e4HJk4iCP4vLp4mw6DEUj3YBXJfoY
+uyX4fjw7p+9A8LpvzrHr+RQDBDQ94EOmjZXQpNzf5HnOjeIeMP9VDOad5B1izKVP
+mm/AtB8FfKfHsXJYmK0v+YpBDEjVeK2v6/9ZC0qZJlvojOPlawHZoNuiG9iO8YI4
+WLqMEWU2
-----END CERTIFICATE-----
diff --git a/contrib/sendmail/KNOWNBUGS b/contrib/sendmail/KNOWNBUGS
index d3c0a2ff416d..b44f931af585 100644
--- a/contrib/sendmail/KNOWNBUGS
+++ b/contrib/sendmail/KNOWNBUGS
@@ -20,6 +20,14 @@ This list is not guaranteed to be complete.
then it will be truncated which may result in a syntactically
invalid address.
+* Berkeley DB map locking problem with fcntl().
+
+ For Linux the default is to use fcntl() for file locking. However,
+ this does not work with Berkeley DB 5.x and probably later.
+ Switching to flock(), i.e., compile with -DHASFLOCK fixes this
+ (however, the have been problems with flock() on some Linux
+ versions). Alternatively, use CDB or an earlier BDB version.
+
* Delivery to programs that generate too much output may cause problems
If e-mail is delivered to a program which generates too much
diff --git a/contrib/sendmail/Makefile b/contrib/sendmail/Makefile
index daf20f288f8b..1cb6b56d6a3b 100644
--- a/contrib/sendmail/Makefile
+++ b/contrib/sendmail/Makefile
@@ -10,8 +10,8 @@ OPTIONS= $(CONFIG) $(FLAGS)
all: FRC
@for x in $(SUBDIRS); \
do \
- (cd $$x; echo Making $@ in:; pwd; \
- $(SHELL) $(BUILD) $(OPTIONS)); \
+ (cd $$x && echo Making $@ in: && pwd && \
+ $(SHELL) $(BUILD) $(OPTIONS)) || exit; \
done
clean: FRC
@@ -24,22 +24,22 @@ clean: FRC
install: FRC
@for x in $(SUBDIRS); \
do \
- (cd $$x; echo Making $@ in:; pwd; \
- $(SHELL) $(BUILD) $(OPTIONS) $@); \
+ (cd $$x && echo Making $@ in: && pwd && \
+ $(SHELL) $(BUILD) $(OPTIONS) $@) || exit; \
done
install-docs: FRC
@for x in $(SUBDIRS); \
do \
- (cd $$x; echo Making $@ in:; pwd; \
- $(SHELL) $(BUILD) $(OPTIONS) $@); \
+ (cd $$x && echo Making $@ in: && pwd && \
+ $(SHELL) $(BUILD) $(OPTIONS) $@) || exit; \
done
fresh: FRC
@for x in $(SUBDIRS); \
do \
- (cd $$x; echo Making $@ in:; pwd; \
- $(SHELL) $(BUILD) $(OPTIONS) -c); \
+ (cd $$x && echo Making $@ in: && pwd && \
+ $(SHELL) $(BUILD) $(OPTIONS) -c) || exit; \
done
$(SUBDIRS): FRC
diff --git a/contrib/sendmail/PGPKEYS b/contrib/sendmail/PGPKEYS
index 03476f63a5ed..0d0b0d5a766c 100644
--- a/contrib/sendmail/PGPKEYS
+++ b/contrib/sendmail/PGPKEYS
@@ -188,6 +188,182 @@ mk6wxhyuojEHuR7it6IU5BP8vaAGrL1jb1c2EeAe+pdJwpAb1Aq6MU6uWqOGup8t
-----END PGP PUBLIC KEY BLOCK-----
+pub 4096R/4BEE1BEE 2021-01-24
+ Key fingerprint = F4CE 2263 2102 53D6 A9F9 79B0 4C66 EA8D 4BEE 1BEE
+uid Sendmail Signing Key/2021 <sendmail@Sendmail.ORG>
+sub 4096R/A9C0321B 2021-01-24
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGANHTwBEACw6b3NmDyyB6uPll+h+pyOmQrbX+up2S007yTXhj2EnYiriLcL
+MdMspVLXl/wtABtfTZ9Lf3v3FuNwHZsVdSZWCFmwlWPptsRrF0VWwYBzxgH6QIUK
+Qx9sFAD+KVD/9Cfl7YXeu5lZrNn3D8FoQB480jJJRaxshXcB6y9QCyKHeCZx/3Ct
+1TE/tlFOgGoKJzNADOimH5SeEZ2gHhB6WB/yKLQYWS8EAvTlGdgZVo6VY6Ar35cd
+3Z9TCQxS8YDsA0p6zENCJ4QgiwolmgZHa4R3/9jObxhVrIpCKCUN+rSdmKDotugP
+GPDyZ0rZRAaRlyqt3rYKVAztkLTU6TbDNLmDpw3CQv3Tpbb2TT39ySmruVVJLA1C
+DYQrh8f35ic0mDwYxKA5KIPZNj9vcReVrwxPDAV5to4n/ZjNNfnqxRiiq4+IzGZ4
+dTlwh4pECps0WdqphLAoTotFcdvYg8cfHMBULdIGqciAGfu7G0yqvlxt4nRe1k8D
+60yAwDtqgO3ThtiTzuYkHZAUmAYOBYPF4e/X/zicWoL+whirV6AELnmv6lft5TaW
+UfXbcx0njY/QPa1iy3g8qkQcY8durY9OVYnA5X4von1vMC4naEEf/cFsdDBl+nZG
+/XxBHr1QX5/P7egbnnF9qMqry856oPE8bjv1KBqZ52UxmGRl14k8gKcfowARAQAB
+tDFTZW5kbWFpbCBTaWduaW5nIEtleS8yMDIxIDxzZW5kbWFpbEBTZW5kbWFpbC5P
+Ukc+iQJVBBMBCgA/FiEE9M4iYyECU9ap+XmwTGbqjUvuG+4FAmANHTwCGwMLCwkN
+CAoMBwsEAwIGFQoJCAsDBRYCAwEAAh4BAheAAAoJEExm6o1L7hvuZlcP/1ipTzk+
+UT36bM/DbeBHaGhQ4yOSg0iiHzu+bzzP3jZslG7rlLgzowEPk7plDlnVbY6MUeXQ
+4hO7keoAn5Cskg8jsrh+kpWYlNTPPKFdjgcuWbUEVAoRIprq1kEVqcG2ai0t1iaH
+CmrUwFRqCCEPoHKg1U2GKcKafFaxOZwM27kV6yTLM5sYFVsoSh+bJ7sa9hymdwrf
+/d1Rh5E+MHJatn3TXGh06aPkVGozyufTXipsxzd5VaBjLDTYbMFkiOt9MC9Sx2IS
+BO5Ws2tOlNslGiAeXQG8EaJB4xrvhOi4i99nBA5TYWVdOAwfJGUZ+X4hItMwlCIg
+4TaJcYHQ7GASELGSGA7azd2JeqbEskiCdabWF8aSbUxA68HRCOjAAUk5afxqEc5J
+BVfT1QmWAPK5cNQTojbd7msrlGXmcSQyFBUDSzoeQNFhpmDpAXCLnGt0vcwbqTik
+Ft+2vJ9nbSczKHkxmN1hudpVdsUNfgGi7p4VzyQq/OzYFVeMXrBBt6aLyATjCoY9
+b7chMDyJBFLEk47U0qQe2VhexI8Fk9Z8wFTPF97gb3rSk5pAfIbCZ9eDcIZuR5eD
+yDDd23vxsMJK0haD/nZ6gQNqBeCg+zDE8g4T9zCdOtavLuqwOqPUZDnNdke9cA0m
+6GSo2MccibyMdqijETcDOPOC47hrIu68QE54iQEzBBABCgAdFiEEsICXn00EPhnQ
+WjacYp747gyLgzMFAmANHmsACgkQYp747gyLgzP1zgf/QJi9+sMvoNVks4+lU4xW
+9fy4C7+fAO96dJtSO5jSn+9M/C55UmU0kWz8XEU88XCVyChLmpSb+Y+2sf5XhWEY
++KDLUHgqiT6NItozXKVggNFMsxkzDi7mzdkCIevTlcGbQSxai7hbKwZzGPb/OzUK
+pRtLl6hTV5wLlsit41EAwILnRmmn6Iix6SPaCx0YvAIKBiy7CSiJyhPbGEKAeEx9
+OTZ9ce0iQWxaCGNgXv22HPvJ7V3VwmfZBJnHcY0ooxEjz/Ky9kHXc+3yHznlATXs
+pzOMH0z+zmHldvIBz0djgVlhn2TRkKSSTaGd4kbLKLmci4Ax/il5noR1hZ82aVhl
+TokBMwQQAQoAHRYhBLF1lkRTA13O3XvpGWBN+/KFQQq+BQJgDR6pAAoJEGBN+/KF
+QQq+4OAH/RpvOktec2Y0AvzWjHorXWmPLi9xEMIuj2GVVVsg+eXP2CDpYuEOVYLP
+8VCWpObXADj+w0DIOMcyqUbMPxkps+CPXjTRc/qED3FLvGNTfNQMe5hDTbbs/tw2
+FtfI9Jzlwsmhcfg5ZxnQKDCPGPQufN9AbQHWc4VIEwhQRc9T/cfBhioWUwrtkgPT
+BBTPnJp/nA10Rn+ycURA+BLdlhAFwuTYBH7nWHkDJUGLHFIat2RhHRakZNhcMrhE
+cXBrg5ONK9qJYtJXzlHiQhM6NP2RPVvYCzLlqkT13SqvLsPMSncyKlIlUuQZqdcE
+QOwGRgp2jkZeRYVBYfFzfIpu5gxVQYOJATMEEAEKAB0WIQRYcmIYqRNADeZgNgE5
+pMd9qXiEsAUCYA0esAAKCRA5pMd9qXiEsAB0CAChpLMwocSQ6hpY7nfVl6wAb3SP
+9C2Dwr89YxzqBYS7i3b/0pB4t1c4cg0vC72DeOIUwuAwUOq6NVgPYnh/NpovWouP
+HN/3WrI013yGkNZIYz3fb8w2+pk0FFndU121pn3IbVYyMxegyHyN+F5NKZCfsTu+
+imlqje26ecBPuz4wcVqYyl/jnR/MU54uMhQW8q0lxCMS67uta0wd2EaTXNxq17Lp
+Z48pNOBiAXxZnXaP996T+7whtLBr9isgeZyeizenjupX69bllRVbwuO8uboTsisC
+LlUbOLzdvTjuSrAQAzNaAfVjNsxzEvLcxxKaPKPG1ubrHT50k3zpB/Ixi+oliQEz
+BBABCgAdFiEEynqPOaJBn/+wqasnjlrp+87u9DsFAmANHrcACgkQjlrp+87u9DtA
+kQf/SLAdxTmR/l95WdeOgvxINcV5ADxCkpO1iJeLp440uddscRrrfHdibEngfAA+
+ARwPv2/jhJgInCOQe+4lmsd+4NtKtanXiRZai1MXCxcF5VLTOMs8Vl7EUMAL5JWG
+IlvmT4/H7Zhji64KpDFkwEjsE8SdZ6HJokJMFSq+YYBgvnsu/GDSfDpb/HtdM845
+pjxHJ+r93KPRepncLedgyDsQpzzRIgUJNhuC+UGtRp+3qRf1eWSkO6qbyL8DtFfW
+WwX1gG099nr8m9Gj+R8zH6HTnWWuFnUyDTHdTN7/25vZ9eoAgjIx0I3g+O02l42B
+G5HeOuLSMdUoqqvOq8313wvWSIkBMwQQAQoAHRYhBLh9RWmG8ZSEB+XMtD1osl1S
+B8rTBQJgDR69AAoJED1osl1SB8rThsMH/0JcgLmhr3K4t0cxt94u6UN1pVQZDrgG
+uMEDpOxW4nPMwN3SkWMM3K7zw0TiGkksyFifRi7zY1BqRilJOGyLkyB3zCY76hKV
+SuLx3U4B6eyrAY8gsPownOdY8FJB3o27uXhPX17qLWOl83/GQMoyRfmmwkBnL4hc
+puJcPT4bOt3OhDK7bs1vGabS9L3HuX0lUIcp8VKquJHXgS+xIr/lMBk5Jit1Qx/p
+VjqmL2qIxTMubmKxU5RxsCZygdV92kBLzYqZ3JO6LOPCwD1a4fZRlwAW2hpC2gtW
+KHK1/QZBSgJGjJUgXGV3fYYR3WH5qmTCAWu2HEloLRSdzdHLldWCsUOJATMEEAEK
+AB0WIQRJ9qi+hHM5SVGRbzth3hHs4nY6cwUCYA0ewgAKCRBh3hHs4nY6c4ygB/44
+pigG2UoBQNZq7R9ajbU5nRkl9mVCZ4dEqY6i3QJs5tGew+r774jMouL/sBTXMnvS
+zD1XgJevJYnQq5U/08zvYDvqrhm4yTkbgg9UqhD9UI8M/XgN0DtbFT6EU/N92lO4
+2xWBMTyAwjVl9JPPjhMoUsGVScZ8pjplJZlgJNuy8GVu6vUoW8j1Gw0jIPKJ0ufy
+20uc4jLuKVmxjj7Z5NsFnWJtiFFq/TknppOQZ8KvZjVzrH6EIOmCJfCnuSATiVsb
+YJzMAjshhG+fJsm24loUjmDDAzy4Nwf18IJb+wSe1oFCSAz3euhIAIxBFkihA8wk
+G4QmCnvdbPfYy4WIMDNEiQEzBBABCgAdFiEEMLynRwX6QVRVcx17qvW13gW9zFMF
+AmANHsgACgkQqvW13gW9zFNuYggAwSZ7y+qCvdvFu6LD4qvk/phRF5VINZIHfl1k
+aOVQWA+DZaDM8lRsvn2lxGFksaPzK9ZXd5QnF3QTlOkEsCILE1tmL7Myob27PaGV
+4mQXjY9bUXe/Ulj4VbHlWjkt5wpwGj9bRuxnn/RKKRNCpknzqv8VTCMVwUyCF4xE
+P0BGFXiyPV+PTNN2GwV5l46zn1FWzTlSgbAxjwQBh43RMuBWG320w+YEysJMs4y9
+k0f3i16hO4G/MiD4WRIaohqjBN6ii/sksYf6mgsZieUlAeQPnovi8pScq6s2cYzJ
+krZNxX6PCNQFTLs1GvLh6IQgypN9Lxxu4FW82wKQMS9yIKkIMokBMwQQAQoAHRYh
+BA9clq7I5p6cjlQuXG1M0ZQp+wPeBQJgDR7SAAoJEG1M0ZQp+wPeFfcH+wUQdI/R
+eMuLByF9cjdC0AfnOXD46azyt7Lgyzdi5OK8xAMmfTGH0iYGGv3pNfcbTxblJ868
+PPjUc2arF6CkLZ5hIQ6dUBmmxG+YOecOZF4jO6Z0WFi1XqxRomhy0m9TNQ931I88
+VRpd0/XepnvJc1lTOiTmxKTFex7mKqzTNBeXlNkVOXpM4aCq4AejEgnEzr5imfyF
+P2qyITbyGpWrnTKtg4ASYWVU+JAZ3/eZIl/0pNuD0/C9MGRmS2yGM82KKMYrRV3X
+QNAdg6LPi8MicUZWlcVYqR/7jEkJeppUpM46EtEo5YoXQR9UflSdu1xjpBzgU56d
+MjXtTE5ROtVDl42JAjMEEAEKAB0WIQQ8ih6Of0TK3hFP7UZLyb2ma/cmrQUCYA0e
+2AAKCRBLyb2ma/cmrdDSD/92AidTGYuf+D3SbIOBhQttWp3SvnOj5UuqgXtHrmuq
+vbhawUAAby+CL0hMOqYk/Z30N/Sr+OQmNyH+Q1C4nuoq4KOINBuaKpcioQai/Jre
+TthuVzeFDk33bQd+IQ4n0WXnVWg0DlpIhDDtZyA2Qqj4nPPsnjuw+Y62VuXFahr1
+ci+8sVns9VZJyVKPzGAKo/4rKjRlAqqVTlh5/RvMJ01TvWwSXSg1+yM08e/zaOCz
+tuIfZAjDZNqXKIU+3xlKKvQGnNxUB+Bxn6ZaXW/YCzf/uabYfy2i4GIBhyj3dRSH
+zbDSg0b/l0zJDIi6qzTzXZFEQr5AFu3CZeLR8maRU/1olCFR2aE29XoAtEF+SyPh
+eI8ZhXqL2ccJqStD37TMsUmemTgBkH1Rig3eelRDeaZ6oh5UjuKcg7IpdmyYdRNE
+5KO3afHdhM6C/CXoh689273ddasvdYcGCIYku6AjiNjcr4sNbGdmqDNc/6emHqp4
+WxyKfc5AuqZpmbEVhIYG1PTmldJl78EZBYoLjea6fai+6LH3c75p85lUWbfcpq7s
+QczweRPz/X+YMnNpCo8+psngSBIjDiJF7JFrVCFPyH8zFbva/TWCZ3Cf8Z4GLm0d
+e1gBJfFeXaQHHL2qaX5FXiYqwL2cjmr09lV3hWmQC9bA4q7Z/q2BEjZtZuPJn/qZ
+NIkCMwQQAQoAHRYhBKaHPSSk1tYoSuQqdfBgWf1dx8w/BQJgDR7dAAoJEPBgWf1d
+x8w/SdkP/1uvi7L2ZVvq564VXA+5YFNq+BvzMDYkf/8RaAAFFUVbblQQBjlHN8nA
+ViZZepOJOmba639e8E/uXsXF5z0l7Y1XEiuU6xofjmX8i9Px3MG5G1mXQGgaozW7
+fimU81f5DlLFv3W9lrZ1iQdpfZQYpBMdE6PuBl4wvElHPB6rVTxBIigjVsQceXMV
+b64RttDSX84glqv15rTrPQLPg5duX+YzMOVKyH7tWuuOsPuWaUZejNieX7UubA4s
+E1pnpH0OBpw/d8r0Rte9ZifmSavfPygaLC3w5ihXKwPLVikhOIF7PgsVaRRBzJQL
+pw7BTt+nGOZIQofW1TM8gOPPrbWzwyCnPEMzjyM6g46zsW8FRxTq8/qRXwB7dg9v
+wZRVSX4+Dzuuvyt/p3p8OX5nhv2UrqXSeZx5gcWrof+td7X8lGj4j/kvFI6lotqL
++DTf4ndH8OyVjVL3Kzdc6e1+F/odgjurPW20GiNasLFpRz7aNUTtoSMc1zHi7tmW
+EB0HMrCvdTwUuDOHVcebaR0xOPVcPcJhLoJDDQPRCFC93RvWL8qf5XPXwxYu9+tk
+Kx22lFNJqnQeYH6s0QqJowcGwchpM23JlAyQ4y8qCb8Rng4V2KvmonWO5iadM+/9
+sNFmf7APUzeCMP0LGO+YLKgf3aPe2lQZOF3nQXpQ7iSDW33C45QpiQIzBBABCgAd
+FiEEUKMDCY6i3XvL7iraCeAfoDwMUE4FAmANHuMACgkQCeAfoDwMUE47RxAAsbz1
+94m0hNMFUkzXc947B9qozcQMQJRhKsouBaMMwR+F1RgLH0oSAhYESsl+o8ngsyTo
+AKYAP5p/N/wMzSZY0/B1XoQkTJT7HCX6G1gBKr6C5US4wL4Y2xQtBBVipAONK21p
+RiSVUcvtOVfdUTSd2NNBUcVq9NCnWjtawu+8Z8fwJYa74gy8u9QQi9QjNPcupz63
+PKzB8WG1NjEI6Jx1TkZbGLoyXDQ/J7lfnoqGQoqIXMJjQHiDuNV8gIaPo2isHx6H
+VOXYm+kx3mG/3cpTlWS1yfehHPrRYg/CB6joHYUUu9oe8HI1C8GF/4VxRsW6bfaZ
+6rByBoPiCIb39xTLyCASXrXZ3n5wJ2blSCN3GPRxOcrNKQRgfNiXEc2jZtVA6sKU
+a5DvvHYvIBqD6M9E8hPd5EomOW7t8zNCaFCvqWOanMmJmCqSlgSavZqEMOyTvcOM
+ARyjZBseIIQZxwcfiKfJyI17adP/0fRdB5ypUUGaLPcbdh7JWJHzEbplGPj9VHrX
++xBN9fk2l8iXwPxD85C7lvup4SX+HEav3ofIJSrL47yC0DDrmia/JS3U/omD4raL
+yfLSoVu0Qf6G6Z1MSLV1sfaMLNWssuwKYx2wHEsjRoURlWuQVR78KuCE8x+GZQ++
+Qa75Wuf0h6myzktUkfvddz6oW5W2yfVbAkuFR+yJAjMEEAEKAB0WIQSt/bcJ/h6m
+guWFWXHVgyEO9RRxpwUCYA0e6AAKCRDVgyEO9RRxp277EACTAyRqNIaZPaSMAdw/
+AcYNX+/0G5+3m2+baSEPjcJUYOdwqQeUFAFZ3Sf9H4cm4zfNafQ0AjWUm9NYpwt8
+YKhN78dOpFaNdER43SAjVGmJb7Vs/yEX4EQZ3j7uRtypwAm6tehdo8kiKtMr774H
+DZHGUp7NYdbBnCwiQWHFcwcK1ZWdgIY4Nw61pK5/iDl0ZIOZDXPgZWutB3ULNwBg
+2PHBLOJaSvzl9jhC7Zjgpus6dEiTU/Ij6dKX+U0X9Hh5c2O3FQ08UwBffTBjTZTm
+ThXGN8RN3a3cuBlpP5rTArU412yV4/+GkDPP/hv9iAgRAhwXomskyoC1Wq7I/1O1
+Ipzac19walDjLDvIBEVZmzi7YODEMU0F/EobW6+aByp9/cBGlBBn2Ppy+RQRevHm
+Lf6jpvHcmdSEMvIDXDDJfUHVYfcpVnZJ3LfPE1kfdOhOKpCju8ZF9OPHUokhjKRM
+frKLWOD2rxNQmqrfhvVsh8NSBNNaL9NkwnwevGo4ap2PaKwA2gxzZrMSrH3au9jE
+K9+pnE94hdhRRfKINNME5r2Uo5Rcs6OIiuDM1wCmrIT2f4n0imXJoTiA/jwHWFAK
+27EPnxXWZkbjR/oiIm5vaKqB9NbZDVtTw/4H7+pQ3E47THD+KY718FVUuV3cnOtM
+MdoRGDkrd8ZS/I6ze7pOnCJy4IkBMwQQAQoAHRYhBK0g4aqLQTZwpkJS2L0nbS5v
+z6iFBQJgDR7wAAoJEL0nbS5vz6iFz58IAIJRgMKRz4cOUy5iIPvtswXMb9tFR37U
+PyLGJR1CbclXwUxTe6brN+8kWGka/g40qoG0Wr6GgQheYBjmV1CvXwOvZv83/FkK
+GkGUZDjNhbfSXlrBMUczUEk3d6w2h8XHOoHozmWgf7fJk06MIJAwEt4ENK3Bfm+k
+CCrCJuma8WzccyBLyU2iMLS14w7GOxJVyV37L8XcwmhysNyCpF0TVLPlPeGrvHO3
+hsw+lJZiZeXKUrU2hnzoM29A71PmkLVUYLN1JzvASwWCVsMfIO5T/bUzSLBysuEU
+msqRL+vJQvzNDJs9gVrAtCnfZRQFHRYVYHsqqayhsj3/mk7x9a8Q6ZCJAjMEEAEK
+AB0WIQQpbJTb0CgCRb/Tkdd7UpZI7oVyZAUCYA0e+AAKCRB7UpZI7oVyZKXLD/96
+55HOR12CYECMhU33Y5fqs10tYTdyoJjjStp+t2oApyaswr+DQPs6UVFUJWgMy478
+ro2DqW9kYHZeX0BumiQ5zrCeyBQYU+RUUNH7MU0pzdGuYWiL9PXqHNacuzV8GrIs
+r4NFB1SJ66nbaKRMdJJnnfvtnJyHPfJ2VloxizYLNYptKUVbcP0j5ahXPbhy6Cyy
+qlsAK28/gSRhDOqdq4/mKcNrc656bsmOqoaOl5po1N0sGStYQCuFWKjawujG5ZvF
+x4hbwJUSU5gOFrBZgm2cYjypIO/GQz6CYbhGt77qV7f7hzo9qwA6UeIqrECvr83W
+Jtp4e+FnjVQ6AfSwLI8oOPRa6DvJDdU+EGYPaWLbXnmq1fMu1nNn9SfHtkR+uDlN
+GiQJk9EZSz30msacuEXZlXiypA2zTQFYAvtBZmYR4qjBX0qHImqmukjZZFhJ0sxR
+LXE66HgvdxMTbYCVCWJY6u21yXF0O0a+nEvx0v1doux1247jzGXwyQTKXZsUZhv1
+qLv8igtMaJkSLZz1E1U703PdsMhU9jH6RKlwkW3KI/2NHEsxw7nDuhS6ez0UIM6O
+sur53HCnDcA7k9eUaa+Sm0yCBeccZ9zmUgG2K3cFKdpQlljyt4WJTsKDrK4AkAHR
+FjAJ0wOvv4apnz5LYNobKc/oTbjJacbTczB2lwGe17kCDQRgDR08ARAA9XG4WjRg
+7cOfk6ur3Tj0TsmoiZ5jDKQ+ObZqk2aeIk5WutraEFe0OkI46F4oEbIwLB8rChHX
+uVq18EM1mDD99tM3xTUoSm6BCdQeNx0Hh6enLZK49LBSMqTn3Fd9PNLL/QBABYWc
+wgrazwxOlTrLOpX+XcgvRuxK36CisNr5i7Ocuc7EIuUurF6YoSaaxDT9XZHpuSSV
+AI//sH+GmeBVgIs6f+8MSGe5R4g3aiyYqykwMtgSVgKqxi6Bo5UD8HeXpEAIgtNT
+2gOxLgvar6vwlbTFamv+vy4C2RXY+7paEjGnlwI4nJrIWh0c1z3qIvAkEzhN88/J
+fVCtjtKFjPAhGf48LxnRnURGb9anyexrRTPkGcmxx7/sxGMe/M31lpHOVKUZduWV
+83/9/7NpSWU0BRmWyzK9CzQC/97Vb8JJhZG3N7RmTZgiO1GKAWFAKgd6X6oo6O/V
+n5zngHY3jfKkb+wlcVa76IIDv3dc3JIENkmghfvuzdrx2IIqK+NSrBzp7OeTtgJE
+vR5yTysS6wdlihY5zJgIBJh+GAy7lA8gzB3MhZe/qPSvnmK3ZTb1RnM5y5ySMZsU
+mZnUVqjqjgUbY7NdXRpPeYLzwzzsvT+vlQX4P7LjGaienI6EP+AO7v2Ei+zv1NMI
+jkXPPNtPwp01B3M09nYihjDnM/dviPF8J1sAEQEAAYkCNgQYAQoAIBYhBPTOImMh
+AlPWqfl5sExm6o1L7hvuBQJgDR08AhsMAAoJEExm6o1L7hvuW6gP/iTNEyA96lc6
+3WxvkrpqiyZN4vdDwWv9FoEuZohlOCwQZpQy8wZlbtmjYcKAz1mRF3uBqZRvgzu4
+7ggzny8lF0m93PnyroRO5O6I8lT95HWH5+7mcoYpbDY1XII+QbP+Xdxi2mkUXqkY
+3TRcp9VzwWyQb/0sgGch7ZOnd7bK12Q8wd2YmkCq5dQ8BXxFbnom6VoRpHnu1AsU
+6ZKYbK5ogKXUoBxYKRqX6vMxMjALd/yJFKZwrCWkOxj0ipXCgHOlqbqgi5wH/gRu
+qGkMYJ6fAnVcEdyfK5IRrtMB/3ZHlIDFXyEIA+K0AxpqE098KwnemOjrSYZV8Ek5
+48tVsKlmqqgJ1QkacR54OLw9CjNm0bXX1iqMfR89NfdIWqfyq732vqKb7UDfcjOK
+IV4VP4sS8rBNrlzGpnkCOejE6YqxqwUt9ggtk9Q3SjqTrPTDZ3hExjcigchwnG5m
+rZzBKYo7vQxoK+Y6Kx+BZHo2tUloURtsgqW7mLrfbY68Vbm4O1Ev5mjWA4bmOTrD
+ivZF0HKBAdHG0B8JolpbSmoPVB0V9UAQvbb/amMK1zo36/cDrSZ9fid3Pbwyuupg
+058rgvZPvBknm6p+k1mGb9XBGJlJaOR9Q0cmKobZhVmnSuCkRBJdLixHRvzcfygi
+ra/bqVWSpZTlHZ0xT9seCUSs1urxGw9Z
+=3HCo
+-----END PGP PUBLIC KEY BLOCK-----
+
+
pub rsa4096/0xD583210EF51471A7 2020-04-08 [SC]
Key fingerprint = ADFD B709 FE1E A682 E585 5971 D583 210E F514 71A7
uid [ full ] Sendmail Signing Key/2020 <sendmail@Sendmail.ORG>
@@ -3715,4 +3891,3 @@ Nq5nZ04BGHdVToZvUf2ABdQnWx94uOCRJp2bLJiEepNtaL2OPqe2EQVF7ia2Y0PT
q8WNeh9erYZriQ==
=VuMX
-----END PGP PUBLIC KEY BLOCK-----
-
diff --git a/contrib/sendmail/README b/contrib/sendmail/README
index 5b11d025b866..50cbce25e169 100644
--- a/contrib/sendmail/README
+++ b/contrib/sendmail/README
@@ -371,11 +371,6 @@ for a response. As of 8.10.0, the default Timeout.ident is 5 seconds
as many sites have adopted the practice of dropping IDENT queries.
This has lead to delays processing mail.
-No ident server is included with this distribution. It is available
-from:
-
- ftp://ftp.lysator.liu.se/pub/ident/servers/
- http://sf.www.lysator.liu.se/~pen/pidentd/
+-------------------------+
| INTEROPERATION PROBLEMS |
diff --git a/contrib/sendmail/RELEASE_NOTES b/contrib/sendmail/RELEASE_NOTES
index 6a0f0c52f844..d8186f05e0f4 100644
--- a/contrib/sendmail/RELEASE_NOTES
+++ b/contrib/sendmail/RELEASE_NOTES
@@ -5,6 +5,121 @@ This listing shows the version of the sendmail binary, the version
of the sendmail configuration files, the date of release, and a
summary of the changes in that release.
+8.17.1/8.17.1 2021/08/17
+ Deprecation notice: due to compatibility problems with some
+ third party code, we plan to finally switch from K&R
+ to ANSI C. If you are using sendmail on a system
+ which does not have a compiler for ANSI C contact us
+ with details as soon as possible so we can determine
+ how to proceed.
+ Experimental support for SMTPUTF8 (EAI, see RFC 6530-6533)
+ is available when using the compile time option USE_EAI
+ (see also devtools/Site/site.config.m4.sample for other
+ required settings) and the cf option SMTPUTF8.
+ If a mail submission via the command line requires
+ the use of SMTPUTF8, e.g., because a header uses UTF-8
+ encoding, but the addresses on the command line are all
+ ASCII, then the new option -U must be used, and
+ the cf option SMTPUTF8 must be set in submit.cf.
+ Please test and provide feedback.
+ Experimental support for SMTP MTA Strict Transport Security
+ (MTA-STS, see RFC 8461) is available when using
+ - the compile time option _FFR_MTA_STS (which requires
+ STARTTLS, MAP_REGEX, SOCKETMAP, and _FFR_TLS_ALTNAMES),
+ - FEATURE(sts), which implicitly sets the cf option
+ StrictTransportSecurity,
+ - postfix-mta-sts-resolver, see
+ https://github.com/Snawoot/postfix-mta-sts-resolver.git
+ New ruleset check_other which is called for all unknown SMTP
+ commands in the server and for commands which do not
+ have specific rulesets, e.g., NOOP and VERB.
+ New ruleset clt_features which can be used to select features
+ in the SMTP client per server. Currently only two
+ flags are available: D/M to disable DANE/MTA-STS,
+ respectively.
+ Avoid leaking session macros for an envelope between
+ delivery attempts to different servers. This problem
+ could have affected check_compat.
+ Avoid leaking actual SMTP replies between delivery attempts
+ to different servers which could cause bogus logging
+ of reply= entries.
+ Change default SMTP reply code for STARTTLS related problems
+ from 403 to 454 to better match the RFCs.
+ Fix a theoretical buffer overflow when encountering an
+ unknown/unsupported socket address family on an
+ operating system where sa_data is larger than 30
+ (the standard is 14). Based on patch by Toomas Soome.
+ Several potential memory leaks and other similar problems
+ (mostly in error handling code) have been fixed.
+ Problems reported by Tomas Korbar of RedHat.
+ Previously the commands GET, POST, CONNECT, or USER terminate
+ a connection immediately only if sent as first command.
+ Now this is also done if any of these is sent directly
+ after STARTTLS or if the 'h' option is set via
+ srv_features.
+ CDB map locking has been changed so a sendmail process which
+ does have a CDB map open does not block an in-place
+ update of the map by makemap. The simple workaround
+ for that problem in earlier versions is to create
+ the map under a different name and then move it
+ into place.
+ On some systems the rejection of a RCPT by a milter could
+ silently fail.
+ CONFIG: New FEATURE(`check_other') to provide a default
+ check_other ruleset.
+ CONFIG: FEATURE(`tls_failures') is deprecated and will be
+ removed in future versions because it has a fundamental
+ problem: it is message oriented but STARTTLS is
+ session oriented. For example, having multiple
+ RCPTs in one envelope for different destinations,
+ with different temporary errors, does not work
+ properly, as the persistent macro applies to all
+ RCPTs and hence implicitly to all destinations (servers).
+ The option TLSFallbacktoClear should be used if needed.
+ MAIL.LOCAL: Enhance some error messages to simplify
+ troubleshooting.
+ Portability:
+ Add support for Darwin 19 & 20.
+ NOTE: File locking using fcntl() does not interoperate
+ with Berkeley DB 5.x (and probably later). Use
+ CDB, flock() (-DHASFLOCK), or an earlier Berkeley
+ DB version. Problem noted by Harald Hannelius.
+ New Files:
+ cf/feature/check_other.m4
+ cf/feature/sts.m4
+ devtools/OS/Darwin.19.x
+ devtools/OS/Darwin.20.x
+ include/sm/ixlen.h
+ libsm/ilenx.c
+ libsm/lowercase.c
+ libsm/strcaseeq.c
+ libsm/t-ixlen.c
+ libsm/t-ixlen.sh
+ libsm/t-streq.c
+ libsm/t-streq.sh
+ libsm/utf8_valid.c
+ libsm/uxtext_unquote.c
+ libsm/xleni.c
+ libsmutil/t-lockfile.c
+ libsmutil/t-lockfile-0.sh
+ libsmutil/t-maplock-0.sh
+
+8.16.2/8.16.2 202X/XX/XX
+ New compile time option NO_EOH_FIELDS to disable the special
+ meaning of the headers Message: and Text: to denote the
+ end of the message header.
+ CONTRIB: AuthRealm.p0 has been modified for 8.16.1 by Anne Bennett.
+ CONTRIB: Added cidrexpand -O option for suppressing duplicates from
+ a CIDR expansion that overlaps a later entry and -S option
+ for skipping comments exactly like makemap does.
+ Portability:
+ Add support for Darwin 19 (Mac OS X 10.15).
+ Use proper FreeBSD version define to allow for cross
+ compiling. Fix from Brooks Davis of the FreeBSD
+ project.
+ New Files:
+ devtools/OS/Darwin.19.x
+
8.16.1/8.16.1 2020/07/05
SECURITY: If sendmail tried to reuse an SMTP session which had
already been closed by the server, then the connection
@@ -114,14 +229,22 @@ summary of the changes in that release.
changes in sys/sem.h
On Linux set MAXHOSTNAMELEN (the maximum length
of a FQHN) to 256 if it is less than that value.
- Added Files:
+ New Files:
cf/feature/blocklist_recipients.m4
+ cf/feature/check_cert_altnames.m4
cf/feature/tls_failures.m4
devtools/OS/Darwin.14.x
devtools/OS/Darwin.15.x
devtools/OS/Darwin.16.x
+ devtools/OS/Darwin.17.x
+ devtools/OS/Darwin.18.x
+ include/sm/notify.h
+ libsm/notify.c
+ libsm/t-notify.c
libsmdb/smcdb.c
sendmail/ratectrl.h
+ sendmail/tls.h
+ sendmail/tlsh.c
8.15.2/8.15.2 2015/07/03
If FEATURE(`nopercenthack') is used then some bogus input triggered
@@ -335,7 +458,7 @@ summary of the changes in that release.
On Linux use socklen_t as the type for the 3rd argument
for getsockname/getpeername if the glibc version is at
least 2.1.
- Added Files:
+ New Files:
devtools/OS/Darwin.12.x
devtools/OS/Darwin.13.x
@@ -416,7 +539,7 @@ summary of the changes in that release.
Add support for Darwin 11.x (Mac OS X 10.7).
Add support for SunOS 5.12 (aka Solaris 12). Patch from
John Beck of Oracle.
- Added Files:
+ New Files:
devtools/OS/Darwin.11.x
devtools/OS/SunOS.5.12
@@ -601,7 +724,7 @@ summary of the changes in that release.
Chris Behrens of Concentric.
Add support for SCO OpenServer 6, patch from Boyd Gerber.
DEVTOOLS: Clarify that confSHAREDLIBDIR requires a trailing slash.
- Added Files:
+ New Files:
devtools/OS/Darwin.9.x
devtools/OS/OSR.i386
@@ -1825,7 +1948,7 @@ summary of the changes in that release.
Use strerror(3) on Linux. If this causes a problem on
your Linux distribution, compile with
-DHASSTRERROR=0 and tell sendmail.org about it.
- Added Files:
+ New Files:
devtools/OS/AIX.5.2
8.12.9/8.12.9 2003/03/29
@@ -3987,7 +4110,7 @@ summary of the changes in that release.
have a From line.
VACATION: Read all of the headers before deciding whether or not
to respond instead of stopping after finding recipient.
- Added Files:
+ New Files:
cf/ostype/darwin.m4
contrib/cidrexpand
contrib/link_hash.sh
@@ -4004,7 +4127,7 @@ summary of the changes in that release.
Purczynski of elzabsoft.pl.
SECURITY: Add more vigilance around set*uid(), setgid(), setgroups(),
initgroups(), and chroot() calls.
- Added Files:
+ New Files:
test/t_setuid.c
8.10.1/8.10.1 2000/04/06
@@ -4109,7 +4232,7 @@ summary of the changes in that release.
VACATION: Fix -t option which is ignored but available for
compatibility with Sun's version, based on patch from
Volker Dobler of Infratest Burke.
- Added Files:
+ New Files:
devtools/M4/UNIX/smlib.m4
devtools/OS/OSF1.V5.0
Deleted Files:
diff --git a/contrib/sendmail/cf/README b/contrib/sendmail/cf/README
index 983aa2821a1a..cfabe5eefe45 100644
--- a/contrib/sendmail/cf/README
+++ b/contrib/sendmail/cf/README
@@ -1120,9 +1120,8 @@ local_procmail Use procmail or another delivery agent as the local mailer.
setreuid() call, you may need to add -f $f to the procmail
argument vector to pass the proper sender to procmail.
- For example, this allows it to use the maildrop
- (http://www.flounder.net/~mrsam/maildrop/) mailer instead
- by specifying:
+ For example, this allows it to use the maildrop mailer
+ instead by specifying:
FEATURE(`local_procmail', `/usr/local/bin/maildrop',
`maildrop -d $u')
@@ -1132,7 +1131,7 @@ local_procmail Use procmail or another delivery agent as the local mailer.
FEATURE(`local_procmail', `/usr/local/bin/scanmails')
WARNING: This feature sets LOCAL_MAILER_FLAGS unconditionally,
- i.e., without respecting any definitions in an OSTYPE setting.
+ i.e., without respecting any definitions in an OSTYPE setting.
bestmx_is_local Accept mail as though locally addressed for any host that
lists us as the best possible MX record. This generates
@@ -1267,6 +1266,12 @@ delay_checks The rulesets check_mail and check_relay will not be called
section. Note: this feature is incompatible to the versions
in 8.10 and 8.11.
+check_other Enable a default check_other ruleset which terminates
+ an SMTP session when it encounters a command which matches
+ a regular expression given as argument. If no argument
+ is given, then the default (to match potential headers) is:
+ ^[[:print:]]+ *:
+
use_client_ptr If this feature is enabled then check_relay will override
its first argument with $&{client_ptr}. This is useful for
rejections based on the unverified hostname of client,
@@ -1578,9 +1583,9 @@ require_rdns Reject mail from connecting SMTP clients without proper
Entries such as
Connect:1.2.3.4 OK
- Connect:1.2 RELAY
- will allowlist IP address 1.2.3.4, so that the rDNS
- blocking does apply to that IP address
+ Connect:1.3 RELAY
+ will allowlist IP address 1.2.3.4 and IP net 1.3.*
+ so that the rDNS blocking does apply not to those IPs.
Entries such as
Connect:1.2.3.4 REJECT
@@ -1603,6 +1608,14 @@ badmx Reject envelope sender addresses (MAIL) whose domain part
has been compiled with the options MAP_REGEX and
DNSMAP.
+sts Experimental support for Strict Transport Security
+ (MTA-STS, see RFC 8461). It sets the option
+ StrictTransportSecurity and takes one optional
+ argument: the socket map specification to access
+ postfix-mta-sts-resolver (see feature/sts.m4
+ for the default value).
+ For more information see doc/op/op.me.
+
+-------+
| HACKS |
+-------+
@@ -2581,7 +2594,7 @@ top level domain TLD, 192.168.212.* network, and the IPv6 address
2002:c0a8:02c7::/48.
Entries in the access map should be tagged according to their type.
-Three tags are available:
+These tags are applicable:
Connect: connection information (${client_addr}, ${client_name})
From: envelope sender
@@ -2818,7 +2831,7 @@ regex map:
# check address against various regex checks
R$* $: $>Parse0 $>3 $1
R$+ < @ bigisp.com. > $* $: $(allnumbers $1 $)
- R@MATCH $#error $: 553 Header Error
+ R@MATCH $#error $: 553 Address Error
These rules are called with the original arguments of the corresponding
check_* ruleset. If the local ruleset returns $#OK, no further checking
@@ -3081,8 +3094,8 @@ Darth+20Mail+20+28Cert+29/emailAddress=darth+2Bcert@endmail.org
(line breaks have been inserted for readability).
-The macros which are subject to this encoding are ${cert_subject},
-${cert_issuer}, ${cn_subject}, and ${cn_issuer}.
+The macros which are subject to this encoding are ${cert_subject},
+${cert_issuer}, ${cn_subject}, and ${cn_issuer}.
Examples:
@@ -3223,13 +3236,13 @@ options:
- CertFile, KeyFile: {Server,Client}{Cert,Key}File
- Flags: see doc/op/op.me for details.
-If FEATURE(`tls_session_features') is used, then default rulesets
-are activated which look up entries in the access map with the tags
-TLS_Srv_features and TLS_Clt_features, respectively.
-For example, these entries:
+If FEATURE(`tls_session_features') and FEATURE(`access_db') are
+used, then default rulesets are activated which look up entries in
+the access map with the tags TLS_Srv_features and TLS_Clt_features,
+respectively. For example, these entries:
- TLS_Srv_features:10.0.2.4 CipherList=MEDIUM+aRSA;
- TLS_Clt_features:10.1.0.1 Options=SSL_OP_NO_TLSv1_2; CipherList=ALL:-EXPORT
+TLS_Srv_features:10.0.2.4 CipherList=MEDIUM+aRSA;
+TLS_Clt_features:10.1.0.1 Options=SSL_OP_NO_TLSv1_2; CipherList=ALL:-EXPORT
specify a cipherlist with MEDIUM strength ciphers that use RSA
certificates only for the client with the IP address 10.0.2.4,
@@ -3240,21 +3253,23 @@ their own rulesets which must return the appropriate data.
If the rulesets are not defined or do not return a value, the
default TLS options are not modified.
-About 2): the ruleset try_tls (srv_features) can be used together
-with the access map. Entries for the access map must be tagged
-with Try_TLS (Srv_Features) and refer to the hostname or IP address
-of the connecting system. A default case can be specified by using
-just the tag. For example, the following entries in the access map:
+About 2): the rulesets try_tls, srv_features, and clt_features can
+be used together with the access map. Entries for the access map
+must be tagged with Try_TLS, Srv_Features, Clt_Features and refer
+to the hostname or IP address of the connecting system. A default
+case can be specified by using just the tag. For example, the
+following entries in the access map:
Try_TLS:broken.server NO
Srv_Features:my.domain v
Srv_Features: V
+ Clt_Features:broken.sts M
will turn off STARTTLS when sending to broken.server (or any host
-in that domain), and request a client certificate during the TLS
-handshake only for hosts in my.domain. The valid entries on the RHS
-for Srv_Features are listed in the Sendmail Installation and
-Operations Guide.
+in that domain), request a client certificate during the TLS handshake
+only for hosts in my.domain, and disable MTA-STS for broken.sts.
+The valid entries on the RHS for Srv_Features and Clt_Features are
+listed in the Sendmail Installation and Operations Guide.
*** 21876 LINES SKIPPED ***
From nobody Wed Feb 1 02:42:13 2023
X-Original-To: dev-commits-src-branches@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 4P65mP3dJdz3bnRs;
Wed, 1 Feb 2023 02:42:13 +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 4P65mP2T4Jz4GwM;
Wed, 1 Feb 2023 02:42:13 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675219333;
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=mZU6qgRsFhOFHWyOJXa6vPuwRsMyb/rGmiCg/yCuT3I=;
b=vecModSMXAcpcFLZx8+g2ccklCh3rAmh9ATnc/F12JLMFt9sIbd4JB5okYWpZS+bHD8SWa
aMGlD6Ej0kMqzLj1bZIZUYe7bpEmzXHXXFfTTv9uLhxPB8upspLYHwHFThNt4EDVYMlijS
g0Q+BZe9dQVH5Yb9LfhDUBPo2DUqJnoIRs/A+2PraQ1bNiHLp+I4boqBLT8nMTxCKxJyg+
r72s55mByz9MAo3lxo+X13sr0DN0hVQRi7/cEZMwjmODkszY+wCK89xTueV47VoAdk9Pt/
pARWRlPLHiu1o5swLhSzsKSWqFgedCW+q5hrdCLnsF8zsrZjHnF3Lg4Ln7U56w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675219333;
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=mZU6qgRsFhOFHWyOJXa6vPuwRsMyb/rGmiCg/yCuT3I=;
b=ussQ3pRsnAnsjOmCLi9FrUFQgWdVG0Q9D9TsOAcOKKdTon8jfFfHYLlrWBSID249ALQk6I
rCipU2amRA6YUAvuuI+LCfAaMWKyeBUvnGdsd0fC93Hcz3C80d1fz4WF8pUJ7PXFBKY3mB
6H3eMkT472ihQe3EIZVtmg6S0lYyE62wDUiJx7WZIKE1bGtIs26eObXMZQTzQLdXM/LZo/
LUmmCuzNQuTOE1uc/fNmXMhalMZMziIwKlnZMsW8jfMxtQkb4H2WZRmrb1XaNPEqx1M9Pt
gNgfeCAd5kvZI/nW0xyE7x/LjWH7o8BoR5r3UID7zYCvbh5538Uy7wzIzvVeGg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675219333; a=rsa-sha256; cv=none;
b=Iba+d1Z5xZnbBSZj8exNyMdleA3F1jN8RIuVLHPCbhi1Haw401iP7ANNf54RDKzk+7kLB/
/NkkxdkaDC4eeCnSsXZ5lK4r2yU6OYa6Zh1Qnrq0Dzz6RsnwFhNAj/3auF7y0AspWNR9WX
JmCwBG8ysQyPBC86sz2SyawfTiOQSFLUFMa2hAC0ECaXyVNl9+Hjx4cfu8z21nrUfAC5U5
1Qw1kFtFjkh0XeR2J7dPD4KACzwK9bFvF+ipnFE664h7mAXPJAiBCwpLVkIHtl0+7K+MyI
OfVBJ2yFL5DRjCIN2bJff93zv7xuCKaGaCG4eW6mf3NTpVNxJcacZmDYFayCZA==
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 4P65mP0nLpz1CPQ;
Wed, 1 Feb 2023 02:42:13 +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 3112gDjn091581;
Wed, 1 Feb 2023 02:42:13 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3112gDjd091580;
Wed, 1 Feb 2023 02:42:13 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 02:42:13 GMT
Message-Id: <202302010242.3112gDjd091580@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Subject: git: e58dfd0de589 - stable/13 - MFC: Update for new library files in sendmail 8.17.1
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gshapiro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: e58dfd0de589b390fc6741233ac4d9d1ff8c7665
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by gshapiro:
URL: https://cgit.FreeBSD.org/src/commit/?id=e58dfd0de589b390fc6741233ac4d9d1ff8c7665
commit e58dfd0de589b390fc6741233ac4d9d1ff8c7665
Author: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
AuthorDate: 2023-01-15 21:23:27 +0000
Commit: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
CommitDate: 2023-02-01 02:31:14 +0000
MFC: Update for new library files in sendmail 8.17.1
(cherry picked from commit d89513ed20502ddb320474a721d872ef32b31402)
---
lib/libsm/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile
index 5cfcc9f17cd2..eed69cecbf0f 100644
--- a/lib/libsm/Makefile
+++ b/lib/libsm/Makefile
@@ -32,7 +32,8 @@ SRCS+= assert.c debug.c errstring.c exc.c heap.c match.c rpool.c \
wbuf.c wsetup.c string.c stringf.c \
xtrap.c strto.c test.c strcasecmp.c strrevcmp.c \
signal.c clock.c config.c sem.c shm.c mbdb.c strexit.c cf.c ldap.c \
- niprop.c mpeix.c memstat.c util.c inet6_ntop.c notify.c
+ niprop.c mpeix.c memstat.c util.c inet6_ntop.c notify.c \
+ ilenx.c xleni.c utf8_valid.c uxtext_unquote.c lowercase.c strcaseeq.c
CLEANFILES+=sm_os.h
INTERNALLIB=
From nobody Wed Feb 1 02:42:14 2023
X-Original-To: dev-commits-src-branches@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 4P65mQ4hq0z3bnlq;
Wed, 1 Feb 2023 02:42:14 +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 4P65mQ3St5z4H2J;
Wed, 1 Feb 2023 02:42:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675219334;
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=aiqXKhC7Z5FKaEHtQNPkLxppwsh9eHGZ1IJLe3jU1S8=;
b=liNQG3BsYnQpfid06dIdiGRvjYIX35nzipwAqiM5DMjR2RQkfepsa3fMlV/Ta2CWjlCcvV
CNFC+P1enJnWZOPwQQ7jYv0MsW1K5nWRyA9fAAEpMnBj2Bpq1Ly4RF26HKZoiv5y6HZ5WQ
gszBhbNJen7VWeF9Xqp+yc5dZLdiFkCWwX7Iloh2Rvn+AMl4H4Wax6aLiv+le4T9iLQbC0
SW8LagJqfwB6lz4NLPhI+dtINw0vngXgo4j4jJxFVWnMh2Z3XNhaIl3VNsDwfijSWniiBs
/eePAxDZPVg+e4MaDetQUXeHXnELQIj1WsOWwJfJogqOtnqRL3S15ItzToR8tg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675219334;
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=aiqXKhC7Z5FKaEHtQNPkLxppwsh9eHGZ1IJLe3jU1S8=;
b=tKWSOHKQevNNJ7hGOhNgBrrPITMe1iedEQIChSNlr+XNR9xB2yOpmO5qKAS57VVpNOF3Fl
jzft6mGapUYu20XUL+0YvCRhhtX70nogUftIqUsdmIli91pY0CCnJPeNWomgxLavFOZkfW
I5ILm7mWtZdAQNJuY98SJDZuMLRZlX1UfalUqJj2V6+2lpvqE4jNEbE2zR/k5w0tCtrlTN
SCBhzwduL9NjuS2bes8CfczUycR2fGtdG4H2QSidA1+695Bk6s5hzZy8/aZ/YDeKb9x4Cf
+HTQWEI74CC8jYaUFlJ99b3nbShZejOUwkuteFzlMSNdzkUGEbI1oM5cI/1b4g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675219334; a=rsa-sha256; cv=none;
b=Qmv2g5B4Qv8oAH7pU1TQihDIbemieFqqqwCFTFe0qGVodQ3C7fCoiZSvcxM/xWn1OM7e4U
JYXOcG0bfUS5oIlR3ombPN/cgG6zxhObMQ6SWrXcxkoQZW8NZfaHTWcvartNbAP5WUCbAn
qZAPGrFpgi7TztOvokKqHvIl22pq5JRwVzUKkSEni2clCoKQEJ0SueyYxAPkk7o9zDPCjO
2C5B94a8qHFUhloNwarVVfm+H8mUYBynq3neHTQByFsVOlCcwq4IO8CB1RAkgxhgbaqIwv
YJO28/69jp0hIbgx5fuGNcmiL83pQGscbopRChE3eJvFntPsV7Mx1QecQjgINQ==
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 4P65mQ1k6jz1By9;
Wed, 1 Feb 2023 02:42:14 +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 3112gEbP091634;
Wed, 1 Feb 2023 02:42:14 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3112gEDI091633;
Wed, 1 Feb 2023 02:42:14 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 02:42:14 GMT
Message-Id: <202302010242.3112gEDI091633@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Subject: git: 59f5a5cb724e - stable/13 - MFC: Add -DSTARTTLS CFLAG in order to enable DANE in sendmail builds
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gshapiro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 59f5a5cb724ea7dac7a6a2a1341549074c8aba49
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by gshapiro:
URL: https://cgit.FreeBSD.org/src/commit/?id=59f5a5cb724ea7dac7a6a2a1341549074c8aba49
commit 59f5a5cb724ea7dac7a6a2a1341549074c8aba49
Author: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
AuthorDate: 2023-01-15 21:24:38 +0000
Commit: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
CommitDate: 2023-02-01 02:31:59 +0000
MFC: Add -DSTARTTLS CFLAG in order to enable DANE in sendmail builds
(cherry picked from commit 3413ee88c39dbfedfa7d00db536a8e8dc073a562)
---
lib/libmilter/Makefile | 5 +++++
lib/libsmutil/Makefile | 7 +++++++
2 files changed, 12 insertions(+)
diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile
index 17bb09857fcf..b3243c2a66cf 100644
--- a/lib/libmilter/Makefile
+++ b/lib/libmilter/Makefile
@@ -15,6 +15,11 @@ CFLAGS+=-DSM_CONF_POLL
CFLAGS+=-DNETINET6
.endif
+.if ${MK_OPENSSL} != "no"
+# STARTTLS support
+CFLAGS+=-DSTARTTLS
+.endif
+
# User customizations to the sendmail build environment
CFLAGS+=${SENDMAIL_CFLAGS}
diff --git a/lib/libsmutil/Makefile b/lib/libsmutil/Makefile
index ff3f8491225b..7bbd21e21bbb 100644
--- a/lib/libsmutil/Makefile
+++ b/lib/libsmutil/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <src.opts.mk>
+
PACKAGE=lib${LIB}
SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/libsmutil
@@ -7,6 +9,11 @@ SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL
+.if ${MK_OPENSSL} != "no"
+# STARTTLS support
+CFLAGS+=-DSTARTTLS
+.endif
+
# User customizations to the sendmail build environment
CFLAGS+=${SENDMAIL_CFLAGS}
From nobody Wed Feb 1 02:42:15 2023
X-Original-To: dev-commits-src-branches@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 4P65mR4sfpz3bnZ0;
Wed, 1 Feb 2023 02:42:15 +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 4P65mR3Yhhz4H2R;
Wed, 1 Feb 2023 02:42:15 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675219335;
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=+euM6PPAuk3usMrF9BfoGnqAX5IonJN9E/lAnUXflN0=;
b=GlpcMwUMkmCkG8UmpKUfI+OF8d2ZiDMuMwsM4Yx8yXt7I7AxvZbUoz9MHBw/Fhan0eS0IL
Qm8CGAQ0ZuNZbVcZVO2DiSEiLapF8499tibcgB5RyygkPdDx8DI9UpGFSoNUaO1jyRnvL9
B9+KOUqmO8gOW/KZxEa/Y4pObXUIWq+5XStLrTva8znblKW7dtI+Dfx3/HFyT8NjYccDWB
Ex7DBVNzHjNMzdjSXerfV8Nhd6/M67OUg23a9aA7E7rNNbhls6Hg28evckLZR/FrTJ2xZj
X2HH1N6feaf/bAS5n+WDjjKd+JV57ecSW2i3tfm8wgpI6hOik5rTWZIdvhMLdQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675219335;
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=+euM6PPAuk3usMrF9BfoGnqAX5IonJN9E/lAnUXflN0=;
b=tBiNyTCHRs7KyzhsJ+KW/Rn5Rgvdr1SvaGhiOY2D0IJQiVsSnhM2hOR2l9g13Vcoq9aXGG
QTDu3ih5Gg7LBzPvGsvFRK6hko5E0qR6eoXiqDok5GFwW6NXNUGvQ32wtrs7unMxVCFuGR
l85H27sVbmv7vJeP95AvcbieTjbacrjhWGsaQ6cx2r79ywVLtk20okHaBoUw11A7ZtEQWv
82F02iET1W5kRCuTWptxEJ9R5BZewwlNNWVvDEYgqOwQtrotPMrKk86PHQ6ORGIyNypZCk
fMZgJY4OmibxVhuwrJb4DmhLhjtwNXXjVPdIpjRoFPqg3oCiANCyrlFn7Z0EEQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675219335; a=rsa-sha256; cv=none;
b=wwQfqw5nW8Dez50O4d7jv0DIfR1rbU44cLAhYPWLBkbLGAl6nsiXpgO0Scnz8QEZukq3Mu
maBVtD0PNug7QhedJu2/x/AKgX786ljogOcMOKfYqG9s6GrvbUJKDiyrbOcfVY6EA2f/cx
obeEkMrIfmuo99KkH1edj92yZewMATzR9hSR04TG0GFGNKPoBx0lCqvTFj9CcHjXPGbN+F
cNwSBRRyHraWnJ0Vvt757TlRfgXXJ3n2Lqzwl1CW55T1M330sbuKHx8fgqXeripoC8oNPy
rfmPdd+o54XZCxbINUt2TnzALC/6Tpef5sEcSbkk1XWqoAKGTpssEW5VZh9TGQ==
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 4P65mR2gCVz1CPh;
Wed, 1 Feb 2023 02:42:15 +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 3112gFJr091658;
Wed, 1 Feb 2023 02:42:15 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3112gFQk091657;
Wed, 1 Feb 2023 02:42:15 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 02:42:15 GMT
Message-Id: <202302010242.3112gFQk091657@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Subject: git: 6e272a78de36 - stable/13 - MFC: sendmail 8.17.1 included this fix, though in a different location so removing the FreeBSD local code in favor of the vendor branch version
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gshapiro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 6e272a78de3630a92ac6eb7b3bcda4d30738655d
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by gshapiro:
URL: https://cgit.FreeBSD.org/src/commit/?id=6e272a78de3630a92ac6eb7b3bcda4d30738655d
commit 6e272a78de3630a92ac6eb7b3bcda4d30738655d
Author: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
AuthorDate: 2023-01-15 21:25:39 +0000
Commit: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
CommitDate: 2023-02-01 02:32:25 +0000
MFC: sendmail 8.17.1 included this fix, though in a different location so
removing the FreeBSD local code in favor of the vendor branch version
(cherry picked from commit f97a19ecb98541455c6c940f4bab2dc7dc425468)
---
contrib/sendmail/include/sm/os/sm_os_freebsd.h | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/contrib/sendmail/include/sm/os/sm_os_freebsd.h b/contrib/sendmail/include/sm/os/sm_os_freebsd.h
index fb00760a4301..db7dbf2b61cd 100644
--- a/contrib/sendmail/include/sm/os/sm_os_freebsd.h
+++ b/contrib/sendmail/include/sm/os/sm_os_freebsd.h
@@ -37,11 +37,7 @@
# define SM_CONF_SHM 1
#endif
#ifndef SM_CONF_SEM
-# if __FreeBSD_version >= 1200059
-# define SM_CONF_SEM 2 /* union semun is no longer declared by default */
-# else
-# define SM_CONF_SEM 1
-# endif
+# define SM_CONF_SEM 1
#endif
#ifndef SM_CONF_MSG
# define SM_CONF_MSG 1
From nobody Wed Feb 1 02:42:16 2023
X-Original-To: dev-commits-src-branches@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 4P65mS5Sdcz3bnm0;
Wed, 1 Feb 2023 02:42:16 +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 4P65mS4LMpz4H7B;
Wed, 1 Feb 2023 02:42:16 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675219336;
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=Yr6TeOhVHH+NnLlJazkXLpOnNl5rrU2ILsXWBgL6Yag=;
b=WgKcYHyfAINkr4qfexZsZI+5jAsQ8HKS3Wdl1TrCt2aC9djj/XyonDsKS9inWPZCYEJZjK
oeIA9LHBnI/eY3FyBY7jtvy76J98fW4zVIVTttXpte58nQfdaQkdWPnq5mXevX70pwXyoD
0q/66EME4veaOg2lBJwk//jR71PpmjRwYmOv63wREpO6Iyb2wR6oABRCZDlm1/I7ckDrit
IYpPGDMurl/6L3pYGoXvHURVRLEp1xFTjzCcjkKIqXFb6FxMCAryavo6kVrmeqn7hG2Mqm
ad6jH8sRHsTWbIzsaHcItqlm/MN7HHN5c7LTUyzK1A8vIrsdtxr8URlo/OmEQA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675219336;
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=Yr6TeOhVHH+NnLlJazkXLpOnNl5rrU2ILsXWBgL6Yag=;
b=QXCRntigOYCm8wS7qKZQXwiQ/VmTGOPz6gjQny/IzQYECFE2OgEa/knbMF+fhes0/RoiP2
QkFqim/DdTZbmvJe9SqW99vIRrXUFdxTmFBdI7Zn+ghp3w4T5Qdrfah7Jq7BcNuPq4G4zN
8Rx8xqjynBH77rRhmX22R137/tnIR7oZ0SJjL27TnmLCd2ttsHzl6x9QyCuowg2sQE7ON6
1A83Ey6K//Tq9kR/CAu5jop2RTbc8nBr5JGrixVDhCLEccH1BRMlJIWXUObh2q5b5GTcdC
6yQYm/CFQ2NelCY3w+nnKGiDkFL/t445a2XEf9rmSjVjWFP9a7fCDn/DTL27og==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675219336; a=rsa-sha256; cv=none;
b=cT3h0GPJWp2TEJZ1mkE9E0Qlw5hKW4M8z1vphgXHjn7Udw9OUjdGOfnVdhiA+aOEFrZhJI
PS9YV38xnecvfqwwUNQzF9x9CaQ6qg0beUIP7g7zG7fQr3dQ6M+BvueeMLneYJ9k0LW/vt
9XmWJZEkzXZ3oqas07qJ7tU1mibwvXW4RtPNfFHYTlntZ5MT9TSt5XrnjneCSBVcgl7Ioc
YpNmHoi11VgJV0wMAGx6vxMU0zbc2z6WR8KlMmMVJAj7QZ/2g0PLOw9Rt1OANZhIALI7LT
E1QSK5B1UYA9KN/Q8Go1/FzxvZxNKxozQRSR04Ug0P85mrRDO91nEpGFsl7cqQ==
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 4P65mS3RLsz1CTq;
Wed, 1 Feb 2023 02:42:16 +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 3112gGNU091694;
Wed, 1 Feb 2023 02:42:16 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3112gGdh091693;
Wed, 1 Feb 2023 02:42:16 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 02:42:16 GMT
Message-Id: <202302010242.3112gGdh091693@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Subject: git: 4c4a4fd4a649 - stable/13 - MFC: Sync with vendor sendmail 8.17.1 cf/cf/submit.mc
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gshapiro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 4c4a4fd4a649a061b847f8af531777b6caa91ed1
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by gshapiro:
URL: https://cgit.FreeBSD.org/src/commit/?id=4c4a4fd4a649a061b847f8af531777b6caa91ed1
commit 4c4a4fd4a649a061b847f8af531777b6caa91ed1
Author: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
AuthorDate: 2023-01-17 06:49:07 +0000
Commit: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
CommitDate: 2023-02-01 02:32:59 +0000
MFC: Sync with vendor sendmail 8.17.1 cf/cf/submit.mc
(cherry picked from commit 021562c5020dd63d6b812369a9020b3b8147bfbd)
---
etc/sendmail/freebsd.submit.mc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/etc/sendmail/freebsd.submit.mc b/etc/sendmail/freebsd.submit.mc
index fabc1118fa21..165c5f8eadf8 100644
--- a/etc/sendmail/freebsd.submit.mc
+++ b/etc/sendmail/freebsd.submit.mc
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2001-2003 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001-2003, 2014 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -24,3 +24,6 @@ define(`confBIND_OPTS', `WorkAroundBrokenAAAA')dnl
dnl
dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:0:0:0:0:0:0:0:1]
FEATURE(`msp', `[127.0.0.1]')dnl
+dnl enable this for SMTPUTF8 support
+dnl LOCAL_CONFIG
+dnl O SMTPUTF8=true
From nobody Wed Feb 1 02:42:17 2023
X-Original-To: dev-commits-src-branches@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 4P65mT75lNz3bncR;
Wed, 1 Feb 2023 02:42:17 +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 4P65mT5vs9z4H9t;
Wed, 1 Feb 2023 02:42:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675219337;
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=CPzJgOFkkhv6gsTOzSK43nnS/k+uw4rpVicIreLGOeg=;
b=MQMVqbnE8qpDSsvtHz9BZifLcqEddxwNGYnZ9EbPPjfjFP8cZpVq2yZ/k0R1OMZGo0H85K
oBDr+aA0KpxhznbLAe/+OO8zSuAQzXaePieLpynpSLd+y/i75C/elsn0whEWHepvZWtsYa
JlCkf/xmtWhuF2o8oCYdq6ec1nuAea3qT6VAZVzPSXqAtZpqD8zTQ3o0F9X6uTUfqTnK74
9DCDGmXEHFW6kKNzgdMtE9sn6mPSCcxIVrGyhEbQSZNbOoOvtjxaYHrHPbw2zrpyTGjqrO
JPNdJ7QjKyiRnVn5pZoR5rbJGO7PyjTRnlaMsie41cpS5tMc3OONij76zSZSLA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675219337;
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=CPzJgOFkkhv6gsTOzSK43nnS/k+uw4rpVicIreLGOeg=;
b=AnBcpH4XIWPjQEO6vMmaJw9pudLPcGwlNEzjSfcRCohHX+Dke6zhS3DXTDdV6uahGLxXcm
8ky7tI8dp5U4xvzr6EsOA8JiN7N7lVaMYThHFoUUuLhviie5f858j5XJWKgOrZQ077/x6L
D/tnORh0qEBhRYSEvhOMN5PikOiNRM3lcwGJpGIImNlCjTHuZh+PLkXVU1AGM6dWFXuKFk
Bgt/Prrt7Ch+3Di7hD1YlP9f+rcnAUl/or8cDe3AGoBCYZIZ8UaHYc+n+6Vk0E3cmuiU4N
amiCOmQw0xKzbmTn1OAN1JT8NevG2/5FsC80mrvtHCJ3PUmpgYIClNGwhf+SWw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675219337; a=rsa-sha256; cv=none;
b=lF3NNwTtPeF/astpu4YKYi162Fmtc095TJ6dGFNSaF4EFmljRoUN+zv+nE4zp/ys0W05o/
XdKzO5DzEjZciAuCTax8/AdtVntvJqQYnYUq0KVXo4KISnF/hBC49QU8xNRJrrCl6ZgHF6
NGF9zzgqhuj3ivv4CHKOPy7EZiMAOaFwlADi15OMeiDPa+8I2m0Z8fXL9XGj8gW+98GET8
OrmT2LV/ld3qRACqevFHTs9YqYHTPVfgzq3rj0ubqvmcZeVh3N71HAKLKA3EEqDIfPj/VF
ACfCH0KtBdD6oYgrfHKPUsE34ajtAdYdgw3r5aQF+KXF+OO/ZA89j8E1X/U3BA==
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 4P65mT4NP4z1CXT;
Wed, 1 Feb 2023 02:42:17 +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 3112gHEL091719;
Wed, 1 Feb 2023 02:42:17 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3112gHjd091718;
Wed, 1 Feb 2023 02:42:17 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 02:42:17 GMT
Message-Id: <202302010242.3112gHjd091718@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Subject: git: ba2ae2cca63a - stable/13 - MFC: Minor changes to force commit these files so new freebsd*.cf files are built to use the new sendmail-8.17.1/cf tree.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gshapiro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: ba2ae2cca63a56197b93fa99c8b0025b2f1891b7
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by gshapiro:
URL: https://cgit.FreeBSD.org/src/commit/?id=ba2ae2cca63a56197b93fa99c8b0025b2f1891b7
commit ba2ae2cca63a56197b93fa99c8b0025b2f1891b7
Author: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
AuthorDate: 2023-01-17 06:49:49 +0000
Commit: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
CommitDate: 2023-02-01 02:33:29 +0000
MFC: Minor changes to force commit these files so new freebsd*.cf files are
built to use the new sendmail-8.17.1/cf tree.
(cherry picked from commit 431d2a81d421d4db7a07833b4fd12015cbae5ee7)
---
etc/sendmail/freebsd.mc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/etc/sendmail/freebsd.mc b/etc/sendmail/freebsd.mc
index dbdfdb57ea62..97264805a67f 100644
--- a/etc/sendmail/freebsd.mc
+++ b/etc/sendmail/freebsd.mc
@@ -73,14 +73,14 @@ dnl NOTE: This can allow sites to use your server as a backup MX without
dnl your permission.
dnl FEATURE(relay_based_on_MX)
-dnl DNS based black hole lists
-dnl --------------------------------
-dnl DNS based black hole lists come and go on a regular basis
-dnl so this file will not serve as a database of the available servers.
+dnl DNS based block lists
+dnl ---------------------
+dnl DNS based block lists come and go on a regular basis so this
+dnl file will not serve as a database of the available servers.
dnl For more information, visit
dnl http://en.wikipedia.org/wiki/DNSBL
-dnl Uncomment to activate your chosen DNS based blacklist
+dnl Uncomment to activate your chosen DNS based block list
dnl FEATURE(dnsbl, `dnsbl.example.com')
dnl Alternatively, you can provide your own server and rejection message:
dnl FEATURE(dnsbl, `dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected"'')
From nobody Wed Feb 1 02:42:18 2023
X-Original-To: dev-commits-src-branches@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 4P65mV6yBYz3bnQ4;
Wed, 1 Feb 2023 02:42:18 +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 4P65mV5tCVz4HGr;
Wed, 1 Feb 2023 02:42:18 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675219338;
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=8K9VDSiQeMD072cphrgdk2nLxqHG9a0tjN/A/v2jmks=;
b=TMrXpUFY4qcxeCSka7Mg/jxEGUFGc81G7kOP3wA8c32YqjLFKfZRzGCBOzipKKNemXpGZG
x4QzQUQE2fLsnVzGsfr3R24Wwvjum/YC/3FQmxSjgWdVHyTvs7lkhMGt+hvRHV/SlY8PmJ
GKP+3Hoj+19xfSdUJig+oRD4E4FI74S1NXM4nekmpu71JXu1m2UZbP0eACl/dHWoCvs2tX
5mfVMBw84ddUaVC1bc3TpICqqsQxCOTOsBHJXyCO5lnXP7MUQgzAtPA30KuZHUpgvrdQhn
Y6ysGefJdei/Dw5WxSs5/NEE0SnQBGdxKtdX14og4iMUpP4WK56eU5oJAdPXhw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675219338;
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=8K9VDSiQeMD072cphrgdk2nLxqHG9a0tjN/A/v2jmks=;
b=hpYQx01z64+kF2ugwkkfI590ztMF8FM7PHEmQn8fmph/UYEPgeznuBSZZJaTT/3LqTnc56
7HZgyus8rGFHCx+Iy84K9QNHI3WKxEqZC5qody3crpkTfAnrD55sVXKvyww8gepHMdOoKM
yV4bJlggrGtooAJSae1gQ+r9J09c9BasZNhzKj/XYdIUWHi8MajKJ7IXU/3/CRWWTnH2V2
UcTpCYjYgElAG+sumD5cAuPGd7NLv/PN1R2g4sE/tjwmwY11U6k3oOTELwBXE9i3iUKHpI
T3f3XpEYOHAdUWoLuJ9lQc/NVIp+B+j6rqMks3x8muZ3G3V/zSgUwkMu0ch/jA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675219338; a=rsa-sha256; cv=none;
b=lCRugzFSjbobgIe5nuJORa9Ko/8RLQ1iyBirKP7/sH6XLTBh3U9StzY9l4nGy0X9Gp6sGZ
dPCi4qNgAPvEbaOEbJrZySSy8ZkGTGRN1BUktDxuIbvIv8mZMYp/TWPuZzeBx2mB08XUf7
8quOBJkdPsuVMB+iARZQ0FTBd7/royn0zxESUVytL1GvWNUnfgjECnw805kxBfv/1V727s
47V2B/dLpiS8KjB1XFrXG0a0ofuRNW8VXsKAaMkW9/DZGP1X4TfXqP9WNi4Pq9LwtdMZBh
iWh8I/VdwjcH9LAKtO/h0bVY5SQL/eKS0935n00CgJls0cXQ11eFWIRx0DsrZg==
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 4P65mV4t67z1CXV;
Wed, 1 Feb 2023 02:42:18 +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 3112gIuk091743;
Wed, 1 Feb 2023 02:42:18 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3112gIgd091742;
Wed, 1 Feb 2023 02:42:18 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 02:42:18 GMT
Message-Id: <202302010242.3112gIgd091742@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Subject: git: 59cf050cb71d - stable/13 - MFC: Note upgrade to sendmail 8.17.1
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gshapiro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 59cf050cb71d30fdafc76fb9119da2a651b45bb6
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by gshapiro:
URL: https://cgit.FreeBSD.org/src/commit/?id=59cf050cb71d30fdafc76fb9119da2a651b45bb6
commit 59cf050cb71d30fdafc76fb9119da2a651b45bb6
Author: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
AuthorDate: 2023-02-01 02:22:39 +0000
Commit: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
CommitDate: 2023-02-01 02:34:13 +0000
MFC: Note upgrade to sendmail 8.17.1
(cherry picked from commit 38c2f8fe6207ec50088f9efc36d66776b0608137)
---
contrib/sendmail/FREEBSD-upgrade | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/sendmail/FREEBSD-upgrade b/contrib/sendmail/FREEBSD-upgrade
index 1afee1bfd07c..c8206c4bc351 100644
--- a/contrib/sendmail/FREEBSD-upgrade
+++ b/contrib/sendmail/FREEBSD-upgrade
@@ -1,6 +1,6 @@
$FreeBSD$
-sendmail 8.16.1
+sendmail 8.17.1
originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/
For the import of sendmail, the following directories were renamed:
@@ -102,4 +102,4 @@ infrastructure in FreeBSD:
usr.sbin/mailwrapper/Makefile
gshapiro@FreeBSD.org
-15-July-2020
+31-January-2022
From nobody Wed Feb 1 02:48:33 2023
X-Original-To: dev-commits-src-branches@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 4P65vj4BYdz3bpMD;
Wed, 1 Feb 2023 02:48:33 +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 4P65vj2Qztz4L2G;
Wed, 1 Feb 2023 02:48:33 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675219713;
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=CZQRDlYS0HtwIpwx7ou7D+DZWdeWbnqLS41Fl0FG1Ac=;
b=JjrLrEFiY3BywbdVywDKKRzeq06l0bocCaaomAljvpe5Ut0pYXUBiCOpotIumiuyA+MRaU
FtZzzVeKdmWyXEaBNaW8Y4FZtuKyBb/SSCMZGF+3NcH4CdYDCJBTrsoppdN0D/0B+pVz8z
cElZeWA5ay6hUmyom/LbHG61zLXTq/POtKQRKRMogP6y7IBTLc4qpmWpFd/rnYVeQqQ3hr
YE3XmAiOwa0Hz6Pg6XkwhPXPoEWrZ7tO+Uj935Cra2bXvUG0+gsuBCPuVplFEg2HUKFHne
FxS8zJsGm37/Rz/+MUp0gG+ytFlLMgewma6f35sTqXcXdO66cAAe+gNdTjQR4w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675219713;
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=CZQRDlYS0HtwIpwx7ou7D+DZWdeWbnqLS41Fl0FG1Ac=;
b=V5nq94doz1wrlbX0zh4FFjfcP2jwrOxEDZs1Fyz4D5qpcZDH6LMKWLQ8DWQ9tJdwO7J84z
8F1+dSoABxXer5yapESlLzafPtr3tHi7utNGM/e1XWl3rf3IBQ1z+ZODT39nIjFHj3QRmc
SUcfVxroCxBB1n9zVwPOPy/slninNjOUAAooTCIO/f1nD+DZuPmE3CieeSvl/4gbwlSC1J
2Ihxgu54UM8O1b7VgEzVtbTs8cQagqs46nK+xlfBKE9AACIXTQJYWF5V2VENoGxGUjl3Wh
BUNCbU3Q8EFQtybDS+hip3i7GPJzLaPA756U5CE184gWgiGNFXllCwANnvHO5A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675219713; a=rsa-sha256; cv=none;
b=Qh5nYQnSLlrEzKzC/IzX6WYS3tlERFtRlmS5M2KuFy3nfj7Fh1SUuq6PTPHXTKvzNb1tlu
Q+Y3thxQJZ6DIrDZF0CmdveLt7b/lYXS1uGHeAvTZh0DHDVGQZmuh3mgYMlForpfQ1tXL6
JIRND0WiZo+p8rzJSvAU7ZUPgfs7+Ne3o+/q8gxtaInQze7zN2y3nQdD1rU/30Uigz1AT+
hXoupzAskHNch0pvuQOYti4FAPsv00/bQ+GozI3UvJOKNhYuuzTPfhZutcC1bkZ27gMGOU
/oNZRDPtQKTQojVg3NTmlFUAQw6NJ6XvhxBhm7ueimjHrBvvppPgP+fHdCdImA==
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 4P65vj1Phwz1CGK;
Wed, 1 Feb 2023 02:48:33 +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 3112mXkM092790;
Wed, 1 Feb 2023 02:48:33 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3112mXOS092789;
Wed, 1 Feb 2023 02:48:33 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 02:48:33 GMT
Message-Id: <202302010248.3112mXOS092789@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Subject: git: 47745a74f28d - stable/13 - Note upgrade to sendmail 8.17.1
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gshapiro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 47745a74f28d25754a3f1050e31211dd0b5137b8
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by gshapiro:
URL: https://cgit.FreeBSD.org/src/commit/?id=47745a74f28d25754a3f1050e31211dd0b5137b8
commit 47745a74f28d25754a3f1050e31211dd0b5137b8
Author: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
AuthorDate: 2023-02-01 02:48:05 +0000
Commit: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
CommitDate: 2023-02-01 02:48:05 +0000
Note upgrade to sendmail 8.17.1
---
RELNOTES | 3 +++
1 file changed, 3 insertions(+)
diff --git a/RELNOTES b/RELNOTES
index f257440aa28a..7bf18ff9e274 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -10,6 +10,9 @@ newline. Entries should be separated by a newline.
Changes to this file should not be MFCed.
+68e86d5265bc,e58dfd0de589,59f5a5cb724e,6e272a78de36,4c4a4fd4a649,ba2ae2cca63a:
+ sendmail has been updated to the latest upstream version (8.17.1).
+
225443828ec6..c44d097dcf92:
bhyve now supports more than 16 vCPUs in a guest. By default
bhyve permits each guest to create the same number of vCPUs as
From nobody Wed Feb 1 02:54:20 2023
X-Original-To: dev-commits-src-branches@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 4P662P1BWgz3bq7Q;
Wed, 1 Feb 2023 02:54:21 +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 4P662N6xRjz4LZc;
Wed, 1 Feb 2023 02:54:20 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675220061;
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=zcozVP9t7ScUtGVyEzF+bMo7ITKeTdxBf0xpC9z5hKI=;
b=BsleV4meygkbYvvPdV4fVhna41fJ8oKB8+951MuHr1oTJ3DUuT+VxnMYi7rJWSzH3QjN6i
6j/e+yCOnevDSB9daC0wgaukoJPDX9bfk8uNdUDbprPEEmXM7NdLcOs8F2fOSkzKWubZ1e
bR2147Zo682VNuAHf8rIGDry9xpgVhgpnx4nUtJa7ML+WFhwX6cwVbqTz2t4r7JujiTVhH
U4ptM5FhZYnEidEbRb7oO+5q3IovaXZQgKVUgTcmP9Fz897NQet7mvmizc/5iVafJmzNi3
lVWEWZ0mS+CmihCwBRAfUC0XkvBClyi2vn8Kp2CU2bK9hiFFgulpSspWjR2ksQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675220061;
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=zcozVP9t7ScUtGVyEzF+bMo7ITKeTdxBf0xpC9z5hKI=;
b=CfovVMw0jD+l03ObRQg9o3lb40ZnGsEZsOgIPhrHvucT4P3bJb0o9+NjYcS0LaV3mwvprK
LrkgnLp4Ld7dmGmnjppZpcQ1VlNS8X/nlkGtY5QZ+2Xu69KgO4RL75BRc7KSLiL//ZPHfk
8E+1k4kpcBgXihFFvUvvjZjHyfyPavxws0GxDy9JbgdEuMud5KVvwmHvwaO4JFd+Irh4Qm
fIrHubSSml7HKDaT68PhKacNU1X1aeJ/mBxvZSTPYT1pLnI+6nW7ZTHfwsjLHSB/zh5ZKk
23ZZd3jiOTQ8dr5mC915ZSfm7U/RN3dfqNJoG8mxJnHsFpGjXImzMW8+T0Rk7Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675220061; a=rsa-sha256; cv=none;
b=cgKacujpL33f4dmYhK6v2iA94sLTdv0Fr0Vtpce2C2yOTC9hfe4anHrLeHQ7ME3S4uI+By
/G9c2qzSAnZwmAQEt22vVzQkCYCifZ+g4gobZc4n9FHvaPBobOSs57gksrGgbAFtVp1QWk
mg34x5mj+BK3RcdOYokJfuwe4Bor2jyZ98qVnRfxE14Yvzcnv4ChHlvLZgGHwClhZMgX2C
QXt1SKtMCeCvuw82twDqvV2QzBG5DC5xXN+9xN97M7ty0GTdCA2Xjkl3s63SNHaBlIxQhh
PUKQ9WdDdNLTWALAI/KxZNbnWLpuvZY731j+K8X4frwTsoFlaCWICUAeaEnriQ==
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 4P662N61W0z1CGt;
Wed, 1 Feb 2023 02:54:20 +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 3112sKGu006306;
Wed, 1 Feb 2023 02:54:20 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3112sKhg006305;
Wed, 1 Feb 2023 02:54:20 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 02:54:20 GMT
Message-Id: <202302010254.3112sKhg006305@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Cy Schubert <cy@FreeBSD.org>
Subject: git: 3f89a2974875 - stable/13 - network.subr: Replace "\ " with "[[:space:]]"
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: cy
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 3f89a29748755a6bd06d8bb1f3ed77aa9e2b6293
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=3f89a29748755a6bd06d8bb1f3ed77aa9e2b6293
commit 3f89a29748755a6bd06d8bb1f3ed77aa9e2b6293
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2022-12-21 16:06:02 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-02-01 02:53:11 +0000
network.subr: Replace "\ " with "[[:space:]]"
"[[:space:]]" is easier to read than "\ " and is conisitent with
clone_up().
Reported by: eugen
Differential Revision: https://reviews.freebsd.org/D37748
(cherry picked from commit fef0e429f190d396d5b3228166a012e85dd912f2)
---
libexec/rc/network.subr | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/libexec/rc/network.subr b/libexec/rc/network.subr
index f79e9314043c..76a5b94bc408 100644
--- a/libexec/rc/network.subr
+++ b/libexec/rc/network.subr
@@ -710,7 +710,7 @@ ipv4_down()
for _inet in $inetList ; do
# get rid of extraneous line
case $_inet in
- inet\ *) ;;
+ inet[[:space:]]*) ;;
*) continue ;;
esac
@@ -750,7 +750,7 @@ ipv6_down()
for _inet6 in $inetList ; do
# get rid of extraneous line
case $_inet6 in
- inet6\ *) ;;
+ inet6[[:space:]]*) ;;
*) continue ;;
esac
@@ -1017,7 +1017,7 @@ ifalias_af_common_handler()
_args=$*
case $_args in
- ${_af}\ *) ;;
+ ${_af}[[:space:]]*) ;;
*) return ;;
esac
@@ -1031,11 +1031,11 @@ ifalias_af_common_handler()
case $_c in
${_af})
case $_tmpargs in
- ${_af}\ *[0-9a-fA-F]-*)
+ ${_af}[[:space:]]*[0-9a-fA-F]-*)
ifalias_af_common_handler $_if $_af $_action \
- `ifalias_expand_addr $_af $_action ${_tmpargs#${_af}\ }`
+ `ifalias_expand_addr $_af $_action ${_tmpargs#${_af}[[:space:]]}`
;;
- ${_af}\ *)
+ ${_af}[[:space:]]*)
${IFCONFIG_CMD} $_if $_tmpargs $_action && _ret=0
;;
esac
@@ -1049,11 +1049,11 @@ ifalias_af_common_handler()
# Process the last component if any.
if [ -n "${_tmpargs}" ]; then
case $_tmpargs in
- ${_af}\ *[0-9a-fA-F]-*)
+ ${_af}[[:space:]]*[0-9a-fA-F]-*)
ifalias_af_common_handler $_if $_af $_action \
- `ifalias_expand_addr $_af $_action ${_tmpargs#${_af}\ }`
+ `ifalias_expand_addr $_af $_action ${_tmpargs#${_af}[[:space:]]}`
;;
- ${_af}\ *)
+ ${_af}[[:space:]]*)
${IFCONFIG_CMD} $_if $_tmpargs $_action && _ret=0
;;
esac
@@ -1086,10 +1086,10 @@ ifalias_af_common()
eval ifconfig_args=\"\$$alias\"
_iaf=
case $ifconfig_args in
- inet\ *) _iaf=inet ;;
- inet6\ *) _iaf=inet6 ;;
- link\ *) _iaf=link ;;
- ether\ *) _iaf=ether ;;
+ inet[[:space:]]*) _iaf=inet ;;
+ inet6[[:space:]]*) _iaf=inet6 ;;
+ link[[:space:]]*) _iaf=link ;;
+ ether[[:space:]]*) _iaf=ether ;;
esac
case ${_af}:${_action}:${_iaf}:"${ifconfig_args}" in
@@ -1137,7 +1137,7 @@ ifalias_af_common()
case $_c in
inet|inet6|link|ether)
case $_tmpargs in
- ${_af}\ *)
+ ${_af}[[:space:]]*)
eval ifalias_af_common_handler $_if $_af $_action $_tmpargs && _ret=0
;;
esac
@@ -1149,7 +1149,7 @@ ifalias_af_common()
done
# Process the last component
case $_tmpargs in
- ${_af}\ *)
+ ${_af}[[:space:]]*)
ifalias_af_common_handler $_if $_af $_action $_tmpargs && _ret=0
;;
esac
@@ -1262,7 +1262,7 @@ wlan_up()
create_args="wlandev $parent `get_if_var $child create_args_IF`"
debug_flags="`get_if_var $child wlandebug_IF`"
case $_iflist in
- ""|$child|$child\ *|*\ $child\ *|*\ $child) ;;
+ ""|$child|$child[[:space:]]*|*[[:space:]]$child[[:space:]]*|*[[:space:]]$child) ;;
*) continue ;;
esac
# Skip if ${child} already exists.
@@ -1302,7 +1302,7 @@ wlan_down()
child_wlans=`get_if_var $parent wlans_IF`
for child in ${child_wlans}; do
case $_iflist in
- ""|$child|$child\ *|*\ $child\ *|*\ $child) ;;
+ ""|$child|$child[[:space:]]*|*[[:space:]]$child[[:space:]]*|*[[:space:]]$child) ;;
*) continue ;;
esac
# Skip if ${child} doesn't exists.
@@ -1335,7 +1335,7 @@ clone_up()
# Parse ifn:ifopt.
OIFS=$IFS; IFS=:; set -- $ifn; ifn=$1; ifopt=$2; IFS=$OIFS
case $_iflist in
- ""|$ifn|$ifn\ *|*\ $ifn\ *|*\ $ifn) ;;
+ ""|$ifn|$ifn[[:space:]]*|*[[:space:]]$ifn[[:space:]]*|*[[:space:]]$ifn) ;;
*) continue ;;
esac
case $ifn in
@@ -1371,7 +1371,7 @@ clone_up()
# Parse ifn:ifopt.
OIFS=$IFS; IFS=:; set -- $ifn; ifn=$1; ifopt=$2; IFS=$OIFS
case $_iflist in
- ""|$ifn|$ifn\ *|*\ $ifn\ *|*\ $ifn) ;;
+ ""|$ifn|$ifn[[:space:]]*|*[[:space:]]$ifn[[:space:]]*|*[[:space:]]$ifn) ;;
*) continue ;;
esac
# Skip if ifn already exists.
@@ -1436,7 +1436,7 @@ clone_down()
*:1) continue ;; # global sticky knob == 1
esac
case $_iflist in
- ""|$ifn|$ifn\ *|*\ $ifn\ *|*\ $ifn) ;;
+ ""|$ifn|$ifn[[:space:]]*|*[[:space:]]$ifn[[:space:]]*|*[[:space:]]$ifn) ;;
*) continue ;;
esac
case $ifn in
From nobody Wed Feb 1 02:54:21 2023
X-Original-To: dev-commits-src-branches@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 4P662Q1fnfz3bq7X;
Wed, 1 Feb 2023 02:54:22 +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 4P662Q0h6qz4LRL;
Wed, 1 Feb 2023 02:54:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675220062;
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=KLrfrFNnmOYm+uCGMlw28UzHhLsqt2CtIBht4DWpcD8=;
b=m4K0cLCUjjbFAO3fci5gAAJDNcbd06wDX9FIxUze8O60462ugZxUhS+l8Evr8Ezlj7E74M
TVeOQncnfVXC9CNp3rLFCxCC3jJQ273ZCmmhNAM4p2tdbZPi0HiWUEZyI12P6lAR0bN7su
ifv3j/ocobMGFcZRsBDpIJhPQ4AXdOuSwupIuA63wgHE6wwOit+ImdGghue2AoqbZspZu8
aFVVqpjV8ph5hKkSWGDXC1wmsUPFWJEaJit7M8Wlgu9b2hg4JZ5F1iCPd/4Vi2gdZtRol+
aXpSrsSF0wKGni9uo54tgCxzbWSTWoLnLs0wiQdN9y7s1P9MJqMYm5W+Jwf8/w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675220062;
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=KLrfrFNnmOYm+uCGMlw28UzHhLsqt2CtIBht4DWpcD8=;
b=f3FVq8GU0We01YIHBD8lmkEI6af5etDAsfmIL7JXtLgNZiWmR6XuceDAzwfMLgfnRf7eaU
55IR/ZJndNHn9pWR3rQJjJNuqThXYHh7bTv8U/kXvJrNFTh4H/l3AIFypcaYxN/xM3r8S+
0fA23nlQIGT8Vfmh+/cMlfkosnpHOFL1C98sF5gKrFaVzAJLVxyd8ek2CnYrAzYjDJVo1w
FoRsbHc3Jurtb2/hLgSxMPI8rw2NmokuJtSWWuXGe15JTyi2p87HLLmFMr2arwsmYQ+MUS
m8a5/7fpUorI+z6bGINagASiIGkTr7KteA0bz1wOiavqU4jIrjxiQGzT3bpxOQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675220062; a=rsa-sha256; cv=none;
b=CZscPhfldP/haZ5fgqNb0XE9g+QnH5qZMPjK7Ovxa0jCYN76SfoFVh2xSfDgy7tpfhXnrY
/Zp23viHOiUafgyB0WrLkmJ0c1ZnTMFDazyWb28AHrvYOt7S7uCVWx7IffwCYRDAmCr0Qd
Sy3LFhjZ2PaudCZGhjPgGO+4UkdHD4qEOtcycgfeSQGgDQAu4uoS2TgeJfKCTfE0mRhGzc
nGxR2jr+nM/o+lLPrwCYcJGG8dHKma4YAMBWwXdw7WR59RSLvy0U8Lh7wbzKGgIAQTTBat
k7mWQYfCuimTsGbMsP88nfV4Hqzg/kdbFB8ZSsIc7UVrXeA7dNSspkhlJdQE+Q==
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 4P662P6vSXz1CGv;
Wed, 1 Feb 2023 02:54:21 +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 3112sLv8006339;
Wed, 1 Feb 2023 02:54:21 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3112sLKa006338;
Wed, 1 Feb 2023 02:54:21 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 02:54:21 GMT
Message-Id: <202302010254.3112sLKa006338@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Cy Schubert <cy@FreeBSD.org>
Subject: git: 40455909e124 - stable/13 - network.subr: Fix infinite loop
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: cy
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 40455909e124f41ba4b25194ed9991a1b71dce79
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=40455909e124f41ba4b25194ed9991a1b71dce79
commit 40455909e124f41ba4b25194ed9991a1b71dce79
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2022-12-14 21:41:10 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-02-01 02:53:11 +0000
network.subr: Fix infinite loop
When setting up carp tunnel, using a password consisting of only the
characters used as hexadecimal characters, i.e. abc-def, there will be
an infinite loop in the shell function ifalias_af_common_handler().
To circumvent this we test for " pass ".
PR: 268378
Reported by: jyoung15@gmail.com
Differential Revision: https://reviews.freebsd.org/D37748
(cherry picked from commit e3e57edf4aac05d041ca55ff2f008c6109ef88d5)
---
libexec/rc/network.subr | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libexec/rc/network.subr b/libexec/rc/network.subr
index 76a5b94bc408..29ac06daefb2 100644
--- a/libexec/rc/network.subr
+++ b/libexec/rc/network.subr
@@ -1049,6 +1049,9 @@ ifalias_af_common_handler()
# Process the last component if any.
if [ -n "${_tmpargs}" ]; then
case $_tmpargs in
+ ${_af}[[:space:]]pass[[:space:]]*)
+ ${IFCONFIG_CMD} $_if $_tmpargs $_action && _ret=0
+ ;;
${_af}[[:space:]]*[0-9a-fA-F]-*)
ifalias_af_common_handler $_if $_af $_action \
`ifalias_expand_addr $_af $_action ${_tmpargs#${_af}[[:space:]]}`
From nobody Wed Feb 1 02:56:13 2023
X-Original-To: dev-commits-src-branches@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 4P664Y66jCz3bqQh;
Wed, 1 Feb 2023 02:56:13 +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 4P664Y53YHz4LxT;
Wed, 1 Feb 2023 02:56:13 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675220173;
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=7afqy0HM6H5t0yyuftLgN7r9RfiJ1Z729UHyPIJOYcM=;
b=QljroHjpwih02DdhK/GrtjAN+zZC7BS3KUqBASyixRXT7dLFjoi2u+2620u8jYmBGv2NLq
eumwjLT6LAscm+yIDZNkODm9pWpqs8mRb8l1J5DLYchKfpXWgVPcYjELRhmL82fYZhy+YS
vnQQKJy6hgV51EyEHfSj0ogDApxP9hOgx/SjL2REPRDpbYGltCSfa/t/pdQw9CXDHQMNLw
0oPVlEj7WxhsnYTrn2lim2OP6Nme32YtKwSyFr8kGqDImGJw1eaOnbj6uoYu2KXYj7NP7X
c4NAzhMWhYhaeS8OliWrU2MQF2Xqvev8DYdD8EfoVR/RJWIqmEcQOvAHQiQKiw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675220173;
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=7afqy0HM6H5t0yyuftLgN7r9RfiJ1Z729UHyPIJOYcM=;
b=wfmKkTwQByXNwNYJzlVCyCmHDfNNPKzvaZYtpdOOKv8R67Fi+i5NIlibISijmUh/UwExzh
XUqPe7j3Eh0sdJlp7q9sLuIugc2sowckrSFyU3lbjA0VQIz+Xvml0q/IQOcwOk/2ovIgy9
w0EvIbu0JsIFf+pFLGlOKDRlUixBf8Xm5EAMz3Ca66gKjIlAd8jhRTxFsW3DaWqL8FW2Y9
tN09ugTAfE7wYuify8dEIgBLOREyaA89Lw4BDR+0Xgr8/N4cSB+DNwoB2tXVP+Sj1KTaYa
qWYX1ErquqXRq94IdAoTAchMq+tDwJQ/jtnm8ulOajXDEKTt6MdLuFK9cvIk/g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675220173; a=rsa-sha256; cv=none;
b=yPXZfAq0YRa8+49E1Lw43SIaaDJaLr5CiOB6xnN/q7nioENJ61Om+hsV0fGwS/w0afmmmA
7sUL38Vn7XQJwSX+cFV/4tnIPmPYrGbZ0Rk2OZPTitBEdoP3yu3tHj3BUGrv2yp918kLHk
lAe/OCRJLkqhxZgAqi8EB3NNPMqwpBYLaaHv284T6ywZwvBR3pexn8NAj3uCaodpOusYtU
CbhHeMJPzk5UcbRFpiT9ntoLPSmKy+COQN8Sqxu6CWrKQd82kyRYUA/EqPevbjXN5/OIoB
ud+w+SHs+huPqFOu7uAUQDf+lmSon4+ePHAI1qbSp2Qonmvv8dcWWUI/0nTxlw==
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 4P664Y453fz1CVn;
Wed, 1 Feb 2023 02:56:13 +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 3112uDYH006679;
Wed, 1 Feb 2023 02:56:13 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3112uDNt006678;
Wed, 1 Feb 2023 02:56:13 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 02:56:13 GMT
Message-Id: <202302010256.3112uDNt006678@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Cy Schubert <cy@FreeBSD.org>
Subject: git: 82de173cbc81 - stable/12 - network.subr: Replace "\ " with "[[:space:]]"
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: cy
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 82de173cbc81a09191ac23a2b2e2df3d83dd55ef
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=82de173cbc81a09191ac23a2b2e2df3d83dd55ef
commit 82de173cbc81a09191ac23a2b2e2df3d83dd55ef
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2022-12-21 16:06:02 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-02-01 02:55:19 +0000
network.subr: Replace "\ " with "[[:space:]]"
"[[:space:]]" is easier to read than "\ " and is conisitent with
clone_up().
Reported by: eugen
Differential Revision: https://reviews.freebsd.org/D37748
(cherry picked from commit fef0e429f190d396d5b3228166a012e85dd912f2)
---
libexec/rc/network.subr | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/libexec/rc/network.subr b/libexec/rc/network.subr
index 623c3d95b32e..793784f8c927 100644
--- a/libexec/rc/network.subr
+++ b/libexec/rc/network.subr
@@ -709,7 +709,7 @@ ipv4_down()
for _inet in $inetList ; do
# get rid of extraneous line
case $_inet in
- inet\ *) ;;
+ inet[[:space:]]*) ;;
*) continue ;;
esac
@@ -749,7 +749,7 @@ ipv6_down()
for _inet6 in $inetList ; do
# get rid of extraneous line
case $_inet6 in
- inet6\ *) ;;
+ inet6[[:space:]]*) ;;
*) continue ;;
esac
@@ -1016,7 +1016,7 @@ ifalias_af_common_handler()
_args=$*
case $_args in
- ${_af}\ *) ;;
+ ${_af}[[:space:]]*) ;;
*) return ;;
esac
@@ -1030,11 +1030,11 @@ ifalias_af_common_handler()
case $_c in
${_af})
case $_tmpargs in
- ${_af}\ *[0-9a-fA-F]-*)
+ ${_af}[[:space:]]*[0-9a-fA-F]-*)
ifalias_af_common_handler $_if $_af $_action \
- `ifalias_expand_addr $_af $_action ${_tmpargs#${_af}\ }`
+ `ifalias_expand_addr $_af $_action ${_tmpargs#${_af}[[:space:]]}`
;;
- ${_af}\ *)
+ ${_af}[[:space:]]*)
${IFCONFIG_CMD} $_if $_tmpargs $_action && _ret=0
;;
esac
@@ -1048,11 +1048,11 @@ ifalias_af_common_handler()
# Process the last component if any.
if [ -n "${_tmpargs}" ]; then
case $_tmpargs in
- ${_af}\ *[0-9a-fA-F]-*)
+ ${_af}[[:space:]]*[0-9a-fA-F]-*)
ifalias_af_common_handler $_if $_af $_action \
- `ifalias_expand_addr $_af $_action ${_tmpargs#${_af}\ }`
+ `ifalias_expand_addr $_af $_action ${_tmpargs#${_af}[[:space:]]}`
;;
- ${_af}\ *)
+ ${_af}[[:space:]]*)
${IFCONFIG_CMD} $_if $_tmpargs $_action && _ret=0
;;
esac
@@ -1085,10 +1085,10 @@ ifalias_af_common()
eval ifconfig_args=\"\$$alias\"
_iaf=
case $ifconfig_args in
- inet\ *) _iaf=inet ;;
- inet6\ *) _iaf=inet6 ;;
- link\ *) _iaf=link ;;
- ether\ *) _iaf=ether ;;
+ inet[[:space:]]*) _iaf=inet ;;
+ inet6[[:space:]]*) _iaf=inet6 ;;
+ link[[:space:]]*) _iaf=link ;;
+ ether[[:space:]]*) _iaf=ether ;;
esac
case ${_af}:${_action}:${_iaf}:"${ifconfig_args}" in
@@ -1136,7 +1136,7 @@ ifalias_af_common()
case $_c in
inet|inet6|link|ether)
case $_tmpargs in
- ${_af}\ *)
+ ${_af}[[:space:]]*)
eval ifalias_af_common_handler $_if $_af $_action $_tmpargs && _ret=0
;;
esac
@@ -1148,7 +1148,7 @@ ifalias_af_common()
done
# Process the last component
case $_tmpargs in
- ${_af}\ *)
+ ${_af}[[:space:]]*)
ifalias_af_common_handler $_if $_af $_action $_tmpargs && _ret=0
;;
esac
@@ -1259,7 +1259,7 @@ wlan_up()
create_args="wlandev $parent `get_if_var $child create_args_IF`"
debug_flags="`get_if_var $child wlandebug_IF`"
case $_iflist in
- ""|$child|$child\ *|*\ $child\ *|*\ $child) ;;
+ ""|$child|$child[[:space:]]*|*[[:space:]]$child[[:space:]]*|*[[:space:]]$child) ;;
*) continue ;;
esac
# Skip if ${child} already exists.
@@ -1299,7 +1299,7 @@ wlan_down()
child_wlans=`get_if_var $parent wlans_IF`
for child in ${child_wlans}; do
case $_iflist in
- ""|$child|$child\ *|*\ $child\ *|*\ $child) ;;
+ ""|$child|$child[[:space:]]*|*[[:space:]]$child[[:space:]]*|*[[:space:]]$child) ;;
*) continue ;;
esac
# Skip if ${child} doesn't exists.
@@ -1332,7 +1332,7 @@ clone_up()
# Parse ifn:ifopt.
OIFS=$IFS; IFS=:; set -- $ifn; ifn=$1; ifopt=$2; IFS=$OIFS
case $_iflist in
- ""|$ifn|$ifn\ *|*\ $ifn\ *|*\ $ifn) ;;
+ ""|$ifn|$ifn[[:space:]]*|*[[:space:]]$ifn[[:space:]]*|*[[:space:]]$ifn) ;;
*) continue ;;
esac
case $ifn in
@@ -1368,7 +1368,7 @@ clone_up()
# Parse ifn:ifopt.
OIFS=$IFS; IFS=:; set -- $ifn; ifn=$1; ifopt=$2; IFS=$OIFS
case $_iflist in
- ""|$ifn|$ifn\ *|*\ $ifn\ *|*\ $ifn) ;;
+ ""|$ifn|$ifn[[:space:]]*|*[[:space:]]$ifn[[:space:]]*|*[[:space:]]$ifn) ;;
*) continue ;;
esac
# Skip if ifn already exists.
@@ -1433,7 +1433,7 @@ clone_down()
*:1) continue ;; # global sticky knob == 1
esac
case $_iflist in
- ""|$ifn|$ifn\ *|*\ $ifn\ *|*\ $ifn) ;;
+ ""|$ifn|$ifn[[:space:]]*|*[[:space:]]$ifn[[:space:]]*|*[[:space:]]$ifn) ;;
*) continue ;;
esac
case $ifn in
From nobody Wed Feb 1 02:56:14 2023
X-Original-To: dev-commits-src-branches@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 4P664b29gRz3bqRc;
Wed, 1 Feb 2023 02:56:15 +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 4P664Z5xJlz4M4W;
Wed, 1 Feb 2023 02:56:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675220174;
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=EPec7C6z4O9JWLcvhqnCvDyYKVeNQ5niDRs2fdSiCzo=;
b=aSLd7W0zgy2DLubDchlxCy/Kvc2yVOSHJMKKCeizCJd33MStG3hgNQmlDa+b6LlatUhdmT
LYF2Tf0OM6l9jN4VWbOR2I/frm1iT4Yfl0liWnAQDZxGze/vTPNS+0413+H5fuIMpy6zV+
wHAXI53d7dk1Es5Lb6RNGP041b5HUUyeyNpUm1Er96fPzY+Kf1WdJhG7jnawMa+QOgnkcs
hYxcVaPGd+4DC3hzASWRr4HwmahgPtz2vlMAK4GRdUTH/ZT8uXq0DWVtjC/cebTio9ZH5s
LDPGg9bCYHzp6HJiQ/c79Fmn2e3xBSXq3VKxnfFs4mY+xrNQIlwl2Ii9HoH8NA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675220174;
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=EPec7C6z4O9JWLcvhqnCvDyYKVeNQ5niDRs2fdSiCzo=;
b=EwTarJP6IGAD5dkjcZbblkUBDO9MTZJSZUlSx+2WCfLiG4QYeDGgQUTU1/+mrclEEIrKeM
CoDl6/YUWhlvVYKNcoCjRE1pA98R2/hKEsx1AJz3mFaNBd8kSjTpToeTuAuy2CM0aOyXEE
TuxClbR6lA62BXrYFJzsZV2PtL2G2QqOzSlOWbuCfdrsRv5Oszug+2znVSL1hz+rg9Wj1q
/OUvUFdHHoSUIzb723AloIfISP1gKzriIbQFS9K03X4OZY3oA94qx4t0TDMIsGjxlmexBu
WbK5mAmkFdNSA2K2/5DzxQLp5jDH37aLZDDhxRW69elfeHodYnNyhktLWq4VQA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675220174; a=rsa-sha256; cv=none;
b=vbB9EpVSbYMeJrzPqSOLk99ENIMGYS1pqIm8AXUmdDMkyQPSJ1qtsJ4DFLbZ6o3ssbaW4J
hiSmXVs8OkMCVVWZKZsGsPub+uo8pVqpk5hD8b+6uRfuEh7R14OdsLAag+4i/Nh5TicZGS
++HdONOw0SBv0MNKKC/96txH9JcwbeF1eQDZL4+s2S0KaNAmEiS9UCVUzW32XO0+PiIuvu
SIlUL+PMOP9xitKAX+rRTHIhM76ofYhhMopufO4g09sTiKxcaACuuLKsomlDO2iCJZaBeg
nO4GC6mwrG7EjFC/FgmzQPZAFAPBT74Bc6g8vHL8ttpgM2uTxt1R2A6rdphlQA==
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 4P664Z51VDz1C04;
Wed, 1 Feb 2023 02:56:14 +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 3112uE57006716;
Wed, 1 Feb 2023 02:56:14 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3112uETk006715;
Wed, 1 Feb 2023 02:56:14 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 02:56:14 GMT
Message-Id: <202302010256.3112uETk006715@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Cy Schubert <cy@FreeBSD.org>
Subject: git: 3512eda8e078 - stable/12 - network.subr: Fix infinite loop
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: cy
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 3512eda8e078d1ca49f6c3ec74eb78d6f373b66b
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=3512eda8e078d1ca49f6c3ec74eb78d6f373b66b
commit 3512eda8e078d1ca49f6c3ec74eb78d6f373b66b
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2022-12-14 21:41:10 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-02-01 02:55:19 +0000
network.subr: Fix infinite loop
When setting up carp tunnel, using a password consisting of only the
characters used as hexadecimal characters, i.e. abc-def, there will be
an infinite loop in the shell function ifalias_af_common_handler().
To circumvent this we test for " pass ".
PR: 268378
Reported by: jyoung15@gmail.com
Differential Revision: https://reviews.freebsd.org/D37748
(cherry picked from commit e3e57edf4aac05d041ca55ff2f008c6109ef88d5)
---
libexec/rc/network.subr | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libexec/rc/network.subr b/libexec/rc/network.subr
index 793784f8c927..ada4b8d138cc 100644
--- a/libexec/rc/network.subr
+++ b/libexec/rc/network.subr
@@ -1048,6 +1048,9 @@ ifalias_af_common_handler()
# Process the last component if any.
if [ -n "${_tmpargs}" ]; then
case $_tmpargs in
+ ${_af}[[:space:]]pass[[:space:]]*)
+ ${IFCONFIG_CMD} $_if $_tmpargs $_action && _ret=0
+ ;;
${_af}[[:space:]]*[0-9a-fA-F]-*)
ifalias_af_common_handler $_if $_af $_action \
`ifalias_expand_addr $_af $_action ${_tmpargs#${_af}[[:space:]]}`
From nobody Wed Feb 1 03:27:21 2023
X-Original-To: dev-commits-src-branches@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 4P66mV0Bffz3btlP;
Wed, 1 Feb 2023 03:27:22 +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 4P66mT6lBtz4PNj;
Wed, 1 Feb 2023 03:27:21 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675222041;
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=yiOSSUzKmplf5ecp0CmeqWiAIlKhs5lcwDHsJYN4yy4=;
b=MUQ2lae1M2j4wZL91lEOFF3XwPQ2RfXux6Q5pCsd6O0l6jIh3pmXZLjRWcpQl6dq7VwbkP
DXa1HPehE+VGqfz8TvST53r7zjlqlgBYd7POyr8xgVYlWNH/3MBMs+mSgwk0cUuDoD9cdy
2aUSvoc47p9wpuD1FsFrIgT9YoG9LnCRAPEWr00VR0nMQY8ObiXqqkri7MlnDGa4E7q+hT
sWus6zufHM6xEx7F56HbfUqYIRkdPQz5pyb+CZgE0RsqzAJY549odK/DGbapx/NohgJ+NE
3uGqmnbKaZLeqar0rq8XxtEfmTmW0krdFWunF/q7w+05FeVp6SsdMc0qkBE68g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675222041;
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=yiOSSUzKmplf5ecp0CmeqWiAIlKhs5lcwDHsJYN4yy4=;
b=NUp3nC/bc9BUmCy7ghjKnE/DKauqDgtmyK0RgxEJ+O7b6aSdloXKexOVpYNHb2eJ6zGbdJ
k5DJ+6vqtyYa+RtJkDpKLpV9hjjqjUEvgApcfJdAufRDVClRrvcPP9EE+bG7w4trKY2iFi
IH2x/5xp05ELCQFimi7i8XTaXPoh1pJITgUIAIz5XfHQVhdxV84eLiQDphSEInJPlJOwoR
z/5z1d8MQ8oFEovpNWW4t1bLYkZWmDMwPtkv9tU5oBaEKB2rTZbhjl1AyiB9c4zLSJuFxE
OBLpNt5jjhNB0iyJdfyhMdkw2laVrZ8CCaYKDCPn9jADcWcn64xf+mdYqbDgCw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675222041; a=rsa-sha256; cv=none;
b=AIBinVyOHO6xmkjM3NP+DzhRirEw0LSxF9iLNVfz599bdO1IzOLB1t0LnaYsFNMk2rEzqx
kAWNY+XSMJe0VUD7c/uv81yKypcJD1mZaeZeUcpuN8NGfbEVvn5BEBlYXVA/GOkkyLKGoE
z8SP+lE6Z2eZTAY72Zqu5bQy8unQUMkkRmV/YxQtequt284yF6zA4e/3APM893GDYUaxKB
hzvTQ4fqImnhXbJW2AZBInC9HE7cdYGzoiU/ympwTDcdj0AAGRk0zzQ20d7QaKcTcCeEDw
GmtLg2DJV7nORbtT5npItcubIgy8WNvJB1xRiOEXCHhgkYEPTu/XsBsucIkNyg==
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 4P66mT5WS0z1D9G;
Wed, 1 Feb 2023 03:27:21 +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 3113RLZh051202;
Wed, 1 Feb 2023 03:27:21 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3113RLcX051201;
Wed, 1 Feb 2023 03:27:21 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 03:27:21 GMT
Message-Id: <202302010327.3113RLcX051201@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Subject: git: 08ca3eb6db2e - stable/12 - MFC: Merge commit '28fbd2825d216dafca4d991ad96d05b312f4f9a3'
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gshapiro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 08ca3eb6db2e04b38e9786d9d787e6a36074ac35
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by gshapiro:
URL: https://cgit.FreeBSD.org/src/commit/?id=08ca3eb6db2e04b38e9786d9d787e6a36074ac35
commit 08ca3eb6db2e04b38e9786d9d787e6a36074ac35
Author: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
AuthorDate: 2023-01-15 21:20:22 +0000
Commit: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
CommitDate: 2023-02-01 03:19:44 +0000
MFC: Merge commit '28fbd2825d216dafca4d991ad96d05b312f4f9a3'
Merge vendor sendmail 8.17.1 into HEAD
(cherry picked from commit 2fb4f839f3fc72ce2bab12f9ba4760f97f73e97f)
---
contrib/sendmail/CACerts | 148 ++---
contrib/sendmail/KNOWNBUGS | 8 +
contrib/sendmail/Makefile | 16 +-
contrib/sendmail/PGPKEYS | 177 +++++-
contrib/sendmail/README | 5 -
contrib/sendmail/RELEASE_NOTES | 139 ++++-
contrib/sendmail/cf/README | 79 ++-
contrib/sendmail/cf/cf/Makefile | 29 +-
contrib/sendmail/cf/cf/submit.cf | 39 +-
contrib/sendmail/cf/cf/submit.mc | 3 +
contrib/sendmail/cf/feature/check_cert_altnames.m4 | 2 +-
contrib/sendmail/cf/feature/check_other.m4 | 46 ++
contrib/sendmail/cf/feature/delay_checks.m4 | 2 +-
contrib/sendmail/cf/feature/dnsbl.m4 | 2 +-
contrib/sendmail/cf/feature/enhdnsbl.m4 | 2 +-
contrib/sendmail/cf/feature/nopercenthack.m4 | 2 +-
contrib/sendmail/cf/feature/nouucp.m4 | 2 +-
contrib/sendmail/cf/feature/sts.m4 | 19 +
contrib/sendmail/cf/m4/cfhead.m4 | 8 +-
contrib/sendmail/cf/m4/proto.m4 | 338 +++++++++--
contrib/sendmail/cf/m4/version.m4 | 2 +-
contrib/sendmail/cf/mailer/local.m4 | 2 +-
contrib/sendmail/contrib/AuthRealm.p0 | 17 +-
contrib/sendmail/contrib/cidrexpand | 77 ++-
contrib/sendmail/contrib/doublebounce.pl | 0
contrib/sendmail/contrib/link_hash.sh | 0
contrib/sendmail/contrib/re-mqueue.pl | 0
contrib/sendmail/doc/op/op.me | 216 ++++++-
contrib/sendmail/editmap/editmap.8 | 22 +-
contrib/sendmail/editmap/editmap.c | 13 +-
contrib/sendmail/include/libmilter/mfapi.h | 2 +-
contrib/sendmail/include/libsmdb/smdb.h | 6 +-
contrib/sendmail/include/sendmail/pathnames.h | 2 +-
contrib/sendmail/include/sm/bdb.h | 4 +-
contrib/sendmail/include/sm/conf.h | 1 +
contrib/sendmail/include/sm/gen.h | 12 +
contrib/sendmail/include/sm/ixlen.h | 43 ++
contrib/sendmail/include/sm/notify.h | 5 +-
contrib/sendmail/include/sm/os/sm_os_freebsd.h | 5 +
contrib/sendmail/include/sm/os/sm_os_openbsd.h | 20 +-
contrib/sendmail/include/sm/rpool.h | 10 +-
contrib/sendmail/include/sm/sem.h | 2 +-
contrib/sendmail/include/sm/sendmail.h | 24 +-
contrib/sendmail/include/sm/shm.h | 2 +-
contrib/sendmail/include/sm/sysexits.h | 4 +
contrib/sendmail/include/sm/time.h | 2 -
contrib/sendmail/libmilter/docs/overview.html | 3 +-
.../sendmail/libmilter/docs/smfi_setmlreply.html | 24 +-
contrib/sendmail/libmilter/engine.c | 48 +-
contrib/sendmail/libmilter/listener.c | 26 +-
contrib/sendmail/libmilter/sm_gethost.c | 4 +-
contrib/sendmail/libsm/Makefile.m4 | 12 +-
contrib/sendmail/libsm/cf.c | 3 +-
contrib/sendmail/libsm/clock.c | 79 +--
contrib/sendmail/libsm/config.c | 4 +-
contrib/sendmail/libsm/heap.c | 27 +-
contrib/sendmail/libsm/ilenx.c | 40 ++
contrib/sendmail/libsm/ldap.c | 66 +--
contrib/sendmail/libsm/lowercase.c | 162 ++++++
contrib/sendmail/libsm/makebuf.c | 2 +-
contrib/sendmail/libsm/mbdb.c | 54 +-
contrib/sendmail/libsm/memstat.c | 4 +-
contrib/sendmail/libsm/niprop.c | 20 +-
contrib/sendmail/libsm/notify.c | 65 ++-
contrib/sendmail/libsm/refill.c | 2 +-
contrib/sendmail/libsm/rpool.c | 29 +-
contrib/sendmail/libsm/sem.c | 16 +-
contrib/sendmail/libsm/shm.c | 8 +-
contrib/sendmail/libsm/signal.c | 76 +--
contrib/sendmail/libsm/strcaseeq.c | 114 ++++
contrib/sendmail/libsm/string.c | 3 -
contrib/sendmail/libsm/stringf.c | 2 +-
contrib/sendmail/libsm/t-ixlen.c | 105 ++++
contrib/sendmail/libsm/t-ixlen.sh | 41 ++
contrib/sendmail/libsm/t-notify.c | 128 ++--
contrib/sendmail/libsm/t-qic.c | 31 +-
contrib/sendmail/libsm/t-sem.c | 9 +-
contrib/sendmail/libsm/t-shm.c | 1 +
contrib/sendmail/libsm/t-str2prt.c | 64 ++
contrib/sendmail/libsm/t-streq.c | 77 +++
contrib/sendmail/libsm/t-streq.sh | 29 +
contrib/sendmail/libsm/utf8_valid.c | 104 ++++
contrib/sendmail/libsm/util.c | 60 +-
contrib/sendmail/libsm/uxtext_unquote.c | 204 +++++++
contrib/sendmail/libsm/vasprintf.c | 2 +-
contrib/sendmail/libsm/vfprintf.c | 7 +-
contrib/sendmail/libsm/vprintf.c | 2 +-
contrib/sendmail/libsm/vsnprintf.c | 2 +-
contrib/sendmail/libsm/xleni.c | 43 ++
contrib/sendmail/libsmdb/smcdb.c | 21 +-
contrib/sendmail/libsmdb/smdb2.c | 10 +-
contrib/sendmail/libsmutil/Makefile.m4 | 6 +
contrib/sendmail/libsmutil/cf.c | 3 +
contrib/sendmail/libsmutil/safefile.c | 60 +-
contrib/sendmail/libsmutil/t-lockfile-0.sh | 70 +++
contrib/sendmail/libsmutil/t-lockfile.c | 351 +++++++++++
contrib/sendmail/libsmutil/t-maplock-0.sh | 111 ++++
contrib/sendmail/mail.local/mail.local.c | 114 ++--
contrib/sendmail/mailstats/mailstats.8 | 26 +-
contrib/sendmail/makemap/makemap.c | 69 ++-
contrib/sendmail/praliases/praliases.8 | 6 +-
contrib/sendmail/praliases/praliases.c | 7 +-
contrib/sendmail/rmail/rmail.8 | 30 +-
contrib/sendmail/smrsh/smrsh.c | 4 +-
contrib/sendmail/src/README | 68 ++-
contrib/sendmail/src/TRACEFLAGS | 8 +
contrib/sendmail/src/alias.c | 76 ++-
contrib/sendmail/src/aliases.5 | 66 +--
contrib/sendmail/src/collect.c | 9 +-
contrib/sendmail/src/conf.c | 596 ++++++++++---------
contrib/sendmail/src/conf.h | 4 +-
contrib/sendmail/src/control.c | 23 +-
contrib/sendmail/src/convtime.c | 3 +-
contrib/sendmail/src/daemon.c | 131 ++++-
contrib/sendmail/src/deliver.c | 529 +++++++++++++----
contrib/sendmail/src/domain.c | 106 +++-
contrib/sendmail/src/envelope.c | 57 +-
contrib/sendmail/src/err.c | 77 ++-
contrib/sendmail/src/headers.c | 183 ++++--
contrib/sendmail/src/helpfile | 8 +-
contrib/sendmail/src/macro.c | 22 +-
contrib/sendmail/src/mailq.1 | 36 +-
contrib/sendmail/src/main.c | 278 ++++++---
contrib/sendmail/src/map.c | 643 ++++++++++++---------
contrib/sendmail/src/mci.c | 14 +-
contrib/sendmail/src/milter.c | 96 +--
contrib/sendmail/src/mime.c | 27 +-
contrib/sendmail/src/parseaddr.c | 111 ++--
contrib/sendmail/src/queue.c | 562 +++++++++++-------
contrib/sendmail/src/ratectrl.c | 18 +-
contrib/sendmail/src/readcf.c | 502 ++++++++++------
contrib/sendmail/src/recipient.c | 67 ++-
contrib/sendmail/src/savemail.c | 48 +-
contrib/sendmail/src/sendmail.8 | 359 ++++++------
contrib/sendmail/src/sendmail.h | 188 ++++--
contrib/sendmail/src/sfsasl.c | 34 +-
contrib/sendmail/src/sm_resolve.c | 148 +++--
contrib/sendmail/src/sm_resolve.h | 1 -
contrib/sendmail/src/srvrsmtp.c | 408 +++++++++----
contrib/sendmail/src/stab.c | 25 +-
contrib/sendmail/src/stats.c | 2 +-
contrib/sendmail/src/tls.c | 54 +-
contrib/sendmail/src/tls.h | 29 +-
contrib/sendmail/src/tlsh.c | 11 +-
contrib/sendmail/src/trace.c | 2 +-
contrib/sendmail/src/udb.c | 32 +-
contrib/sendmail/src/usersmtp.c | 347 +++++++----
contrib/sendmail/src/util.c | 232 ++++++--
contrib/sendmail/src/version.c | 2 +-
contrib/sendmail/test/t_dropgid.c | 17 +-
contrib/sendmail/test/t_exclopen.c | 5 +-
contrib/sendmail/test/t_pathconf.c | 6 +-
contrib/sendmail/test/t_seteuid.c | 5 +-
contrib/sendmail/test/t_setgid.c | 15 +-
contrib/sendmail/test/t_setreuid.c | 5 +-
contrib/sendmail/test/t_setuid.c | 3 +-
contrib/sendmail/test/t_snprintf.c | 2 +-
contrib/sendmail/vacation/vacation.1 | 10 +-
contrib/sendmail/vacation/vacation.c | 17 +-
159 files changed, 7657 insertions(+), 2919 deletions(-)
diff --git a/contrib/sendmail/CACerts b/contrib/sendmail/CACerts
index 630707555657..5e3b5ee084c7 100644
--- a/contrib/sendmail/CACerts
+++ b/contrib/sendmail/CACerts
@@ -1,7 +1,7 @@
# This file contains some CA certificates that are used to sign the
# certificates of mail servers of members of the sendmail consortium
-# who may reply to questions etc sent to sendmail.org.
-# It is useful to allow connections from those MTAs that can present
+# who may reply to questions etc sent to support.sendmail.org.
+# It is useful to allow connections from those MTAs which can present
# a certificate signed by one of these CA certificates.
#
@@ -9,92 +9,92 @@ Certificate:
Data:
Version: 3 (0x2)
Serial Number:
- 81:9d:41:0f:40:55:ac:4a
- Signature Algorithm: sha1WithRSAEncryption
- Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=CA/emailAddress=ca+ca-rsa2018@esmtp.org
+ 92:a1:3b:d3:90:0b:ea:a7
+ Signature Algorithm: sha256WithRSAEncryption
+ Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=CA/emailAddress=ca+ca-rsa2021@esmtp.org
Validity
- Not Before: Feb 27 02:30:55 2018 GMT
- Not After : Feb 26 02:30:55 2021 GMT
- Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=CA/emailAddress=ca+ca-rsa2018@esmtp.org
+ Not Before: Feb 25 17:44:02 2021 GMT
+ Not After : Feb 25 17:44:02 2024 GMT
+ Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=CA/emailAddress=ca+ca-rsa2021@esmtp.org
Subject Public Key Info:
Public Key Algorithm: rsaEncryption
Public-Key: (2048 bit)
Modulus:
- 00:b8:a3:8d:79:28:c1:1f:9c:11:74:43:26:e1:3b:
- cc:14:87:5b:6b:64:4c:ed:79:1b:7f:2a:03:d0:7b:
- ef:9e:88:b0:64:36:ee:58:ef:fd:d9:c7:20:b3:71:
- e9:6d:1e:a7:bc:c1:7c:3b:fe:2a:e4:16:2f:bc:d6:
- 2c:f5:98:f9:c4:21:1c:ca:c3:7e:57:89:c8:a9:2f:
- da:6b:9b:52:d6:c9:9d:98:97:6d:08:7c:a6:37:4e:
- d4:26:bb:db:73:b0:38:ef:7d:1e:dd:8e:dd:8e:17:
- 2f:a0:3d:a9:0e:4d:f0:2b:b8:14:23:33:ad:c8:a0:
- e5:9d:0f:27:ad:83:a2:78:90:05:ec:29:06:91:07:
- 45:6c:5f:ba:8e:1d:f1:d7:1b:2d:f9:99:ba:2e:27:
- e1:03:7d:e9:d2:54:35:cc:39:79:07:83:d8:93:9b:
- d6:ef:72:ab:d4:63:8e:6b:f7:00:66:5f:77:e8:b6:
- bc:de:5f:8c:d0:ce:1a:c4:db:03:9d:e4:ee:0a:ec:
- 77:c5:f2:30:69:7e:70:12:e5:c2:4a:28:3f:e7:19:
- eb:af:41:fb:e6:a6:1d:b5:fd:2b:99:03:f5:20:90:
- 38:73:bd:43:70:da:cf:1f:34:5d:ab:17:4b:73:cf:
- f9:3d:e1:a2:79:14:de:d8:40:85:82:c4:5a:84:82:
- 32:f1
+ 00:cc:8c:39:bd:cf:55:4f:66:2a:78:c7:65:47:81:
+ dd:d1:3f:08:12:4b:87:40:48:95:5c:24:52:65:a1:
+ 82:1c:f4:90:a1:7c:f7:27:8f:02:e5:cb:ac:89:ae:
+ b8:25:4e:26:da:14:20:07:29:a4:59:03:61:b4:44:
+ ae:45:55:b4:72:7d:66:9a:88:de:59:bf:6f:31:23:
+ 06:29:ab:c2:b9:a0:6c:6a:5d:d0:ac:e6:b8:ac:8a:
+ 6f:5e:bb:f3:19:b5:8d:e1:df:2e:d1:7f:1a:bc:2c:
+ 13:10:65:46:7f:68:c7:60:49:c6:30:4e:a0:24:ed:
+ d4:a8:27:cf:b2:d0:c5:7c:96:47:82:b6:f1:17:0a:
+ 5a:35:82:0b:85:0f:17:71:a9:bd:3a:4c:e6:32:95:
+ 3e:68:f7:3d:f5:04:33:16:19:1e:4c:0a:04:c3:1f:
+ 9e:ba:db:e2:0d:29:c8:3f:29:cf:47:cb:11:db:d2:
+ cd:d0:26:2f:35:eb:7d:a2:60:18:e7:7b:a2:43:15:
+ 59:d7:ea:9d:38:60:f1:48:df:57:54:df:8a:50:b9:
+ e3:5c:72:82:51:b7:05:78:c2:14:08:71:71:1c:06:
+ 44:4a:85:73:08:a8:49:50:b2:d2:fb:da:a2:a5:5a:
+ 36:49:a8:4b:38:56:f6:67:0f:12:34:39:cc:fb:9c:
+ bd:d3
Exponent: 65537 (0x10001)
X509v3 extensions:
- X509v3 Subject Key Identifier:
- 42:37:75:E7:8F:12:CF:D9:EB:21:22:7D:8A:E8:49:21:FD:E2:3A:3A
- X509v3 Authority Key Identifier:
- keyid:42:37:75:E7:8F:12:CF:D9:EB:21:22:7D:8A:E8:49:21:FD:E2:3A:3A
- DirName:/C=US/ST=California/L=Berkeley/O=Endmail Org/OU=MTA/CN=CA/emailAddress=ca+ca-rsa2018@esmtp.org
- serial:81:9D:41:0F:40:55:AC:4A
- X509v3 Basic Constraints:
+ X509v3 Subject Key Identifier:
+ 86:F0:F9:7A:CD:66:A9:16:CC:A3:26:08:3D:B3:B2:42:C2:E5:A9:13
+ X509v3 Authority Key Identifier:
+ keyid:86:F0:F9:7A:CD:66:A9:16:CC:A3:26:08:3D:B3:B2:42:C2:E5:A9:13
+ DirName:/C=US/ST=California/L=Berkeley/O=Endmail Org/OU=MTA/CN=CA/emailAddress=ca+ca-rsa2021@esmtp.org
+ serial:92:A1:3B:D3:90:0B:EA:A7
+ X509v3 Basic Constraints:
CA:TRUE
- X509v3 Subject Alternative Name:
- email:ca+ca-rsa2018@esmtp.org
- X509v3 Issuer Alternative Name:
- email:ca+ca-rsa2018@esmtp.org
- Signature Algorithm: sha1WithRSAEncryption
- 0b:4c:e5:c2:ed:0a:e5:7b:95:29:22:d4:8f:5f:cb:1b:b1:e3:
- 4c:fc:90:e7:2e:97:87:87:a2:63:0d:6d:4d:f0:1f:0d:84:11:
- dc:df:b7:fa:c3:c6:2e:07:e9:a0:e9:a6:9f:54:17:ad:1a:d0:
- 36:be:31:cc:a5:85:a0:45:4a:87:45:80:7e:de:ea:97:68:e0:
- 2b:09:5d:9a:31:6f:f5:78:22:c5:66:2a:99:70:9e:6d:c4:ab:
- f6:90:01:70:53:07:66:6c:a6:b5:ce:4b:36:05:83:87:0c:a7:
- e0:1e:34:d0:5e:76:a4:20:71:cd:9d:c1:ae:82:27:e0:6f:16:
- 57:74:e7:63:9f:d0:3d:72:91:6d:97:a4:82:23:84:dd:6e:0d:
- da:43:00:a7:ce:2f:f8:79:04:67:6a:e5:b0:ab:30:d8:f1:90:
- 10:43:3b:09:77:27:34:a4:d4:c0:25:4e:21:32:a3:ab:60:1c:
- 9d:6e:e2:65:39:51:7f:cd:9f:88:3a:7e:f4:38:af:7b:5b:a7:
- bb:7b:70:97:21:59:fc:5c:55:a1:db:74:0a:37:1e:33:97:5f:
- 70:32:98:b3:d9:99:4e:08:3c:de:01:82:17:9b:49:d7:fa:c9:
- 45:8d:93:cc:42:d6:36:f2:39:3a:47:28:3f:6f:6a:e5:23:f3:
- 5c:d4:a3:1b
+ X509v3 Subject Alternative Name:
+ email:ca+ca-rsa2021@esmtp.org
+ X509v3 Issuer Alternative Name:
+ email:ca+ca-rsa2021@esmtp.org
+ Signature Algorithm: sha256WithRSAEncryption
+ 41:14:09:49:01:5f:51:ff:20:7b:c2:41:79:9d:11:3c:7c:48:
+ d6:43:d4:c6:0d:55:e6:76:bb:2c:c7:fb:dd:10:53:79:30:1a:
+ 35:64:2c:d0:64:b6:5a:fd:a9:d3:e3:09:8c:7d:22:81:b7:71:
+ a6:7d:bf:80:24:79:24:c1:61:6d:54:ab:14:4b:5a:54:cb:75:
+ 47:2e:e5:51:6f:cb:91:b6:a7:e8:aa:8d:78:c5:7e:05:56:3b:
+ 31:02:bd:0c:e4:af:78:27:7d:6d:bf:fd:0f:0d:2a:00:1d:cc:
+ a2:34:4d:a3:9e:70:45:89:56:2d:d2:35:ee:26:ea:0f:9d:fc:
+ c0:2c:64:f6:55:af:de:e0:72:64:e2:20:8f:e2:f2:e9:e2:6c:
+ 3a:0c:45:23:dd:80:57:25:fa:18:bb:25:f8:7e:3c:3b:a7:ef:
+ 40:f0:ba:6f:ce:b1:eb:f9:14:03:04:34:3d:e0:43:a6:8d:95:
+ d0:a4:dc:df:e4:79:ce:8d:e2:1e:30:ff:55:0c:e6:9d:e4:1d:
+ 62:cc:a5:4f:9a:6f:c0:b4:1f:05:7c:a7:c7:b1:72:58:98:ad:
+ 2f:f9:8a:41:0c:48:d5:78:ad:af:eb:ff:59:0b:4a:99:26:5b:
+ e8:8c:e3:e5:6b:01:d9:a0:db:a2:1b:d8:8e:f1:82:38:58:ba:
+ 8c:11:65:36
-----BEGIN CERTIFICATE-----
-MIIE4jCCA8qgAwIBAgIJAIGdQQ9AVaxKMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+MIIE4jCCA8qgAwIBAgIJAJKhO9OQC+qnMA0GCSqGSIb3DQEBCwUAMIGOMQswCQYD
VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTERMA8GA1UEBwwIQmVya2VsZXkx
FDASBgNVBAoMC0VuZG1haWwgT3JnMQwwCgYDVQQLDANNVEExCzAJBgNVBAMMAkNB
-MSYwJAYJKoZIhvcNAQkBFhdjYStjYS1yc2EyMDE4QGVzbXRwLm9yZzAeFw0xODAy
-MjcwMjMwNTVaFw0yMTAyMjYwMjMwNTVaMIGOMQswCQYDVQQGEwJVUzETMBEGA1UE
+MSYwJAYJKoZIhvcNAQkBFhdjYStjYS1yc2EyMDIxQGVzbXRwLm9yZzAeFw0yMTAy
+MjUxNzQ0MDJaFw0yNDAyMjUxNzQ0MDJaMIGOMQswCQYDVQQGEwJVUzETMBEGA1UE
CAwKQ2FsaWZvcm5pYTERMA8GA1UEBwwIQmVya2VsZXkxFDASBgNVBAoMC0VuZG1h
aWwgT3JnMQwwCgYDVQQLDANNVEExCzAJBgNVBAMMAkNBMSYwJAYJKoZIhvcNAQkB
-FhdjYStjYS1yc2EyMDE4QGVzbXRwLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALijjXkowR+cEXRDJuE7zBSHW2tkTO15G38qA9B7756IsGQ27ljv
-/dnHILNx6W0ep7zBfDv+KuQWL7zWLPWY+cQhHMrDfleJyKkv2mubUtbJnZiXbQh8
-pjdO1Ca723OwOO99Ht2O3Y4XL6A9qQ5N8Cu4FCMzrcig5Z0PJ62DoniQBewpBpEH
-RWxfuo4d8dcbLfmZui4n4QN96dJUNcw5eQeD2JOb1u9yq9Rjjmv3AGZfd+i2vN5f
-jNDOGsTbA53k7grsd8XyMGl+cBLlwkooP+cZ669B++amHbX9K5kD9SCQOHO9Q3Da
-zx80XasXS3PP+T3honkU3thAhYLEWoSCMvECAwEAAaOCAT8wggE7MB0GA1UdDgQW
-BBRCN3XnjxLP2eshIn2K6Ekh/eI6OjCBwwYDVR0jBIG7MIG4gBRCN3XnjxLP2esh
-In2K6Ekh/eI6OqGBlKSBkTCBjjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlm
+FhdjYStjYS1yc2EyMDIxQGVzbXRwLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMyMOb3PVU9mKnjHZUeB3dE/CBJLh0BIlVwkUmWhghz0kKF89yeP
+AuXLrImuuCVOJtoUIAcppFkDYbRErkVVtHJ9ZpqI3lm/bzEjBimrwrmgbGpd0Kzm
+uKyKb1678xm1jeHfLtF/GrwsExBlRn9ox2BJxjBOoCTt1Kgnz7LQxXyWR4K28RcK
+WjWCC4UPF3GpvTpM5jKVPmj3PfUEMxYZHkwKBMMfnrrb4g0pyD8pz0fLEdvSzdAm
+LzXrfaJgGOd7okMVWdfqnThg8UjfV1TfilC541xyglG3BXjCFAhxcRwGREqFcwio
+SVCy0vvaoqVaNkmoSzhW9mcPEjQ5zPucvdMCAwEAAaOCAT8wggE7MB0GA1UdDgQW
+BBSG8Pl6zWapFsyjJgg9s7JCwuWpEzCBwwYDVR0jBIG7MIG4gBSG8Pl6zWapFsyj
+Jgg9s7JCwuWpE6GBlKSBkTCBjjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlm
b3JuaWExETAPBgNVBAcMCEJlcmtlbGV5MRQwEgYDVQQKDAtFbmRtYWlsIE9yZzEM
MAoGA1UECwwDTVRBMQswCQYDVQQDDAJDQTEmMCQGCSqGSIb3DQEJARYXY2ErY2Et
-cnNhMjAxOEBlc210cC5vcmeCCQCBnUEPQFWsSjAMBgNVHRMEBTADAQH/MCIGA1Ud
-EQQbMBmBF2NhK2NhLXJzYTIwMThAZXNtdHAub3JnMCIGA1UdEgQbMBmBF2NhK2Nh
-LXJzYTIwMThAZXNtdHAub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQALTOXC7Qrle5Up
-ItSPX8sbseNM/JDnLpeHh6JjDW1N8B8NhBHc37f6w8YuB+mg6aafVBetGtA2vjHM
-pYWgRUqHRYB+3uqXaOArCV2aMW/1eCLFZiqZcJ5txKv2kAFwUwdmbKa1zks2BYOH
-DKfgHjTQXnakIHHNncGugifgbxZXdOdjn9A9cpFtl6SCI4Tdbg3aQwCnzi/4eQRn
-auWwqzDY8ZAQQzsJdyc0pNTAJU4hMqOrYBydbuJlOVF/zZ+IOn70OK97W6e7e3CX
-IVn8XFWh23QKNx4zl19wMpiz2ZlOCDzeAYIXm0nX+slFjZPMQtY28jk6Ryg/b2rl
-I/Nc1KMb
+cnNhMjAyMUBlc210cC5vcmeCCQCSoTvTkAvqpzAMBgNVHRMEBTADAQH/MCIGA1Ud
+EQQbMBmBF2NhK2NhLXJzYTIwMjFAZXNtdHAub3JnMCIGA1UdEgQbMBmBF2NhK2Nh
+LXJzYTIwMjFAZXNtdHAub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQBBFAlJAV9R/yB7
+wkF5nRE8fEjWQ9TGDVXmdrssx/vdEFN5MBo1ZCzQZLZa/anT4wmMfSKBt3Gmfb+A
+JHkkwWFtVKsUS1pUy3VHLuVRb8uRtqfoqo14xX4FVjsxAr0M5K94J31tv/0PDSoA
+HcyiNE2jnnBFiVYt0jXuJuoPnfzALGT2Va/e4HJk4iCP4vLp4mw6DEUj3YBXJfoY
+uyX4fjw7p+9A8LpvzrHr+RQDBDQ94EOmjZXQpNzf5HnOjeIeMP9VDOad5B1izKVP
+mm/AtB8FfKfHsXJYmK0v+YpBDEjVeK2v6/9ZC0qZJlvojOPlawHZoNuiG9iO8YI4
+WLqMEWU2
-----END CERTIFICATE-----
diff --git a/contrib/sendmail/KNOWNBUGS b/contrib/sendmail/KNOWNBUGS
index d3c0a2ff416d..b44f931af585 100644
--- a/contrib/sendmail/KNOWNBUGS
+++ b/contrib/sendmail/KNOWNBUGS
@@ -20,6 +20,14 @@ This list is not guaranteed to be complete.
then it will be truncated which may result in a syntactically
invalid address.
+* Berkeley DB map locking problem with fcntl().
+
+ For Linux the default is to use fcntl() for file locking. However,
+ this does not work with Berkeley DB 5.x and probably later.
+ Switching to flock(), i.e., compile with -DHASFLOCK fixes this
+ (however, the have been problems with flock() on some Linux
+ versions). Alternatively, use CDB or an earlier BDB version.
+
* Delivery to programs that generate too much output may cause problems
If e-mail is delivered to a program which generates too much
diff --git a/contrib/sendmail/Makefile b/contrib/sendmail/Makefile
index daf20f288f8b..1cb6b56d6a3b 100644
--- a/contrib/sendmail/Makefile
+++ b/contrib/sendmail/Makefile
@@ -10,8 +10,8 @@ OPTIONS= $(CONFIG) $(FLAGS)
all: FRC
@for x in $(SUBDIRS); \
do \
- (cd $$x; echo Making $@ in:; pwd; \
- $(SHELL) $(BUILD) $(OPTIONS)); \
+ (cd $$x && echo Making $@ in: && pwd && \
+ $(SHELL) $(BUILD) $(OPTIONS)) || exit; \
done
clean: FRC
@@ -24,22 +24,22 @@ clean: FRC
install: FRC
@for x in $(SUBDIRS); \
do \
- (cd $$x; echo Making $@ in:; pwd; \
- $(SHELL) $(BUILD) $(OPTIONS) $@); \
+ (cd $$x && echo Making $@ in: && pwd && \
+ $(SHELL) $(BUILD) $(OPTIONS) $@) || exit; \
done
install-docs: FRC
@for x in $(SUBDIRS); \
do \
- (cd $$x; echo Making $@ in:; pwd; \
- $(SHELL) $(BUILD) $(OPTIONS) $@); \
+ (cd $$x && echo Making $@ in: && pwd && \
+ $(SHELL) $(BUILD) $(OPTIONS) $@) || exit; \
done
fresh: FRC
@for x in $(SUBDIRS); \
do \
- (cd $$x; echo Making $@ in:; pwd; \
- $(SHELL) $(BUILD) $(OPTIONS) -c); \
+ (cd $$x && echo Making $@ in: && pwd && \
+ $(SHELL) $(BUILD) $(OPTIONS) -c) || exit; \
done
$(SUBDIRS): FRC
diff --git a/contrib/sendmail/PGPKEYS b/contrib/sendmail/PGPKEYS
index 03476f63a5ed..0d0b0d5a766c 100644
--- a/contrib/sendmail/PGPKEYS
+++ b/contrib/sendmail/PGPKEYS
@@ -188,6 +188,182 @@ mk6wxhyuojEHuR7it6IU5BP8vaAGrL1jb1c2EeAe+pdJwpAb1Aq6MU6uWqOGup8t
-----END PGP PUBLIC KEY BLOCK-----
+pub 4096R/4BEE1BEE 2021-01-24
+ Key fingerprint = F4CE 2263 2102 53D6 A9F9 79B0 4C66 EA8D 4BEE 1BEE
+uid Sendmail Signing Key/2021 <sendmail@Sendmail.ORG>
+sub 4096R/A9C0321B 2021-01-24
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGANHTwBEACw6b3NmDyyB6uPll+h+pyOmQrbX+up2S007yTXhj2EnYiriLcL
+MdMspVLXl/wtABtfTZ9Lf3v3FuNwHZsVdSZWCFmwlWPptsRrF0VWwYBzxgH6QIUK
+Qx9sFAD+KVD/9Cfl7YXeu5lZrNn3D8FoQB480jJJRaxshXcB6y9QCyKHeCZx/3Ct
+1TE/tlFOgGoKJzNADOimH5SeEZ2gHhB6WB/yKLQYWS8EAvTlGdgZVo6VY6Ar35cd
+3Z9TCQxS8YDsA0p6zENCJ4QgiwolmgZHa4R3/9jObxhVrIpCKCUN+rSdmKDotugP
+GPDyZ0rZRAaRlyqt3rYKVAztkLTU6TbDNLmDpw3CQv3Tpbb2TT39ySmruVVJLA1C
+DYQrh8f35ic0mDwYxKA5KIPZNj9vcReVrwxPDAV5to4n/ZjNNfnqxRiiq4+IzGZ4
+dTlwh4pECps0WdqphLAoTotFcdvYg8cfHMBULdIGqciAGfu7G0yqvlxt4nRe1k8D
+60yAwDtqgO3ThtiTzuYkHZAUmAYOBYPF4e/X/zicWoL+whirV6AELnmv6lft5TaW
+UfXbcx0njY/QPa1iy3g8qkQcY8durY9OVYnA5X4von1vMC4naEEf/cFsdDBl+nZG
+/XxBHr1QX5/P7egbnnF9qMqry856oPE8bjv1KBqZ52UxmGRl14k8gKcfowARAQAB
+tDFTZW5kbWFpbCBTaWduaW5nIEtleS8yMDIxIDxzZW5kbWFpbEBTZW5kbWFpbC5P
+Ukc+iQJVBBMBCgA/FiEE9M4iYyECU9ap+XmwTGbqjUvuG+4FAmANHTwCGwMLCwkN
+CAoMBwsEAwIGFQoJCAsDBRYCAwEAAh4BAheAAAoJEExm6o1L7hvuZlcP/1ipTzk+
+UT36bM/DbeBHaGhQ4yOSg0iiHzu+bzzP3jZslG7rlLgzowEPk7plDlnVbY6MUeXQ
+4hO7keoAn5Cskg8jsrh+kpWYlNTPPKFdjgcuWbUEVAoRIprq1kEVqcG2ai0t1iaH
+CmrUwFRqCCEPoHKg1U2GKcKafFaxOZwM27kV6yTLM5sYFVsoSh+bJ7sa9hymdwrf
+/d1Rh5E+MHJatn3TXGh06aPkVGozyufTXipsxzd5VaBjLDTYbMFkiOt9MC9Sx2IS
+BO5Ws2tOlNslGiAeXQG8EaJB4xrvhOi4i99nBA5TYWVdOAwfJGUZ+X4hItMwlCIg
+4TaJcYHQ7GASELGSGA7azd2JeqbEskiCdabWF8aSbUxA68HRCOjAAUk5afxqEc5J
+BVfT1QmWAPK5cNQTojbd7msrlGXmcSQyFBUDSzoeQNFhpmDpAXCLnGt0vcwbqTik
+Ft+2vJ9nbSczKHkxmN1hudpVdsUNfgGi7p4VzyQq/OzYFVeMXrBBt6aLyATjCoY9
+b7chMDyJBFLEk47U0qQe2VhexI8Fk9Z8wFTPF97gb3rSk5pAfIbCZ9eDcIZuR5eD
+yDDd23vxsMJK0haD/nZ6gQNqBeCg+zDE8g4T9zCdOtavLuqwOqPUZDnNdke9cA0m
+6GSo2MccibyMdqijETcDOPOC47hrIu68QE54iQEzBBABCgAdFiEEsICXn00EPhnQ
+WjacYp747gyLgzMFAmANHmsACgkQYp747gyLgzP1zgf/QJi9+sMvoNVks4+lU4xW
+9fy4C7+fAO96dJtSO5jSn+9M/C55UmU0kWz8XEU88XCVyChLmpSb+Y+2sf5XhWEY
++KDLUHgqiT6NItozXKVggNFMsxkzDi7mzdkCIevTlcGbQSxai7hbKwZzGPb/OzUK
+pRtLl6hTV5wLlsit41EAwILnRmmn6Iix6SPaCx0YvAIKBiy7CSiJyhPbGEKAeEx9
+OTZ9ce0iQWxaCGNgXv22HPvJ7V3VwmfZBJnHcY0ooxEjz/Ky9kHXc+3yHznlATXs
+pzOMH0z+zmHldvIBz0djgVlhn2TRkKSSTaGd4kbLKLmci4Ax/il5noR1hZ82aVhl
+TokBMwQQAQoAHRYhBLF1lkRTA13O3XvpGWBN+/KFQQq+BQJgDR6pAAoJEGBN+/KF
+QQq+4OAH/RpvOktec2Y0AvzWjHorXWmPLi9xEMIuj2GVVVsg+eXP2CDpYuEOVYLP
+8VCWpObXADj+w0DIOMcyqUbMPxkps+CPXjTRc/qED3FLvGNTfNQMe5hDTbbs/tw2
+FtfI9Jzlwsmhcfg5ZxnQKDCPGPQufN9AbQHWc4VIEwhQRc9T/cfBhioWUwrtkgPT
+BBTPnJp/nA10Rn+ycURA+BLdlhAFwuTYBH7nWHkDJUGLHFIat2RhHRakZNhcMrhE
+cXBrg5ONK9qJYtJXzlHiQhM6NP2RPVvYCzLlqkT13SqvLsPMSncyKlIlUuQZqdcE
+QOwGRgp2jkZeRYVBYfFzfIpu5gxVQYOJATMEEAEKAB0WIQRYcmIYqRNADeZgNgE5
+pMd9qXiEsAUCYA0esAAKCRA5pMd9qXiEsAB0CAChpLMwocSQ6hpY7nfVl6wAb3SP
+9C2Dwr89YxzqBYS7i3b/0pB4t1c4cg0vC72DeOIUwuAwUOq6NVgPYnh/NpovWouP
+HN/3WrI013yGkNZIYz3fb8w2+pk0FFndU121pn3IbVYyMxegyHyN+F5NKZCfsTu+
+imlqje26ecBPuz4wcVqYyl/jnR/MU54uMhQW8q0lxCMS67uta0wd2EaTXNxq17Lp
+Z48pNOBiAXxZnXaP996T+7whtLBr9isgeZyeizenjupX69bllRVbwuO8uboTsisC
+LlUbOLzdvTjuSrAQAzNaAfVjNsxzEvLcxxKaPKPG1ubrHT50k3zpB/Ixi+oliQEz
+BBABCgAdFiEEynqPOaJBn/+wqasnjlrp+87u9DsFAmANHrcACgkQjlrp+87u9DtA
+kQf/SLAdxTmR/l95WdeOgvxINcV5ADxCkpO1iJeLp440uddscRrrfHdibEngfAA+
+ARwPv2/jhJgInCOQe+4lmsd+4NtKtanXiRZai1MXCxcF5VLTOMs8Vl7EUMAL5JWG
+IlvmT4/H7Zhji64KpDFkwEjsE8SdZ6HJokJMFSq+YYBgvnsu/GDSfDpb/HtdM845
+pjxHJ+r93KPRepncLedgyDsQpzzRIgUJNhuC+UGtRp+3qRf1eWSkO6qbyL8DtFfW
+WwX1gG099nr8m9Gj+R8zH6HTnWWuFnUyDTHdTN7/25vZ9eoAgjIx0I3g+O02l42B
+G5HeOuLSMdUoqqvOq8313wvWSIkBMwQQAQoAHRYhBLh9RWmG8ZSEB+XMtD1osl1S
+B8rTBQJgDR69AAoJED1osl1SB8rThsMH/0JcgLmhr3K4t0cxt94u6UN1pVQZDrgG
+uMEDpOxW4nPMwN3SkWMM3K7zw0TiGkksyFifRi7zY1BqRilJOGyLkyB3zCY76hKV
+SuLx3U4B6eyrAY8gsPownOdY8FJB3o27uXhPX17qLWOl83/GQMoyRfmmwkBnL4hc
+puJcPT4bOt3OhDK7bs1vGabS9L3HuX0lUIcp8VKquJHXgS+xIr/lMBk5Jit1Qx/p
+VjqmL2qIxTMubmKxU5RxsCZygdV92kBLzYqZ3JO6LOPCwD1a4fZRlwAW2hpC2gtW
+KHK1/QZBSgJGjJUgXGV3fYYR3WH5qmTCAWu2HEloLRSdzdHLldWCsUOJATMEEAEK
+AB0WIQRJ9qi+hHM5SVGRbzth3hHs4nY6cwUCYA0ewgAKCRBh3hHs4nY6c4ygB/44
+pigG2UoBQNZq7R9ajbU5nRkl9mVCZ4dEqY6i3QJs5tGew+r774jMouL/sBTXMnvS
+zD1XgJevJYnQq5U/08zvYDvqrhm4yTkbgg9UqhD9UI8M/XgN0DtbFT6EU/N92lO4
+2xWBMTyAwjVl9JPPjhMoUsGVScZ8pjplJZlgJNuy8GVu6vUoW8j1Gw0jIPKJ0ufy
+20uc4jLuKVmxjj7Z5NsFnWJtiFFq/TknppOQZ8KvZjVzrH6EIOmCJfCnuSATiVsb
+YJzMAjshhG+fJsm24loUjmDDAzy4Nwf18IJb+wSe1oFCSAz3euhIAIxBFkihA8wk
+G4QmCnvdbPfYy4WIMDNEiQEzBBABCgAdFiEEMLynRwX6QVRVcx17qvW13gW9zFMF
+AmANHsgACgkQqvW13gW9zFNuYggAwSZ7y+qCvdvFu6LD4qvk/phRF5VINZIHfl1k
+aOVQWA+DZaDM8lRsvn2lxGFksaPzK9ZXd5QnF3QTlOkEsCILE1tmL7Myob27PaGV
+4mQXjY9bUXe/Ulj4VbHlWjkt5wpwGj9bRuxnn/RKKRNCpknzqv8VTCMVwUyCF4xE
+P0BGFXiyPV+PTNN2GwV5l46zn1FWzTlSgbAxjwQBh43RMuBWG320w+YEysJMs4y9
+k0f3i16hO4G/MiD4WRIaohqjBN6ii/sksYf6mgsZieUlAeQPnovi8pScq6s2cYzJ
+krZNxX6PCNQFTLs1GvLh6IQgypN9Lxxu4FW82wKQMS9yIKkIMokBMwQQAQoAHRYh
+BA9clq7I5p6cjlQuXG1M0ZQp+wPeBQJgDR7SAAoJEG1M0ZQp+wPeFfcH+wUQdI/R
+eMuLByF9cjdC0AfnOXD46azyt7Lgyzdi5OK8xAMmfTGH0iYGGv3pNfcbTxblJ868
+PPjUc2arF6CkLZ5hIQ6dUBmmxG+YOecOZF4jO6Z0WFi1XqxRomhy0m9TNQ931I88
+VRpd0/XepnvJc1lTOiTmxKTFex7mKqzTNBeXlNkVOXpM4aCq4AejEgnEzr5imfyF
+P2qyITbyGpWrnTKtg4ASYWVU+JAZ3/eZIl/0pNuD0/C9MGRmS2yGM82KKMYrRV3X
+QNAdg6LPi8MicUZWlcVYqR/7jEkJeppUpM46EtEo5YoXQR9UflSdu1xjpBzgU56d
+MjXtTE5ROtVDl42JAjMEEAEKAB0WIQQ8ih6Of0TK3hFP7UZLyb2ma/cmrQUCYA0e
+2AAKCRBLyb2ma/cmrdDSD/92AidTGYuf+D3SbIOBhQttWp3SvnOj5UuqgXtHrmuq
+vbhawUAAby+CL0hMOqYk/Z30N/Sr+OQmNyH+Q1C4nuoq4KOINBuaKpcioQai/Jre
+TthuVzeFDk33bQd+IQ4n0WXnVWg0DlpIhDDtZyA2Qqj4nPPsnjuw+Y62VuXFahr1
+ci+8sVns9VZJyVKPzGAKo/4rKjRlAqqVTlh5/RvMJ01TvWwSXSg1+yM08e/zaOCz
+tuIfZAjDZNqXKIU+3xlKKvQGnNxUB+Bxn6ZaXW/YCzf/uabYfy2i4GIBhyj3dRSH
+zbDSg0b/l0zJDIi6qzTzXZFEQr5AFu3CZeLR8maRU/1olCFR2aE29XoAtEF+SyPh
+eI8ZhXqL2ccJqStD37TMsUmemTgBkH1Rig3eelRDeaZ6oh5UjuKcg7IpdmyYdRNE
+5KO3afHdhM6C/CXoh689273ddasvdYcGCIYku6AjiNjcr4sNbGdmqDNc/6emHqp4
+WxyKfc5AuqZpmbEVhIYG1PTmldJl78EZBYoLjea6fai+6LH3c75p85lUWbfcpq7s
+QczweRPz/X+YMnNpCo8+psngSBIjDiJF7JFrVCFPyH8zFbva/TWCZ3Cf8Z4GLm0d
+e1gBJfFeXaQHHL2qaX5FXiYqwL2cjmr09lV3hWmQC9bA4q7Z/q2BEjZtZuPJn/qZ
+NIkCMwQQAQoAHRYhBKaHPSSk1tYoSuQqdfBgWf1dx8w/BQJgDR7dAAoJEPBgWf1d
+x8w/SdkP/1uvi7L2ZVvq564VXA+5YFNq+BvzMDYkf/8RaAAFFUVbblQQBjlHN8nA
+ViZZepOJOmba639e8E/uXsXF5z0l7Y1XEiuU6xofjmX8i9Px3MG5G1mXQGgaozW7
+fimU81f5DlLFv3W9lrZ1iQdpfZQYpBMdE6PuBl4wvElHPB6rVTxBIigjVsQceXMV
+b64RttDSX84glqv15rTrPQLPg5duX+YzMOVKyH7tWuuOsPuWaUZejNieX7UubA4s
+E1pnpH0OBpw/d8r0Rte9ZifmSavfPygaLC3w5ihXKwPLVikhOIF7PgsVaRRBzJQL
+pw7BTt+nGOZIQofW1TM8gOPPrbWzwyCnPEMzjyM6g46zsW8FRxTq8/qRXwB7dg9v
+wZRVSX4+Dzuuvyt/p3p8OX5nhv2UrqXSeZx5gcWrof+td7X8lGj4j/kvFI6lotqL
++DTf4ndH8OyVjVL3Kzdc6e1+F/odgjurPW20GiNasLFpRz7aNUTtoSMc1zHi7tmW
+EB0HMrCvdTwUuDOHVcebaR0xOPVcPcJhLoJDDQPRCFC93RvWL8qf5XPXwxYu9+tk
+Kx22lFNJqnQeYH6s0QqJowcGwchpM23JlAyQ4y8qCb8Rng4V2KvmonWO5iadM+/9
+sNFmf7APUzeCMP0LGO+YLKgf3aPe2lQZOF3nQXpQ7iSDW33C45QpiQIzBBABCgAd
+FiEEUKMDCY6i3XvL7iraCeAfoDwMUE4FAmANHuMACgkQCeAfoDwMUE47RxAAsbz1
+94m0hNMFUkzXc947B9qozcQMQJRhKsouBaMMwR+F1RgLH0oSAhYESsl+o8ngsyTo
+AKYAP5p/N/wMzSZY0/B1XoQkTJT7HCX6G1gBKr6C5US4wL4Y2xQtBBVipAONK21p
+RiSVUcvtOVfdUTSd2NNBUcVq9NCnWjtawu+8Z8fwJYa74gy8u9QQi9QjNPcupz63
+PKzB8WG1NjEI6Jx1TkZbGLoyXDQ/J7lfnoqGQoqIXMJjQHiDuNV8gIaPo2isHx6H
+VOXYm+kx3mG/3cpTlWS1yfehHPrRYg/CB6joHYUUu9oe8HI1C8GF/4VxRsW6bfaZ
+6rByBoPiCIb39xTLyCASXrXZ3n5wJ2blSCN3GPRxOcrNKQRgfNiXEc2jZtVA6sKU
+a5DvvHYvIBqD6M9E8hPd5EomOW7t8zNCaFCvqWOanMmJmCqSlgSavZqEMOyTvcOM
+ARyjZBseIIQZxwcfiKfJyI17adP/0fRdB5ypUUGaLPcbdh7JWJHzEbplGPj9VHrX
++xBN9fk2l8iXwPxD85C7lvup4SX+HEav3ofIJSrL47yC0DDrmia/JS3U/omD4raL
+yfLSoVu0Qf6G6Z1MSLV1sfaMLNWssuwKYx2wHEsjRoURlWuQVR78KuCE8x+GZQ++
+Qa75Wuf0h6myzktUkfvddz6oW5W2yfVbAkuFR+yJAjMEEAEKAB0WIQSt/bcJ/h6m
+guWFWXHVgyEO9RRxpwUCYA0e6AAKCRDVgyEO9RRxp277EACTAyRqNIaZPaSMAdw/
+AcYNX+/0G5+3m2+baSEPjcJUYOdwqQeUFAFZ3Sf9H4cm4zfNafQ0AjWUm9NYpwt8
+YKhN78dOpFaNdER43SAjVGmJb7Vs/yEX4EQZ3j7uRtypwAm6tehdo8kiKtMr774H
+DZHGUp7NYdbBnCwiQWHFcwcK1ZWdgIY4Nw61pK5/iDl0ZIOZDXPgZWutB3ULNwBg
+2PHBLOJaSvzl9jhC7Zjgpus6dEiTU/Ij6dKX+U0X9Hh5c2O3FQ08UwBffTBjTZTm
+ThXGN8RN3a3cuBlpP5rTArU412yV4/+GkDPP/hv9iAgRAhwXomskyoC1Wq7I/1O1
+Ipzac19walDjLDvIBEVZmzi7YODEMU0F/EobW6+aByp9/cBGlBBn2Ppy+RQRevHm
+Lf6jpvHcmdSEMvIDXDDJfUHVYfcpVnZJ3LfPE1kfdOhOKpCju8ZF9OPHUokhjKRM
+frKLWOD2rxNQmqrfhvVsh8NSBNNaL9NkwnwevGo4ap2PaKwA2gxzZrMSrH3au9jE
+K9+pnE94hdhRRfKINNME5r2Uo5Rcs6OIiuDM1wCmrIT2f4n0imXJoTiA/jwHWFAK
+27EPnxXWZkbjR/oiIm5vaKqB9NbZDVtTw/4H7+pQ3E47THD+KY718FVUuV3cnOtM
+MdoRGDkrd8ZS/I6ze7pOnCJy4IkBMwQQAQoAHRYhBK0g4aqLQTZwpkJS2L0nbS5v
+z6iFBQJgDR7wAAoJEL0nbS5vz6iFz58IAIJRgMKRz4cOUy5iIPvtswXMb9tFR37U
+PyLGJR1CbclXwUxTe6brN+8kWGka/g40qoG0Wr6GgQheYBjmV1CvXwOvZv83/FkK
+GkGUZDjNhbfSXlrBMUczUEk3d6w2h8XHOoHozmWgf7fJk06MIJAwEt4ENK3Bfm+k
+CCrCJuma8WzccyBLyU2iMLS14w7GOxJVyV37L8XcwmhysNyCpF0TVLPlPeGrvHO3
+hsw+lJZiZeXKUrU2hnzoM29A71PmkLVUYLN1JzvASwWCVsMfIO5T/bUzSLBysuEU
+msqRL+vJQvzNDJs9gVrAtCnfZRQFHRYVYHsqqayhsj3/mk7x9a8Q6ZCJAjMEEAEK
+AB0WIQQpbJTb0CgCRb/Tkdd7UpZI7oVyZAUCYA0e+AAKCRB7UpZI7oVyZKXLD/96
+55HOR12CYECMhU33Y5fqs10tYTdyoJjjStp+t2oApyaswr+DQPs6UVFUJWgMy478
+ro2DqW9kYHZeX0BumiQ5zrCeyBQYU+RUUNH7MU0pzdGuYWiL9PXqHNacuzV8GrIs
+r4NFB1SJ66nbaKRMdJJnnfvtnJyHPfJ2VloxizYLNYptKUVbcP0j5ahXPbhy6Cyy
+qlsAK28/gSRhDOqdq4/mKcNrc656bsmOqoaOl5po1N0sGStYQCuFWKjawujG5ZvF
+x4hbwJUSU5gOFrBZgm2cYjypIO/GQz6CYbhGt77qV7f7hzo9qwA6UeIqrECvr83W
+Jtp4e+FnjVQ6AfSwLI8oOPRa6DvJDdU+EGYPaWLbXnmq1fMu1nNn9SfHtkR+uDlN
+GiQJk9EZSz30msacuEXZlXiypA2zTQFYAvtBZmYR4qjBX0qHImqmukjZZFhJ0sxR
+LXE66HgvdxMTbYCVCWJY6u21yXF0O0a+nEvx0v1doux1247jzGXwyQTKXZsUZhv1
+qLv8igtMaJkSLZz1E1U703PdsMhU9jH6RKlwkW3KI/2NHEsxw7nDuhS6ez0UIM6O
+sur53HCnDcA7k9eUaa+Sm0yCBeccZ9zmUgG2K3cFKdpQlljyt4WJTsKDrK4AkAHR
+FjAJ0wOvv4apnz5LYNobKc/oTbjJacbTczB2lwGe17kCDQRgDR08ARAA9XG4WjRg
+7cOfk6ur3Tj0TsmoiZ5jDKQ+ObZqk2aeIk5WutraEFe0OkI46F4oEbIwLB8rChHX
+uVq18EM1mDD99tM3xTUoSm6BCdQeNx0Hh6enLZK49LBSMqTn3Fd9PNLL/QBABYWc
+wgrazwxOlTrLOpX+XcgvRuxK36CisNr5i7Ocuc7EIuUurF6YoSaaxDT9XZHpuSSV
+AI//sH+GmeBVgIs6f+8MSGe5R4g3aiyYqykwMtgSVgKqxi6Bo5UD8HeXpEAIgtNT
+2gOxLgvar6vwlbTFamv+vy4C2RXY+7paEjGnlwI4nJrIWh0c1z3qIvAkEzhN88/J
+fVCtjtKFjPAhGf48LxnRnURGb9anyexrRTPkGcmxx7/sxGMe/M31lpHOVKUZduWV
+83/9/7NpSWU0BRmWyzK9CzQC/97Vb8JJhZG3N7RmTZgiO1GKAWFAKgd6X6oo6O/V
+n5zngHY3jfKkb+wlcVa76IIDv3dc3JIENkmghfvuzdrx2IIqK+NSrBzp7OeTtgJE
+vR5yTysS6wdlihY5zJgIBJh+GAy7lA8gzB3MhZe/qPSvnmK3ZTb1RnM5y5ySMZsU
+mZnUVqjqjgUbY7NdXRpPeYLzwzzsvT+vlQX4P7LjGaienI6EP+AO7v2Ei+zv1NMI
+jkXPPNtPwp01B3M09nYihjDnM/dviPF8J1sAEQEAAYkCNgQYAQoAIBYhBPTOImMh
+AlPWqfl5sExm6o1L7hvuBQJgDR08AhsMAAoJEExm6o1L7hvuW6gP/iTNEyA96lc6
+3WxvkrpqiyZN4vdDwWv9FoEuZohlOCwQZpQy8wZlbtmjYcKAz1mRF3uBqZRvgzu4
+7ggzny8lF0m93PnyroRO5O6I8lT95HWH5+7mcoYpbDY1XII+QbP+Xdxi2mkUXqkY
+3TRcp9VzwWyQb/0sgGch7ZOnd7bK12Q8wd2YmkCq5dQ8BXxFbnom6VoRpHnu1AsU
+6ZKYbK5ogKXUoBxYKRqX6vMxMjALd/yJFKZwrCWkOxj0ipXCgHOlqbqgi5wH/gRu
+qGkMYJ6fAnVcEdyfK5IRrtMB/3ZHlIDFXyEIA+K0AxpqE098KwnemOjrSYZV8Ek5
+48tVsKlmqqgJ1QkacR54OLw9CjNm0bXX1iqMfR89NfdIWqfyq732vqKb7UDfcjOK
+IV4VP4sS8rBNrlzGpnkCOejE6YqxqwUt9ggtk9Q3SjqTrPTDZ3hExjcigchwnG5m
+rZzBKYo7vQxoK+Y6Kx+BZHo2tUloURtsgqW7mLrfbY68Vbm4O1Ev5mjWA4bmOTrD
+ivZF0HKBAdHG0B8JolpbSmoPVB0V9UAQvbb/amMK1zo36/cDrSZ9fid3Pbwyuupg
+058rgvZPvBknm6p+k1mGb9XBGJlJaOR9Q0cmKobZhVmnSuCkRBJdLixHRvzcfygi
+ra/bqVWSpZTlHZ0xT9seCUSs1urxGw9Z
+=3HCo
+-----END PGP PUBLIC KEY BLOCK-----
+
+
pub rsa4096/0xD583210EF51471A7 2020-04-08 [SC]
Key fingerprint = ADFD B709 FE1E A682 E585 5971 D583 210E F514 71A7
uid [ full ] Sendmail Signing Key/2020 <sendmail@Sendmail.ORG>
@@ -3715,4 +3891,3 @@ Nq5nZ04BGHdVToZvUf2ABdQnWx94uOCRJp2bLJiEepNtaL2OPqe2EQVF7ia2Y0PT
q8WNeh9erYZriQ==
=VuMX
-----END PGP PUBLIC KEY BLOCK-----
-
diff --git a/contrib/sendmail/README b/contrib/sendmail/README
index 5b11d025b866..50cbce25e169 100644
--- a/contrib/sendmail/README
+++ b/contrib/sendmail/README
@@ -371,11 +371,6 @@ for a response. As of 8.10.0, the default Timeout.ident is 5 seconds
as many sites have adopted the practice of dropping IDENT queries.
This has lead to delays processing mail.
-No ident server is included with this distribution. It is available
-from:
-
- ftp://ftp.lysator.liu.se/pub/ident/servers/
- http://sf.www.lysator.liu.se/~pen/pidentd/
+-------------------------+
| INTEROPERATION PROBLEMS |
diff --git a/contrib/sendmail/RELEASE_NOTES b/contrib/sendmail/RELEASE_NOTES
index 6a0f0c52f844..d8186f05e0f4 100644
--- a/contrib/sendmail/RELEASE_NOTES
+++ b/contrib/sendmail/RELEASE_NOTES
@@ -5,6 +5,121 @@ This listing shows the version of the sendmail binary, the version
of the sendmail configuration files, the date of release, and a
summary of the changes in that release.
+8.17.1/8.17.1 2021/08/17
+ Deprecation notice: due to compatibility problems with some
+ third party code, we plan to finally switch from K&R
+ to ANSI C. If you are using sendmail on a system
+ which does not have a compiler for ANSI C contact us
+ with details as soon as possible so we can determine
+ how to proceed.
+ Experimental support for SMTPUTF8 (EAI, see RFC 6530-6533)
+ is available when using the compile time option USE_EAI
+ (see also devtools/Site/site.config.m4.sample for other
+ required settings) and the cf option SMTPUTF8.
+ If a mail submission via the command line requires
+ the use of SMTPUTF8, e.g., because a header uses UTF-8
+ encoding, but the addresses on the command line are all
+ ASCII, then the new option -U must be used, and
+ the cf option SMTPUTF8 must be set in submit.cf.
+ Please test and provide feedback.
+ Experimental support for SMTP MTA Strict Transport Security
+ (MTA-STS, see RFC 8461) is available when using
+ - the compile time option _FFR_MTA_STS (which requires
+ STARTTLS, MAP_REGEX, SOCKETMAP, and _FFR_TLS_ALTNAMES),
+ - FEATURE(sts), which implicitly sets the cf option
+ StrictTransportSecurity,
+ - postfix-mta-sts-resolver, see
+ https://github.com/Snawoot/postfix-mta-sts-resolver.git
+ New ruleset check_other which is called for all unknown SMTP
+ commands in the server and for commands which do not
+ have specific rulesets, e.g., NOOP and VERB.
+ New ruleset clt_features which can be used to select features
+ in the SMTP client per server. Currently only two
+ flags are available: D/M to disable DANE/MTA-STS,
+ respectively.
+ Avoid leaking session macros for an envelope between
+ delivery attempts to different servers. This problem
+ could have affected check_compat.
+ Avoid leaking actual SMTP replies between delivery attempts
+ to different servers which could cause bogus logging
+ of reply= entries.
+ Change default SMTP reply code for STARTTLS related problems
+ from 403 to 454 to better match the RFCs.
+ Fix a theoretical buffer overflow when encountering an
+ unknown/unsupported socket address family on an
+ operating system where sa_data is larger than 30
+ (the standard is 14). Based on patch by Toomas Soome.
+ Several potential memory leaks and other similar problems
+ (mostly in error handling code) have been fixed.
+ Problems reported by Tomas Korbar of RedHat.
+ Previously the commands GET, POST, CONNECT, or USER terminate
+ a connection immediately only if sent as first command.
+ Now this is also done if any of these is sent directly
+ after STARTTLS or if the 'h' option is set via
+ srv_features.
+ CDB map locking has been changed so a sendmail process which
+ does have a CDB map open does not block an in-place
+ update of the map by makemap. The simple workaround
+ for that problem in earlier versions is to create
+ the map under a different name and then move it
+ into place.
+ On some systems the rejection of a RCPT by a milter could
+ silently fail.
+ CONFIG: New FEATURE(`check_other') to provide a default
+ check_other ruleset.
+ CONFIG: FEATURE(`tls_failures') is deprecated and will be
+ removed in future versions because it has a fundamental
+ problem: it is message oriented but STARTTLS is
+ session oriented. For example, having multiple
+ RCPTs in one envelope for different destinations,
+ with different temporary errors, does not work
+ properly, as the persistent macro applies to all
+ RCPTs and hence implicitly to all destinations (servers).
+ The option TLSFallbacktoClear should be used if needed.
+ MAIL.LOCAL: Enhance some error messages to simplify
+ troubleshooting.
+ Portability:
+ Add support for Darwin 19 & 20.
+ NOTE: File locking using fcntl() does not interoperate
+ with Berkeley DB 5.x (and probably later). Use
+ CDB, flock() (-DHASFLOCK), or an earlier Berkeley
+ DB version. Problem noted by Harald Hannelius.
+ New Files:
+ cf/feature/check_other.m4
+ cf/feature/sts.m4
+ devtools/OS/Darwin.19.x
+ devtools/OS/Darwin.20.x
+ include/sm/ixlen.h
+ libsm/ilenx.c
+ libsm/lowercase.c
+ libsm/strcaseeq.c
+ libsm/t-ixlen.c
+ libsm/t-ixlen.sh
+ libsm/t-streq.c
+ libsm/t-streq.sh
+ libsm/utf8_valid.c
+ libsm/uxtext_unquote.c
+ libsm/xleni.c
+ libsmutil/t-lockfile.c
+ libsmutil/t-lockfile-0.sh
+ libsmutil/t-maplock-0.sh
+
+8.16.2/8.16.2 202X/XX/XX
+ New compile time option NO_EOH_FIELDS to disable the special
+ meaning of the headers Message: and Text: to denote the
+ end of the message header.
+ CONTRIB: AuthRealm.p0 has been modified for 8.16.1 by Anne Bennett.
+ CONTRIB: Added cidrexpand -O option for suppressing duplicates from
+ a CIDR expansion that overlaps a later entry and -S option
+ for skipping comments exactly like makemap does.
+ Portability:
+ Add support for Darwin 19 (Mac OS X 10.15).
+ Use proper FreeBSD version define to allow for cross
+ compiling. Fix from Brooks Davis of the FreeBSD
+ project.
+ New Files:
+ devtools/OS/Darwin.19.x
+
8.16.1/8.16.1 2020/07/05
SECURITY: If sendmail tried to reuse an SMTP session which had
already been closed by the server, then the connection
@@ -114,14 +229,22 @@ summary of the changes in that release.
changes in sys/sem.h
On Linux set MAXHOSTNAMELEN (the maximum length
of a FQHN) to 256 if it is less than that value.
- Added Files:
+ New Files:
cf/feature/blocklist_recipients.m4
+ cf/feature/check_cert_altnames.m4
cf/feature/tls_failures.m4
devtools/OS/Darwin.14.x
devtools/OS/Darwin.15.x
devtools/OS/Darwin.16.x
+ devtools/OS/Darwin.17.x
+ devtools/OS/Darwin.18.x
+ include/sm/notify.h
+ libsm/notify.c
+ libsm/t-notify.c
libsmdb/smcdb.c
sendmail/ratectrl.h
+ sendmail/tls.h
+ sendmail/tlsh.c
8.15.2/8.15.2 2015/07/03
If FEATURE(`nopercenthack') is used then some bogus input triggered
@@ -335,7 +458,7 @@ summary of the changes in that release.
On Linux use socklen_t as the type for the 3rd argument
for getsockname/getpeername if the glibc version is at
least 2.1.
- Added Files:
+ New Files:
devtools/OS/Darwin.12.x
devtools/OS/Darwin.13.x
@@ -416,7 +539,7 @@ summary of the changes in that release.
Add support for Darwin 11.x (Mac OS X 10.7).
Add support for SunOS 5.12 (aka Solaris 12). Patch from
John Beck of Oracle.
- Added Files:
+ New Files:
devtools/OS/Darwin.11.x
devtools/OS/SunOS.5.12
@@ -601,7 +724,7 @@ summary of the changes in that release.
Chris Behrens of Concentric.
Add support for SCO OpenServer 6, patch from Boyd Gerber.
DEVTOOLS: Clarify that confSHAREDLIBDIR requires a trailing slash.
- Added Files:
+ New Files:
devtools/OS/Darwin.9.x
devtools/OS/OSR.i386
@@ -1825,7 +1948,7 @@ summary of the changes in that release.
Use strerror(3) on Linux. If this causes a problem on
your Linux distribution, compile with
-DHASSTRERROR=0 and tell sendmail.org about it.
- Added Files:
+ New Files:
devtools/OS/AIX.5.2
8.12.9/8.12.9 2003/03/29
@@ -3987,7 +4110,7 @@ summary of the changes in that release.
have a From line.
VACATION: Read all of the headers before deciding whether or not
to respond instead of stopping after finding recipient.
- Added Files:
+ New Files:
cf/ostype/darwin.m4
contrib/cidrexpand
contrib/link_hash.sh
@@ -4004,7 +4127,7 @@ summary of the changes in that release.
Purczynski of elzabsoft.pl.
SECURITY: Add more vigilance around set*uid(), setgid(), setgroups(),
initgroups(), and chroot() calls.
- Added Files:
+ New Files:
test/t_setuid.c
8.10.1/8.10.1 2000/04/06
@@ -4109,7 +4232,7 @@ summary of the changes in that release.
VACATION: Fix -t option which is ignored but available for
compatibility with Sun's version, based on patch from
Volker Dobler of Infratest Burke.
- Added Files:
+ New Files:
devtools/M4/UNIX/smlib.m4
devtools/OS/OSF1.V5.0
Deleted Files:
diff --git a/contrib/sendmail/cf/README b/contrib/sendmail/cf/README
index 983aa2821a1a..cfabe5eefe45 100644
--- a/contrib/sendmail/cf/README
+++ b/contrib/sendmail/cf/README
@@ -1120,9 +1120,8 @@ local_procmail Use procmail or another delivery agent as the local mailer.
setreuid() call, you may need to add -f $f to the procmail
argument vector to pass the proper sender to procmail.
- For example, this allows it to use the maildrop
- (http://www.flounder.net/~mrsam/maildrop/) mailer instead
- by specifying:
+ For example, this allows it to use the maildrop mailer
+ instead by specifying:
FEATURE(`local_procmail', `/usr/local/bin/maildrop',
`maildrop -d $u')
@@ -1132,7 +1131,7 @@ local_procmail Use procmail or another delivery agent as the local mailer.
FEATURE(`local_procmail', `/usr/local/bin/scanmails')
WARNING: This feature sets LOCAL_MAILER_FLAGS unconditionally,
- i.e., without respecting any definitions in an OSTYPE setting.
+ i.e., without respecting any definitions in an OSTYPE setting.
bestmx_is_local Accept mail as though locally addressed for any host that
lists us as the best possible MX record. This generates
@@ -1267,6 +1266,12 @@ delay_checks The rulesets check_mail and check_relay will not be called
section. Note: this feature is incompatible to the versions
in 8.10 and 8.11.
+check_other Enable a default check_other ruleset which terminates
+ an SMTP session when it encounters a command which matches
+ a regular expression given as argument. If no argument
+ is given, then the default (to match potential headers) is:
+ ^[[:print:]]+ *:
+
use_client_ptr If this feature is enabled then check_relay will override
its first argument with $&{client_ptr}. This is useful for
rejections based on the unverified hostname of client,
@@ -1578,9 +1583,9 @@ require_rdns Reject mail from connecting SMTP clients without proper
Entries such as
Connect:1.2.3.4 OK
- Connect:1.2 RELAY
- will allowlist IP address 1.2.3.4, so that the rDNS
- blocking does apply to that IP address
+ Connect:1.3 RELAY
+ will allowlist IP address 1.2.3.4 and IP net 1.3.*
+ so that the rDNS blocking does apply not to those IPs.
Entries such as
Connect:1.2.3.4 REJECT
@@ -1603,6 +1608,14 @@ badmx Reject envelope sender addresses (MAIL) whose domain part
has been compiled with the options MAP_REGEX and
DNSMAP.
+sts Experimental support for Strict Transport Security
+ (MTA-STS, see RFC 8461). It sets the option
+ StrictTransportSecurity and takes one optional
+ argument: the socket map specification to access
+ postfix-mta-sts-resolver (see feature/sts.m4
+ for the default value).
+ For more information see doc/op/op.me.
+
+-------+
| HACKS |
+-------+
@@ -2581,7 +2594,7 @@ top level domain TLD, 192.168.212.* network, and the IPv6 address
2002:c0a8:02c7::/48.
Entries in the access map should be tagged according to their type.
-Three tags are available:
+These tags are applicable:
Connect: connection information (${client_addr}, ${client_name})
From: envelope sender
@@ -2818,7 +2831,7 @@ regex map:
# check address against various regex checks
R$* $: $>Parse0 $>3 $1
R$+ < @ bigisp.com. > $* $: $(allnumbers $1 $)
- R@MATCH $#error $: 553 Header Error
+ R@MATCH $#error $: 553 Address Error
These rules are called with the original arguments of the corresponding
check_* ruleset. If the local ruleset returns $#OK, no further checking
@@ -3081,8 +3094,8 @@ Darth+20Mail+20+28Cert+29/emailAddress=darth+2Bcert@endmail.org
(line breaks have been inserted for readability).
-The macros which are subject to this encoding are ${cert_subject},
-${cert_issuer}, ${cn_subject}, and ${cn_issuer}.
+The macros which are subject to this encoding are ${cert_subject},
+${cert_issuer}, ${cn_subject}, and ${cn_issuer}.
Examples:
@@ -3223,13 +3236,13 @@ options:
- CertFile, KeyFile: {Server,Client}{Cert,Key}File
- Flags: see doc/op/op.me for details.
-If FEATURE(`tls_session_features') is used, then default rulesets
-are activated which look up entries in the access map with the tags
-TLS_Srv_features and TLS_Clt_features, respectively.
-For example, these entries:
+If FEATURE(`tls_session_features') and FEATURE(`access_db') are
+used, then default rulesets are activated which look up entries in
+the access map with the tags TLS_Srv_features and TLS_Clt_features,
+respectively. For example, these entries:
- TLS_Srv_features:10.0.2.4 CipherList=MEDIUM+aRSA;
- TLS_Clt_features:10.1.0.1 Options=SSL_OP_NO_TLSv1_2; CipherList=ALL:-EXPORT
+TLS_Srv_features:10.0.2.4 CipherList=MEDIUM+aRSA;
+TLS_Clt_features:10.1.0.1 Options=SSL_OP_NO_TLSv1_2; CipherList=ALL:-EXPORT
specify a cipherlist with MEDIUM strength ciphers that use RSA
certificates only for the client with the IP address 10.0.2.4,
@@ -3240,21 +3253,23 @@ their own rulesets which must return the appropriate data.
If the rulesets are not defined or do not return a value, the
default TLS options are not modified.
-About 2): the ruleset try_tls (srv_features) can be used together
-with the access map. Entries for the access map must be tagged
-with Try_TLS (Srv_Features) and refer to the hostname or IP address
-of the connecting system. A default case can be specified by using
-just the tag. For example, the following entries in the access map:
+About 2): the rulesets try_tls, srv_features, and clt_features can
+be used together with the access map. Entries for the access map
+must be tagged with Try_TLS, Srv_Features, Clt_Features and refer
+to the hostname or IP address of the connecting system. A default
+case can be specified by using just the tag. For example, the
+following entries in the access map:
Try_TLS:broken.server NO
Srv_Features:my.domain v
Srv_Features: V
+ Clt_Features:broken.sts M
will turn off STARTTLS when sending to broken.server (or any host
-in that domain), and request a client certificate during the TLS
-handshake only for hosts in my.domain. The valid entries on the RHS
-for Srv_Features are listed in the Sendmail Installation and
-Operations Guide.
+in that domain), request a client certificate during the TLS handshake
+only for hosts in my.domain, and disable MTA-STS for broken.sts.
+The valid entries on the RHS for Srv_Features and Clt_Features are
+listed in the Sendmail Installation and Operations Guide.
*** 21876 LINES SKIPPED ***
From nobody Wed Feb 1 03:27:22 2023
X-Original-To: dev-commits-src-branches@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 4P66mW0ptBz3btX8;
Wed, 1 Feb 2023 03:27: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 4P66mV70mRz4P9D;
Wed, 1 Feb 2023 03:27:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675222043;
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=D0sLDrQVCCXvFCF2sPZDZs7h8g6vJdn288JVNx1h+TY=;
b=TSkXu8lGKVJL1IVFwKWFUnpqaSQgTFTvFGfhhTtDqPiM+17OHnJDCy1gd5m6asCvMOaBq/
aA20CDM+uanC3+LxvK439AyFSOCiULQmTzhy60adwbzVdYu6sXq+45dQ5/eQAev9LmPNDH
b7d1ExiE1v8J09KyWZwtVL2BypMxyYqciWJ9Nj8pp+EEtdjZTbNmgXLoLQ2cE/gwYBXVS4
VWHSnr2rhd3oeWNukM8HwiP4xxUuBz7GV3RlLlKmDGtkxGzbn6lBb++4ak7tm3MOrEtXRf
Xnb3TDc0yEiyjGZ0soof5/N+Q0p33ETvnBV+Tdg1L5Xxz9BQ/ZQYPaWWOQEQXQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675222043;
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=D0sLDrQVCCXvFCF2sPZDZs7h8g6vJdn288JVNx1h+TY=;
b=suUbdFxTWx9UjigLiRIK89V0yXXL++eo8t14c8L8i7xhftqW3mPK4n/FpLSd7rZdY65cY1
Z2qh37bE53dM4emFefS8xPO/rxRBcMWlwVgsZVMqzBJivQ9LyQiqKAe0jhEAPIoM0BFL0E
OtoZJo3hzXrZf7NIOLq5xQ1CVv3hP7TeiDc4zRbxLabuBH1VQI9n92H1ZSObeAjxVz5zWf
r3y5rU65kbUylpqK0iVSjdVOHbc7W82VLKFABjkHyoAZJ5f3qH0g42Lsqeua4pvAKSStlO
eFMZxMrQkfDVXl/exlu+e20cUZscTp/KNS/WBKGhyoV3dCmcwYN3us8y5k5GsQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675222043; a=rsa-sha256; cv=none;
b=SUEagkr69rRm2Cj/v69bA+rbwxgSdOWEAM/5+rUJfJ607PK80df2DbBYdD6hID+/ZfWa7C
PaJjjB3DyQ+DBEqxs/c22029t8Ld5fzXlAP5a7ZcdA6hoej8HTctpw5qEa2rgln34Ha7B4
4LujfWcGbzibXjcJyyKhvHjt8fnhtIsb1ruHGCVWNOwsY+esMJZQIRxguLMnDgThTzUbx6
OjEBLJv60IVmGtXZYXoDhQyF7KvAboWoCPSTDOL736xikwG9IxXlBvfl+XY9YuoTmYQO1q
TuRg+IDvwuVkcOIAzMq4K6pxHUjsFg+G9S7cjGbpN0ZbKacSW79INumiPsiN5w==
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 4P66mV5mQrz1D9H;
Wed, 1 Feb 2023 03:27:22 +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 3113RMiT051228;
Wed, 1 Feb 2023 03:27:22 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3113RMCF051227;
Wed, 1 Feb 2023 03:27:22 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 03:27:22 GMT
Message-Id: <202302010327.3113RMCF051227@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Subject: git: b8d63afff572 - stable/12 - MFC: Update for new library files in sendmail 8.17.1
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gshapiro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: b8d63afff572d5299c9c8a66487ab978a42711f9
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by gshapiro:
URL: https://cgit.FreeBSD.org/src/commit/?id=b8d63afff572d5299c9c8a66487ab978a42711f9
commit b8d63afff572d5299c9c8a66487ab978a42711f9
Author: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
AuthorDate: 2023-01-15 21:23:27 +0000
Commit: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
CommitDate: 2023-02-01 03:19:59 +0000
MFC: Update for new library files in sendmail 8.17.1
(cherry picked from commit d89513ed20502ddb320474a721d872ef32b31402)
---
lib/libsm/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile
index 5cfcc9f17cd2..eed69cecbf0f 100644
--- a/lib/libsm/Makefile
+++ b/lib/libsm/Makefile
@@ -32,7 +32,8 @@ SRCS+= assert.c debug.c errstring.c exc.c heap.c match.c rpool.c \
wbuf.c wsetup.c string.c stringf.c \
xtrap.c strto.c test.c strcasecmp.c strrevcmp.c \
signal.c clock.c config.c sem.c shm.c mbdb.c strexit.c cf.c ldap.c \
- niprop.c mpeix.c memstat.c util.c inet6_ntop.c notify.c
+ niprop.c mpeix.c memstat.c util.c inet6_ntop.c notify.c \
+ ilenx.c xleni.c utf8_valid.c uxtext_unquote.c lowercase.c strcaseeq.c
CLEANFILES+=sm_os.h
INTERNALLIB=
From nobody Wed Feb 1 03:27:23 2023
X-Original-To: dev-commits-src-branches@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 4P66mX1x9Lz3btj0;
Wed, 1 Feb 2023 03:27:24 +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 4P66mX11vCz4P4N;
Wed, 1 Feb 2023 03:27:24 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675222044;
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=U/AMhOsqWfOISt3ZxmBlOTDl3X9uzRGRxc0O6a+6F38=;
b=Wl5IplWXy2/0H1E6Z5PdygTKY54tQnzhkb6LnDHXpLZt/Ux1A6CAcmAQqqzOFy4vWTWX32
ZZPpHgqtEvrPHhkZPkAoNXOBvjDNV+gQxCFt9FHHOmedjgEA3WK9g/bvu9UZBH7gPGN/tD
81dhc1hfHdm0ykhElJszq0wvI/OaOEqCVP5UYLSleFQxkJNpU0UmyI0y8deJmz0Rl2Mo4E
bd66605wVT/Kn1l1yZ0DvOd5GiVZn0I+K79A7t+1XJqgPJMC4fUTLbJnP75i582w6nIQSZ
awPoK+flKJ2dj+Vn1HqvhVICkAcEZ3jq+qHqDkpCj9SPSBP9xbbfPdWxrGdESA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675222044;
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=U/AMhOsqWfOISt3ZxmBlOTDl3X9uzRGRxc0O6a+6F38=;
b=kng42FmK9RoDww84Fbs7XR1Ocnt5wvhMqfmo4MbdYxwjSXQIwWNaDVjjsoDHjIMayxjuvn
r/BuNLdGtF/Qy/04HxhG6flIIDevXY3Gw1TZNC0ryxRlJ5kv7VQrvhKQ1EJ8jtaufS09ZQ
zfBjA6AR8pU1GWjO9SzTiNB8d1t7mYw0RR5p8PrGe6hqOtPHhCS6hkE8W0CQRq90sW1JB3
7VB20zg1j791F0VwgHZIl1FG7LoYmgUbvqYlEc/vdMUcBgM//qhdn+P2ELQUgGNivfJ86f
FN9SCFj6CPA7WK4lFI2U+DJ83BHST8n56llMy7BWJDsoCNCPwlln134t7t64sQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675222044; a=rsa-sha256; cv=none;
b=Lw83/wsTydzzLoLT0R6PMeNX5kkhb9Qw8U2KORx4nseGjOBsTCvgcCOvWOi7217OSS+Cyn
eJ72KW3g/0hzmIwnVHw+2EJuT5xqrgdbbScVasx5kxtHl9cct3U92hv5s57ZydqOXJpkZo
rGyoohudhBns68WvaNNEFkl+iklMn6CO2MF5/BfWe93Y9mH/sDeUjLhMjnG1yXw4gNxxa1
X1HXcgXey7NFzG9NAnb/qSBnRFq8WbF2BEJArHgZsygSNm13w4g00EPWNlRFNpbxpSU6Db
lfj9sU/xc1780bdfBIVLAE4emYUoT5Hb291ZCYym7XqjxKnP0YxoIDyN1kV73Q==
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 4P66mW6p8Cz1DcS;
Wed, 1 Feb 2023 03:27: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 3113RNPr051253;
Wed, 1 Feb 2023 03:27:23 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3113RNXp051252;
Wed, 1 Feb 2023 03:27:23 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 03:27:23 GMT
Message-Id: <202302010327.3113RNXp051252@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Subject: git: a7ce4a295346 - stable/12 - MFC: Add -DSTARTTLS CFLAG in order to enable DANE in sendmail builds
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gshapiro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: a7ce4a295346d207d835a2f3318231cebc7d4ccd
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by gshapiro:
URL: https://cgit.FreeBSD.org/src/commit/?id=a7ce4a295346d207d835a2f3318231cebc7d4ccd
commit a7ce4a295346d207d835a2f3318231cebc7d4ccd
Author: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
AuthorDate: 2023-01-15 21:24:38 +0000
Commit: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
CommitDate: 2023-02-01 03:20:12 +0000
MFC: Add -DSTARTTLS CFLAG in order to enable DANE in sendmail builds
(cherry picked from commit 3413ee88c39dbfedfa7d00db536a8e8dc073a562)
---
lib/libmilter/Makefile | 5 +++++
lib/libsmutil/Makefile | 7 +++++++
2 files changed, 12 insertions(+)
diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile
index 17bb09857fcf..b3243c2a66cf 100644
--- a/lib/libmilter/Makefile
+++ b/lib/libmilter/Makefile
@@ -15,6 +15,11 @@ CFLAGS+=-DSM_CONF_POLL
CFLAGS+=-DNETINET6
.endif
+.if ${MK_OPENSSL} != "no"
+# STARTTLS support
+CFLAGS+=-DSTARTTLS
+.endif
+
# User customizations to the sendmail build environment
CFLAGS+=${SENDMAIL_CFLAGS}
diff --git a/lib/libsmutil/Makefile b/lib/libsmutil/Makefile
index ff3f8491225b..7bbd21e21bbb 100644
--- a/lib/libsmutil/Makefile
+++ b/lib/libsmutil/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <src.opts.mk>
+
PACKAGE=lib${LIB}
SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/libsmutil
@@ -7,6 +9,11 @@ SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL
+.if ${MK_OPENSSL} != "no"
+# STARTTLS support
+CFLAGS+=-DSTARTTLS
+.endif
+
# User customizations to the sendmail build environment
CFLAGS+=${SENDMAIL_CFLAGS}
From nobody Wed Feb 1 03:27:24 2023
X-Original-To: dev-commits-src-branches@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 4P66mY3H1Tz3btlX;
Wed, 1 Feb 2023 03:27:25 +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 4P66mY26rwz4PWT;
Wed, 1 Feb 2023 03:27:25 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675222045;
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=PRSxiksauedbw4FEPtaLTTqLHVUfv7msOC/7aV9zqpw=;
b=Q2Yp7oHJ1BaU4octGB/2xYzGq+L0OQcdHVXuP0fijMH62cv8QwoPLAtcJCte9kMwMUtva1
MB9WagLTYFPCerzt6aqn+553LD4meFRZ/k0VDeu7LJz81dt1hjOgmAH/PPz+UsxT+5e9vO
pybI1ZzyWENzKRwOTfSvy7PfvKqTnANNL0X3PpD696xUUOg8gvxHdB+GQJzOR29Oh5wzs4
D6ghCAW5JM3gnZBHSbXF+xGzaM1UZTKVm7p8059SM/LaL/wAJHQa7GeD+AMzwLk3UTt7JG
wQPwvl7YhDJ9V2ZjpLmkEWQf6W2/PEv6h+i8PwVu/iwTmyQ9nHB44BEk7j8mSg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675222045;
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=PRSxiksauedbw4FEPtaLTTqLHVUfv7msOC/7aV9zqpw=;
b=sasWF1L0Atjkm/TC5PGWAMuGkDCKHcL2kfAoGWy0aZifSkL2ys1PPU2ZxYMONXY0zIb+Jc
MemITsCLYm2sbfFdGvXrvhclrvNbBSU0JgY7/vMfNYvNBwpi9X8B7K/7zP7EkOmtBHByMy
5SDTXInr9B42taTBmuhAUPmQ7NpesM2Xa+3CTvkJxLtP8hcyoef49wEvytAXJ4pO0T7uBm
soXjRKDLvNXXBIU9dAmsR9WFXc/ijfgqw/JyhkFep1Xes6px4hqyFEBxNMg9qFelBLfDFR
spe+f3I+ZWRT9cAZOaN8T7DaxO6ceS2q+eMBRAnJqVOj6YI2Y27zo6rvSFUUSg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675222045; a=rsa-sha256; cv=none;
b=ev3yDbCVmKO4gmCL/d65AQn/djCmL/efjUoHWQpRaACF74rWnfyGOhPqo8jx7I/7m96mm2
yH/pMG+pfVv4XFSoYwvwYhrvfxN6Bi+ptU13o3qzyWbYc8gNVbdGmoAGuMa4M+MZrBhEMM
daGPd4setVi12SK+HSILUzq2FGY9vH35NBkNVgPXwpMinX6TlvULs4zgRRqhGje+3RXDgF
XRZSmB/KfP956GL/4Mf8P3/5J+YDkOtwQRWdPEoqQsYddrHcBnAxrP2qWjOVPhxvLabiYt
Gzt9Q9HEd/+8sK/eCTt2pP3Xj4olMTZTFyTIrBRZ5I98OYTREkBbabmymHrPzg==
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 4P66mY0ZVPz1DR5;
Wed, 1 Feb 2023 03:27:25 +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 3113ROcw051277;
Wed, 1 Feb 2023 03:27:24 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3113ROQi051276;
Wed, 1 Feb 2023 03:27:24 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 03:27:24 GMT
Message-Id: <202302010327.3113ROQi051276@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Subject: git: 1b51c714b007 - stable/12 - MFC: sendmail 8.17.1 included this fix, though in a different location so removing the FreeBSD local code in favor of the vendor branch version
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gshapiro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 1b51c714b007cdaf22a58239010fb97e97377d26
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by gshapiro:
URL: https://cgit.FreeBSD.org/src/commit/?id=1b51c714b007cdaf22a58239010fb97e97377d26
commit 1b51c714b007cdaf22a58239010fb97e97377d26
Author: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
AuthorDate: 2023-01-15 21:25:39 +0000
Commit: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
CommitDate: 2023-02-01 03:20:25 +0000
MFC: sendmail 8.17.1 included this fix, though in a different location so
removing the FreeBSD local code in favor of the vendor branch version
(cherry picked from commit f97a19ecb98541455c6c940f4bab2dc7dc425468)
---
contrib/sendmail/include/sm/os/sm_os_freebsd.h | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/contrib/sendmail/include/sm/os/sm_os_freebsd.h b/contrib/sendmail/include/sm/os/sm_os_freebsd.h
index fb00760a4301..db7dbf2b61cd 100644
--- a/contrib/sendmail/include/sm/os/sm_os_freebsd.h
+++ b/contrib/sendmail/include/sm/os/sm_os_freebsd.h
@@ -37,11 +37,7 @@
# define SM_CONF_SHM 1
#endif
#ifndef SM_CONF_SEM
-# if __FreeBSD_version >= 1200059
-# define SM_CONF_SEM 2 /* union semun is no longer declared by default */
-# else
-# define SM_CONF_SEM 1
-# endif
+# define SM_CONF_SEM 1
#endif
#ifndef SM_CONF_MSG
# define SM_CONF_MSG 1
From nobody Wed Feb 1 03:27:26 2023
X-Original-To: dev-commits-src-branches@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 4P66mZ4W1fz3btd5;
Wed, 1 Feb 2023 03:27:26 +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 4P66mZ3Wxbz4PVh;
Wed, 1 Feb 2023 03:27:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675222046;
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=+oXpfjq1v061N9QP1qYr61V9q0MVSoqtToqo+bXzHGo=;
b=PM5WmVXYBOSH2Yvj/G/jL2jN3VhTx4YmT0i/bvgsWJbYX1T/fDPR0J/FAGg62lFVE+S3E/
pziu7UVFpOQEBRLL6bDW46ftNPZe8FBZqcJ2WqGSnKmvEcIV2BuW1pzJiX7uA32V0SQQsK
/5SIKwIDUrEb8vE2do2e8YWtdn9rDiHfowUl3ypzeYR8xbsJyJc7QskCzreRWGs/R/ABju
UBW+6mKtRCndnDm3DahU2YPnP58A3jxkl5gghO5jwj7BHuE1ksrarodlE9xQ6+BmuAchy7
iME5g43XeSxf3ULzwaeBI/oKVVwOrbXqaxezZzz7yyMqHEW/IVHd5BoqOWA49Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675222046;
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=+oXpfjq1v061N9QP1qYr61V9q0MVSoqtToqo+bXzHGo=;
b=lAY/pXtZwCn317WQBrk7XvkF0a8Qw+ZAms01GNMM216rusOReVdXBpJF5Ge7dwMh7WFRYR
tlq+j+fggYnH6PMshefd3eqaDtS4PKNR537LUOzJmBPX2Ukm/YD95aPHLz9ZlEtFzFhIYc
LN3D42D10OFIa0Eees8BiaazUFlFJPetDS/pO8jlt955UObn0/PhHBbiccSKarUupU99ja
vTntN3X9aKCrnKso5SFMDIjan/ohYZTNW+kcRFOK8sIi/sudvETi4YYWuRJysNZgHWIUqd
LY91OeFRM+F0Xoj/pzmmv1cOwTrucj+4DZrtGu1aepq1eXaSljk/4VUGH3rSow==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675222046; a=rsa-sha256; cv=none;
b=k65uyi1tFwjTivbm1nsoK5YSB9dmn7ycY5LX3pBqM1jsfA1ZRUzWJqbCpXsx+1u8r/F3Dr
r03RNyh+xchxZDV3k4YxEgD0Z+UNr8oesjlkt14jEK+vZttp4iLe/q6/LCa0cpxOkRzeIf
hjVlcV7JMzxjoMDiDxlFJXIRCDFGDD+aIHEXZCeip2PW6t2PbXHxsGM0H66nRqWqqjs3RU
SDRtecliRUIoMz4VoSuLat7fJ/k/BFMAA2OPK8ZGhfq4ME8++dJG9GrSD15ihf0RhzD23g
Vssy1I2bIA0PG9LYy7PG7BrzzKNbcLI3oQ+xMX3fSAQvTIyWdDbfD2RFD5qpNA==
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 4P66mZ1XBYz1DcT;
Wed, 1 Feb 2023 03:27:26 +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 3113RQgc051308;
Wed, 1 Feb 2023 03:27:26 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3113RQFG051307;
Wed, 1 Feb 2023 03:27:26 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 03:27:26 GMT
Message-Id: <202302010327.3113RQFG051307@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Subject: git: 8d4a89c92fad - stable/12 - MFC: Sync with vendor sendmail 8.17.1 cf/cf/submit.mc
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gshapiro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 8d4a89c92fadf5c130e4bbfff8c8b53a0105eebe
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by gshapiro:
URL: https://cgit.FreeBSD.org/src/commit/?id=8d4a89c92fadf5c130e4bbfff8c8b53a0105eebe
commit 8d4a89c92fadf5c130e4bbfff8c8b53a0105eebe
Author: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
AuthorDate: 2023-01-17 06:49:07 +0000
Commit: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
CommitDate: 2023-02-01 03:20:51 +0000
MFC: Sync with vendor sendmail 8.17.1 cf/cf/submit.mc
(cherry picked from commit 021562c5020dd63d6b812369a9020b3b8147bfbd)
---
etc/sendmail/freebsd.submit.mc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/etc/sendmail/freebsd.submit.mc b/etc/sendmail/freebsd.submit.mc
index fabc1118fa21..165c5f8eadf8 100644
--- a/etc/sendmail/freebsd.submit.mc
+++ b/etc/sendmail/freebsd.submit.mc
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2001-2003 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001-2003, 2014 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -24,3 +24,6 @@ define(`confBIND_OPTS', `WorkAroundBrokenAAAA')dnl
dnl
dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:0:0:0:0:0:0:0:1]
FEATURE(`msp', `[127.0.0.1]')dnl
+dnl enable this for SMTPUTF8 support
+dnl LOCAL_CONFIG
+dnl O SMTPUTF8=true
From nobody Wed Feb 1 03:27:27 2023
X-Original-To: dev-commits-src-branches@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 4P66mb4n37z3btlm;
Wed, 1 Feb 2023 03:27:27 +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 4P66mb3YN2z4PK0;
Wed, 1 Feb 2023 03:27:27 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675222047;
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=MJ5+CBZ+ArML4r6Mkg102ZsHEIxTV7Qy1roVkcrdmII=;
b=rzj6jFjSY5zRPfRjeK91OESX67o+gUOYhDwmd4ouq7js3WMB3d0Ga/Ro/Z+3ncnvqSgZQq
HGwH5+ora7dsqF2AyOlZFsSxoIA9ToOMTsDe7WfGe22C3k9piv9DgIjDtgVEAVPjHolhxT
SxPizetcIqDEA4QIYSjJ8DsJzDtLNjrhMlVZmyvCx7kUr1/P8N7H4nyA4TmvBR4YDjy0s+
C4I5c2udVNQi44wO2vOJ3ua9TT6lkZDiej60KBN/Mj4IQpW9cMwRPqchZCZVzru3o+uuLE
HA7Dv2vEdwXeChrA0ur4oYfi+0+jLq2gIa4XLB8va506FTz5TzU2UO8Uv28xEA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675222047;
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=MJ5+CBZ+ArML4r6Mkg102ZsHEIxTV7Qy1roVkcrdmII=;
b=b5XSFLanF455NMkKdfpTF7Wk/fxAP1h7998Jblf4+A9cdm0rWtFAKYgK1+qEIIDAtZF3dc
BnP0QMAbBR5ykjYB83OGgj9Rrxm0sCKOKUDQteuDRZrPfQVCQ2ecJRJyaRIUlO+NIUOvjo
7Y2kXZ++KLbN6P39Ypd745g0M7PFo7LPiPoq9TQUK/Dfl3fWAv+Pb8bwdppf0cCBKxKQCj
ZJr1c36vzMPB8lan7fpCvItcw061ILhfdh6cQTfVaVi+Yhfcz3/7Vfwlm3OzHMgIZdTj9P
o1qk+VVu25SmRKCl1OPa+G2QJexLHs7gqSugm3bzUFao6IOGHXUGZe5RN7IaWg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675222047; a=rsa-sha256; cv=none;
b=o1GCxKhO7tMxbq3r4zKXDsKHZcY/B48lcYq21jIkkewr5G/wTm4ewwJ4l0KuDCsC+C6uBu
Te1sPZX7rTLriIc9tDC3bbaGi4yRhVwJrGuk+Ns6sagE1FRV4u+UIUu8beK4oXPS594SwI
9Od0O7JZ+9EH/N1v8ZA/HyDzN6Jm2YY4LsBZ4Yv6BE9UrWp6MkDWEIopK5KeIcP57BBghR
+DMETVI3xlhEJh2hDihO3h4ZGxw+t+7l2IBWKqqg/xqT+sQxb8Mqax4TiFL9tKvN8yQjWp
5Vq1t+cm+b/C6MBvqovvVgJaUfvZV1Vsj9/1ddM7+E+3Nl119Sl3vyU+B5OxWg==
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 4P66mb2JDXz1DYn;
Wed, 1 Feb 2023 03:27: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 3113RREu051333;
Wed, 1 Feb 2023 03:27:27 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3113RR61051332;
Wed, 1 Feb 2023 03:27:27 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 03:27:27 GMT
Message-Id: <202302010327.3113RR61051332@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Subject: git: 909f90986eff - stable/12 - MFC: Minor changes to force commit these files so new freebsd*.cf files are built to use the new sendmail-8.17.1/cf tree.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gshapiro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 909f90986eff546974d513ddcee2c9a90558d6ef
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by gshapiro:
URL: https://cgit.FreeBSD.org/src/commit/?id=909f90986eff546974d513ddcee2c9a90558d6ef
commit 909f90986eff546974d513ddcee2c9a90558d6ef
Author: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
AuthorDate: 2023-01-17 06:49:49 +0000
Commit: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
CommitDate: 2023-02-01 03:21:03 +0000
MFC: Minor changes to force commit these files so new freebsd*.cf files are
built to use the new sendmail-8.17.1/cf tree.
(cherry picked from commit 431d2a81d421d4db7a07833b4fd12015cbae5ee7)
---
etc/sendmail/freebsd.mc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/etc/sendmail/freebsd.mc b/etc/sendmail/freebsd.mc
index dbdfdb57ea62..97264805a67f 100644
--- a/etc/sendmail/freebsd.mc
+++ b/etc/sendmail/freebsd.mc
@@ -73,14 +73,14 @@ dnl NOTE: This can allow sites to use your server as a backup MX without
dnl your permission.
dnl FEATURE(relay_based_on_MX)
-dnl DNS based black hole lists
-dnl --------------------------------
-dnl DNS based black hole lists come and go on a regular basis
-dnl so this file will not serve as a database of the available servers.
+dnl DNS based block lists
+dnl ---------------------
+dnl DNS based block lists come and go on a regular basis so this
+dnl file will not serve as a database of the available servers.
dnl For more information, visit
dnl http://en.wikipedia.org/wiki/DNSBL
-dnl Uncomment to activate your chosen DNS based blacklist
+dnl Uncomment to activate your chosen DNS based block list
dnl FEATURE(dnsbl, `dnsbl.example.com')
dnl Alternatively, you can provide your own server and rejection message:
dnl FEATURE(dnsbl, `dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected"'')
From nobody Wed Feb 1 03:27:28 2023
X-Original-To: dev-commits-src-branches@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 4P66md1gttz3btln;
Wed, 1 Feb 2023 03:27:29 +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 4P66mc5Z99z4PQ9;
Wed, 1 Feb 2023 03:27:28 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675222048;
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=r56twDlLG3K/+bU4DgxdBxzvmMMbmzrkFaKSTnNZBiU=;
b=RwAd+f0OEiVZzZWjzE5h2O1yBfAGLZQZCS/L8mpvRv0ItB3tmK7DguOnHnttME2fDAOKR0
QBSXmApHey/QOebdxVT3ZKZx1RG0byUe0GW/NT2ckFyQnyNFNJCc0P/r/QcJTtwjucATN8
itpwYq8LqaYraWWLhHFfOywKD4TwZqAfqtmWG9MkCqU0vx+Ai26VFx2nreGpDejrGLUf+3
dfj+Xv8JN/tOnU7fcCMPoRW4bDMjOWDiBlkqUfovn1+0VVS4H/YvT9cTy2bQes86PQpJkY
viC0G2oRlEiNbX1hR2BPaeG/d2FVLup1NjF0AOBHtKkB6m9rXiBfMmM9SuRxaQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675222048;
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=r56twDlLG3K/+bU4DgxdBxzvmMMbmzrkFaKSTnNZBiU=;
b=UquBQs45boUHqVDCZZb7D43wwJDylGTZADXWYTZJYf7WdsvEgS3gCyXWHuP8+mYCwrc04g
uMYns/DUaE0z1avelngsYDbCAD+GCigEDJJOApnU8dFjkH2adTEUmghKOGnB/raPdqw1wP
HJO2VGw1+h3g/D3+H7CZIFmhX7PFAyvRY33L3jb8uy5J8RJWTVEQ3AfLtNKAXFUqniP9ee
688PXo+F4IMi6XJKLvokZItFu6WtrBAQnUyq1qtvuDZmyyz8YN7wuMxdIYjZfw5HioN4zp
+ayC/FVlex/U0rHE+Ym+rUcrWoKiCnfISFhTKUQhkEabxXkitV/93hYOs3jDNw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675222048; a=rsa-sha256; cv=none;
b=Sw6hYKuEDTi60pnI3oDR5GcxuklyZFJC56WNKAmeFAG273b5bg6JY2NGHbpREiRiXElEjb
+/NdBMED17FFnl9AAI9ufct062Gtk1mYVvyksL1cxUeGxf4u0CZFWkZPmB9PHxUgw72rrJ
+RSkyIgL4029mtDw9a2QaENaR6XP7gn37GJt16UYWgUdW0X/rDBkZXUJKYneBcUWHMSlvN
qkwo2kfNzxcIPrr0CCUKH/5MfawTX8hV17xoTLQERVMy5/18syiEjzuIjwYAI/fXOMgiYH
F4oBI5p1X7kJjmmvVZu4RnYtV3F9YZ1x8sEvSm70eAO0N6yRQL0AbKD6nC5e8g==
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 4P66mc3JlLz1DCB;
Wed, 1 Feb 2023 03:27:28 +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 3113RS2o051358;
Wed, 1 Feb 2023 03:27:28 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3113RSLN051357;
Wed, 1 Feb 2023 03:27:28 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 03:27:28 GMT
Message-Id: <202302010327.3113RSLN051357@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Subject: git: 46f35ff24f4b - stable/12 - Note upgrade to sendmail 8.17.1
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gshapiro
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 46f35ff24f4b0b17f2174bd66b039d146e32c794
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by gshapiro:
URL: https://cgit.FreeBSD.org/src/commit/?id=46f35ff24f4b0b17f2174bd66b039d146e32c794
commit 46f35ff24f4b0b17f2174bd66b039d146e32c794
Author: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
AuthorDate: 2023-02-01 03:21:35 +0000
Commit: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
CommitDate: 2023-02-01 03:21:35 +0000
Note upgrade to sendmail 8.17.1
---
contrib/sendmail/FREEBSD-upgrade | 25 +++----------------------
1 file changed, 3 insertions(+), 22 deletions(-)
diff --git a/contrib/sendmail/FREEBSD-upgrade b/contrib/sendmail/FREEBSD-upgrade
index 86fb5ec554b3..d694b51ad454 100644
--- a/contrib/sendmail/FREEBSD-upgrade
+++ b/contrib/sendmail/FREEBSD-upgrade
@@ -1,6 +1,6 @@
$FreeBSD$
-sendmail 8.16.1
+sendmail 8.17.1
originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/
For the import of sendmail, the following directories were renamed:
@@ -9,26 +9,7 @@ For the import of sendmail, the following directories were renamed:
Imported using the instructions at:
-http://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html
-
-Then merged using:
-
-% set FSVN=svn+ssh://repo.freebsd.org/base
-% svn checkout $FSVN/head/contrib/sendmail head
-% cd head
-### Replace XXXXXX with import revision number in next command:
-% svn merge -c rXXXXXX --accept=postpone '^/vendor/sendmail/dist' .
-% svn resolve --accept working cf/cf/Build \
- cf/cf/generic-{bsd4.4,hpux{9,10},linux,mpeix,nextstep3.3,osf1,solaris,sunos4.1,ultrix4}.cf \
- devtools doc/op/op.ps editmap/editmap.0 mail.local/mail.local.0 mailstats/mailstats.0 \
- makemap/makemap.0 praliases/praliases.0 rmail/rmail.0 smrsh/smrsh.0 \
- src/{aliases,mailq,newaliases,sendmail}.0 vacation/vacation.0
-% svn propset -R svn:keywords FreeBSD=%H .
-% svn propdel svn:keywords libmilter/docs/*.jpg
-% svn diff --no-diff-deleted --old=$FSVN/vendor/sendmail/dist --new=.
-% svn status
-% svn diff
-% svn commit
+https://docs.freebsd.org/en/articles/committers-guide/#git-primer
After importing, bump the version of src/etc/sendmail/freebsd*mc
so mergemaster will merge /etc/mail/freebsd*cf by making a minor
@@ -102,4 +83,4 @@ infrastructure in FreeBSD:
usr.sbin/mailwrapper/Makefile
gshapiro@FreeBSD.org
-23-July-2020
+31-January-2022
From nobody Wed Feb 1 07:25:18 2023
X-Original-To: dev-commits-src-branches@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 4P6D325q61z3cQD0;
Wed, 1 Feb 2023 07:25:18 +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 4P6D325BqLz3G9l;
Wed, 1 Feb 2023 07:25:18 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675236318;
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=o4aaX60fEKqT6PGSwRW7UpaAjeSXLFLksaXKj137qMI=;
b=MMtNYLZtBh8RlYTPhm3rXIwUU1sB6v99i1CO2xbOV73z6PHKW7Z+SwNCezIe+W5XDIUzWS
4278DB/ef3xglvQG4P4WcwUoTU9OvNNeQacfA3trmk8gShkPZfOA6gGGp4xtx/ckHNkJMV
lHyXEh2jtvw07Qo2nUl7MtZzdRpEQUcReoausI50P3pUCyGMCYlZJsHfpbf7Y4eHbm88yu
JE1vTYV2C/cJOajj0LpbRGfVFGOGfZWT58PNH15RyNOYhCWTv0uDZJTqnEOuz71GU58jAv
nkjcudrZ6XI8kKroondezNxELhZ5aLpZShtoShiqiCD02jYI7s9bEhz6qlb/kQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675236318;
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=o4aaX60fEKqT6PGSwRW7UpaAjeSXLFLksaXKj137qMI=;
b=HWUWFZl3z2A/e3/pz5Q67OiF9HMSRI3mIWi32f4p+olcKQtfU2SR/0dr2EUAricwwb4k5Z
bKfLddzzTfol77E3NPsGWhsY9q+aQGDNQ2iNfMHRYsOspF0oeQy89vLWV0GvKGprXYcnjU
s2WJ6KvQgLPOWC9MdGR7FnO8D3zrke3JfTPp+44hk15GGaWJ/2qX/vW4ILCHy7JgJ+1GzD
GAIQvF6mZsg8PeKdoocfCv4I0tvcWBXdf6SjG6Ofq9SiJ3ULzSiBQGwUdfO/zkSMb8YGwJ
5kp+cdhuSjtTYIQSnzRjSQcsPsu/OmxqJMER0rgKg3BIlkRUsKa3smfmMceY1A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675236318; a=rsa-sha256; cv=none;
b=F7GkcnL8CiKVoqhhSWpf5IMYhB29k9o+kBlG34PfNhdg1YQr3i6U1oTM9pWwLA1EdNMS/L
RtRu0rzxIc77Edy16BuVm7CPtTZjFIV90AuGKOhDaRBjrBoXP3kwZcr/5ulh6PZtXL3PTB
4jSK79tch7aKfcEtkkch/V+5fvZIlLqdMHte/0QxUHlBWSxmmZ9aBAM6y4mnfmKZ4DB9K4
/zIdMZXfU8u9BhNHhiYUm9+u6qOGZP4Dp0G4zf50qePV84jNLjnu5jJu4cclsaySDLZFRR
NxGemfWyNN/rO8m2s2xr5FfSu8KDnb/0Ibzeb/niQ48YCCjjD38HclK4SHta+g==
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 4P6D3248HDz1Kqg;
Wed, 1 Feb 2023 07:25:18 +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 3117PIOS090498;
Wed, 1 Feb 2023 07:25:18 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3117PIE7090497;
Wed, 1 Feb 2023 07:25:18 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 07:25:18 GMT
Message-Id: <202302010725.3117PIE7090497@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Xin LI <delphij@FreeBSD.org>
Subject: git: 9eea81e59641 - stable/13 - usr.bin/stat: Fix error message formatting.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: delphij
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 9eea81e59641df1a5a45dbe06628081bc4bb7bad
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by delphij:
URL: https://cgit.FreeBSD.org/src/commit/?id=9eea81e59641df1a5a45dbe06628081bc4bb7bad
commit 9eea81e59641df1a5a45dbe06628081bc4bb7bad
Author: Jamie Landeg-Jones <jamie@catflap.org>
AuthorDate: 2023-01-29 22:37:25 +0000
Commit: Xin LI <delphij@FreeBSD.org>
CommitDate: 2023-02-01 07:24:52 +0000
usr.bin/stat: Fix error message formatting.
PR: bin/261657
(cherry picked from commit 37399d5bcf67c6d68e30a34ce2df30e0964d46d9)
---
usr.bin/stat/stat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c
index 9d94399a6333..8229e742da87 100644
--- a/usr.bin/stat/stat.c
+++ b/usr.bin/stat/stat.c
@@ -373,7 +373,7 @@ main(int argc, char *argv[])
errs = 1;
linkfail = 1;
if (!quiet)
- warn("%s: stat", file);
+ warn("%s", file);
}
else
output(&st, file, statfmt, fn, nonl);
From nobody Wed Feb 1 07:25:46 2023
X-Original-To: dev-commits-src-branches@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 4P6D3b1PzQz3cQ6S;
Wed, 1 Feb 2023 07:25:47 +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 4P6D3b0xVbz3GDc;
Wed, 1 Feb 2023 07:25:47 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675236347;
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=n8hCevUmO6AfuVigrO/YjJq3R+o2YQJ/L4jrHI8+wwI=;
b=l0jwmtnhDXUiFbNEXfl02umt3J5hWWsRU28T476fsColnbgxrbCuTfGOWmOYj/f62bh7VH
FS3Cmm8QMyNqsok+5TsabzNFqZAJZOYYzTqusx4iLXFOa8TRG8ia7gdYbCLp6XGaeeEwpq
WJ6SoCVCznxAze9c8qOlcSbpeBSA33kr7HNkb0S65DVxsEEClCUtpdewqZ+zH3s8B+3nV1
fXetg163da/dziMqHhnwFVo1UDWpwAXnrOxCCmGrULLkcxt5qyqQjG+X/UEMCjkXzSuz34
FLmSKDXiWcPqbyFbEOw/TMoIgS6CNeRA533isMu7vLNC+v3VB3fpafhQxTLzNw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675236347;
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=n8hCevUmO6AfuVigrO/YjJq3R+o2YQJ/L4jrHI8+wwI=;
b=pufRnsER57GKQd4XnXNVpQaKjjqe9mQrL+O+UzsLCuzlK1zLlwdt7TTOOYxY9BOgSx8Z69
zkFqkU9/tDC6uO8lT+ZRgJmZhiZ4NTk6p1A6YcVYFmktrx1xbKSRhrN2ouGOak+vPSkK/r
3HHSuhptlC40hWIMulLmycvcGLELqq3YYJioQYxo/ypv9yVC97W+6Jd3QigkxIGpMw/lw5
VcNI2tcgjP0Kw6PfsqWLGPart0LxDooDsvEbIPKxXtNMkW/ppBQE4JJFyZGhoOkf8glcrN
AixUoz/ME8koLabU0aGcK4cXO4W6P1byGDY7FIncFCCDFTqns0f/c4n0NYkiMA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675236347; a=rsa-sha256; cv=none;
b=wZV9npyIK+1ryoRsS8400sFTXmksxhF4DwESv5lSHsia8UMP+8EOKdXaqcRRO1IIE5Miij
Tz7KI4e3rrAFKLsNqB+XgNfek/V6p8ZbI8OwVpZlRngHGWif4xRgxHapxPXkbSNh1B8iiG
N2qqBxMUkaxRilc/NUNbFXp8tUjAmQtB+EzWoJbU0mSBRlmZHcCWfR2Vsw+CZjcM/BsREb
e5Y+k0Aidpyo4n8dt8+cLZEkjBFvBhjet/l9gIo3B8UHvz5Ip+86wtGP+DFZNvW2zQldEV
eBOE8nVVAnT/pybfVGg+IAFBqGwPpeN4JwTpKVKm3gPrJOaUm6nl9f4rPhKN0Q==
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 4P6D3Z75mhz1L4y;
Wed, 1 Feb 2023 07:25:46 +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 3117PkQL090688;
Wed, 1 Feb 2023 07:25:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3117PkYY090687;
Wed, 1 Feb 2023 07:25:46 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 07:25:46 GMT
Message-Id: <202302010725.3117PkYY090687@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Xin LI <delphij@FreeBSD.org>
Subject: git: b2ffd03bbb3e - stable/12 - usr.bin/stat: Fix error message formatting.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: delphij
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: b2ffd03bbb3e9cfb0cb9a6995a0e23351d2004fb
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by delphij:
URL: https://cgit.FreeBSD.org/src/commit/?id=b2ffd03bbb3e9cfb0cb9a6995a0e23351d2004fb
commit b2ffd03bbb3e9cfb0cb9a6995a0e23351d2004fb
Author: Jamie Landeg-Jones <jamie@catflap.org>
AuthorDate: 2023-01-29 22:37:25 +0000
Commit: Xin LI <delphij@FreeBSD.org>
CommitDate: 2023-02-01 07:25:36 +0000
usr.bin/stat: Fix error message formatting.
PR: bin/261657
(cherry picked from commit 37399d5bcf67c6d68e30a34ce2df30e0964d46d9)
---
usr.bin/stat/stat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c
index 0b63a4067caf..e73f62362281 100644
--- a/usr.bin/stat/stat.c
+++ b/usr.bin/stat/stat.c
@@ -371,7 +371,7 @@ main(int argc, char *argv[])
errs = 1;
linkfail = 1;
if (!quiet)
- warn("%s: stat", file);
+ warn("%s", file);
}
else
output(&st, file, statfmt, fn, nonl);
From nobody Wed Feb 1 17:31:57 2023
X-Original-To: dev-commits-src-branches@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 4P6TW16sxVz3bJBS;
Wed, 1 Feb 2023 17:31:57 +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 4P6TW16RF5z3PTq;
Wed, 1 Feb 2023 17:31:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675272717;
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=OOTOTzKgkdEjkwm2wRw1TFHYeKmyo81GlIbyXChs8F0=;
b=h8y0/u5m9mj98zcBmNag/3nHCtrJazY8oR9/vxkYZWOAYFztc15malnb8oalA3MDyDgbUE
ZWbRi9fbeBQocHwHITXO8mkWdghk6rtAkFTgpTdIsA1dloS9ZZmQ8dbckiBBnbHRw62rix
FVufbemdQY/Yisl15vxrbaomMnYLD2Pt5Zh9kfZ8TyypsLN8Ij/NR2ds9q4guZ1cJaV/o4
fMKOO+0k1GBbr4JvlmfplnVYYz+qNDl3DsVfCurTyjU/ll/f0p+CTdY6Je9vTQ/Aew4Bch
zUzSWHCYIh4RCYGXzpsE+eFsmMBULM8i7uzyzqUkAEVEW3Uudqd6kh4bSWHOYQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675272717;
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=OOTOTzKgkdEjkwm2wRw1TFHYeKmyo81GlIbyXChs8F0=;
b=xh0+caL4x+FAAvi3tjZYYUeuvuE/Q13Qu1CFKDNUJAXtosx86Ku0BnW4BaRsVFvUEEPyz4
lMuIiMLEw277IdjSgZOSHc/QgBbnuCeshlV+NlL2MbAgOydAUxShp9SRaidCvYr8Ycxupd
76dRodSiKhMn6ys49CjNh2+Y+42iftBVNXiKUCfmzxQ9tXbQ1z/WTEuIHF57QkxKg5fGFH
0C6HqbZ/2IJ4ZhKRdZ/Pwdd9tMJ7rQkL+LJXE5K79/9ARbPtj2ERPgVSghNr6lWbnnwGKb
vCL/7nvBNKxRl4jA1y/KCgIJ2h0aCKMZIQV0LflHfr1CAG/C2DLj6tRsBAZ4YA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675272717; a=rsa-sha256; cv=none;
b=KB3FKLxKrMRok+AXAGTnDPePYSs+8qK7OLxN/rfhWkiq/1DQej7aliYQ+irJhoDiMjgpa3
WHCIbTjtWR8LGRLUYHI5eWYNNI/eA63mh+Kd/h4MNsNlQi7Dru//Pb8z6JDcChae2saOEa
ZbdtJL/ObD2atnmybgOBqRwHLrQGdSSeL5gSknmebMZHsT8kr+exTGJ7zQ0E0/xOmSHFa5
QQ7vVp4V/cMt20yc0henS1kpC2ZE2SWBLK2NWkgy3GDQxSU4BJ5nsD599hoN9kBBXBmXtt
As3yOGfAKrMFON6bNwh03XcwJxUEpyITZv7a8Fe0vTEN5cSNy7SbFu0CRpElyw==
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 4P6TW15VLmzN8P;
Wed, 1 Feb 2023 17:31:57 +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 311HVvfY057079;
Wed, 1 Feb 2023 17:31:57 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311HVvmj057078;
Wed, 1 Feb 2023 17:31:57 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 17:31:57 GMT
Message-Id: <202302011731.311HVvmj057078@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 584ca49a07f4 - stable/13 - ipsec: Clear pad bytes in PF_KEY messages
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 584ca49a07f42c0b6d43687ae1763fd800089484
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=584ca49a07f42c0b6d43687ae1763fd800089484
commit 584ca49a07f42c0b6d43687ae1763fd800089484
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-01-16 15:46:20 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-02-01 17:22:31 +0000
ipsec: Clear pad bytes in PF_KEY messages
Various handlers for SADB messages will allocate a new mbuf and populate
some structures in it. Some of these structures, such as struct
sadb_supported, contain small reserved fields that are not initialized
and are thus leaked to userspace.
Fix the problem by adding a helper to allocate zeroed mbufs. This
reduces code duplication and the overhead of zeroing these messages
isn't harmful.
Reviewed by: zlei, melifaro
Reported by: KMSAN
Sponsored by: The FreeBSD Foundation
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D38068
(cherry picked from commit 8a9495517b0ad54da9759a7ba2cc0b56f8e7c8f9)
---
sys/netipsec/key.c | 69 +++++++++++++++++++++++-------------------------------
1 file changed, 29 insertions(+), 40 deletions(-)
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index 869d6b850aa0..efda68f09078 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -804,6 +804,25 @@ key_havesp(u_int dir)
TAILQ_FIRST(&V_sptree[dir]) != NULL : 1);
}
+/*
+ * Allocate a single mbuf with a buffer of the desired length. The buffer is
+ * pre-zeroed to help ensure that uninitialized pad bytes are not leaked.
+ */
+static struct mbuf *
+key_mget(u_int len)
+{
+ struct mbuf *m;
+
+ KASSERT(len <= MCLBYTES,
+ ("%s: invalid buffer length %u", __func__, len));
+
+ m = m_get2(len, M_NOWAIT, MT_DATA, M_PKTHDR);
+ if (m == NULL)
+ return (NULL);
+ memset(mtod(m, void *), 0, len);
+ return (m);
+}
+
/* %%% IPsec policy management */
/*
* Return current SPDB generation.
@@ -2315,14 +2334,8 @@ key_spddelete2(struct socket *so, struct mbuf *m,
/* create new sadb_msg to reply. */
len = PFKEY_ALIGN8(sizeof(struct sadb_msg));
- MGETHDR(n, M_NOWAIT, MT_DATA);
- if (n && len > MHLEN) {
- if (!(MCLGET(n, M_NOWAIT))) {
- m_freem(n);
- n = NULL;
- }
- }
- if (!n)
+ n = key_mget(len);
+ if (n == NULL)
return key_senderror(so, m, ENOBUFS);
n->m_len = len;
@@ -3753,14 +3766,8 @@ key_setsadbmsg(u_int8_t type, u_int16_t tlen, u_int8_t satype, u_int32_t seq,
len = PFKEY_ALIGN8(sizeof(struct sadb_msg));
if (len > MCLBYTES)
return NULL;
- MGETHDR(m, M_NOWAIT, MT_DATA);
- if (m && len > MHLEN) {
- if (!(MCLGET(m, M_NOWAIT))) {
- m_freem(m);
- m = NULL;
- }
- }
- if (!m)
+ m = key_mget(len);
+ if (m == NULL)
return NULL;
m->m_pkthdr.len = m->m_len = len;
m->m_next = NULL;
@@ -4937,14 +4944,8 @@ key_getspi(struct socket *so, struct mbuf *m, const struct sadb_msghdr *mhp)
len = PFKEY_ALIGN8(sizeof(struct sadb_msg)) +
PFKEY_ALIGN8(sizeof(struct sadb_sa));
- MGETHDR(n, M_NOWAIT, MT_DATA);
- if (len > MHLEN) {
- if (!(MCLGET(n, M_NOWAIT))) {
- m_freem(n);
- n = NULL;
- }
- }
- if (!n) {
+ n = key_mget(len);
+ if (n == NULL) {
error = ENOBUFS;
goto fail;
}
@@ -7148,14 +7149,8 @@ key_register(struct socket *so, struct mbuf *m, const struct sadb_msghdr *mhp)
if (len > MCLBYTES)
return key_senderror(so, m, ENOBUFS);
- MGETHDR(n, M_NOWAIT, MT_DATA);
- if (n != NULL && len > MHLEN) {
- if (!(MCLGET(n, M_NOWAIT))) {
- m_freem(n);
- n = NULL;
- }
- }
- if (!n)
+ n = key_mget(len);
+ if (n == NULL)
return key_senderror(so, m, ENOBUFS);
n->m_pkthdr.len = n->m_len = len;
@@ -7786,14 +7781,8 @@ key_parse(struct mbuf *m, struct socket *so)
if (m->m_next) {
struct mbuf *n;
- MGETHDR(n, M_NOWAIT, MT_DATA);
- if (n && m->m_pkthdr.len > MHLEN) {
- if (!(MCLGET(n, M_NOWAIT))) {
- m_free(n);
- n = NULL;
- }
- }
- if (!n) {
+ n = key_mget(m->m_pkthdr.len);
+ if (n == NULL) {
m_freem(m);
return ENOBUFS;
}
From nobody Wed Feb 1 17:31:58 2023
X-Original-To: dev-commits-src-branches@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 4P6TW3116rz3bJ1P;
Wed, 1 Feb 2023 17:31:59 +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 4P6TW30Dkqz3P5T;
Wed, 1 Feb 2023 17:31:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675272719;
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=boOMdEdTYypExb2wjJ8/+XyNgAvoBnla2e90Ua3rwkU=;
b=QlckSkax3FsjaND0RfxHI9Q25WWlXl3zTMWJH6f0aztrzAE6yKadv74vpoqct/3c7uCAgJ
FYJGLZQk2NIupULLFMdqm1rAjzfmL0GjKKS49gKJWfsuaTInSpVGBg6WfrBE/KEO4ZtQxU
8IVLHvs31xQPA0mubILCBJGMsMfgHu7yJ9Dj0lEmU4vzI1D8odRa9xM8VwkwvURgGNlFsQ
cKT7w9kVfXaqXtgxudaiP9KmmAqRzGWBFvG1fDi+J+wBm88SLOpyVU7oxu/lIMVhUt8AEW
50k42dGuDU8R2Z7jkeaGG/D8BxbsPQ9KHn3MCoa3lJkwcxVUTa0g9VbRcx2KnQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675272719;
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=boOMdEdTYypExb2wjJ8/+XyNgAvoBnla2e90Ua3rwkU=;
b=svxUyqF4j4By4mF33JWdC5L4SmTDHtaxsOQhWPa3Hr4bU2KJy/CypS3edspu0T/SLmwNrl
EznoACExEqq/sgOBoJ+ZYtSvLAoyYtH8c8AdyQlWY3YMimGHyjMsDArsNCLLZMYzXbyOqN
Bo6ZsqNrqpOLPksnbJAP9kA0inxtk+HGdog0FOCAGDyxjsQ014DHRg/EEXJ8+hK/m3cjGm
PazTnZQp3sw5fWK/G3pZiy19uMA3TQtIuR32GqkS2yWZGVn9MGIjKW/6FjsAo2hFKiNxvo
6epnIYEn9oMaDEIKiS3s0ubaE+694X9H5apTNfN/FNSxuDMlNNEMG68F7U5Aqw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675272719; a=rsa-sha256; cv=none;
b=DH60lFz4cDcfu6R8E7a9UnRBFzQauqFNzoR0t0UtTGSV9ex0U0hoHyKi+iwmlsxfK/nQg4
NyqSRN370IzAtoRYnMgCtHrAy1Wc6EjtrErIe7ztyypGNZxltqqZH6qOdFvpG8D4fw78b8
IZxaLWsr47VNBZqBSkGcmKXTiRv3zzklJBicb7XyKtj6YBPmmDr2uj8e0cWQI+mGMNyL6D
FNcIehhXhqH6mQFkTvUT5BFXY8cLsFQRqJ7utJtCwLNHFXGrsyj7aQy0YLORKbHiL3NErt
Ny907RPCHg8IObYUb0/h5VRySUenS8C1X1BIBqgRjm2BlIxdSnUM3FVah9nD8Q==
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 4P6TW26PmwzMxN;
Wed, 1 Feb 2023 17:31:58 +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 311HVwDc058041;
Wed, 1 Feb 2023 17:31:58 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311HVwTc058040;
Wed, 1 Feb 2023 17:31:58 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 17:31:58 GMT
Message-Id: <202302011731.311HVwTc058040@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 1a57779234d4 - stable/13 - netmap: Fix a queue length check in the generic port rx path
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 1a57779234d4590fc16cba26305105f5c6fdd42b
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=1a57779234d4590fc16cba26305105f5c6fdd42b
commit 1a57779234d4590fc16cba26305105f5c6fdd42b
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-01-23 19:41:55 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-02-01 17:22:31 +0000
netmap: Fix a queue length check in the generic port rx path
The check is ok by default, since the default value of
netmap_generic_ringsize is 1024. But we should check against the
configured "ring" size.
Reviewed by: vmaffione
MFC after: 1 week
Sponsored by: Zenarmor
Sponsored by: OPNsense
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D38062
(cherry picked from commit 539437c8281d24450bacded3734276acd9983e90)
---
sys/dev/netmap/netmap_generic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/dev/netmap/netmap_generic.c b/sys/dev/netmap/netmap_generic.c
index f3125860b869..f726cf471177 100644
--- a/sys/dev/netmap/netmap_generic.c
+++ b/sys/dev/netmap/netmap_generic.c
@@ -838,7 +838,7 @@ generic_rx_handler(struct ifnet *ifp, struct mbuf *m)
nm_prlim(2, "Warning: driver pushed up big packet "
"(size=%d)", (int)MBUF_LEN(m));
m_freem(m);
- } else if (unlikely(mbq_len(&kring->rx_queue) > 1024)) {
+ } else if (unlikely(mbq_len(&kring->rx_queue) > na->num_rx_desc)) {
m_freem(m);
} else {
mbq_safe_enqueue(&kring->rx_queue, m);
From nobody Wed Feb 1 17:31:59 2023
X-Original-To: dev-commits-src-branches@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 4P6TW41LSVz3bJ3F;
Wed, 1 Feb 2023 17:32:00 +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 4P6TW40wZnz3PVl;
Wed, 1 Feb 2023 17:32:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675272720;
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=yYFhsmyALy03RtZ8h4toN6TmPLfWz9v0vA7yGlamLV8=;
b=bnR35u0EJcqlfw9Faxd9p5JIYH0NbLFqv74NG7fXDlkYjHlh24ltill0BZoGIQdk1JcdXi
aMe4tJYL+mKEHPr6vnZle4k358IGDxswI8pvUWaWaFJwJddMjZBQ3LqxVVdM3s2Yvh/x6M
/QMLJsiJQk3drJTy3+QBdDgPCsxC1kacf84CUxtkDjE4GQ7/IAIrbQ87rx1+9Pm6XMew9R
1t059roJScSSvQbXTnSdViu8qiaMbOORI65m11D74mJJyQslrFVldv9NeQFR4NOA4Fp6pS
9Iq6tUzQGc5c1yNH2koWi1tp6YvEyo3SpD1q15edS4qzF8ksjHufMQ5G2hy5CA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675272720;
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=yYFhsmyALy03RtZ8h4toN6TmPLfWz9v0vA7yGlamLV8=;
b=KSmbpfqITgXww2SH9HfQedNPve0xA9eRO+nvsQLY9DePBi8gu9WLggS1IUyfme4x2932i/
yvcwESNn/xPoa/r2FphQzIJpI9gO+EZm2QnWyOTNITP0dPlllIEgIeN7XLnYcv+WGzgqYN
/+Qb0ZFIPssX26Cgf0AlJ/u2Z1E5iua4QD33IHKTrFDkp9wAhqi+yhs/W9aEx9DtJaa26I
/A1U7jh0wZpEDP1XeznNjfgtTT4uNEA7bvGfBc1P1+DzOZK5Qp7zuNkQzz6bFgs70FyRV9
V86zw5c7sYl2sihyyCS1ZBTB/e18MXN6UQqjFwvxkI+x16lXB7yYLzI3j5CJxw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675272720; a=rsa-sha256; cv=none;
b=bnZYJy4tb/GSV8J9uhPC8whHB8BPIFsLXMeJcb3lzcvzImv9+G0LtGis1M1to8ie5oklJM
704vGKxgzhlujKdXpR4oOXTX49CObYOj3tvG/XIFOmcP1jU2p11FFUxVdCWfeG9XM4tkPP
5kzz8fk5kO2WCrEd2qX3I/y4A1Mh0aIPU3PI4l7Ko2wP/upbafa5zIK+hQJMbffjItxN2R
CTxV8xk6WwdZI7elrLm/2dPpXFAjAmAhVBCLKAZX7/oO5K8Q4ZKQ10mYtmyEu5KSJrFRRe
QbNKaKc1URT7VCir+85CJRU1xiXK3aMe0RegXX5s0HJb/zdHzI5M57urqg2neQ==
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 4P6TW400DrzMxR;
Wed, 1 Feb 2023 17:32:00 +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 311HVxWu058068;
Wed, 1 Feb 2023 17:31:59 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311HVxxT058067;
Wed, 1 Feb 2023 17:31:59 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 17:31:59 GMT
Message-Id: <202302011731.311HVxxT058067@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 57fa543941b8 - stable/13 - netmap: Correct a comment
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 57fa543941b82410736df2ad4a0331981ac74c67
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=57fa543941b82410736df2ad4a0331981ac74c67
commit 57fa543941b82410736df2ad4a0331981ac74c67
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-01-23 19:42:19 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-02-01 17:22:31 +0000
netmap: Correct a comment
Reviewed by: vmaffione
MFC after: 1 week
Sponsored by: Zenarmor
Sponsored by: OPNsense
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D38063
(cherry picked from commit 854b2f302dcc73dfef2e4458d382f8149ce9167c)
---
sys/dev/netmap/netmap_kern.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h
index bf24dfa0f18d..195b5de7a502 100644
--- a/sys/dev/netmap/netmap_kern.h
+++ b/sys/dev/netmap/netmap_kern.h
@@ -2053,7 +2053,7 @@ struct nm_os_gen_arg {
void *head, *tail; /* tailq, if the OS-specific routine needs to build one */
void *addr; /* payload of current packet */
u_int len; /* packet length */
- u_int ring_nr; /* packet length */
+ u_int ring_nr; /* transmit ring index */
u_int qevent; /* in txqdisc mode, place an event on this mbuf */
};
From nobody Wed Feb 1 17:32:01 2023
X-Original-To: dev-commits-src-branches@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 4P6TW52LQ2z3bJ1V;
Wed, 1 Feb 2023 17:32:01 +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 4P6TW51qYHz3Pkb;
Wed, 1 Feb 2023 17:32:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675272721;
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=/42Re8zptttSpdzb8tLYIk0NsZSd/uESYGVkAUba34Q=;
b=uVJQLEbLHc5Czm8rVanBbNZSDn1pU5/WeP7DM1Yp8W1Y380uWT2pWm94Wiyg1P/UpiLdvX
DmbRJ1rtNntEQn/b+2OvY55GIECZ2BRwxnUC8w21NJQM/Ue5PtgNFLqy5CTK0rWxr5TMKs
JM8L+Jm4ldsDgJGvpK8/3qN5dTBVxgHQp7v4ThFlkH/4qxhyeqSImV6VNSg4NjlrokcFgJ
YaMROO0ojkK5KVj/Xsw+31QX/uhVpKW4pizrdhg+I/IXeu0CHW/l1dzhnCE5PI/qlnW3KP
Dd5kF3jJyKGhVLKjAhPljwYMAtzAl9r0zZSf7XBOZ4ea4zXHw9I2/3QlUm4m+g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675272721;
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=/42Re8zptttSpdzb8tLYIk0NsZSd/uESYGVkAUba34Q=;
b=sgi/FM2bXMaSzUsBcRadKK1vY8aZwyeosYZnTz33yaNfMUPHxd0aeDAlEF+HDYT0Be9bjT
vUPoKccARnKMCOkz/j9fk8mi7TpLiGwGZ5afKr3bR1u5TooTZtnAkuQxQBQYVeb+siq8LQ
EF3IUUEKMWFqUsW1rRNzbqFvCBz9grwNdNkNcPmyRbNLkmFICAliyAnQ7Sfxivg1m2CO9U
0rXLsClGF11q+Fd7Hp2gTUc3Qg6VafAlN29/eu8bU7lru6SX33kycyuZUKCwRe0Meb07yN
dpv+YJocfDXKivQ7x+qyodVn9S1dzq1XQDfSxzaKIcHqHij5A2v7AzneQlxXrA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675272721; a=rsa-sha256; cv=none;
b=erZxEGo5Nssdt4/Ij2kKTUN0XMo4t7SAq+9m0CxdSGyT0X41bthy2gc9/lnuCC4xe4kBVl
+i3BwCfPprDH4IDnLebFI5tpYvjXdQ2vZIp9umyLFbKK1u8A8M9ZqUJUGvT15n4o3tCvZf
gyO6zww8oO7bYt27RFgpbmbhtoxGU8N0j0VxYtkbQuK2XNqiSbGKSjRwXfYN2XKzkwgW4o
1hueI0Fx5pu7pCiOP+b8LF4owc9PnVgXPtLnXkgovM1Cr3XFnHpT2OO7RSEec9Ok/VVcEI
ceszi/X9pUI1MSXxGuLeJZ6BRivItrBes/umKI9lqY3DiKgk6e300b8zppmj4A==
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 4P6TW50xCmzNB0;
Wed, 1 Feb 2023 17:32:01 +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 311HW1ov058096;
Wed, 1 Feb 2023 17:32:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311HW1fX058095;
Wed, 1 Feb 2023 17:32:01 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 17:32:01 GMT
Message-Id: <202302011732.311HW1fX058095@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: b547900689ec - stable/13 - netmap: Tell the compiler to avoid reloading ring indices
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: b547900689ec6b500fefbf76585e7e4650a49dc2
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=b547900689ec6b500fefbf76585e7e4650a49dc2
commit b547900689ec6b500fefbf76585e7e4650a49dc2
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-01-23 19:41:05 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-02-01 17:22:31 +0000
netmap: Tell the compiler to avoid reloading ring indices
Per the removed comments these fields should be loaded only once, since
they can in principle be modified concurrently, though this would be a
violation of the userspace contract with netmap.
No functional change intended.
Reviewed by: vmaffione
MFC after: 1 week
Sponsored by: Zenarmor
Sponsored by: OPNsense
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D38061
(cherry picked from commit 56c438fcd4a755f0abe8254779c39a0c4b530c75)
---
sys/dev/netmap/netmap.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/dev/netmap/netmap.c b/sys/dev/netmap/netmap.c
index 1b8a4ff1d5d4..8c4481c2e6c3 100644
--- a/sys/dev/netmap/netmap.c
+++ b/sys/dev/netmap/netmap.c
@@ -1671,8 +1671,8 @@ netmap_unget_na(struct netmap_adapter *na, struct ifnet *ifp)
u_int
nm_txsync_prologue(struct netmap_kring *kring, struct netmap_ring *ring)
{
- u_int head = ring->head; /* read only once */
- u_int cur = ring->cur; /* read only once */
+ u_int head = NM_ACCESS_ONCE(ring->head);
+ u_int cur = NM_ACCESS_ONCE(ring->cur);
u_int n = kring->nkr_num_slots;
nm_prdis(5, "%s kcur %d ktail %d head %d cur %d tail %d",
@@ -1749,8 +1749,8 @@ nm_rxsync_prologue(struct netmap_kring *kring, struct netmap_ring *ring)
* - cur could in principle go back, however it does not matter
* because we are processing a brand new rxsync()
*/
- cur = kring->rcur = ring->cur; /* read only once */
- head = kring->rhead = ring->head; /* read only once */
+ cur = kring->rcur = NM_ACCESS_ONCE(ring->cur);
+ head = kring->rhead = NM_ACCESS_ONCE(ring->head);
#if 1 /* kernel sanity checks */
NM_FAIL_ON(kring->nr_hwcur >= n || kring->nr_hwtail >= n);
#endif /* kernel sanity checks */
From nobody Wed Feb 1 17:32:02 2023
X-Original-To: dev-commits-src-branches@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 4P6TW63fxCz3bJBb;
Wed, 1 Feb 2023 17:32:02 +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 4P6TW62bRmz3Php;
Wed, 1 Feb 2023 17:32:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675272722;
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=qiPiqQ+WZXmv1xUJgT/nsQKFkbjI7zGe7HCWeS1kOPU=;
b=fx69HZZ987t9d0zQ7Mx7+jtli4VMmQVgMqpnmXJNmcuh7XtGzMp37VJvH80pfNUUMfhrZo
Ep/K4RowvykEoN9EuQVRLfNbeK52UNfO20LTLxA2GJgVFA9YX4mCaXEdifn5KiswkONiT6
5rJIqp960fXcLWucDyg71DP6om/j46c46nn3OaKzRZjFgT2JZZwNp1jOhNevq0Kw4iYaQF
M8v+0JYy2JdytRK9q/JdItg8GadVFldRbWOS3j03wauCtn25jQHTfVOkqockr2uZswP6D0
UhjFHv8KyiuMj+QxkP8SvMGXHcEyzRaLk9RgLR2344z7NVJdBmgNq1bKGvSqqA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675272722;
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=qiPiqQ+WZXmv1xUJgT/nsQKFkbjI7zGe7HCWeS1kOPU=;
b=P3XJYJV2K3yYgPoPAkCAnpThLT9Oqth2sPZhZFOgreRJEAV0VFOkp8piDu/ravtabConJb
S7GroOSC8ktixyxAPgqRgxsrBGEqe83Jo2m+6NrIoC3yuxrliO6FYIyTsmEhPm/RBYW2KX
gx82WrnYmwaUCgZDaHtsTturImgTQmnd6hq4rhJCgBe/derQXJLtbfpqduc8u6UDk/bOyL
jsViEAMMxzX2F9rzTgqxm8H+KZk96/QbVPA4vV81bGKmUiuroAUuSkCJD3OciVuGWOi2Is
pdTaQd7/RUjywuPRuu/OUeZDDsV8kDq0DJyGHif9UWHQSNadthfxkKjBga7k8w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675272722; a=rsa-sha256; cv=none;
b=OOUoSJEh3u5fgRaH+lrLpjhJzSIzD4T8DSrSjbfJL/QzKHfdSmaA9Uycnt5eGwijZ0AIGk
pCnpbskQqaFpXJo/Te6o9oouWTyMB+48aUKFvZJpPfwvc945m0/uhKnXjs8DcbTTO1mVZf
uIpp/GX6pL+FlydHFTqvpmr2IzfXIGdIGkohQt6ZyN1DW0P7aoTli08cNpwAKZIRlggr/P
GCWz4yXiY0eIUQRBZSEY947i9ihpf5S34pObidTArDsAUdyHe2209sKWelqw15frf02pOL
tqltQc7cNgUGKjL2NEH2Sl2L8Ae74hhAn5vY1UZn63VQCLU6gY/Dv0J0iOoqYA==
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 4P6TW61jDSzMvD;
Wed, 1 Feb 2023 17:32:02 +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 311HW2Rj058127;
Wed, 1 Feb 2023 17:32:02 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311HW2uF058126;
Wed, 1 Feb 2023 17:32:02 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 17:32:02 GMT
Message-Id: <202302011732.311HW2uF058126@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: b5c8243d6a98 - stable/13 - dtrace: Improve a verifier error message
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: b5c8243d6a985214aafb951bda7606fc64e7a3a9
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=b5c8243d6a985214aafb951bda7606fc64e7a3a9
commit b5c8243d6a985214aafb951bda7606fc64e7a3a9
Author: Domagoj Stolfa <domagoj.stolfa@gmail.com>
AuthorDate: 2023-01-24 14:09:27 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-02-01 17:22:31 +0000
dtrace: Improve a verifier error message
Using '%r0' in efunc causes it to parse %r as a 'r' specifier.
This diff just adds a '%' in front of '%r0' in order to create the
correct output.
Reviewed by: markj
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D38176
(cherry picked from commit 7c5bc69a1a33b3a544175ad89c0bba1429491218)
---
.../contrib/opensolaris/uts/common/dtrace/dtrace.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
index 292326fb8efd..585fa13e4912 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
@@ -9811,7 +9811,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs,
if (rd >= nregs)
err += efunc(pc, "invalid register %u\n", rd);
if (rd == 0)
- err += efunc(pc, "cannot write to %r0\n");
+ err += efunc(pc, "cannot write to %%r0\n");
break;
case DIF_OP_NOT:
case DIF_OP_MOV:
@@ -9823,7 +9823,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs,
if (rd >= nregs)
err += efunc(pc, "invalid register %u\n", rd);
if (rd == 0)
- err += efunc(pc, "cannot write to %r0\n");
+ err += efunc(pc, "cannot write to %%r0\n");
break;
case DIF_OP_LDSB:
case DIF_OP_LDSH:
@@ -9839,7 +9839,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs,
if (rd >= nregs)
err += efunc(pc, "invalid register %u\n", rd);
if (rd == 0)
- err += efunc(pc, "cannot write to %r0\n");
+ err += efunc(pc, "cannot write to %%r0\n");
if (kcheckload)
dp->dtdo_buf[pc] = DIF_INSTR_LOAD(op +
DIF_OP_RLDSB - DIF_OP_LDSB, r1, rd);
@@ -9858,7 +9858,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs,
if (rd >= nregs)
err += efunc(pc, "invalid register %u\n", rd);
if (rd == 0)
- err += efunc(pc, "cannot write to %r0\n");
+ err += efunc(pc, "cannot write to %%r0\n");
break;
case DIF_OP_ULDSB:
case DIF_OP_ULDSH:
@@ -9874,7 +9874,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs,
if (rd >= nregs)
err += efunc(pc, "invalid register %u\n", rd);
if (rd == 0)
- err += efunc(pc, "cannot write to %r0\n");
+ err += efunc(pc, "cannot write to %%r0\n");
break;
case DIF_OP_STB:
case DIF_OP_STH:
@@ -9944,7 +9944,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs,
if (rd >= nregs)
err += efunc(pc, "invalid register %u\n", rd);
if (rd == 0)
- err += efunc(pc, "cannot write to %r0\n");
+ err += efunc(pc, "cannot write to %%r0\n");
break;
case DIF_OP_SETS:
if (DIF_INSTR_STRING(instr) >= dp->dtdo_strlen) {
@@ -9954,7 +9954,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs,
if (rd >= nregs)
err += efunc(pc, "invalid register %u\n", rd);
if (rd == 0)
- err += efunc(pc, "cannot write to %r0\n");
+ err += efunc(pc, "cannot write to %%r0\n");
break;
case DIF_OP_LDGA:
case DIF_OP_LDTA:
@@ -9965,7 +9965,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs,
if (rd >= nregs)
err += efunc(pc, "invalid register %u\n", rd);
if (rd == 0)
- err += efunc(pc, "cannot write to %r0\n");
+ err += efunc(pc, "cannot write to %%r0\n");
break;
case DIF_OP_LDGS:
case DIF_OP_LDTS:
@@ -9977,7 +9977,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs,
if (rd >= nregs)
err += efunc(pc, "invalid register %u\n", rd);
if (rd == 0)
- err += efunc(pc, "cannot write to %r0\n");
+ err += efunc(pc, "cannot write to %%r0\n");
break;
case DIF_OP_STGS:
case DIF_OP_STTS:
@@ -9995,7 +9995,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs,
if (rd >= nregs)
err += efunc(pc, "invalid register %u\n", rd);
if (rd == 0)
- err += efunc(pc, "cannot write to %r0\n");
+ err += efunc(pc, "cannot write to %%r0\n");
if (subr == DIF_SUBR_COPYOUT ||
subr == DIF_SUBR_COPYOUTSTR) {
From nobody Wed Feb 1 22:23:18 2023
X-Original-To: dev-commits-src-branches@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 4P6bzC3CSjz3cBmZ;
Wed, 1 Feb 2023 22:23:19 +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 4P6bzC19XCz4Fnr;
Wed, 1 Feb 2023 22:23:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675290199;
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=+A12hjFg1YHGxfH/92L1YH5OYAgBZBVeP1CP/zIeNoU=;
b=crE9ko18StC9pJI3NtuEXh0FtTkuDAY6fIIjVRltZgd3jF8F40O2LIymmc6nbeFh5T9NFk
KxTaybqoE9yvksB6KBOiksEb07HQvHo0wNLwwTDI2kRQpOCN9s4x+FyWi0I/LvNMtRyXYu
dkXdSiDLOBdRsWYo5pL6kl1Dy9odWWMbIgcbMACdaC2chS2PqRT2t5QnJrRMjqWQi4SXgd
k/zdWD4FdvM+PYmnk4suuF4nk0ESIQlful3fk6zS+TqTN4KwcavmpSoBI1v5OWOmZdYkae
8AecX036JKh6ZLjfkaDDU5umdShAl63CxxJ5pDBuGDrI2b2CGJZAhrdF4FbfcQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675290199;
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=+A12hjFg1YHGxfH/92L1YH5OYAgBZBVeP1CP/zIeNoU=;
b=lyYa3SgtT5wEeV/ETGi35jQ5k3WWaijmBFiJ5VLit7d4W2unVnL8yk8j35Rv9KVJl5gsRU
+d3nXeUGaKkyfl4IPitjQcXudIWf9ULnvzA5tjsvUoMPD9+hyMGdywQdi7FDz7tB9kvRU9
jGOQBQ0GFWrkjkzOnMBP7beMcj4IRvGizCn/6F7Qzrqwj9/EfYbdpmiSAS/mDNTYDzuZ4T
rGa+eb1mr8JPURE7sCXo6BO3lXJsx04bG9n+/H0aeG6ohuux5FN70c+xc60C6VhYQVJCGB
hE7xKKDQourX5+daT4YsAtjxOROdxNiZ7D6VAF/XypgxSAa5G6zAC/d6LyzZmA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675290199; a=rsa-sha256; cv=none;
b=ryOhiQymmH1eIqhgkuqkldKjUMfSo/AYZa8vzayTueyBg5MXk34dFJyauOkgZmzS545WH6
eBKLqScH1o70d4c2j6M++NQZHevlgkw3OnQphlfhR2DkPM6NT3XzXf5XiaLKUDPA6JkZP+
RISoXOxTmKBhZeMzMCeKDxfTWtQuMDGZrUHpzjWuh82uQNrRJ7FTO0lGPqdiP5TjrifJqU
QfzqKli5F+ae2UYdgCs3PpZW+cIwdWjnw+5/tpt0XOl+bqcDyfRZzMGE7nKV+00+16/dlQ
orWDLA5wqCeEbNlN2BRWQ8dFX2mzjxgO++kE12fpVpRMft8PzxtGQ0Dfyt0hig==
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 4P6bzC0FHPzWbb;
Wed, 1 Feb 2023 22:23:19 +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 311MNIk0071247;
Wed, 1 Feb 2023 22:23:18 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MNIQS071246;
Wed, 1 Feb 2023 22:23:18 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:23:18 GMT
Message-Id: <202302012223.311MNIQS071246@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: bbd822b52f6b - stable/13 - sctp: get rid of stcb send lock
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: bbd822b52f6b72da09a445624931d9226d97a385
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=bbd822b52f6b72da09a445624931d9226d97a385
commit bbd822b52f6b72da09a445624931d9226d97a385
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-03-28 23:50:17 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:22:59 +0000
sctp: get rid of stcb send lock
Just use the stcb lock instead to simplify locking.
Reported by: syzbot+d00b202063150f85b110@syzkaller.appspotmail.com
Reported by: syzbot+87f268a0a6d2d6383306@syzkaller.appspotmail.com
(cherry picked from commit 5ac91821f5d7dd701752ba76041720d240a507c5)
---
sys/netinet/sctp_input.c | 11 +-
sys/netinet/sctp_lock_bsd.h | 22 --
sys/netinet/sctp_output.c | 556 ++++++++++++++++++----------------------
sys/netinet/sctp_pcb.c | 12 +-
sys/netinet/sctp_ss_functions.c | 70 +++--
sys/netinet/sctp_sysctl.c | 46 ++--
sys/netinet/sctp_timer.c | 4 +-
sys/netinet/sctp_uio.h | 2 +-
sys/netinet/sctp_usrreq.c | 4 -
sys/netinet/sctputil.c | 12 +-
10 files changed, 333 insertions(+), 406 deletions(-)
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index c86e369e2b92..13e41748a82e 100644
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -179,6 +179,8 @@ sctp_is_there_unsent_data(struct sctp_tcb *stcb, int so_locked)
struct sctp_stream_queue_pending *sp;
struct sctp_association *asoc;
+ SCTP_TCB_LOCK_ASSERT(stcb);
+
/*
* This function returns if any stream has true unsent data on it.
* Note that as it looks through it will clean up any places that
@@ -186,7 +188,6 @@ sctp_is_there_unsent_data(struct sctp_tcb *stcb, int so_locked)
*/
asoc = &stcb->asoc;
unsent_data = 0;
- SCTP_TCB_SEND_LOCK(stcb);
if (!stcb->asoc.ss_functions.sctp_ss_is_empty(stcb, asoc)) {
/* Check to see if some data queued */
for (i = 0; i < stcb->asoc.streamoutcnt; i++) {
@@ -234,7 +235,6 @@ sctp_is_there_unsent_data(struct sctp_tcb *stcb, int so_locked)
}
}
}
- SCTP_TCB_SEND_UNLOCK(stcb);
return (unsent_data);
}
@@ -246,6 +246,8 @@ sctp_process_init(struct sctp_init_chunk *cp, struct sctp_tcb *stcb)
struct sctp_nets *lnet;
unsigned int i;
+ SCTP_TCB_LOCK_ASSERT(stcb);
+
init = &cp->init;
asoc = &stcb->asoc;
/* save off parameters */
@@ -263,7 +265,6 @@ sctp_process_init(struct sctp_init_chunk *cp, struct sctp_tcb *stcb)
}
}
}
- SCTP_TCB_SEND_LOCK(stcb);
if (asoc->pre_open_streams > ntohs(init->num_inbound_streams)) {
unsigned int newcnt;
struct sctp_stream_out *outs;
@@ -323,7 +324,6 @@ sctp_process_init(struct sctp_init_chunk *cp, struct sctp_tcb *stcb)
/* cut back the count */
asoc->pre_open_streams = newcnt;
}
- SCTP_TCB_SEND_UNLOCK(stcb);
asoc->streamoutcnt = asoc->pre_open_streams;
if (asoc->strmout) {
for (i = 0; i < asoc->streamoutcnt; i++) {
@@ -1808,8 +1808,6 @@ sctp_process_cookie_existing(struct mbuf *m, int iphlen, int offset,
SCTP_TCB_LOCK(stcb);
atomic_subtract_int(&stcb->asoc.refcnt, 1);
/* send up all the data */
- SCTP_TCB_SEND_LOCK(stcb);
-
sctp_report_all_outbound(stcb, 0, SCTP_SO_LOCKED);
for (i = 0; i < stcb->asoc.streamoutcnt; i++) {
stcb->asoc.strmout[i].chunks_on_queues = 0;
@@ -1896,7 +1894,6 @@ sctp_process_cookie_existing(struct mbuf *m, int iphlen, int offset,
*/
LIST_INSERT_HEAD(head, stcb, sctp_asocs);
- SCTP_TCB_SEND_UNLOCK(stcb);
SCTP_INP_WUNLOCK(stcb->sctp_ep);
SCTP_INP_INFO_WUNLOCK();
asoc->total_flight = 0;
diff --git a/sys/netinet/sctp_lock_bsd.h b/sys/netinet/sctp_lock_bsd.h
index cd20a730e5b8..2087db337a37 100644
--- a/sys/netinet/sctp_lock_bsd.h
+++ b/sys/netinet/sctp_lock_bsd.h
@@ -337,28 +337,6 @@ __FBSDID("$FreeBSD$");
#define SCTP_ASOC_CREATE_LOCK_CONTENDED(_inp) \
((_inp)->inp_create_mtx.mtx_lock & MTX_CONTESTED)
-#define SCTP_TCB_SEND_LOCK_INIT(_tcb) do { \
- mtx_init(&(_tcb)->tcb_send_mtx, "sctp-send-tcb", "tcbs", \
- MTX_DEF | MTX_DUPOK); \
-} while (0)
-
-#define SCTP_TCB_SEND_LOCK_DESTROY(_tcb) do { \
- mtx_destroy(&(_tcb)->tcb_send_mtx); \
-} while (0)
-
-#define SCTP_TCB_SEND_LOCK(_tcb) do { \
- mtx_lock(&(_tcb)->tcb_send_mtx); \
-} while (0)
-
-#define SCTP_TCB_SEND_UNLOCK(_tcb) do { \
- mtx_unlock(&(_tcb)->tcb_send_mtx); \
-} while (0)
-
-#define SCTP_TCB_SEND_LOCK_ASSERT(_tcb) do { \
- KASSERT(mtx_owned(&(_tcb)->tcb_send_mtx), \
- ("Don't own TCB send lock")); \
-} while (0)
-
/*
* For the majority of things (once we have found the association) we will
* lock the actual association mutex. This will protect all the assoiciation
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 348ad5f83bd3..c8e1cc4e3bb2 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -6318,13 +6318,15 @@ static int
sctp_msg_append(struct sctp_tcb *stcb,
struct sctp_nets *net,
struct mbuf *m,
- struct sctp_sndrcvinfo *srcv, int hold_stcb_lock)
+ struct sctp_sndrcvinfo *srcv)
{
int error = 0;
struct mbuf *at;
struct sctp_stream_queue_pending *sp = NULL;
struct sctp_stream_out *strm;
+ SCTP_TCB_LOCK_ASSERT(stcb);
+
/*
* Given an mbuf chain, put it into the association send queue and
* place it on the wheel
@@ -6396,18 +6398,12 @@ sctp_msg_append(struct sctp_tcb *stcb,
sctp_auth_key_acquire(stcb, sp->auth_keyid);
sp->holds_key_ref = 1;
}
- if (hold_stcb_lock == 0) {
- SCTP_TCB_SEND_LOCK(stcb);
- }
strm = &stcb->asoc.strmout[srcv->sinfo_stream];
sctp_snd_sb_alloc(stcb, sp->length);
atomic_add_int(&stcb->asoc.stream_queue_cnt, 1);
TAILQ_INSERT_TAIL(&strm->outqueue, sp, next);
stcb->asoc.ss_functions.sctp_ss_add_to_stream(stcb, &stcb->asoc, strm, sp);
m = NULL;
- if (hold_stcb_lock == 0) {
- SCTP_TCB_SEND_UNLOCK(stcb);
- }
out_now:
if (m) {
sctp_m_freem(m);
@@ -6656,9 +6652,8 @@ sctp_sendall_iterator(struct sctp_inpcb *inp, struct sctp_tcb *stcb, void *ptr,
atomic_subtract_int(&stcb->asoc.refcnt, 1);
goto no_chunk_output;
} else {
- if (m) {
- ret = sctp_msg_append(stcb, net, m,
- &ca->sndrcv, 1);
+ if (m != NULL) {
+ ret = sctp_msg_append(stcb, net, m, &ca->sndrcv);
}
asoc = &stcb->asoc;
if (ca->sndrcv.sinfo_flags & SCTP_EOF) {
@@ -7166,7 +7161,6 @@ sctp_move_to_outqueue(struct sctp_tcb *stcb,
int leading;
uint8_t rcv_flags = 0;
uint8_t some_taken;
- uint8_t send_lock_up = 0;
SCTP_TCB_LOCK_ASSERT(stcb);
asoc = &stcb->asoc;
@@ -7174,10 +7168,6 @@ one_more_time:
/* sa_ignore FREED_MEMORY */
sp = TAILQ_FIRST(&strq->outqueue);
if (sp == NULL) {
- if (send_lock_up == 0) {
- SCTP_TCB_SEND_LOCK(stcb);
- send_lock_up = 1;
- }
sp = TAILQ_FIRST(&strq->outqueue);
if (sp) {
goto one_more_time;
@@ -7191,10 +7181,6 @@ one_more_time:
strq->last_msg_incomplete = 0;
}
to_move = 0;
- if (send_lock_up) {
- SCTP_TCB_SEND_UNLOCK(stcb);
- send_lock_up = 0;
- }
goto out_of;
}
if ((sp->msg_is_complete) && (sp->length == 0)) {
@@ -7206,16 +7192,11 @@ one_more_time:
*/
if ((sp->put_last_out == 0) && (sp->discard_rest == 0)) {
SCTP_PRINTF("Gak, put out entire msg with NO end!-1\n");
- SCTP_PRINTF("sender_done:%d len:%d msg_comp:%d put_last_out:%d send_lock:%d\n",
+ SCTP_PRINTF("sender_done:%d len:%d msg_comp:%d put_last_out:%d\n",
sp->sender_all_done,
sp->length,
sp->msg_is_complete,
- sp->put_last_out,
- send_lock_up);
- }
- if (send_lock_up == 0) {
- SCTP_TCB_SEND_LOCK(stcb);
- send_lock_up = 1;
+ sp->put_last_out);
}
atomic_subtract_int(&asoc->stream_queue_cnt, 1);
TAILQ_REMOVE(&strq->outqueue, sp, next);
@@ -7234,11 +7215,6 @@ one_more_time:
sp->data = NULL;
}
sctp_free_a_strmoq(stcb, sp, so_locked);
- /* we can't be locked to it */
- if (send_lock_up) {
- SCTP_TCB_SEND_UNLOCK(stcb);
- send_lock_up = 0;
- }
/* back to get the next msg */
goto one_more_time;
} else {
@@ -7258,10 +7234,6 @@ one_more_time:
to_move = 0;
goto out_of;
} else if (sp->discard_rest) {
- if (send_lock_up == 0) {
- SCTP_TCB_SEND_LOCK(stcb);
- send_lock_up = 1;
- }
/* Whack down the size */
atomic_subtract_int(&stcb->asoc.total_output_queue_size, sp->length);
if ((stcb->sctp_socket != NULL) &&
@@ -7282,7 +7254,6 @@ one_more_time:
}
}
some_taken = sp->some_taken;
-re_look:
length = sp->length;
if (sp->msg_is_complete) {
/* The message is complete */
@@ -7307,31 +7278,9 @@ re_look:
}
} else {
to_move = sctp_can_we_split_this(stcb, length, space_left, frag_point, eeor_mode);
- if (to_move) {
- /*-
- * We use a snapshot of length in case it
- * is expanding during the compare.
- */
- uint32_t llen;
-
- llen = length;
- if (to_move >= llen) {
- to_move = llen;
- if (send_lock_up == 0) {
- /*-
- * We are taking all of an incomplete msg
- * thus we need a send lock.
- */
- SCTP_TCB_SEND_LOCK(stcb);
- send_lock_up = 1;
- if (sp->msg_is_complete) {
- /*
- * the sender finished the
- * msg
- */
- goto re_look;
- }
- }
+ if (to_move > 0) {
+ if (to_move >= length) {
+ to_move = length;
}
if (sp->some_taken == 0) {
rcv_flags |= SCTP_DATA_FIRST_FRAG;
@@ -7370,10 +7319,6 @@ re_look:
if (to_move >= length) {
/* we think we can steal the whole thing */
- if ((sp->sender_all_done == 0) && (send_lock_up == 0)) {
- SCTP_TCB_SEND_LOCK(stcb);
- send_lock_up = 1;
- }
if (to_move < sp->length) {
/* bail, it changed */
goto dont_do_it;
@@ -7467,10 +7412,6 @@ dont_do_it:
* all the data if there is no leading space, so we
* must put the data back and restore.
*/
- if (send_lock_up == 0) {
- SCTP_TCB_SEND_LOCK(stcb);
- send_lock_up = 1;
- }
if (sp->data == NULL) {
/* unsteal the data */
sp->data = chk->data;
@@ -7579,8 +7520,8 @@ dont_do_it:
* previous loop prior to padding.
*/
-#ifdef SCTP_ASOCLOG_OF_TSNS
SCTP_TCB_LOCK_ASSERT(stcb);
+#ifdef SCTP_ASOCLOG_OF_TSNS
if (asoc->tsn_out_at >= SCTP_TSN_LOG_SIZE) {
asoc->tsn_out_at = 0;
asoc->tsn_out_wrapped = 1;
@@ -7638,16 +7579,11 @@ dont_do_it:
/* All done pull and kill the message */
if (sp->put_last_out == 0) {
SCTP_PRINTF("Gak, put out entire msg with NO end!-2\n");
- SCTP_PRINTF("sender_done:%d len:%d msg_comp:%d put_last_out:%d send_lock:%d\n",
+ SCTP_PRINTF("sender_done:%d len:%d msg_comp:%d put_last_out:%d\n",
sp->sender_all_done,
sp->length,
sp->msg_is_complete,
- sp->put_last_out,
- send_lock_up);
- }
- if (send_lock_up == 0) {
- SCTP_TCB_SEND_LOCK(stcb);
- send_lock_up = 1;
+ sp->put_last_out);
}
atomic_subtract_int(&asoc->stream_queue_cnt, 1);
TAILQ_REMOVE(&strq->outqueue, sp, next);
@@ -7672,9 +7608,6 @@ dont_do_it:
TAILQ_INSERT_TAIL(&asoc->send_queue, chk, sctp_next);
asoc->send_queue_cnt++;
out_of:
- if (send_lock_up) {
- SCTP_TCB_SEND_UNLOCK(stcb);
- }
return (to_move);
}
@@ -12079,6 +12012,8 @@ sctp_send_str_reset_req(struct sctp_tcb *stcb,
int can_send_out_req = 0;
uint32_t seq;
+ SCTP_TCB_LOCK_ASSERT(stcb);
+
asoc = &stcb->asoc;
if (asoc->stream_reset_outstanding) {
/*-
@@ -12182,7 +12117,6 @@ sctp_send_str_reset_req(struct sctp_tcb *stcb,
* Ok now we proceed with copying the old out stuff and
* initializing the new stuff.
*/
- SCTP_TCB_SEND_LOCK(stcb);
stcb->asoc.ss_functions.sctp_ss_clear(stcb, &stcb->asoc, false);
for (i = 0; i < stcb->asoc.streamoutcnt; i++) {
TAILQ_INIT(&stcb->asoc.strmout[i].outqueue);
@@ -12236,7 +12170,6 @@ sctp_send_str_reset_req(struct sctp_tcb *stcb,
}
stcb->asoc.strm_realoutsize = stcb->asoc.streamoutcnt + adding_o;
SCTP_FREE(oldstream, SCTP_M_STRMO);
- SCTP_TCB_SEND_UNLOCK(stcb);
}
skip_stuff:
if ((add_stream & 1) && (adding_o > 0)) {
@@ -12487,7 +12420,7 @@ int
sctp_lower_sosend(struct socket *so,
struct sockaddr *addr,
struct uio *uio,
- struct mbuf *i_pak,
+ struct mbuf *top,
struct mbuf *control,
int flags,
struct sctp_sndrcvinfo *srcv
@@ -12498,7 +12431,6 @@ sctp_lower_sosend(struct socket *so,
struct epoch_tracker et;
ssize_t sndlen = 0, max_len, local_add_more;
int error;
- struct mbuf *top = NULL;
int queue_only = 0, queue_only_for_init = 0;
bool free_cnt_applied = false;
int un_sent;
@@ -12514,10 +12446,10 @@ sctp_lower_sosend(struct socket *so,
int user_marks_eor;
bool create_lock_applied = false;
int nagle_applies = 0;
- int some_on_control = 0;
- int got_all_of_the_send = 0;
+ bool some_on_control;
+ bool got_all_of_the_send = false;
bool hold_tcblock = false;
- int non_blocking = 0;
+ bool non_blocking = false;
ssize_t local_soresv = 0;
uint16_t port;
uint16_t sinfo_flags;
@@ -12526,47 +12458,35 @@ sctp_lower_sosend(struct socket *so,
error = 0;
net = NULL;
stcb = NULL;
- asoc = NULL;
t_inp = inp = (struct sctp_inpcb *)so->so_pcb;
if (inp == NULL) {
- SCTP_LTRACE_ERR_RET(NULL, NULL, NULL, SCTP_FROM_SCTP_OUTPUT, EINVAL);
error = EINVAL;
- if (i_pak != NULL) {
- SCTP_RELEASE_PKT(i_pak);
- }
- return (error);
+ goto out_unlocked;
}
- if ((uio == NULL) && (i_pak == NULL)) {
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL);
- return (EINVAL);
+ if ((uio == NULL) && (top == NULL)) {
+ error = EINVAL;
+ goto out_unlocked;
}
user_marks_eor = sctp_is_feature_on(inp, SCTP_PCB_FLAGS_EXPLICIT_EOR);
atomic_add_int(&inp->total_sends, 1);
if (uio != NULL) {
if (uio->uio_resid < 0) {
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL);
- return (EINVAL);
+ error = EINVAL;
+ goto out_unlocked;
}
sndlen = uio->uio_resid;
} else {
- top = SCTP_HEADER_TO_CHAIN(i_pak);
- sndlen = SCTP_HEADER_LEN(i_pak);
+ sndlen = SCTP_HEADER_LEN(top);
}
SCTPDBG(SCTP_DEBUG_OUTPUT1, "Send called addr:%p send length %zd\n",
- (void *)addr,
- sndlen);
+ (void *)addr, sndlen);
if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) &&
SCTP_IS_LISTENING(inp)) {
- /* The listener can NOT send */
- SCTP_LTRACE_ERR_RET(NULL, NULL, NULL, SCTP_FROM_SCTP_OUTPUT, ENOTCONN);
- error = ENOTCONN;
+ /* The listener can NOT send. */
+ error = EINVAL;
goto out_unlocked;
}
- /**
- * Pre-screen address, if one is given the sin-len
- * must be set correctly!
- */
if (addr != NULL) {
union sctp_sockstore *raddr = (union sctp_sockstore *)addr;
@@ -12574,7 +12494,6 @@ sctp_lower_sosend(struct socket *so,
#ifdef INET
case AF_INET:
if (raddr->sin.sin_len != sizeof(struct sockaddr_in)) {
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL);
error = EINVAL;
goto out_unlocked;
}
@@ -12584,7 +12503,6 @@ sctp_lower_sosend(struct socket *so,
#ifdef INET6
case AF_INET6:
if (raddr->sin6.sin6_len != sizeof(struct sockaddr_in6)) {
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL);
error = EINVAL;
goto out_unlocked;
}
@@ -12592,7 +12510,6 @@ sctp_lower_sosend(struct socket *so,
break;
#endif
default:
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EAFNOSUPPORT);
error = EAFNOSUPPORT;
goto out_unlocked;
}
@@ -12605,7 +12522,6 @@ sctp_lower_sosend(struct socket *so,
sinfo_assoc_id = srcv->sinfo_assoc_id;
if (INVALID_SINFO_FLAG(sinfo_flags) ||
PR_SCTP_INVALID_POLICY(sinfo_flags)) {
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL);
error = EINVAL;
goto out_unlocked;
}
@@ -12622,33 +12538,27 @@ sctp_lower_sosend(struct socket *so,
sinfo_flags |= SCTP_EOF;
}
if (sinfo_flags & SCTP_SENDALL) {
- /* its a sendall */
error = sctp_sendall(inp, uio, top, srcv);
top = NULL;
goto out_unlocked;
}
if ((sinfo_flags & SCTP_ADDR_OVER) && (addr == NULL)) {
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL);
error = EINVAL;
goto out_unlocked;
}
- /* now we must find the assoc */
+ /* Now we must find the association. */
+ SCTP_INP_RLOCK(inp);
if ((inp->sctp_flags & SCTP_PCB_FLAGS_CONNECTED) ||
(inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) {
- SCTP_INP_RLOCK(inp);
stcb = LIST_FIRST(&inp->sctp_asoc_list);
if (stcb != NULL) {
SCTP_TCB_LOCK(stcb);
hold_tcblock = true;
- if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) {
- SCTP_INP_RUNLOCK(inp);
- error = ENOTCONN;
- goto out_unlocked;
- }
}
SCTP_INP_RUNLOCK(inp);
} else if (sinfo_assoc_id > SCTP_ALL_ASSOC) {
- stcb = sctp_findassociation_ep_asocid(inp, sinfo_assoc_id, 1);
+ stcb = sctp_findasoc_ep_asocid_locked(inp, sinfo_assoc_id, 1);
+ SCTP_INP_RUNLOCK(inp);
if (stcb != NULL) {
SCTP_TCB_LOCK_ASSERT(stcb);
hold_tcblock = true;
@@ -12659,9 +12569,8 @@ sctp_lower_sosend(struct socket *so,
* increment it, and if we don't find a tcb
* decrement it.
*/
- SCTP_INP_WLOCK(inp);
SCTP_INP_INCR_REF(inp);
- SCTP_INP_WUNLOCK(inp);
+ SCTP_INP_RUNLOCK(inp);
stcb = sctp_findassociation_ep_addr(&t_inp, addr, &net, NULL, NULL);
if (stcb == NULL) {
SCTP_INP_WLOCK(inp);
@@ -12671,7 +12580,10 @@ sctp_lower_sosend(struct socket *so,
SCTP_TCB_LOCK_ASSERT(stcb);
hold_tcblock = true;
}
+ } else {
+ SCTP_INP_RUNLOCK(inp);
}
+
#ifdef INVARIANTS
if (stcb != NULL) {
SCTP_TCB_LOCK_ASSERT(stcb);
@@ -12686,14 +12598,11 @@ sctp_lower_sosend(struct socket *so,
create_lock_applied = true;
if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) ||
(inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE)) {
- /* Should I really unlock ? */
- SCTP_LTRACE_ERR_RET(NULL, NULL, NULL, SCTP_FROM_SCTP_OUTPUT, EINVAL);
error = EINVAL;
goto out_unlocked;
}
if (((inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) == 0) &&
(addr->sa_family == AF_INET6)) {
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL);
error = EINVAL;
goto out_unlocked;
}
@@ -12717,18 +12626,16 @@ sctp_lower_sosend(struct socket *so,
SCTP_ASOC_CREATE_UNLOCK(inp);
create_lock_applied = false;
}
- if (error) {
+ if (error != 0) {
goto out_unlocked;
}
if (t_inp != inp) {
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, ENOTCONN);
error = ENOTCONN;
goto out_unlocked;
}
}
if (stcb == NULL) {
if (addr == NULL) {
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, ENOENT);
error = ENOENT;
goto out_unlocked;
} else {
@@ -12741,7 +12648,6 @@ sctp_lower_sosend(struct socket *so,
* User asks to abort a non-existent assoc,
* or EOF a non-existent assoc with no data
*/
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, ENOENT);
error = ENOENT;
goto out_unlocked;
}
@@ -12754,7 +12660,8 @@ sctp_lower_sosend(struct socket *so,
p,
SCTP_INITIALIZE_AUTH_PARAMS);
if (stcb == NULL) {
- /* Error is setup for us in the call */
+ /* error is setup for us in the call. */
+ KASSERT(error != 0, ("error is 0 although stcb is NULL"));
goto out_unlocked;
}
SCTP_TCB_LOCK_ASSERT(stcb);
@@ -12774,6 +12681,8 @@ sctp_lower_sosend(struct socket *so,
SCTP_FROM_SCTP_OUTPUT + SCTP_LOC_6);
hold_tcblock = false;
stcb = NULL;
+ KASSERT(error != 0,
+ ("error is 0 although sctp_process_cmsgs_for_init() indicated an error"));
goto out_unlocked;
}
}
@@ -12793,8 +12702,16 @@ sctp_lower_sosend(struct socket *so,
KASSERT(hold_tcblock, ("hold_tcblock is false"));
SCTP_TCB_LOCK_ASSERT(stcb);
asoc = &stcb->asoc;
- KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
- ("Association about to be freed"));
+ if ((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) ||
+ (asoc->state & SCTP_STATE_WAS_ABORTED)) {
+ if (asoc->state & SCTP_STATE_WAS_ABORTED) {
+ /* XXX: Could also be ECONNABORTED, not enough info. */
+ error = ECONNRESET;
+ } else {
+ error = ENOTCONN;
+ }
+ goto out_unlocked;
+ }
/* Keep the stcb from being freed under our feet. */
atomic_add_int(&asoc->refcnt, 1);
free_cnt_applied = true;
@@ -12816,7 +12733,6 @@ sctp_lower_sosend(struct socket *so,
net = NULL;
if ((net == NULL) ||
((port != 0) && (port != stcb->rport))) {
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL);
error = EINVAL;
goto out_unlocked;
}
@@ -12831,7 +12747,6 @@ sctp_lower_sosend(struct socket *so,
if (sctp_is_feature_on(inp, SCTP_PCB_FLAGS_NO_FRAGMENT)) {
if (sndlen > (ssize_t)asoc->smallest_mtu) {
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EMSGSIZE);
error = EMSGSIZE;
goto out_unlocked;
}
@@ -12839,7 +12754,7 @@ sctp_lower_sosend(struct socket *so,
if (SCTP_SO_IS_NBIO(so)
|| (flags & (MSG_NBIO | MSG_DONTWAIT)) != 0
) {
- non_blocking = 1;
+ non_blocking = true;
}
/* would we block? */
if (non_blocking) {
@@ -12853,11 +12768,12 @@ sctp_lower_sosend(struct socket *so,
}
if ((SCTP_SB_LIMIT_SND(so) < (amount + inqueue_bytes + asoc->sb_send_resv)) ||
(asoc->chunks_on_out_queue >= SCTP_BASE_SYSCTL(sctp_max_chunks_on_queue))) {
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EWOULDBLOCK);
- if (sndlen > (ssize_t)SCTP_SB_LIMIT_SND(so))
+ if ((sndlen > (ssize_t)SCTP_SB_LIMIT_SND(so)) &&
+ (user_marks_eor == 0)) {
error = EMSGSIZE;
- else
+ } else {
error = EWOULDBLOCK;
+ }
goto out_unlocked;
}
asoc->sb_send_resv += (uint32_t)sndlen;
@@ -12865,15 +12781,9 @@ sctp_lower_sosend(struct socket *so,
atomic_add_int(&asoc->sb_send_resv, (int)sndlen);
}
local_soresv = sndlen;
- if (asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) {
- SCTP_LTRACE_ERR_RET(NULL, stcb, NULL, SCTP_FROM_SCTP_OUTPUT, ECONNRESET);
- error = ECONNRESET;
- goto out_unlocked;
- }
/* Is the stream no. valid? */
if (srcv->sinfo_stream >= asoc->streamoutcnt) {
/* Invalid stream number */
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL);
error = EINVAL;
goto out_unlocked;
}
@@ -12887,27 +12797,18 @@ sctp_lower_sosend(struct socket *so,
} else {
error = EINVAL;
}
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, error);
goto out_unlocked;
}
if ((SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_WAIT) ||
(SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_ECHOED)) {
queue_only = 1;
}
- /* we are now done with all control */
- if (control) {
- sctp_m_freem(control);
- control = NULL;
- }
if ((SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_SENT) ||
(SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_RECEIVED) ||
(SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_ACK_SENT) ||
(asoc->state & SCTP_STATE_SHUTDOWN_PENDING)) {
- if (sinfo_flags & SCTP_ABORT) {
- ;
- } else {
- SCTP_LTRACE_ERR_RET(NULL, stcb, NULL, SCTP_FROM_SCTP_OUTPUT, ECONNRESET);
- error = ECONNRESET;
+ if ((sinfo_flags & SCTP_ABORT) == 0) {
+ error = EPIPE;
goto out_unlocked;
}
}
@@ -12921,6 +12822,8 @@ sctp_lower_sosend(struct socket *so,
SCTP_TCB_LOCK_ASSERT(stcb);
KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
("Association about to be freed"));
+ KASSERT((asoc->state & SCTP_STATE_WAS_ABORTED) == 0,
+ ("Association was aborted"));
/* Are we aborting? */
if (sinfo_flags & SCTP_ABORT) {
@@ -12931,12 +12834,11 @@ sctp_lower_sosend(struct socket *so,
SCTP_STAT_INCR(sctps_sends_with_abort);
if ((SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_WAIT) ||
(SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_ECHOED)) {
- /* It has to be up before we abort */
- /* how big is the user initiated abort? */
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL);
+ /* It has to be up before we abort. */
error = EINVAL;
goto out;
}
+ /* How big is the user initiated abort? */
if (top != NULL) {
struct mbuf *cntm;
@@ -12951,17 +12853,14 @@ sctp_lower_sosend(struct socket *so,
tot_out = sndlen;
tot_demand = (tot_out + sizeof(struct sctp_paramhdr));
if (tot_demand > SCTP_DEFAULT_ADD_MORE) {
- /* To big */
- SCTP_LTRACE_ERR_RET(NULL, stcb, net, SCTP_FROM_SCTP_OUTPUT, EMSGSIZE);
error = EMSGSIZE;
- goto out;
+ goto out_unlocked;
}
mm = sctp_get_mbuf_for_msg((unsigned int)tot_demand, 0, M_NOWAIT, 1, MT_DATA);
}
if (mm == NULL) {
- SCTP_LTRACE_ERR_RET(NULL, stcb, net, SCTP_FROM_SCTP_OUTPUT, ENOMEM);
error = ENOMEM;
- goto out;
+ goto out_unlocked;
}
max_out = asoc->smallest_mtu - sizeof(struct sctp_paramhdr);
max_out -= sizeof(struct sctp_abort_msg);
@@ -12979,8 +12878,18 @@ sctp_lower_sosend(struct socket *so,
error = uiomove((caddr_t)ph, (int)tot_out, uio);
SCTP_TCB_LOCK(stcb);
hold_tcblock = true;
- if (asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) {
+ if ((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) ||
+ (asoc->state & SCTP_STATE_WAS_ABORTED)) {
sctp_m_freem(mm);
+ if (asoc->state & SCTP_STATE_WAS_ABORTED) {
+ /*
+ * XXX: Could also be ECONNABORTED,
+ * not enough info.
+ */
+ error = ECONNRESET;
+ } else {
+ error = ENOTCONN;
+ }
goto out_unlocked;
}
if (error != 0) {
@@ -12991,6 +12900,7 @@ sctp_lower_sosend(struct socket *so,
*/
sctp_m_freem(mm);
mm = NULL;
+ error = 0;
}
} else {
if (sndlen != 0) {
@@ -13020,6 +12930,8 @@ sctp_lower_sosend(struct socket *so,
SCTP_TCB_LOCK_ASSERT(stcb);
KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
("Association about to be freed"));
+ KASSERT((asoc->state & SCTP_STATE_WAS_ABORTED) == 0,
+ ("Association was aborted"));
/* Calculate the maximum we can send */
inqueue_bytes = asoc->total_output_queue_size - (asoc->chunks_on_out_queue * SCTP_DATA_CHUNK_OVERHEAD(stcb));
@@ -13031,22 +12943,20 @@ sctp_lower_sosend(struct socket *so,
/* Unless E_EOR mode is on, we must make a send FIT in one call. */
if ((user_marks_eor == 0) &&
(sndlen > (ssize_t)SCTP_SB_LIMIT_SND(stcb->sctp_socket))) {
- /* It will NEVER fit */
- SCTP_LTRACE_ERR_RET(NULL, stcb, net, SCTP_FROM_SCTP_OUTPUT, EMSGSIZE);
+ /* It will NEVER fit. */
error = EMSGSIZE;
goto out_unlocked;
}
- if ((uio == NULL) && user_marks_eor) {
+ if ((uio == NULL) && (user_marks_eor != 0)) {
/*-
* We do not support eeor mode for
* sending with mbuf chains (like sendfile).
*/
- SCTP_LTRACE_ERR_RET(NULL, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL);
error = EINVAL;
goto out_unlocked;
}
- if (user_marks_eor) {
+ if (user_marks_eor != 0) {
local_add_more = (ssize_t)min(SCTP_SB_LIMIT_SND(so), SCTP_BASE_SYSCTL(sctp_add_more_threshold));
} else {
/*-
@@ -13058,13 +12968,12 @@ sctp_lower_sosend(struct socket *so,
if (non_blocking) {
goto skip_preblock;
}
- if (((max_len <= local_add_more) &&
- ((ssize_t)SCTP_SB_LIMIT_SND(so) >= local_add_more)) ||
+ if (((max_len <= local_add_more) && ((ssize_t)SCTP_SB_LIMIT_SND(so) >= local_add_more)) ||
(max_len == 0) ||
((asoc->chunks_on_out_queue + asoc->stream_queue_cnt) >= SCTP_BASE_SYSCTL(sctp_max_chunks_on_queue))) {
- /* No room right now ! */
- SOCKBUF_LOCK(&so->so_snd);
+ /* No room right now! */
inqueue_bytes = asoc->total_output_queue_size - (asoc->chunks_on_out_queue * SCTP_DATA_CHUNK_OVERHEAD(stcb));
+ SOCKBUF_LOCK(&so->so_snd);
while ((SCTP_SB_LIMIT_SND(so) < (inqueue_bytes + local_add_more)) ||
((asoc->stream_queue_cnt + asoc->chunks_on_out_queue) >= SCTP_BASE_SYSCTL(sctp_max_chunks_on_queue))) {
SCTPDBG(SCTP_DEBUG_OUTPUT1, "pre_block limit:%u <(inq:%d + %zd) || (%d+%d > %d)\n",
@@ -13082,29 +12991,41 @@ sctp_lower_sosend(struct socket *so,
SCTP_TCB_UNLOCK(stcb);
hold_tcblock = false;
error = sbwait(&so->so_snd);
- SCTP_TCB_LOCK(stcb);
- hold_tcblock = true;
- if (asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) {
- SOCKBUF_UNLOCK(&so->so_snd);
- goto out_unlocked;
- }
- stcb->block_entry = NULL;
if (error || so->so_error || be.error) {
if (error == 0) {
- if (so->so_error)
+ if (so->so_error != 0) {
error = so->so_error;
- if (be.error) {
+ }
+ if (be.error != 0) {
error = be.error;
}
}
SOCKBUF_UNLOCK(&so->so_snd);
goto out_unlocked;
}
+ SOCKBUF_UNLOCK(&so->so_snd);
+ SCTP_TCB_LOCK(stcb);
+ hold_tcblock = true;
+ if ((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) ||
+ (asoc->state & SCTP_STATE_WAS_ABORTED)) {
+ if (asoc->state & SCTP_STATE_WAS_ABORTED) {
+ /*
+ * XXX: Could also be ECONNABORTED,
+ * not enough info.
+ */
+ error = ECONNRESET;
+ } else {
+ error = ENOTCONN;
+ }
+ goto out_unlocked;
+ }
+ stcb->block_entry = NULL;
if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_BLK_LOGGING_ENABLE) {
sctp_log_block(SCTP_BLOCK_LOG_OUTOF_BLK,
asoc, asoc->total_output_queue_size);
}
inqueue_bytes = asoc->total_output_queue_size - (asoc->chunks_on_out_queue * SCTP_DATA_CHUNK_OVERHEAD(stcb));
+ SOCKBUF_LOCK(&so->so_snd);
}
if (SCTP_SB_LIMIT_SND(so) > inqueue_bytes) {
max_len = SCTP_SB_LIMIT_SND(so) - inqueue_bytes;
@@ -13120,6 +13041,8 @@ skip_preblock:
SCTP_TCB_LOCK_ASSERT(stcb);
KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
("Association about to be freed"));
+ KASSERT((asoc->state & SCTP_STATE_WAS_ABORTED) == 0,
+ ("Association was aborted"));
/*
* sndlen covers for mbuf case uio_resid covers for the non-mbuf
@@ -13127,42 +13050,48 @@ skip_preblock:
*/
if (sndlen == 0) {
if (sinfo_flags & SCTP_EOF) {
- got_all_of_the_send = 1;
+ got_all_of_the_send = true;
goto dataless_eof;
} else {
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL);
error = EINVAL;
goto out;
}
}
+
if (top == NULL) {
struct sctp_stream_queue_pending *sp;
struct sctp_stream_out *strm;
uint32_t sndout;
- /*
- * XXX: This will change soon, when the TCP send lock is
- * retired.
- */
- SCTP_TCB_UNLOCK(stcb);
- hold_tcblock = false;
- SCTP_TCB_SEND_LOCK(stcb);
if ((asoc->stream_locked) &&
(asoc->stream_locked_on != srcv->sinfo_stream)) {
- SCTP_TCB_SEND_UNLOCK(stcb);
- SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL);
error = EINVAL;
goto out;
}
strm = &asoc->strmout[srcv->sinfo_stream];
if (strm->last_msg_incomplete == 0) {
do_a_copy_in:
- SCTP_TCB_SEND_UNLOCK(stcb);
+ SCTP_TCB_UNLOCK(stcb);
+ hold_tcblock = false;
sp = sctp_copy_it_in(stcb, asoc, srcv, uio, net, max_len, user_marks_eor, &error);
- if (error) {
+ SCTP_TCB_LOCK(stcb);
+ hold_tcblock = true;
+ if ((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) ||
+ (asoc->state & SCTP_STATE_WAS_ABORTED)) {
+ if (asoc->state & SCTP_STATE_WAS_ABORTED) {
+ /*
+ * XXX: Could also be ECONNABORTED,
+ * not enough info.
+ */
+ error = ECONNRESET;
+ } else {
+ error = ENOTCONN;
+ }
+ goto out;
+ }
+ if (error != 0) {
goto out;
}
- SCTP_TCB_SEND_LOCK(stcb);
/* The out streams might be reallocated. */
strm = &asoc->strmout[srcv->sinfo_stream];
if (sp->msg_is_complete) {
@@ -13200,74 +13129,79 @@ skip_preblock:
#endif
goto do_a_copy_in;
*** 1041 LINES SKIPPED ***
From nobody Wed Feb 1 22:27:19 2023
X-Original-To: dev-commits-src-branches@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 4P6c3r0rFQz3cBwG;
Wed, 1 Feb 2023 22:27:20 +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 4P6c3r0NK3z4G7M;
Wed, 1 Feb 2023 22:27:20 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675290440;
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=gdmNp8D+G6jyZ1JBtMAxDZHiXwR/4nq11CxUhmj9aoQ=;
b=daXaVpA7Mhj5cOCtqodp5KtzG0b8CP7NJOnWZDXZhuFqynj/VsM7DntLMN9dRsR1v1GLRZ
6Za1vlnzqAJoQhGAEVCvgou0oY50eCyzdqlu+yo9qMxNHGUkUhzI8BIoEoeGC4SrtjY3R2
49R6zlPcTX1W4Hi0H7h0AcFDqwhkxXtjNlsId2TeruiqU2qe6ijmMgOtuJmiBd7wwS2/+z
yAgp0ktcBM4H+DlzwRxtkKiGGs87IvrSEISjh3Y78Q8kNX3bYwD8cxYY8Umc6P7sIKTGkM
0+vPU7XUEqQmug6Q8FRq0/RnXhcjPOms2ob40/+NOnzPeeJBEGTTLl0gTFZ6zQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675290440;
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=gdmNp8D+G6jyZ1JBtMAxDZHiXwR/4nq11CxUhmj9aoQ=;
b=qvBn8ogh4Og7OzNjwUjui2NfYcBuUSrFagktyZxMFPJQk+Il6OTYd+jR3kFBKgP+teAO6b
gBjDjaeTaDZWmtLw/SXr96k5K8KvpB2G1k9w3p5hUof5h32NityFNny5KJl6KJQeaSdKkr
NL/wBU9JfGshmrwm4vpJaRFlqnON8gAACUMOW8y7GMwWw2yKpqeORmNVNUTtbll0/zWy5K
OPL0XS5uu7lCEbgJV/4AxhDMFP2BBcY4YlzeQhELW3/PlJkOxMCDMg8ZZnATeDRZzJ1k88
RIdaEYRBD4x9v+QvkpbOpQE/XrOkb7S9mDmRh6hVR1P4KFd4AeE/xLwTjnxrsA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675290440; a=rsa-sha256; cv=none;
b=dXXMGnqcH/jp9ldxRrnfKEb8myn+xjzKPvRSgY9ttu3WFgJj7Aojjn4s0tbsNGyfLlu0r4
v1ZKd9shYnjiVRMO4gYvTV1irYQy1EiHxq+XF3eqGwtVCX2dpEkp/3DCNtgORbC2yc56fc
vvnSWxrDl/OPb0hLiBrF3e7LDzFuRkrcw+vkA5kO5HkvTrXsp6X1zFwxWrQsgwcKcMTqB1
vR4mpLKBjeAaLKoWVNhE1LnlxCt3eGZkmTO5cwkl5gj36xZvWScV2O9xKGaNwNy4sfZXwN
E2mus6TiGloiLoqBBR+45w6jSTZPa9E4Vg9f9Zgoh0uvKpFK6CIOe8mLF3TMKA==
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 4P6c3q6RjWzWkq;
Wed, 1 Feb 2023 22:27:19 +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 311MRJBV071815;
Wed, 1 Feb 2023 22:27:19 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MRJLW071814;
Wed, 1 Feb 2023 22:27:19 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:27:19 GMT
Message-Id: <202302012227.311MRJLW071814@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 842ec9984a98 - stable/13 - sctp: don't lock an already locked stcb.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 842ec9984a98c8dddbdd49d8f5586f3b63f05872
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=842ec9984a98c8dddbdd49d8f5586f3b63f05872
commit 842ec9984a98c8dddbdd49d8f5586f3b63f05872
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-03-29 14:33:53 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:26:44 +0000
sctp: don't lock an already locked stcb.
Reported by: syzbot+e8dca84da3b4b82f4400@syzkaller.appspotmail.com
(cherry picked from commit 5d0c76c7302bad0cd0a9f83a30e11d70141adf37)
---
sys/netinet/sctp_output.c | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index c8e1cc4e3bb2..0bdf4c86d64d 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -13374,22 +13374,25 @@ skip_preblock:
}
SOCKBUF_UNLOCK(&so->so_snd);
- SCTP_TCB_LOCK(stcb);
- hold_tcblock = true;
- stcb->block_entry = NULL;
- if ((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) ||
- (asoc->state & SCTP_STATE_WAS_ABORTED)) {
- if (asoc->state & SCTP_STATE_WAS_ABORTED) {
- /*
- * XXX: Could also be ECONNABORTED,
- * not enough info.
- */
- error = ECONNRESET;
- } else {
- error = ENOTCONN;
+ if (!hold_tcblock) {
+ SCTP_TCB_LOCK(stcb);
+ hold_tcblock = true;
+ if ((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) ||
+ (asoc->state & SCTP_STATE_WAS_ABORTED)) {
+ if (asoc->state & SCTP_STATE_WAS_ABORTED) {
+ /*
+ * XXX: Could also be
+ * ECONNABORTED, not enough
+ * info.
+ */
+ error = ECONNRESET;
+ } else {
+ error = ENOTCONN;
+ }
+ goto out;
}
- goto out;
}
+ stcb->block_entry = NULL;
if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_BLK_LOGGING_ENABLE) {
sctp_log_block(SCTP_BLOCK_LOG_OUTOF_BLK,
asoc, asoc->total_output_queue_size);
From nobody Wed Feb 1 22:28:12 2023
X-Original-To: dev-commits-src-branches@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 4P6c4s0130z3cBwm;
Wed, 1 Feb 2023 22:28:13 +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 4P6c4r6c0hz4GKh;
Wed, 1 Feb 2023 22:28:12 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675290492;
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=dv5QoyxQLwV7UVZ08NG40QUs3dDxfm6TNSLRIJx4MBQ=;
b=dHEZ9XQeYiyuaSyoW2AqMArwW0Xgg6gaJK71ZG5sG5A6eOyiBr+Ws2HfHQcuEvqVIVaxud
bTHPWumUQvLfr4btwTmBLl4kok61MK5tl+8AJEVRQ2OXlvvFBcDGXPnwCVFzFFMLOiFCDE
yJbggoVPoUQ0T/J/Vjcl0aS49tJ4Fj6Nmg/9FLLpv01QtJJtPaPVqqhpCs4UZNjpoET6fV
/dTMfVWMFLcw5PeH8cWZrTfbpaw9y6xt7I6xFTAJj9og2td294pX/uZKP7kG50norctMp+
d54Gbp/Cd/Ath1yOLcbSJxUaMHyDv6kUh8SufRors0q2wRm/1NkG8JDcAj5g9w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675290492;
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=dv5QoyxQLwV7UVZ08NG40QUs3dDxfm6TNSLRIJx4MBQ=;
b=Ex7sxHw3JNY8aNhi+8aN0DI9v5zYmnmJ2/onqwknYvbIYrfzDoLKuJ1g83YhmT3NET45tT
TUcS+HRW2n5Al0M9c64blDlvTJDapk/LKRuxIS5QesfoyLMrODkT0zKwE9ITU0BcmfhOAb
8X0FdavxZg8CESPNLwmdaP+NNaP6pBTJzG/97a6ccAhU6ppc7aIReaCXUbqJdhEyyqzFe+
+nhymzPH1Y3CQYt4HxVFE/m+PP8vaP64Qv5Fv5FS3kAODaWEkup623O6iTi5jCqZJxVvbT
qDVKnUCw/IFghcEnx0H2vXQsJ3sZjch7S6PgYzFhyhDfey2+juxgEyrA6m4Igg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675290492; a=rsa-sha256; cv=none;
b=BDiWN7eN1rTBwg/N4JcPpeRZLetcbQpt2t1Zt2iGhpEabFL49eLfNTUGUc5Mzd0d/L7+Jk
DzHTuB3EZ7VjJrN2Pvi3wCBlGLX2VK8aiLfZDfHnSAbjKbAQ+1ieQQxlomFXz0cSwJs+0R
Im4Ews7RK3ykGCjSeiin33xYAJvugaG90RUme4QdPLiSu5AueiAaX83BBiH9kszL2q2aIS
N9z+GAwwozz5GyfVBPGG/MHf69OOG5GSJQ+NmGySZKTKaSvmRCSjYnyhi1zr5EUeinsC3T
As/py47agFjdNKQ6F0EmVtTujZsEQaPqXsp0KPegvtfjLVKIQj2iYtOJFaNoXQ==
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 4P6c4r5j8wzWdh;
Wed, 1 Feb 2023 22:28:12 +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 311MSCd8072157;
Wed, 1 Feb 2023 22:28:12 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MSCrC072156;
Wed, 1 Feb 2023 22:28:12 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:28:12 GMT
Message-Id: <202302012228.311MSCrC072156@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 8cd432d01b0e - stable/13 - sctp: fix typos
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 8cd432d01b0ea51bf92d874a4095963eb505318d
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=8cd432d01b0ea51bf92d874a4095963eb505318d
commit 8cd432d01b0ea51bf92d874a4095963eb505318d
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-03-29 19:09:51 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:27:44 +0000
sctp: fix typos
Thanks to David Sanders for fixing the typos in the userland stack.
(cherry picked from commit e7e65008ffba90dc57c5f2edf5a000d7d1293a47)
---
sys/netinet/sctp_asconf.c | 17 ++++++++++-------
sys/netinet/sctp_bsd_addr.c | 4 ++--
sys/netinet/sctp_cc_functions.c | 2 +-
sys/netinet/sctp_indata.c | 29 +++++++++++++++--------------
sys/netinet/sctp_input.c | 20 ++++++++++----------
sys/netinet/sctp_output.c | 26 +++++++++++++-------------
sys/netinet/sctp_ss_functions.c | 6 +++---
sys/netinet/sctp_sysctl.c | 4 ++--
sys/netinet/sctp_sysctl.h | 2 +-
sys/netinet/sctp_timer.c | 8 ++++----
sys/netinet/sctp_usrreq.c | 4 ++--
sys/netinet/sctputil.c | 24 ++++++++++++------------
12 files changed, 75 insertions(+), 71 deletions(-)
diff --git a/sys/netinet/sctp_asconf.c b/sys/netinet/sctp_asconf.c
index 2250d084ca06..411440468856 100644
--- a/sys/netinet/sctp_asconf.c
+++ b/sys/netinet/sctp_asconf.c
@@ -1107,7 +1107,7 @@ sctp_path_check_and_react(struct sctp_tcb *stcb, struct sctp_ifa *newifa)
return;
}
- /* Multiple local addresses exsist in the association. */
+ /* Multiple local addresses exist in the association. */
TAILQ_FOREACH(net, &stcb->asoc.nets, sctp_next) {
/* clear any cached route and source address */
RO_NHFREE(&net->ro);
@@ -1948,7 +1948,7 @@ sctp_addr_mgmt_assoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
sin6 = &ifa->address.sin6;
if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
- /* we skip unspecifed addresses */
+ /* we skip unspecified addresses */
return;
}
if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
@@ -1979,7 +1979,7 @@ sctp_addr_mgmt_assoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
sin = &ifa->address.sin;
if (sin->sin_addr.s_addr == 0) {
- /* we skip unspecifed addresses */
+ /* we skip unspecified addresses */
return;
}
if (stcb->asoc.scope.ipv4_local_scope == 0 &&
@@ -2134,7 +2134,7 @@ sctp_asconf_iterator_stcb(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
}
sin6 = &ifa->address.sin6;
if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
- /* we skip unspecifed addresses */
+ /* we skip unspecified addresses */
continue;
}
if (prison_check_ip6(inp->ip_inp.inp.inp_cred,
@@ -2166,7 +2166,7 @@ sctp_asconf_iterator_stcb(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
sin = &ifa->address.sin;
if (sin->sin_addr.s_addr == 0) {
- /* we skip unspecifed addresses */
+ /* we skip unspecified addresses */
continue;
}
if (prison_check_ip4(inp->ip_inp.inp.inp_cred,
@@ -2449,7 +2449,10 @@ sctp_find_valid_localaddr(struct sctp_tcb *stcb, int addr_locked)
sin = &sctp_ifa->address.sin;
if (sin->sin_addr.s_addr == 0) {
- /* skip unspecifed addresses */
+ /*
+ * skip unspecified
+ * addresses
+ */
continue;
}
if (prison_check_ip4(stcb->sctp_ep->ip_inp.inp.inp_cred,
@@ -2485,7 +2488,7 @@ sctp_find_valid_localaddr(struct sctp_tcb *stcb, int addr_locked)
sin6 = &sctp_ifa->address.sin6;
if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
/*
- * we skip unspecifed
+ * we skip unspecified
* addresses
*/
continue;
diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c
index 2a00885d8ddd..a36c360279ff 100644
--- a/sys/netinet/sctp_bsd_addr.c
+++ b/sys/netinet/sctp_bsd_addr.c
@@ -224,7 +224,7 @@ sctp_init_ifns_for_vrf(int vrfid)
#ifdef INET6
case AF_INET6:
if (IN6_IS_ADDR_UNSPECIFIED(&((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr)) {
- /* skip unspecifed addresses */
+ /* skip unspecified addresses */
continue;
}
break;
@@ -326,7 +326,7 @@ sctp_addr_change(struct ifaddr *ifa, int cmd)
case AF_INET6:
ifa_flags = ((struct in6_ifaddr *)ifa)->ia6_flags;
if (IN6_IS_ADDR_UNSPECIFIED(&((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr)) {
- /* skip unspecifed addresses */
+ /* skip unspecified addresses */
return;
}
break;
diff --git a/sys/netinet/sctp_cc_functions.c b/sys/netinet/sctp_cc_functions.c
index 81b9e28f9959..c5b031199a01 100644
--- a/sys/netinet/sctp_cc_functions.c
+++ b/sys/netinet/sctp_cc_functions.c
@@ -1323,7 +1323,7 @@ sctp_cwnd_prepare_rtcc_net_for_sack(struct sctp_tcb *stcb SCTP_UNUSED,
struct sctp_nets *net)
{
if (net->cc_mod.rtcc.tls_needs_set > 0) {
- /* We had a bw measurment going on */
+ /* We had a bw measurement going on */
struct timeval ltls;
SCTP_GETPTIME_TIMEVAL(<ls);
diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c
index 18949ab9b6e2..c4620b7cfa0d 100644
--- a/sys/netinet/sctp_indata.c
+++ b/sys/netinet/sctp_indata.c
@@ -497,7 +497,7 @@ sctp_queue_data_to_stream(struct sctp_tcb *stcb,
* ssn 2 with TSN 1? If the peer is doing some sort of funky TSN/SSN
* assignment this could happen... and I don't see how this would be
* a violation. So for now I am undecided an will leave the sort by
- * SSN alone. Maybe a hybred approach is the answer
+ * SSN alone. Maybe a hybrid approach is the answer
*
*/
struct sctp_queued_to_read *at;
@@ -962,10 +962,11 @@ sctp_inject_old_unordered_data(struct sctp_tcb *stcb,
* (since the equals part is a TSN failure
* it must be that).
*
- * We are completly hosed in that case since
- * I have no way to recover. This really
- * will only happen if we can get more TSN's
- * higher before the pd-api-point.
+ * We are completely hosed in that case
+ * since I have no way to recover. This
+ * really will only happen if we can get
+ * more TSN's higher before the
+ * pd-api-point.
*/
sctp_abort_in_reasm(stcb, control, chk,
abort_flag,
@@ -3381,7 +3382,7 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc,
*/
if (tp1->whoTo && tp1->whoTo->saw_newack == 0) {
/*
- * No new acks were receieved for data sent to this
+ * No new acks were received for data sent to this
* dest. Therefore, according to the SFR algo for
* CMT, no data sent to this dest can be marked for
* FR using this SACK.
@@ -3392,12 +3393,12 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc,
tp1->whoTo->this_sack_highest_newack) &&
!(accum_moved && asoc->fast_retran_loss_recovery)) {
/*
- * CMT: New acks were receieved for data sent to
- * this dest. But no new acks were seen for data
- * sent after tp1. Therefore, according to the SFR
- * algo for CMT, tp1 cannot be marked for FR using
- * this SACK. This step covers part of the DAC algo
- * and the HTNA algo as well.
+ * CMT: New acks were received for data sent to this
+ * dest. But no new acks were seen for data sent
+ * after tp1. Therefore, according to the SFR algo
+ * for CMT, tp1 cannot be marked for FR using this
+ * SACK. This step covers part of the DAC algo and
+ * the HTNA algo as well.
*/
continue;
}
@@ -4435,7 +4436,7 @@ sctp_handle_sack(struct mbuf *m, int offset_seg, int offset_dup,
* old sack, if so discard. 2) If there is nothing left in the send
* queue (cum-ack is equal to last acked) then you have a duplicate
* too, update any rwnd change and verify no timers are running.
- * then return. 3) Process any new consequtive data i.e. cum-ack
+ * then return. 3) Process any new consecutive data i.e. cum-ack
* moved process these first and note that it moved. 4) Process any
* sack blocks. 5) Drop any acked from the queue. 6) Check for any
* revoked blocks and mark. 7) Update the cwnd. 8) Nothing left,
@@ -4572,7 +4573,7 @@ hopeless_peer:
* We init netAckSz and netAckSz2 to 0. These are used to track 2
* things. The total byte count acked is tracked in netAckSz AND
* netAck2 is used to track the total bytes acked that are un-
- * amibguious and were never retransmitted. We track these on a per
+ * ambiguous and were never retransmitted. We track these on a per
* destination address basis.
*/
TAILQ_FOREACH(net, &asoc->nets, sctp_next) {
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index 13e41748a82e..8b6a6446f486 100644
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -1596,14 +1596,14 @@ sctp_process_cookie_existing(struct mbuf *m, int iphlen, int offset,
* random number generator returned the same vtag
* when we first sent our INIT-ACK and when we later
* sent our INIT. The side with the seq numbers that
- * are different will be the one that normnally
- * would have hit case C. This in effect "extends"
- * our vtags in this collision case to be 64 bits.
- * The same collision could occur aka you get both
- * vtag and seq number the same twice in a row.. but
- * is much less likely. If it did happen then we
- * would proceed through and bring up the assoc.. we
- * may end up with the wrong stream setup however..
+ * are different will be the one that normally would
+ * have hit case C. This in effect "extends" our
+ * vtags in this collision case to be 64 bits. The
+ * same collision could occur aka you get both vtag
+ * and seq number the same twice in a row.. but is
+ * much less likely. If it did happen then we would
+ * proceed through and bring up the assoc.. we may
+ * end up with the wrong stream setup however..
* which would be bad.. but there is no way to
* tell.. until we send on a stream that does not
* exist :-)
@@ -2020,7 +2020,7 @@ sctp_process_cookie_new(struct mbuf *m, int iphlen, int offset,
/*
* now that we know the INIT/INIT-ACK are in place, create a new TCB
- * and popluate
+ * and populate
*/
/*
@@ -4125,7 +4125,7 @@ strres_nochunk:
* Handle a router or endpoints report of a packet loss, there are two ways
* to handle this, either we get the whole packet and must disect it
* ourselves (possibly with truncation and or corruption) or it is a summary
- * from a middle box that did the disectting for us.
+ * from a middle box that did the disecting for us.
*/
static void
sctp_handle_packet_dropped(struct sctp_pktdrop_chunk *cp,
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 0bdf4c86d64d..7e5c84228ecb 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -1914,7 +1914,7 @@ sctp_is_address_in_scope(struct sctp_ifa *ifa,
/* ok to use deprecated addresses? */
sin6 = &ifa->address.sin6;
if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
- /* skip unspecifed addresses */
+ /* skip unspecified addresses */
return (0);
}
if ( /* (local_scope == 0) && */
@@ -3317,7 +3317,7 @@ sctp_source_address_selection(struct sctp_inpcb *inp,
* have the best source.
* - If not we must rotate amongst the addresses.
*
- * Cavets and issues
+ * Caveats and issues
*
* Do we need to pay attention to scope. We can have a private address
* or a global address we are sourcing or sending to. So if we draw
@@ -6967,7 +6967,7 @@ sctp_clean_up_datalist(struct sctp_tcb *stcb,
if (i > 0) {
/*
* Any chunk NOT 0 you zap the time chunk 0 gets
- * zapped or set based on if a RTO measurment is
+ * zapped or set based on if a RTO measurement is
* needed.
*/
data_list[i]->do_rtt = 0;
@@ -7125,7 +7125,7 @@ sctp_can_we_split_this(struct sctp_tcb *stcb, uint32_t length,
}
if ((length <= space_left) ||
((length - space_left) < SCTP_BASE_SYSCTL(sctp_min_residual))) {
- /* Sub-optimial residual don't split in non-eeor mode. */
+ /* Sub-optimal residual don't split in non-eeor mode. */
return (0);
}
/*
@@ -7359,7 +7359,7 @@ dont_do_it:
* than the sp->length.
*/
#ifdef INVARIANTS
- panic("Huh, freing tail? - TSNH");
+ panic("Huh, freeing tail? - TSNH");
#else
SCTP_PRINTF("Huh, freeing tail? - TSNH\n");
sp->tail_mbuf = sp->data = NULL;
@@ -7742,10 +7742,10 @@ sctp_med_chunk_output(struct sctp_inpcb *inp,
* - Service the stream queue that is next, moving any
* message (note I must get a complete message i.e. FIRST/MIDDLE and
* LAST to the out queue in one pass) and assigning TSN's. This
- * only applys though if the peer does not support NDATA. For NDATA
+ * only applies though if the peer does not support NDATA. For NDATA
* chunks its ok to not send the entire message ;-)
* - Check to see if the cwnd/rwnd allows any output, if so we go ahead and
- * fomulate and send the low level chunks. Making sure to combine
+ * formulate and send the low level chunks. Making sure to combine
* any control in the control chunk queue also.
*/
struct sctp_nets *net, *start_at, *sack_goes_to = NULL, *old_start_at = NULL;
@@ -7941,7 +7941,7 @@ again_one_more_time:
/* how much can we send? */
/* SCTPDBG("Examine for sending net:%x\n", (uint32_t)net); */
if (old_start_at && (old_start_at == net)) {
- /* through list ocmpletely. */
+ /* through list completely. */
break;
}
tsns_sent = 0xa;
@@ -8639,7 +8639,7 @@ again_one_more_time:
SCTP_LTRACE_ERR_RET(inp, stcb, NULL, SCTP_FROM_SCTP_OUTPUT, ENOMEM);
return (ENOMEM);
}
- /* upate our MTU size */
+ /* update our MTU size */
/* Do clear IP_DF ? */
if (chk->flags & CHUNK_FLAGS_FRAGMENT_OK) {
no_fragmentflg = 0;
@@ -9629,7 +9629,7 @@ one_chunk_around:
if (chk->flags & CHUNK_FLAGS_FRAGMENT_OK) {
no_fragmentflg = 0;
}
- /* upate our MTU size */
+ /* update our MTU size */
if (mtu > (chk->send_size + dmtu))
mtu -= (chk->send_size + dmtu);
else
@@ -9689,7 +9689,7 @@ one_chunk_around:
if (fwd->flags & CHUNK_FLAGS_FRAGMENT_OK) {
no_fragmentflg = 0;
}
- /* upate our MTU size */
+ /* update our MTU size */
if (mtu > (fwd->send_size + dmtu))
mtu -= (fwd->send_size + dmtu);
else
@@ -9903,7 +9903,7 @@ sctp_chunk_output(struct sctp_inpcb *inp,
* FIRST/MIDDLE and LAST to the out queue in one pass) and assigning
* TSN's
* - Check to see if the cwnd/rwnd allows any output, if so we
- * go ahead and fomulate and send the low level chunks. Making sure
+ * go ahead and formulate and send the low level chunks. Making sure
* to combine any control in the control chunk queue also.
*/
struct sctp_association *asoc;
@@ -9958,7 +9958,7 @@ do_it_again:
*/
if (from_where == SCTP_OUTPUT_FROM_COOKIE_ACK) {
/*-
- * Special hook for handling cookiess discarded
+ * Special hook for handling cookies discarded
* by peer that carried data. Send cookie-ack only
* and then the next call with get the retran's.
*/
diff --git a/sys/netinet/sctp_ss_functions.c b/sys/netinet/sctp_ss_functions.c
index 793e936a3636..049c93767125 100644
--- a/sys/netinet/sctp_ss_functions.c
+++ b/sys/netinet/sctp_ss_functions.c
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
/*
* Default simple round-robin algorithm.
- * Just interates the streams in the order they appear.
+ * Just iterates the streams in the order they appear.
*/
static void
@@ -299,7 +299,7 @@ sctp_ss_default_is_user_msgs_incomplete(struct sctp_tcb *stcb SCTP_UNUSED, struc
/*
* Real round-robin algorithm.
- * Always interates the streams in ascending order.
+ * Always iterates the streams in ascending order.
*/
static void
sctp_ss_rr_add(struct sctp_tcb *stcb, struct sctp_association *asoc,
@@ -331,7 +331,7 @@ sctp_ss_rr_add(struct sctp_tcb *stcb, struct sctp_association *asoc,
/*
* Real round-robin per packet algorithm.
- * Always interates the streams in ascending order and
+ * Always iterates the streams in ascending order and
* only fills messages of the same stream in a packet.
*/
static struct sctp_stream_out *
diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c
index 92c5c64928eb..1314b700b467 100644
--- a/sys/netinet/sctp_sysctl.c
+++ b/sys/netinet/sctp_sysctl.c
@@ -143,7 +143,7 @@ sctp_sysctl_number_of_addresses(struct sctp_inpcb *inp)
struct sctp_laddr *laddr;
cnt = 0;
- /* neither Mac OS X nor FreeBSD support mulitple routing functions */
+ /* neither Mac OS X nor FreeBSD support multiple routing functions */
if ((vrf = sctp_find_vrf(inp->def_vrf_id)) == NULL) {
return (0);
}
@@ -223,7 +223,7 @@ sctp_sysctl_copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *st
}
}
- /* neither Mac OS X nor FreeBSD support mulitple routing functions */
+ /* neither Mac OS X nor FreeBSD support multiple routing functions */
if ((vrf = sctp_find_vrf(inp->def_vrf_id)) == NULL) {
SCTP_INP_RUNLOCK(inp);
SCTP_INP_INFO_RUNLOCK();
diff --git a/sys/netinet/sctp_sysctl.h b/sys/netinet/sctp_sysctl.h
index 0f76721058bc..695cd743403b 100644
--- a/sys/netinet/sctp_sysctl.h
+++ b/sys/netinet/sctp_sysctl.h
@@ -144,7 +144,7 @@ struct sctp_sysctl {
#define SCTPCTL_AUTOASCONF_DEFAULT 1
/* autoasconf: Enable SCTP Auto-ASCONF */
-#define SCTPCTL_MULTIPLEASCONFS_DESC "Enable SCTP Muliple-ASCONFs"
+#define SCTPCTL_MULTIPLEASCONFS_DESC "Enable SCTP Multiple-ASCONFs"
#define SCTPCTL_MULTIPLEASCONFS_MIN 0
#define SCTPCTL_MULTIPLEASCONFS_MAX 1
#define SCTPCTL_MULTIPLEASCONFS_DEFAULT SCTP_DEFAULT_MULTIPLE_ASCONFS
diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c
index 8a7c222071c1..8a7d9be866f8 100644
--- a/sys/netinet/sctp_timer.c
+++ b/sys/netinet/sctp_timer.c
@@ -188,7 +188,7 @@ sctp_find_alternate_net(struct sctp_tcb *stcb,
* JRS 5/14/07 - If mode is set to 2, use the CMT PF find alternate
* net algorithm. This algorithm chooses the active destination (not
* in PF state) with the largest cwnd value. If all destinations are
- * in PF state, unreachable, or unconfirmed, choose the desination
+ * in PF state, unreachable, or unconfirmed, choose the destination
* that is in PF state with the lowest error count. In case of a
* tie, choose the destination that was most recently active.
*/
@@ -940,7 +940,7 @@ sctp_t3rxt_timer(struct sctp_inpcb *inp,
/*
* Get the address that failed, to force a new src address
- * selecton and a route allocation.
+ * selection and a route allocation.
*/
if (net->ro._s_addr) {
sctp_free_ifa(net->ro._s_addr);
@@ -1448,8 +1448,8 @@ sctp_heartbeat_timer(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
if (!(net->dest_state & SCTP_ADDR_NOHB) &&
!((net_was_pf == 0) && (net->dest_state & SCTP_ADDR_PF))) {
/*
- * when move to PF during threshold mangement, a HB has been
- * queued in that routine
+ * when move to PF during threshold management, a HB has
+ * been queued in that routine
*/
uint32_t ms_gone_by;
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index 4b797ca3e533..1f046fb3189d 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -1104,7 +1104,7 @@ sctp_fill_up_addresses_vrf(struct sctp_inpcb *inp,
if (sin->sin_addr.s_addr == 0) {
/*
* we skip
- * unspecifed
+ * unspecified
* addresses
*/
continue;
@@ -1152,7 +1152,7 @@ sctp_fill_up_addresses_vrf(struct sctp_inpcb *inp,
if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
/*
* we skip
- * unspecifed
+ * unspecified
* addresses
*/
continue;
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 684bc68940b4..e0ac9e23fc68 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -1200,7 +1200,7 @@ sctp_init_asoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
asoc->str_reset_seq_out = asoc->init_seq_number;
asoc->sending_seq = asoc->init_seq_number;
asoc->asconf_seq_out_acked = asoc->init_seq_number - 1;
- /* we are optimisitic here */
+ /* we are optimistic here */
asoc->peer_supports_nat = 0;
asoc->sent_queue_retran_cnt = 0;
@@ -2233,7 +2233,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
case SCTP_TIMER_TYPE_RECV:
/*
* Here we use the Delayed-Ack timer value from the inp,
- * ususually about 200ms.
+ * usually about 200ms.
*/
if ((inp == NULL) || (stcb == NULL) || (net != NULL)) {
#ifdef INVARIANTS
@@ -2337,7 +2337,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
break;
case SCTP_TIMER_TYPE_NEWCOOKIE:
/*
- * Nothing needed but the endpoint here ususually about 60
+ * Nothing needed but the endpoint here usually about 60
* minutes.
*/
if ((inp == NULL) || (stcb != NULL) || (net != NULL)) {
@@ -2353,8 +2353,8 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
break;
case SCTP_TIMER_TYPE_PATHMTURAISE:
/*
- * Here we use the value found in the EP for PMTUD,
- * ususually about 10 minutes.
+ * Here we use the value found in the EP for PMTUD, usually
+ * about 10 minutes.
*/
if ((inp == NULL) || (stcb == NULL) || (net == NULL)) {
#ifdef INVARIANTS
@@ -2468,7 +2468,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
break;
case SCTP_TIMER_TYPE_INPKILL:
/*
- * The inp is setup to die. We re-use the signature_chage
+ * The inp is setup to die. We re-use the signature_change
* timer since that has stopped and we are in the GONE
* state.
*/
@@ -2774,7 +2774,7 @@ sctp_timer_stop(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
break;
case SCTP_TIMER_TYPE_INPKILL:
/*
- * The inp is setup to die. We re-use the signature_chage
+ * The inp is setup to die. We re-use the signature_change
* timer since that has stopped and we are in the GONE
* state.
*/
@@ -2992,7 +2992,7 @@ sctp_calculate_rto(struct sctp_tcb *stcb,
rto_logging(net, SCTP_LOG_RTTVAR);
}
} else {
- /* First RTO measurment */
+ /* First RTO measurement */
net->RTO_measured = 1;
first_measure = 1;
net->lastsa = rtt << SCTP_RTT_SHIFT;
@@ -5701,7 +5701,7 @@ restart_nosblocks:
} else {
/* remove it */
TAILQ_REMOVE(&inp->read_queue, control, next);
- /* Add back any hiddend data */
+ /* Add back any hidden data */
sctp_free_remote_addr(control->whoFrom);
sctp_free_a_readq(stcb, control);
}
@@ -5781,7 +5781,7 @@ restart_nosblocks:
* have the strm interleave feature present. Then if we have
* taken some (pdapi) or we can refer to tht tcb AND we have
* not started a delivery for this stream, we can take it.
- * Note we do NOT allow a notificaiton on the same assoc to
+ * Note we do NOT allow a notification on the same assoc to
* be delivered.
*/
control = ctl;
@@ -6138,7 +6138,7 @@ get_more_data:
#ifdef INVARIANTS
panic("control->data not null at read eor?");
#else
- SCTP_PRINTF("Strange, data left in the control buffer .. invarients would panic?\n");
+ SCTP_PRINTF("Strange, data left in the control buffer .. invariants would panic?\n");
sctp_m_freem(control->data);
control->data = NULL;
#endif
@@ -6149,7 +6149,7 @@ get_more_data:
hold_rlock = 1;
}
TAILQ_REMOVE(&inp->read_queue, control, next);
- /* Add back any hiddend data */
+ /* Add back any hidden data */
if (control->held_length) {
held_length = 0;
control->held_length = 0;
From nobody Wed Feb 1 22:28:49 2023
X-Original-To: dev-commits-src-branches@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 4P6c5Z1f6jz3cCFq;
Wed, 1 Feb 2023 22:28:50 +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 4P6c5Z15XVz4Gp7;
Wed, 1 Feb 2023 22:28:50 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675290530;
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=MaRRWeUG6WxZuRcOCT4/OFfYKVPvpj5dpZ2CgqRhGfk=;
b=h7KHSyuH1n++CY3bj0gZ20VKgaIovBJKpkJbg2Cv4P1/YoeLO89txOEOVUum+AmJCj4LDm
mNzIhQ2124SqRzRKOehx1lVTk1igPPyTOGcBzyxx2gqG2oitrr3FiXAQXJhUMM9cPURT8Y
hjMRVrqLgnyzmtkeA4ZIk1vQARsMDmxH233UKYznKE3j5HFh/xzTis7wpyf6cRhMJZj55S
rMNcfRzlPJUfMIfgys/46luxAayilLBCQ/J+c6Ni1hBSanQkf5wY2xEkkmEAjUCxygIokF
rLWbfMd9m2mlJa1SLQBy8hjcGH7aUj7AdmLfQE+YLHKnVbKOrKAN+X5BSTP1Tw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675290530;
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=MaRRWeUG6WxZuRcOCT4/OFfYKVPvpj5dpZ2CgqRhGfk=;
b=P78a+L2oEk3kznsm6UaIWjyS0/M6/0Tv1v6h0RtNknhUz/f5b9qFUcZFlu02Nhb1CGIzOS
0521gVqblAkaZwYxk/HiuaORcdtRGaovIhlK+qhB+J72zpzzjc2edWYHXimlacnhb74ekF
hmVXB2PmHdM7v5r5PylfZhR+EmSxB10Yh2vihMssbWCUgBmMbLI7GibVadIhg/BYw0Ruz+
WclOpqcD40hXph3ZoC0H2yJ8Xl43ME8liF15pqP3oSf8kNtzj6mjCRYqBZ4hv8CQr6sFoR
Rtg0UX2lAnb8FoOgvcy46Ao04ONxRyqQ+lDOH1I/VODZz6h1BRFfsQ5yVuUVCA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675290530; a=rsa-sha256; cv=none;
b=Q6JjHLX3dwh4/vzayokpdIbGj4soNVFmXmzREKys2IUgAhaVixu2ZoZR6qUfgDNQyUityg
ajUpoz57bRjbv96eMPjDOnNtCM1EfHQmIAezdu9/nSlrZ6adK4DpJaa1oprVfQMXtGE+rb
BY/KTc16bfyZHpZIVftEh5IPRtbHP7Z1356xVoph9NuenCRT3AFVRHE+vX+WOUl9a7EBS0
+2UGIqbnzsIiSOemsTdon0ZH4Y9CXmtq9nhyc5O8FA25k6F+8v0B2SMgLPb8D3NJ9ffZtY
Zjy78g3Wx1GK+pnu1r9cXWyy9C+6xsnuRpvUYWtLOPO938yINBZvH79zNOkkaA==
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 4P6c5Z07lzzWhB;
Wed, 1 Feb 2023 22:28:50 +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 311MSncM072358;
Wed, 1 Feb 2023 22:28:49 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MSneL072357;
Wed, 1 Feb 2023 22:28:49 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:28:49 GMT
Message-Id: <202302012228.311MSneL072357@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: a8ac188a425a - stable/13 - sctp: ensure that ASCONF chunks are not too large
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a8ac188a425aaab990477c72e1b8c59fb7b6bf69
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=a8ac188a425aaab990477c72e1b8c59fb7b6bf69
commit a8ac188a425aaab990477c72e1b8c59fb7b6bf69
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-03-29 23:22:20 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:28:28 +0000
sctp: ensure that ASCONF chunks are not too large
(cherry picked from commit 218e463b85c4b78af93583cfc3d95a1cab8408bf)
---
sys/netinet/sctp_asconf.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/sys/netinet/sctp_asconf.c b/sys/netinet/sctp_asconf.c
index 411440468856..a4457471410e 100644
--- a/sys/netinet/sctp_asconf.c
+++ b/sys/netinet/sctp_asconf.c
@@ -2561,7 +2561,7 @@ sctp_compose_asconf(struct sctp_tcb *stcb, int *retlen, int addr_locked)
struct sctp_asconf_chunk *acp;
struct sctp_asconf_paramhdr *aph;
struct sctp_asconf_addr_param *aap;
- uint32_t p_length;
+ uint32_t p_length, overhead;
uint32_t correlation_id = 1; /* 0 is reserved... */
caddr_t ptr, lookup_ptr;
uint8_t lookup_used = 0;
@@ -2574,6 +2574,20 @@ sctp_compose_asconf(struct sctp_tcb *stcb, int *retlen, int addr_locked)
if (aa == NULL)
return (NULL);
+ /* Consider IP header and SCTP common header. */
+ if (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) {
+ overhead = SCTP_MIN_OVERHEAD;
+ } else {
+ overhead = SCTP_MIN_V4_OVERHEAD;
+ }
+ /* Consider ASONF chunk. */
+ overhead += sizeof(struct sctp_asconf_chunk);
+ /* Consider AUTH chunk. */
+ overhead += sctp_get_auth_chunk_len(stcb->asoc.peer_hmac_id);
+ if (stcb->asoc.smallest_mtu <= overhead) {
+ /* MTU too small. */
+ return (NULL);
+ }
/*
* get a chunk header mbuf and a cluster for the asconf params since
* it's simpler to fill in the asconf chunk header lookup address on
@@ -2615,7 +2629,7 @@ sctp_compose_asconf(struct sctp_tcb *stcb, int *retlen, int addr_locked)
/* get the parameter length */
p_length = SCTP_SIZE32(aa->ap.aph.ph.param_length);
/* will it fit in current chunk? */
- if ((SCTP_BUF_LEN(m_asconf) + p_length > stcb->asoc.smallest_mtu) ||
+ if ((SCTP_BUF_LEN(m_asconf) + p_length > stcb->asoc.smallest_mtu - overhead) ||
(SCTP_BUF_LEN(m_asconf) + p_length > MCLBYTES)) {
/* won't fit, so we're done with this chunk */
break;
From nobody Wed Feb 1 22:29:26 2023
X-Original-To: dev-commits-src-branches@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 4P6c6G5nRfz3cCCM;
Wed, 1 Feb 2023 22:29:26 +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 4P6c6G3jccz4H0y;
Wed, 1 Feb 2023 22:29:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675290566;
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=Csa+z2BQ+pOc6u/AmLdGJXebCv3PWQVEXoLW0g/iWk0=;
b=nI+yjnufUa/uQGAEVOUjXGsn5yNogv3cxEXfTzK+fVFmtOn7MPI8/a0Aiw5idDiX+T12qC
HFGIjp78oZwPF8Bhbgu7BVHoTTUblQo2klZuMY8vlBtiA+BErrr0B8KXQQgXQZk7yR5UWs
cau/uxdQNVKp7aofdWpw1jnkfCiaiywdRjpEBGHb1a4fvsZbqXqYgSVTe/5adZnt/jWcx9
iniUPRaKr/Yig8ZqwNFj8XAngZWIKeSfNYriLv0+qVXZ+DzrGo6kDaAZjBFoUAz2ENJY8B
Bn2WrFehE3T1Ss8ipRD2pnNsKGe9h/GJoEdgqAA0TFfOAF18DJUYA2fj16daZQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675290566;
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=Csa+z2BQ+pOc6u/AmLdGJXebCv3PWQVEXoLW0g/iWk0=;
b=i1PFptoxNMgrtPtnxY+GHI1epm6ySBrKpjCP78Ht+WjStf++G4Of/TL49KVRHHEfZTC1WR
LCX8YkUcSTh96ZrZu56Ywss6WCNizkGFISXMngpTy9jP/pz/eQeT21OzLbJmL6ed2mzOXd
0ByRa55slNSY7Wcy5bQRSsD/y2Lfeq5QVz2VOqnrOcIlozz108BDJ18lj7EkU2o9jSeTdH
OX8c7HMZXEuMpLAfRsXup36Tn2QyAvkestTILDz3PjZbiVrCzQpfglDh1wThz+P3psQVVJ
NRBYk/7CTsaPI+2zq5R2aoCsc1pBeN1ALhDfvNdvoBLiT54+sqL84TG7S1odFQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675290566; a=rsa-sha256; cv=none;
b=euGQTHsmpSSkmjTcrafg35TfxGtWiiTocdwTijEK6aRj4CIJ+qT3Ml3G7NTw11IKHXE8hf
dUgivGRWAPlqRBqJsaX2Mxv6Suwkd33529Ta3YRv++6StFh8RIO7Rc+jVmi5kqyf11Erwe
nD5x/bRlwkgIhvwM0McdHBZlVuf+DF6r6XFjaHwNlKoMxxpS/WdF9BbV9co4mNKkEYgtyC
zTIlZuDGySnxEFlkqstew34CwolZDiyuL2Q3YXe8V2F/yWo6IzCXKPfuyBfOyFWKqOx8jU
2gRdxz93uHQVblWZGspXsVvagMPGPp2h8d+FwfWFyyql/Ykh9lfN0Yy3StRyGg==
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 4P6c6G2SDPzWQN;
Wed, 1 Feb 2023 22:29:26 +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 311MTQuR072542;
Wed, 1 Feb 2023 22:29:26 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MTQZY072541;
Wed, 1 Feb 2023 22:29:26 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:29:26 GMT
Message-Id: <202302012229.311MTQZY072541@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 2bf685d16aa7 - stable/13 - sctp: clear pointer to stack when returning from function.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 2bf685d16aa76eb7d93ed0b50aef4183e0ce77ee
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=2bf685d16aa76eb7d93ed0b50aef4183e0ce77ee
commit 2bf685d16aa76eb7d93ed0b50aef4183e0ce77ee
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-01 22:54:49 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:29:03 +0000
sctp: clear pointer to stack when returning from function.
Reported by: syzbot+04cee5d8805dfbb63c06@syzkaller.appspotmail.com
Reported by: syzbot+71e7e33dfc3cc39a6bd0@syzkaller.appspotmail.com
Reported by: syzbot+6c36fc3c1bd03ed96107@syzkaller.appspotmail.com
Reported by: syzbot+198b3751c158181c47de@syzkaller.appspotmail.com
(cherry picked from commit 39a22011bbb820b389ce8ad166f7bdce112a75cc)
---
sys/netinet/sctp_output.c | 38 ++++++++++++++++++--------------------
1 file changed, 18 insertions(+), 20 deletions(-)
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 7e5c84228ecb..39a6140fd36c 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -12991,21 +12991,21 @@ sctp_lower_sosend(struct socket *so,
SCTP_TCB_UNLOCK(stcb);
hold_tcblock = false;
error = sbwait(&so->so_snd);
- if (error || so->so_error || be.error) {
- if (error == 0) {
- if (so->so_error != 0) {
- error = so->so_error;
- }
- if (be.error != 0) {
- error = be.error;
- }
+ if (error == 0) {
+ if (so->so_error != 0) {
+ error = so->so_error;
+ }
+ if (be.error != 0) {
+ error = be.error;
}
- SOCKBUF_UNLOCK(&so->so_snd);
- goto out_unlocked;
}
SOCKBUF_UNLOCK(&so->so_snd);
SCTP_TCB_LOCK(stcb);
hold_tcblock = true;
+ stcb->block_entry = NULL;
+ if (error != 0) {
+ goto out_unlocked;
+ }
if ((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) ||
(asoc->state & SCTP_STATE_WAS_ABORTED)) {
if (asoc->state & SCTP_STATE_WAS_ABORTED) {
@@ -13019,7 +13019,6 @@ sctp_lower_sosend(struct socket *so,
}
goto out_unlocked;
}
- stcb->block_entry = NULL;
if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_BLK_LOGGING_ENABLE) {
sctp_log_block(SCTP_BLOCK_LOG_OUTOF_BLK,
asoc, asoc->total_output_queue_size);
@@ -13352,14 +13351,14 @@ skip_preblock:
SCTP_TCB_UNLOCK(stcb);
hold_tcblock = false;
error = sbwait(&so->so_snd);
- if (error || so->so_error || be.error) {
- if (error == 0) {
- if (so->so_error)
- error = so->so_error;
- if (be.error) {
- error = be.error;
- }
+ if (error == 0) {
+ if (so->so_error != 0)
+ error = so->so_error;
+ if (be.error != 0) {
+ error = be.error;
}
+ }
+ if (error != 0) {
SOCKBUF_UNLOCK(&so->so_snd);
SCTP_TCB_LOCK(stcb);
hold_tcblock = true;
@@ -13371,12 +13370,12 @@ skip_preblock:
}
goto out_unlocked;
}
-
}
SOCKBUF_UNLOCK(&so->so_snd);
if (!hold_tcblock) {
SCTP_TCB_LOCK(stcb);
hold_tcblock = true;
+ stcb->block_entry = NULL;
if ((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) ||
(asoc->state & SCTP_STATE_WAS_ABORTED)) {
if (asoc->state & SCTP_STATE_WAS_ABORTED) {
@@ -13392,7 +13391,6 @@ skip_preblock:
goto out;
}
}
- stcb->block_entry = NULL;
if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_BLK_LOGGING_ENABLE) {
sctp_log_block(SCTP_BLOCK_LOG_OUTOF_BLK,
asoc, asoc->total_output_queue_size);
From nobody Wed Feb 1 22:30:07 2023
X-Original-To: dev-commits-src-branches@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 4P6c736f4jz3cCN4;
Wed, 1 Feb 2023 22:30:07 +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 4P6c7369YZz4HFp;
Wed, 1 Feb 2023 22:30:07 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675290607;
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=Pdr5Ft3Nt0eR7uvqdWK0CjTYsWLPyzPWLkP+7CUpLUM=;
b=C0v3nMPSIFfOblMLZ9UC+C7of77vrW0OtbtBzk0ELQkkhuAvWTLnemZzOgyLgWJHNFEV1P
9YioTBPLTl6eh1VUWCrVA8iY58TP7pN2W06rZzO/9SSHW9RsIN01EvWGZrKa0t4Rh5M9o5
YrKMuwrKfpF09Lz4e7pjKo4ZbXl+e1TA+Lqs0CM2af7VIyC1OXRQr7LBoZG172rfQgiEZY
W5E9sC0V98T7LVgHKsG0sRneGVbRtGnQ1BEL1O4xzjmd0xz9d4Bk4kyosC++/DYl4/dc/+
I+/iCd5nqABokFZCiiKtvQGXXxqKf9ToOURCc00fS4L15YzsIO8j9wF74l2cKQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675290607;
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=Pdr5Ft3Nt0eR7uvqdWK0CjTYsWLPyzPWLkP+7CUpLUM=;
b=eg7pISA7PANPcHwUt8eBeWqMHxWYvfkC8K/tlYI27r19aM4AdYDlLP/Kwa6xDvVbgWF93Y
lwXuMQ6+2wL0LieWqT5tlSwbcRVADDskXvCwLw7N9YPGTMPs4wH0J0hdNnikH+9sOeHhoq
Jgz46opdftQmsx9VEPXIT/0GUbTxuo2F+zfYKu3O9Zv6lE4rQIQ2nZe+eBPEYzJppTxPpm
WklsRoguHZJ6mMqYbxmjMf/hMLfJyTqAWJq9w+ykfLV4r/vqtEvebXSJrs6Ox8Ee4oSHUG
4VmcvhiyUpYTme0sbZx3IpV4B7NFdzXiX4nITpGVC6Pvn/T3Gc3c4+iY0hiUsw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675290607; a=rsa-sha256; cv=none;
b=FXLVOYV1YQoID+/5Lvte1TfpSU8NQPRub5/yaVOYMm5gp6bm+Xdr4BQczwHCmU8odIBv3e
yldsw3VTpJRNpFH5rYv9Ry9/Te/wM350cFSABDFUlzZPv3R9nIhTaP5e3UxmjP6oluXEfi
4dnWyg4gKzrG7sTFXax6R/U0qhciO1+i36Ss8QJy5IYfpD3zTA73OG3b01fzfxv32Sxp7x
AFLFEjX07RwXyN0hSCFnwAsyKM7kPE3WPMogRxnAVgY2Z9s3Nk5B3QV8MmIj3qSdZgUQ0N
eJyGnbYlg5jsju3uLrYR7AfKEtrdqbv//kh2M+Fe5fmCDEI0Cy28z8USSegNTw==
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 4P6c735DLpzWFC;
Wed, 1 Feb 2023 22:30:07 +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 311MU7ND075889;
Wed, 1 Feb 2023 22:30:07 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MU7bO075884;
Wed, 1 Feb 2023 22:30:07 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:30:07 GMT
Message-Id: <202302012230.311MU7bO075884@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 249626cfd805 - stable/13 - sctp: remove a test, which isn't safe
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 249626cfd805e42eacd7c892d50b2bf88fc1c4b6
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=249626cfd805e42eacd7c892d50b2bf88fc1c4b6
commit 249626cfd805e42eacd7c892d50b2bf88fc1c4b6
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-02 13:09:50 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:29:43 +0000
sctp: remove a test, which isn't safe
We can't ensure the stcb is still around. This issue was found
by syzkaller.
(cherry picked from commit 0f316316200386986de7ac72cf717c13b28f387e)
---
sys/netinet/sctp_output.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 39a6140fd36c..d0cebba4335b 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -13655,11 +13655,6 @@ out_unlocked:
if (free_cnt_applied) {
atomic_subtract_int(&asoc->refcnt, 1);
}
-#ifdef INVARIANTS
- if (mtx_owned(&stcb->tcb_mtx)) {
- panic("Leaving with tcb mtx owned?");
- }
-#endif
}
if (top != NULL) {
sctp_m_freem(top);
From nobody Wed Feb 1 22:30:41 2023
X-Original-To: dev-commits-src-branches@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 4P6c7j5y54z3cCbL;
Wed, 1 Feb 2023 22:30:41 +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 4P6c7j5Wjsz4HgY;
Wed, 1 Feb 2023 22:30:41 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675290641;
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=Ks+GUyKIbDHKELf99V/ennOcV5zja4kUvel1OIu5MZk=;
b=nnAQobokiKePqItYyLfURgGJHAQ0G55KiqmbJ0oSZUAoMCplgxcxrm/LOyRiERm5HJVD/K
15VTVcP55DFBifVulnzmxVxpxkjlSfO0D/IswX2Xv11t+Dd3ROkD+H50tfCNn3wyeTgDOd
R/NPlvEJ4u1wHwXM5J47zVBBmygmlAZOiJSxkFuLd5CWD+nK0K5SZ60RJq3VZT00YtQVut
82+w5Fjw7b5jDQoEAax8Jv7fjttfbBd+1UYdQvXAzWxmzlIjOJKQjd6ulgVQk45y0B/Sq+
IB8xvZf30hTJ6J5vATLVKEttrr/p6nYsjhSa/SAonAoXJN31IvcJfsqw+vZQYg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675290641;
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=Ks+GUyKIbDHKELf99V/ennOcV5zja4kUvel1OIu5MZk=;
b=PSE3BTc3rrHm1bDmfZH0Hu8iUnNZhS8GJAbtNKZlDZk3UBcAcHZEN49gZB5J7ky195LtKS
CCyWqFEgYJuMNw4OH463JBi79KUmsKF64gVLvJep2InjBuIdkOOprpyQcRdCXJ8pUEfOHa
DArKgFwpOOZtOUV1n8MhOE3EdUtusSGsBfN4njAv+m8ETXSmAEHJlI/MFRKLXgB452TpF2
PoW6Bpxb7LNlfPTxozP3g4NRDYkOFjrhrZ0rN4kgyaXYgO1G5ojpQ809ci1T3TC2xPN/JE
IgXBGw7gDBzv10CKeiB+Me6pznkT89m8Jwy1aVemzEPVeIveHgChP8wGXX/52Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675290641; a=rsa-sha256; cv=none;
b=wlM5YelOuX8P0tMu+rSLgy8hJ7fJXluKnjA3joqJM48AeqNuj2aOXfq+CGRNiF2RYbPxE7
OuCXIrVJ0/glpzUP0AHUBaD1ShxbYvg6Xv65mOgmLFmV8GX6aMNTTY2U89KofLNNSJBVD9
al48iOcxJhTmrVv6DUXp9J/8LP/bhBsdXagzhKxarigv8ns1qG6LVMFFmeiNgxK9NHkAHN
bq3fX0m05MbmQqy3vsRv6sQhPEL9tznap6JiZfduxnPuIbBLzIXQ2ADyCCIdV4tHR1EkZ0
rEA7ML/skTMhwE8WzeMjx+0gaTCVlsZkoodlhAqDJkIwnl3+hQSXZIou4ACW/w==
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 4P6c7j4czHzWFF;
Wed, 1 Feb 2023 22:30:41 +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 311MUf4g082230;
Wed, 1 Feb 2023 22:30:41 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MUfMQ082229;
Wed, 1 Feb 2023 22:30:41 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:30:41 GMT
Message-Id: <202302012230.311MUfMQ082229@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 108d740adff2 - stable/13 - sctp: cleanup, no functional change
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 108d740adff29f694a023e427966454a7211f270
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=108d740adff29f694a023e427966454a7211f270
commit 108d740adff29f694a023e427966454a7211f270
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-02 21:02:16 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:30:21 +0000
sctp: cleanup, no functional change
(cherry picked from commit b30b7a140c527c023f97083c256715ea86d4b6f4)
---
sys/netinet/sctp_output.c | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index d0cebba4335b..3458da7e0578 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -13358,21 +13358,7 @@ skip_preblock:
error = be.error;
}
}
- if (error != 0) {
- SOCKBUF_UNLOCK(&so->so_snd);
- SCTP_TCB_LOCK(stcb);
- hold_tcblock = true;
- stcb->block_entry = NULL;
- if (((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0) &&
- ((asoc->state & SCTP_STATE_WAS_ABORTED) == 0) &&
- (sp != NULL)) {
- sp->processing = 0;
- }
- goto out_unlocked;
- }
- }
- SOCKBUF_UNLOCK(&so->so_snd);
- if (!hold_tcblock) {
+ SOCKBUF_UNLOCK(&so->so_snd);
SCTP_TCB_LOCK(stcb);
hold_tcblock = true;
stcb->block_entry = NULL;
@@ -13388,8 +13374,16 @@ skip_preblock:
} else {
error = ENOTCONN;
}
- goto out;
+ goto out_unlocked;
+ }
+ if (error != 0) {
+ if (sp != NULL) {
+ sp->processing = 0;
+ }
+ goto out_unlocked;
}
+ } else {
+ SOCKBUF_UNLOCK(&so->so_snd);
}
if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_BLK_LOGGING_ENABLE) {
sctp_log_block(SCTP_BLOCK_LOG_OUTOF_BLK,
From nobody Wed Feb 1 22:31:17 2023
X-Original-To: dev-commits-src-branches@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 4P6c8P651dz3cCh0;
Wed, 1 Feb 2023 22:31:17 +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 4P6c8P5V3rz4HtQ;
Wed, 1 Feb 2023 22:31:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675290677;
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=4d7NFGtbufCORv2X/z9X9bdwH3+cfwHhe4H2J4zcIO4=;
b=YYwImdd0jV2kHlN//OPSflj9I0IbncGzYrlUUshkJWQ9EYRecJYTvsr9fU+LSF8AgNE9hr
qD1PLGPaCQazSrceoa5wJF9gagsDSHjkNTMpfBaZhlc0zKZP0f9iDPLSxb6LfE0oJOqQEj
gZMqZwL0wUzWnfzSG0h8tcmLW519oSEm0H32Y9vNHcJY2D+AgOB0Yr2meMJWei6TdqPino
2GRosKID0H8GIxfWLV2IWwndsKgXglIaU/TomBVT84B8LzWsAe//Yyb2NjSbjBHma+ZNj+
zdHdWrPJCI2Pt/qSVE8mY41vrEjaZMTI/RQ1solCfT2pzjgjlxTsuDjlw1zP3g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675290677;
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=4d7NFGtbufCORv2X/z9X9bdwH3+cfwHhe4H2J4zcIO4=;
b=kX0NlzCMHqZspd4nctfJbRzVj4/032cQMw/m4EoZGlGZ54BK1oR30Qn9gZiyp5ABRDYb9R
b/BanbJ5EBpXY7D+S2//ZBLA+v/yWx3F4NhhkrWtp6+MRP9v54GNE1Gqw9sHtCm+VT1vaF
bsi4PKSG+ezQCc00S136JY2qjQ+n8/ESWFzEs9mOkGkMHmIzoAIdrJtAui5GqW4+DFhSsu
ULTn5UhVRyzI9iax3ss3jq5Y9+Q42ZmDfxGXy2vsrQAE/XK5/qQEX22qIRjblDKLGuE6hd
i6viGIcnyaCqzFKu/YG3oB3F+CgqZGw36OGo6wAXH/5m4qMZ8EsuEWSSIxe/vw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675290677; a=rsa-sha256; cv=none;
b=rnjhJ4WzpRcAefpUbjP04Of8yN9wnSofEZdUbjRIywsxRvV0Q401vTTID+FMDJmdSwkzzC
TvfgrH4r14DcPJ8RWjmn56swhAdgDUUjN2G2MU/DsEknHo5o+XRaGeyWniKMKp104f41Xp
bOIKYw+dfkHj9JBduaF74YctRXD2UdzuVk0TzyprjD5C54kO9qdljdeyWEF7aQp3zSOQZH
Qx1LPCTply2KVmVI56wgtS3Gp6C+C5qAaBbFp3ULCpii16dMju7X/6fF/30wLY8lKn1u87
gVBkeAbdD2iKAnpa3K7eSNkqXJXzYsfnobSKsObpG6ZonFMs8pncOMJAJJhz7w==
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 4P6c8P4Xf1zWcB;
Wed, 1 Feb 2023 22:31:17 +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 311MVHQI082459;
Wed, 1 Feb 2023 22:31:17 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MVHLt082458;
Wed, 1 Feb 2023 22:31:17 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:31:17 GMT
Message-Id: <202302012231.311MVHLt082458@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 2f4109acd8bc - stable/13 - sctp: don't refer to a potentially outdated stream
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 2f4109acd8bc705ece55117a4f421a8a2bbf0b56
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=2f4109acd8bc705ece55117a4f421a8a2bbf0b56
commit 2f4109acd8bc705ece55117a4f421a8a2bbf0b56
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-02 21:26:27 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:30:56 +0000
sctp: don't refer to a potentially outdated stream
Reported by: syzbot+1593381019112e5bb35c@syzkaller.appspotmail.com
(cherry picked from commit 52106f072fd06890fd50ce1a232cbf522ae2155c)
---
sys/netinet/sctp_output.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 3458da7e0578..63310a6cc48b 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -13399,6 +13399,8 @@ skip_preblock:
KASSERT((asoc->state & SCTP_STATE_WAS_ABORTED) == 0,
("Association was aborted"));
+ /* The out streams might be reallocated. */
+ strm = &asoc->strmout[srcv->sinfo_stream];
if (sp != NULL) {
if (sp->msg_is_complete == 0) {
strm->last_msg_incomplete = 1;
From nobody Wed Feb 1 22:33:08 2023
X-Original-To: dev-commits-src-branches@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 4P6cBX3RtDz3cCnV;
Wed, 1 Feb 2023 22:33:08 +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 4P6cBX2fV5z4JNG;
Wed, 1 Feb 2023 22:33:08 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675290788;
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=NEpdDxSVVSUhDE5p9667BiS+ZceMf2w9MOMr2ofpyiI=;
b=J3VLDWkdgOb08vgUjdR+y8jam7zNuRXlc0OtP87KlpUki6pCrQT+4SkxJz8/lJWLx3956v
NSO3krh88hWYFQNTBPxJRiEdMKO9jJ+hHba3cbXDQ1jSfLzOeeVSyKrsbWcpZUvpZqq7Xz
fzo6Bgi+msJ1/FQq7NDJezqpnl+Q7m9Weroke8b9AQKG5tyZK0kycABhyY7Qanqt+ti7UA
jYQClECJh6LKefSNot0qcx+BVw1dPZEGEqD55GNvChxQUM+qRYyZKGWoGoKKL71h8PBvoQ
KNZlgVbyOgYMR4DobVF2yGk4B1l5Vprmht9OJrwShrs7OSfYs0v8Ixs30V0smQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675290788;
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=NEpdDxSVVSUhDE5p9667BiS+ZceMf2w9MOMr2ofpyiI=;
b=VS+5kDnl4YfJ6y57umh6hGxIdVeKDVvw8otcKzfGfn/DwJ7CiXfPVX2Kb3Hs3WNzeSgP0j
pmgRKMqajKQDXb4T8SWq8MwsDU2A9exmW+veYdESPYyhpOllgju9ve5xWovKK2jQvWuZex
MTw3S4zFy860qOHbBcumWgTxD9CDJsPA0xKYxCnx8ps+J4Wxm9X3+1dsbcFi8Hx+QDu3Il
0iaKiJFiQCxyiQyxNVkAb+mf9h/qGKpMwXWP0gBZD+lhKagbk6XWzhbnJ05zpoBOwfSI4h
TiUvTEUCfMr5opu1Gun5y3qqXANpoCQFxvHDgmVOjJcDForRBKymBxLTfRa4vg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675290788; a=rsa-sha256; cv=none;
b=bq2cG5VTJ6NGwWCRpEikXrWwXJyBH92mgoivaD7yhSLIaG8jES8FxnotVFf0X1zZTATdSN
44UAXqC0MuozCBW2zZoqOL3kfODo36i7R0beUgbez8abQag4Mduzuqf/h/IW1bIL6CeeLn
Wrumpn4RHWataAOlQni43OdTcaxbxEpZZ/CBNz17IIlrxThjxEKddoeYAG0+YnQXpgaJDM
RdB8K3Nz0/EUOKnp9LLpIBmsNQSKNho0F9BcA4h9G/knDpF8C9Tg0N1UI/3wEKfg/Rl5OR
PdUB1OmNdSsuYKHJjUd0gIhDSBCSHqbC4Uldji70lfKmcMIyZ+9wZ6iZUzV1CQ==
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 4P6cBX1jjZzWfN;
Wed, 1 Feb 2023 22:33:08 +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 311MX8A8086809;
Wed, 1 Feb 2023 22:33:08 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MX8qE086808;
Wed, 1 Feb 2023 22:33:08 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:33:08 GMT
Message-Id: <202302012233.311MX8qE086808@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: e2a7bfb44413 - stable/13 - sctp: use variable names in a consistent way
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: e2a7bfb44413f14f7a8082961cffc516be391788
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=e2a7bfb44413f14f7a8082961cffc516be391788
commit e2a7bfb44413f14f7a8082961cffc516be391788
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-07 15:51:31 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:32:42 +0000
sctp: use variable names in a consistent way
No functional change intended.
(cherry picked from commit 3c3d77bdff6bbb71368fd2b34c32b1ef03421000)
---
sys/netinet/sctp_pcb.c | 150 ++++++++++++++++++++++++-------------------------
1 file changed, 75 insertions(+), 75 deletions(-)
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index ac6f76bc7d7d..9d9760bd0e86 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -3318,7 +3318,7 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from)
* freeing. a) Any local lists. b) Any associations. c) The hash of
* all associations. d) finally the ep itself.
*/
- struct sctp_tcb *asoc, *nasoc;
+ struct sctp_tcb *stcb, *nstcb;
struct sctp_laddr *laddr, *nladdr;
struct inpcb *ip_pcb;
struct socket *so;
@@ -3369,28 +3369,28 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from)
int cnt_in_sd;
cnt_in_sd = 0;
- LIST_FOREACH_SAFE(asoc, &inp->sctp_asoc_list, sctp_tcblist, nasoc) {
- SCTP_TCB_LOCK(asoc);
- if (asoc->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) {
- asoc->sctp_socket = NULL;
+ LIST_FOREACH_SAFE(stcb, &inp->sctp_asoc_list, sctp_tcblist, nstcb) {
+ SCTP_TCB_LOCK(stcb);
+ if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) {
+ stcb->sctp_socket = NULL;
/* Skip guys being freed */
cnt_in_sd++;
- if (asoc->asoc.state & SCTP_STATE_IN_ACCEPT_QUEUE) {
+ if (stcb->asoc.state & SCTP_STATE_IN_ACCEPT_QUEUE) {
/*
* Special case - we did not start a
* kill timer on the asoc due to it
* was not closed. So go ahead and
* start it now.
*/
- SCTP_CLEAR_SUBSTATE(asoc, SCTP_STATE_IN_ACCEPT_QUEUE);
- sctp_timer_start(SCTP_TIMER_TYPE_ASOCKILL, inp, asoc, NULL);
+ SCTP_CLEAR_SUBSTATE(stcb, SCTP_STATE_IN_ACCEPT_QUEUE);
+ sctp_timer_start(SCTP_TIMER_TYPE_ASOCKILL, inp, stcb, NULL);
}
- SCTP_TCB_UNLOCK(asoc);
+ SCTP_TCB_UNLOCK(stcb);
continue;
}
- if (((SCTP_GET_STATE(asoc) == SCTP_STATE_COOKIE_WAIT) ||
- (SCTP_GET_STATE(asoc) == SCTP_STATE_COOKIE_ECHOED)) &&
- (asoc->asoc.total_output_queue_size == 0)) {
+ if (((SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_WAIT) ||
+ (SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_ECHOED)) &&
+ (stcb->asoc.total_output_queue_size == 0)) {
/*
* If we have data in queue, we don't want
* to just free since the app may have done,
@@ -3398,99 +3398,99 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from)
* it wants the data to get across first.
*/
/* Just abandon things in the front states */
- if (sctp_free_assoc(inp, asoc, SCTP_PCBFREE_NOFORCE,
+ if (sctp_free_assoc(inp, stcb, SCTP_PCBFREE_NOFORCE,
SCTP_FROM_SCTP_PCB + SCTP_LOC_2) == 0) {
cnt_in_sd++;
}
continue;
}
/* Disconnect the socket please */
- asoc->sctp_socket = NULL;
- SCTP_ADD_SUBSTATE(asoc, SCTP_STATE_CLOSED_SOCKET);
- if ((asoc->asoc.size_on_reasm_queue > 0) ||
- (asoc->asoc.control_pdapi) ||
- (asoc->asoc.size_on_all_streams > 0) ||
+ stcb->sctp_socket = NULL;
+ SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_CLOSED_SOCKET);
+ if ((stcb->asoc.size_on_reasm_queue > 0) ||
+ (stcb->asoc.control_pdapi) ||
+ (stcb->asoc.size_on_all_streams > 0) ||
(so && (so->so_rcv.sb_cc > 0))) {
/* Left with Data unread */
struct mbuf *op_err;
op_err = sctp_generate_cause(SCTP_CAUSE_USER_INITIATED_ABT, "");
- asoc->sctp_ep->last_abort_code = SCTP_FROM_SCTP_PCB + SCTP_LOC_3;
- sctp_send_abort_tcb(asoc, op_err, SCTP_SO_LOCKED);
+ stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_PCB + SCTP_LOC_3;
+ sctp_send_abort_tcb(stcb, op_err, SCTP_SO_LOCKED);
SCTP_STAT_INCR_COUNTER32(sctps_aborted);
- if ((SCTP_GET_STATE(asoc) == SCTP_STATE_OPEN) ||
- (SCTP_GET_STATE(asoc) == SCTP_STATE_SHUTDOWN_RECEIVED)) {
+ if ((SCTP_GET_STATE(stcb) == SCTP_STATE_OPEN) ||
+ (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_RECEIVED)) {
SCTP_STAT_DECR_GAUGE32(sctps_currestab);
}
- if (sctp_free_assoc(inp, asoc,
+ if (sctp_free_assoc(inp, stcb,
SCTP_PCBFREE_NOFORCE, SCTP_FROM_SCTP_PCB + SCTP_LOC_4) == 0) {
cnt_in_sd++;
}
continue;
- } else if (TAILQ_EMPTY(&asoc->asoc.send_queue) &&
- TAILQ_EMPTY(&asoc->asoc.sent_queue) &&
- (asoc->asoc.stream_queue_cnt == 0)) {
- if ((*asoc->asoc.ss_functions.sctp_ss_is_user_msgs_incomplete) (asoc, &asoc->asoc)) {
+ } else if (TAILQ_EMPTY(&stcb->asoc.send_queue) &&
+ TAILQ_EMPTY(&stcb->asoc.sent_queue) &&
+ (stcb->asoc.stream_queue_cnt == 0)) {
+ if ((*stcb->asoc.ss_functions.sctp_ss_is_user_msgs_incomplete) (stcb, &stcb->asoc)) {
goto abort_anyway;
}
- if ((SCTP_GET_STATE(asoc) != SCTP_STATE_SHUTDOWN_SENT) &&
- (SCTP_GET_STATE(asoc) != SCTP_STATE_SHUTDOWN_ACK_SENT)) {
+ if ((SCTP_GET_STATE(stcb) != SCTP_STATE_SHUTDOWN_SENT) &&
+ (SCTP_GET_STATE(stcb) != SCTP_STATE_SHUTDOWN_ACK_SENT)) {
struct sctp_nets *netp;
/*
* there is nothing queued to send,
* so I send shutdown
*/
- if ((SCTP_GET_STATE(asoc) == SCTP_STATE_OPEN) ||
- (SCTP_GET_STATE(asoc) == SCTP_STATE_SHUTDOWN_RECEIVED)) {
+ if ((SCTP_GET_STATE(stcb) == SCTP_STATE_OPEN) ||
+ (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_RECEIVED)) {
SCTP_STAT_DECR_GAUGE32(sctps_currestab);
}
- SCTP_SET_STATE(asoc, SCTP_STATE_SHUTDOWN_SENT);
- sctp_stop_timers_for_shutdown(asoc);
- if (asoc->asoc.alternate) {
- netp = asoc->asoc.alternate;
+ SCTP_SET_STATE(stcb, SCTP_STATE_SHUTDOWN_SENT);
+ sctp_stop_timers_for_shutdown(stcb);
+ if (stcb->asoc.alternate) {
+ netp = stcb->asoc.alternate;
} else {
- netp = asoc->asoc.primary_destination;
+ netp = stcb->asoc.primary_destination;
}
- sctp_send_shutdown(asoc, netp);
- sctp_timer_start(SCTP_TIMER_TYPE_SHUTDOWN, asoc->sctp_ep, asoc,
+ sctp_send_shutdown(stcb, netp);
+ sctp_timer_start(SCTP_TIMER_TYPE_SHUTDOWN, stcb->sctp_ep, stcb,
netp);
- sctp_timer_start(SCTP_TIMER_TYPE_SHUTDOWNGUARD, asoc->sctp_ep, asoc, NULL);
- sctp_chunk_output(inp, asoc, SCTP_OUTPUT_FROM_SHUT_TMR, SCTP_SO_LOCKED);
+ sctp_timer_start(SCTP_TIMER_TYPE_SHUTDOWNGUARD, stcb->sctp_ep, stcb, NULL);
+ sctp_chunk_output(inp, stcb, SCTP_OUTPUT_FROM_SHUT_TMR, SCTP_SO_LOCKED);
}
} else {
/* mark into shutdown pending */
- SCTP_ADD_SUBSTATE(asoc, SCTP_STATE_SHUTDOWN_PENDING);
- sctp_timer_start(SCTP_TIMER_TYPE_SHUTDOWNGUARD, asoc->sctp_ep, asoc, NULL);
- if ((*asoc->asoc.ss_functions.sctp_ss_is_user_msgs_incomplete) (asoc, &asoc->asoc)) {
- SCTP_ADD_SUBSTATE(asoc, SCTP_STATE_PARTIAL_MSG_LEFT);
+ SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_SHUTDOWN_PENDING);
+ sctp_timer_start(SCTP_TIMER_TYPE_SHUTDOWNGUARD, stcb->sctp_ep, stcb, NULL);
+ if ((*stcb->asoc.ss_functions.sctp_ss_is_user_msgs_incomplete) (stcb, &stcb->asoc)) {
+ SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_PARTIAL_MSG_LEFT);
}
- if (TAILQ_EMPTY(&asoc->asoc.send_queue) &&
- TAILQ_EMPTY(&asoc->asoc.sent_queue) &&
- (asoc->asoc.state & SCTP_STATE_PARTIAL_MSG_LEFT)) {
+ if (TAILQ_EMPTY(&stcb->asoc.send_queue) &&
+ TAILQ_EMPTY(&stcb->asoc.sent_queue) &&
+ (stcb->asoc.state & SCTP_STATE_PARTIAL_MSG_LEFT)) {
struct mbuf *op_err;
abort_anyway:
op_err = sctp_generate_cause(SCTP_CAUSE_USER_INITIATED_ABT, "");
- asoc->sctp_ep->last_abort_code = SCTP_FROM_SCTP_PCB + SCTP_LOC_5;
- sctp_send_abort_tcb(asoc, op_err, SCTP_SO_LOCKED);
+ stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_PCB + SCTP_LOC_5;
+ sctp_send_abort_tcb(stcb, op_err, SCTP_SO_LOCKED);
SCTP_STAT_INCR_COUNTER32(sctps_aborted);
- if ((SCTP_GET_STATE(asoc) == SCTP_STATE_OPEN) ||
- (SCTP_GET_STATE(asoc) == SCTP_STATE_SHUTDOWN_RECEIVED)) {
+ if ((SCTP_GET_STATE(stcb) == SCTP_STATE_OPEN) ||
+ (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_RECEIVED)) {
SCTP_STAT_DECR_GAUGE32(sctps_currestab);
}
- if (sctp_free_assoc(inp, asoc,
+ if (sctp_free_assoc(inp, stcb,
SCTP_PCBFREE_NOFORCE,
SCTP_FROM_SCTP_PCB + SCTP_LOC_6) == 0) {
cnt_in_sd++;
}
continue;
} else {
- sctp_chunk_output(inp, asoc, SCTP_OUTPUT_FROM_CLOSING, SCTP_SO_LOCKED);
+ sctp_chunk_output(inp, stcb, SCTP_OUTPUT_FROM_CLOSING, SCTP_SO_LOCKED);
}
}
cnt_in_sd++;
- SCTP_TCB_UNLOCK(asoc);
+ SCTP_TCB_UNLOCK(stcb);
}
/* now is there some left in our SHUTDOWN state? */
if (cnt_in_sd) {
@@ -3520,41 +3520,41 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from)
* have a contest on the INP lock.. which would cause us to die ...
*/
cnt = 0;
- LIST_FOREACH_SAFE(asoc, &inp->sctp_asoc_list, sctp_tcblist, nasoc) {
- SCTP_TCB_LOCK(asoc);
+ LIST_FOREACH_SAFE(stcb, &inp->sctp_asoc_list, sctp_tcblist, nstcb) {
+ SCTP_TCB_LOCK(stcb);
if (immediate != SCTP_FREE_SHOULD_USE_GRACEFUL_CLOSE) {
/* Disconnect the socket please */
- asoc->sctp_socket = NULL;
- SCTP_ADD_SUBSTATE(asoc, SCTP_STATE_CLOSED_SOCKET);
+ stcb->sctp_socket = NULL;
+ SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_CLOSED_SOCKET);
}
- if (asoc->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) {
- if (asoc->asoc.state & SCTP_STATE_IN_ACCEPT_QUEUE) {
- SCTP_CLEAR_SUBSTATE(asoc, SCTP_STATE_IN_ACCEPT_QUEUE);
- sctp_timer_start(SCTP_TIMER_TYPE_ASOCKILL, inp, asoc, NULL);
+ if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) {
+ if (stcb->asoc.state & SCTP_STATE_IN_ACCEPT_QUEUE) {
+ SCTP_CLEAR_SUBSTATE(stcb, SCTP_STATE_IN_ACCEPT_QUEUE);
+ sctp_timer_start(SCTP_TIMER_TYPE_ASOCKILL, inp, stcb, NULL);
}
cnt++;
- SCTP_TCB_UNLOCK(asoc);
+ SCTP_TCB_UNLOCK(stcb);
continue;
}
/* Free associations that are NOT killing us */
- if ((SCTP_GET_STATE(asoc) != SCTP_STATE_COOKIE_WAIT) &&
- ((asoc->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0)) {
+ if ((SCTP_GET_STATE(stcb) != SCTP_STATE_COOKIE_WAIT) &&
+ ((stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0)) {
struct mbuf *op_err;
op_err = sctp_generate_cause(SCTP_CAUSE_USER_INITIATED_ABT, "");
- asoc->sctp_ep->last_abort_code = SCTP_FROM_SCTP_PCB + SCTP_LOC_7;
- sctp_send_abort_tcb(asoc, op_err, SCTP_SO_LOCKED);
+ stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_PCB + SCTP_LOC_7;
+ sctp_send_abort_tcb(stcb, op_err, SCTP_SO_LOCKED);
SCTP_STAT_INCR_COUNTER32(sctps_aborted);
- } else if (asoc->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) {
+ } else if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) {
cnt++;
- SCTP_TCB_UNLOCK(asoc);
+ SCTP_TCB_UNLOCK(stcb);
continue;
}
- if ((SCTP_GET_STATE(asoc) == SCTP_STATE_OPEN) ||
- (SCTP_GET_STATE(asoc) == SCTP_STATE_SHUTDOWN_RECEIVED)) {
+ if ((SCTP_GET_STATE(stcb) == SCTP_STATE_OPEN) ||
+ (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_RECEIVED)) {
SCTP_STAT_DECR_GAUGE32(sctps_currestab);
}
- if (sctp_free_assoc(inp, asoc, SCTP_PCBFREE_FORCE,
+ if (sctp_free_assoc(inp, stcb, SCTP_PCBFREE_FORCE,
SCTP_FROM_SCTP_PCB + SCTP_LOC_8) == 0) {
cnt++;
}
@@ -3664,9 +3664,9 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from)
#ifdef SCTP_TRACK_FREED_ASOCS
/* TEMP CODE */
- LIST_FOREACH_SAFE(asoc, &inp->sctp_asoc_free_list, sctp_tcblist, nasoc) {
- LIST_REMOVE(asoc, sctp_tcblist);
- SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_asoc), asoc);
+ LIST_FOREACH_SAFE(stcb, &inp->sctp_asoc_free_list, sctp_tcblist, nstcb) {
+ LIST_REMOVE(stcb, sctp_tcblist);
+ SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_asoc), stcb);
SCTP_DECR_ASOC_COUNT();
}
/* *** END TEMP CODE *** */
From nobody Wed Feb 1 22:33:50 2023
X-Original-To: dev-commits-src-branches@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 4P6cCL5Kj0z3cCjb;
Wed, 1 Feb 2023 22:33:50 +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 4P6cCL4sv5z4JmV;
Wed, 1 Feb 2023 22:33:50 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675290830;
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=jnBeRpYqRDSZqn/Nnc968azHi2B5J/lgaSwGC0GsR8w=;
b=PMyDbhsfE12jHISGAHehygrHj0ScW2FqMz54Fkl4R0dv36RvBOoMjGaCk1FmmFlUJ/PO34
qcWZiEpwg3gEPnC56q3DJFiCwOtu69SudgU/vm7hom6Lgheipy1GfVqu1AdWQYhTJFTR85
fPmMjF7p0nanHDuUpxPgEMJYaMuDs+KIwGophQu3LlAlpqKgzSiw4keiCfu32hMJ5i/yMv
3iEGSmqZQTTmR/qyjjcxsceiTt67imyQ5Vgb+NvydQxTD+uUYbJTaHDL+bnXhTvM+qcGsM
lhIgGQdRrEHXrbGooEFCpDDj+B2WFnFTwewoaFNRy+8cRe/lZ8fifIZBVpJTyw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675290830;
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=jnBeRpYqRDSZqn/Nnc968azHi2B5J/lgaSwGC0GsR8w=;
b=fKe0Gi9EwSF/v2FtzrU2ZPP0NqTMlteJqKw8CTEsbGDcWn+b7/Qo1G06alfen3JZrhRggh
uVPwl28eIOt0Rm+5jHzfG2C1EJIb/F8hK8faUsLSqfxTTUhSObhb7ngOK/oVxJ1uvHuQN/
Qc06FL4KvP8Qz/5UamhoQgts92JSz6Vv8+RxPWhWQM62fQJqkIaH/7bVB0JR15yruJuCSq
XGwk1JpUC4nzeOHquOwWO71eKguHudUfTmTHqw3mliSiZwCYCv6CYRd1YCSOG6IcqyH12d
u74Wju/x3LwLxtcc7YHZAXr6EIwtIaW/0JF2NLE7sbawUC6EQYC8cw6IODslzw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675290830; a=rsa-sha256; cv=none;
b=CXXOy3+5qP//hCVgfFG/kDTvssIRBcJ0xYFh3fotX+enziL7jj7A7GFd97rzAHQzJnALU8
tQJM9hqVV8jHiDhg3/SR6P9qjf2uaJdtngCrcPCPeSIpMC3n+/MWUPFY08DVik1a6PP5un
IFejsGMcu2CZ4lYRU9INa3VBT1LgG1RMxgHqPxQiZN5yBqAOkIEG+rizR90X4UwB4IDPQs
64XrmRcSra4YvskZZR6qa+wsin+cw5HIjwB3zUxP+7jsZ3iKSd0w+JDoNrHBEYQdZPfLyX
Zq7WaeOTlsThVAS7liOuN5HXxpXwlcRVtCYXZhUibEhPXdjQSE314LFAdBFyjA==
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 4P6cCL3w7GzWck;
Wed, 1 Feb 2023 22:33:50 +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 311MXo9r087031;
Wed, 1 Feb 2023 22:33:50 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MXoH6087030;
Wed, 1 Feb 2023 22:33:50 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:33:50 GMT
Message-Id: <202302012233.311MXoH6087030@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 07663e93480f - stable/13 - sctp: remove a mutex not used anymore
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 07663e93480f445454480d53ff8647fbffbe2f97
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=07663e93480f445454480d53ff8647fbffbe2f97
commit 07663e93480f445454480d53ff8647fbffbe2f97
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-07 15:54:57 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:33:25 +0000
sctp: remove a mutex not used anymore
(cherry picked from commit d7224a53b392ec6e230749d9fb42d8826d305d08)
---
sys/netinet/sctp_pcb.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h
index adbecf9bd00f..736b0f9d54e9 100644
--- a/sys/netinet/sctp_pcb.h
+++ b/sys/netinet/sctp_pcb.h
@@ -465,7 +465,6 @@ struct sctp_tcb {
uint16_t rport; /* remote port in network format */
uint16_t resv;
struct mtx tcb_mtx;
- struct mtx tcb_send_mtx;
};
#include <netinet/sctp_lock_bsd.h>
From nobody Wed Feb 1 22:34:28 2023
X-Original-To: dev-commits-src-branches@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 4P6cD508pNz3cCjh;
Wed, 1 Feb 2023 22:34:29 +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 4P6cD46n0vz4K6Z;
Wed, 1 Feb 2023 22:34:28 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675290869;
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=UhvzvVpkFpFTne2G3Ig10wBX4FDlPZc3BDmD8q3xCqE=;
b=R/uCZ6iwyelvsXh/ot+hewMWmEBElr9tXwbew/zinRDGLqgyGQOqL0qqHNYGVAQagH/F04
epG8O5IR6hrcGVN8ZJM1mxmxrXHDEWdEfdwDlotDJ6xGXbEzJhQIyqVdUQ1zKTK0APPYtl
9KPfvCIf3HLnbHs53eUnOZtEy3QoywmRtKbJavbXnfiuRC1lptgwVnX/jY3XZKv7Em2PJF
V65KE8FCCLnUD88rOyJ+QS4QP44ohJpwmxVzSOwfulxayx5A1onvO/8G7lyryXAMtQUtfc
ffRmlefkkrrQhrHRtlINlgKEvypRl3krFl9I4gs05Za6Li++yclo0V3YnEe7xQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675290868;
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=UhvzvVpkFpFTne2G3Ig10wBX4FDlPZc3BDmD8q3xCqE=;
b=gh4e6pIfHsg4xMaUeqS+OcNOiKOcrdV8p46Y1itUPZIV14OCRUUO+3D9oZd734Jy9knQFi
wazFJBexLtjyMUu3HzNQ30XJHAjn+gFC19NJligUfgZFcf6oU5QCdb+0gjCHMZsuHmF9IM
9DuqZIey8vQ4EUWtySCE4g9frXfzulQdqCRruoLmoPsck9wset2xq0pCIb/XYMevHWSUL1
1pygETHm+ARxlmI4h8yvtOOh4z0X31ua28o2uAkCJxCVjdqDyI4QQB+T4fKulvFN5hesgi
5lsJ4oQajGEtGFnyZ/YRdmVdRzCSeitjE+htCIzGYWWnAanNamCoUJmZYbeRaA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675290868; a=rsa-sha256; cv=none;
b=Q+fGcZjVXBb2FUFAsHy5GJDmSHk8NFFmtcOa6P2qvESdaMzxyShT/T5AMcsEtWYMTbkVvK
j83tSTWyjq5+A994HYECrvdBYzvszSMd0RTfdP/SwVhqkAT7s1rIOGZhw8UdzOA9e1yX8K
+/tnm9MZBRWQCxbLVab++Ff4UDvDl40lyaQreEIIwUEaR18i199pQg7Bk+wpXg894ukBTV
+lqz6qfQlvlQP7MW54lxuboKSZv69ggq4s+jNOQnGZtC0RQpP1BCnCqTLEQhTRAztF4OMO
ailZ+fuUhjGsxMjxK/Ep9jipNcpMQMDs6PiDud+cLiXA/ACAVOQDvDvgqAturg==
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 4P6cD45qWGzWSb;
Wed, 1 Feb 2023 22:34:28 +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 311MYSJF087256;
Wed, 1 Feb 2023 22:34:28 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MYS7q087255;
Wed, 1 Feb 2023 22:34:28 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:34:28 GMT
Message-Id: <202302012234.311MYS7q087255@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 40a79f26978b - stable/13 - sctp: fix parameter type in NAT status message
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 40a79f26978b54f48955c7f208c5c34ab28969d7
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=40a79f26978b54f48955c7f208c5c34ab28969d7
commit 40a79f26978b54f48955c7f208c5c34ab28969d7
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-13 17:46:28 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:34:05 +0000
sctp: fix parameter type in NAT status message
Thanks to Sriram Yagnaraman for providing the patch for the
userland stack.
(cherry picked from commit 595ac4a11893971ba17a51e0477d580e29e1ef7a)
---
sys/netinet/sctp_asconf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/netinet/sctp_asconf.c b/sys/netinet/sctp_asconf.c
index a4457471410e..675530c65fb6 100644
--- a/sys/netinet/sctp_asconf.c
+++ b/sys/netinet/sctp_asconf.c
@@ -3336,7 +3336,7 @@ out:
aa_add->ap.addrp.ph.param_type = SCTP_IPV4_ADDRESS;
aa_add->ap.addrp.ph.param_length = sizeof(struct sctp_ipv4addr_param);
/* No need to fill the address, we are using 0.0.0.0 */
- aa_del->ap.aph.ph.param_type = SCTP_ADD_IP_ADDRESS;
+ aa_del->ap.aph.ph.param_type = SCTP_DEL_IP_ADDRESS;
aa_del->ap.aph.ph.param_length = sizeof(struct sctp_asconf_addrv4_param);
aa_del->ap.addrp.ph.param_type = SCTP_IPV4_ADDRESS;
aa_del->ap.addrp.ph.param_length = sizeof(struct sctp_ipv4addr_param);
From nobody Wed Feb 1 22:39:30 2023
X-Original-To: dev-commits-src-branches@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 4P6cKv1hK9z3cDWv;
Wed, 1 Feb 2023 22:39:31 +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 4P6cKv11gDz4KHS;
Wed, 1 Feb 2023 22:39:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675291171;
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=NUH9rgeLatwyVia5IvSWL2vnwSJemxXI/Ci1NGI0nkU=;
b=W9Pt3AVrA+P6EKkbo3O+9t6zxdHxzeSCNqM74/mnVe7G72vjWGNWje/9xeXxip/DByoUKs
4eti8ODI40CSQHQZWmnOVH34L0EEJ7v3m8Qiral5dkJIIWwMQ1t2oI28aZvzrwhFVLyWUl
DmqUypYl/yVWGiUddPTjXfjL4MJxqSVr2WwDVJEKjlrv4EvbP2xhQw6LZjwK70At3av7gZ
dN+s3XjboDR62vK8dTgmBydxd7gNdVp71NIfM8bZlggqFsuVXxohw1Txzvq0lohLZ6Jb9t
hrUVKXP6wyQcJir4cy4T6tgc2eozR1U5uzbxhZC/1Ud8S19Q/l7bSs/3Vo7wnQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675291171;
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=NUH9rgeLatwyVia5IvSWL2vnwSJemxXI/Ci1NGI0nkU=;
b=pDzScJDzRDQwvM68nXMD/WmdZxeH1epmM8Kk3PQSk+uzcaCvjyfiREVFCBHjWYYOLHS1qY
5FcWPbCl92kWTsnRaOsMHjYdUMYQGW5jZpb5RMMLdnZ7oOO5r2YAThFGl2hSrOuhoUmkc9
v8zeghTvXAEpB+Oq4wxSLPv4NvaQuyZUHTZzukWWxTW8zbNG74jahxjKoS2bdEW5GswUux
81BV+5ALcTZCmVfPodFwecF2ZU+845M5y1m4lyh9a1cWz+dDLgXIr8ikMAAyUHeZhy3HmU
weDQfUuWM48WfH2kQ9drzXCTd+WC1xmFQZIkXCJ3+NFhlsWVigHa2a4n4820zg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291171; a=rsa-sha256; cv=none;
b=q1DM8qOeg0srF2K3BiKfsxYBaZI4ad1nWxA0Bc923veuHNmf15JQKOJv0uqBJQZ94QJDRn
0VFeUdiHptM0t9VHf161rkgNYZY5Mk0VDrbXSjWvTeAW7q2vu5J+U4ROcpqEQ+XwT7DqrU
cJB2NJ+3MDnVkMgjaOGpWsN8FzoUqmlcxvPY2Bq63M0uadOdkVm8VUoVSvYq3nRUe6+pJ/
iOoeecP+VkVVrx1hdIr03sAjBiEqi1i14igen70/Lo39iEyXYnnCX9aSg65c1DH6bveQmG
75STpCap43+XCAUYqoOTnu0ZUwG5CtpSHI3+5h1pmRVPClQVy4DZlg4G45cRmQ==
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 4P6cKt6pKyzWwx;
Wed, 1 Feb 2023 22:39:30 +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 311MdUZr087966;
Wed, 1 Feb 2023 22:39:30 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MdUvn087965;
Wed, 1 Feb 2023 22:39:30 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:39:30 GMT
Message-Id: <202302012239.311MdUvn087965@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 6e756956ced5 - stable/13 - sctp: #ifdef INET-only and INET6-only variables.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 6e756956ced50d30ec5ca433373de4d7a7c58d3c
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=6e756956ced50d30ec5ca433373de4d7a7c58d3c
commit 6e756956ced50d30ec5ca433373de4d7a7c58d3c
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-04-13 23:08:21 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:38:50 +0000
sctp: #ifdef INET-only and INET6-only variables.
Duplicating the SCTP_PCB_FLAGS_BOUND_V6 check made the #ifdef's
simpler than applying #ifdef's directly to the original code. Modern
compilers should cache the result rather than testing the flag twice.
(cherry picked from commit 29a843177e108c688d7daaccac6ada4d16f01dca)
---
sys/netinet/sctp_sysctl.c | 37 +++++++++++++++++++++++++------------
1 file changed, 25 insertions(+), 12 deletions(-)
diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c
index 1314b700b467..0d435a36d940 100644
--- a/sys/netinet/sctp_sysctl.c
+++ b/sys/netinet/sctp_sysctl.c
@@ -188,8 +188,15 @@ sctp_sysctl_copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *st
{
struct sctp_ifn *sctp_ifn;
struct sctp_ifa *sctp_ifa;
- int loopback_scope, ipv4_local_scope, local_scope, site_scope;
- int ipv4_addr_legal, ipv6_addr_legal;
+ int loopback_scope;
+#ifdef INET
+ int ipv4_local_scope;
+ int ipv4_addr_legal;
+#endif
+#ifdef INET6
+ int local_scope, site_scope;
+ int ipv6_addr_legal;
+#endif
struct sctp_vrf *vrf;
struct xsctp_laddr xladdr;
struct sctp_laddr *laddr;
@@ -199,28 +206,34 @@ sctp_sysctl_copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *st
if (stcb) {
/* use association specific values */
loopback_scope = stcb->asoc.scope.loopback_scope;
+#ifdef INET
ipv4_local_scope = stcb->asoc.scope.ipv4_local_scope;
+ ipv4_addr_legal = stcb->asoc.scope.ipv4_addr_legal;
+#endif
+#ifdef INET6
local_scope = stcb->asoc.scope.local_scope;
site_scope = stcb->asoc.scope.site_scope;
- ipv4_addr_legal = stcb->asoc.scope.ipv4_addr_legal;
ipv6_addr_legal = stcb->asoc.scope.ipv6_addr_legal;
+#endif
} else {
/* Use generic values for endpoints. */
loopback_scope = 1;
+#ifdef INET
ipv4_local_scope = 1;
+ if (inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6 &&
+ SCTP_IPV6_V6ONLY(inp))
+ ipv4_addr_legal = 0;
+ else
+ ipv4_addr_legal = 1;
+#endif
+#ifdef INET6
local_scope = 1;
site_scope = 1;
- if (inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) {
+ if (inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6)
ipv6_addr_legal = 1;
- if (SCTP_IPV6_V6ONLY(inp)) {
- ipv4_addr_legal = 0;
- } else {
- ipv4_addr_legal = 1;
- }
- } else {
+ else
ipv6_addr_legal = 0;
- ipv4_addr_legal = 1;
- }
+#endif
}
/* neither Mac OS X nor FreeBSD support multiple routing functions */
From nobody Wed Feb 1 22:40:08 2023
X-Original-To: dev-commits-src-branches@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 4P6cLc5R0nz3cDXL;
Wed, 1 Feb 2023 22:40:08 +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 4P6cLc4zlLz4Kmx;
Wed, 1 Feb 2023 22:40:08 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675291208;
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=cVFlH22pUS2Jp2qZzG6s8iV3bFHpEYJS5P7GlcSZJMA=;
b=pcqendmxLErPg129NnW5KOcFn9OiCo27B4Q8yBsZ+gHtMYVQOgZqfEb3n6LHkZrbgeIZjW
M+FAyMSLdbFH4FBKaN5FL2t+wQMhGQ0dPKJkym4y6VPymFgtoc2908EsHUYwDiiNGfpn2H
sZpg305a7Eu7IugmiacaLyJaXDemOR63yczoP37ueZ4vKnaFEi9rvspPiZldP7Ath1raxg
boxNKqPH/ji7u/5aQYZyoh8zOQakKwt3xo21S8k4A0yd2a3YHmZ2umQ2psJK7vVByLWBIg
k7E+lIU7/lc0ZSYGokhQn77017xV/feVAKXNHv1s1qVvQxgngTHTpwMbRgIIug==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675291208;
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=cVFlH22pUS2Jp2qZzG6s8iV3bFHpEYJS5P7GlcSZJMA=;
b=su3iaw1JCfYdGmd3Jd0aKJPR9ApBTf2LpzPM3Hs1DjdCQjlFaOP2PNI6NJqwE2sY9qb0D2
KNR1P9+/PDLrbhkcuvFDhXKMLaLDdiwKAnrJ2cwT3OUDAx8TQYWXkeohRlVPqs1Vb1r6HP
2FfXnVLR8rSKdD+/WiJlsE42goSr6SE5IFEVcJlIRdPlW7Xzmc2/DXNQbWDBmZWjt31Zwe
U4WnIWmc7GlVc4i7UPTB7kHrA6UNS2TRVzWhmJsfXqwO9xCJ4ZS/6MLFf1ca8yjanBeSEe
vCrRcATQZqUz2ElSbGGPxIMW7uQnLQJPl0Z+XP+QiLcDDiQhbx5A4A92OaMVAw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291208; a=rsa-sha256; cv=none;
b=GNGoYtEh+cEFHU3EcM56EgaNp05KmPB3iRU9EHoZHVHgB7SpzjxlLEDLlzt3Cxgw/MbdCE
StbRKNWp2UIaHeeNVBC+yTm/qf9IIcs/X7OO/lSGVjxzrZvOas5cUVFYdpOazC8idgwfFq
WqbrNOjW9RfdPZgH6kmD3JfZM41eGD71zJYA5kKkW/scnfTvGuNSEb8smcpKEUR1sQkj5U
/vWkT230SdaMGw+HNA8lG/4fBVE44YdOjyLohibmrEzwoEEJW1xsY3tjeVPKOqxeaZT8qy
FEKyH/L7i7XXSHLeop8aAjRzHgS+Ki5kxyntG2LLKKSJVHK0llH/a7YQMRjZNA==
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 4P6cLc42MjzWSj;
Wed, 1 Feb 2023 22:40:08 +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 311Me8JR091475;
Wed, 1 Feb 2023 22:40:08 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311Me8hM091472;
Wed, 1 Feb 2023 22:40:08 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:40:08 GMT
Message-Id: <202302012240.311Me8hM091472@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: b9c95fbd43d8 - stable/13 - sctp: cleanup
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: b9c95fbd43d8ec020fbad5686c07c35b7a9fcf97
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=b9c95fbd43d8ec020fbad5686c07c35b7a9fcf97
commit b9c95fbd43d8ec020fbad5686c07c35b7a9fcf97
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-14 19:50:10 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:39:45 +0000
sctp: cleanup
(cherry picked from commit 2486a7c0c733fb67636c2004aa3300f417eb5cfe)
---
sys/netinet/sctp_sysctl.c | 67 +++++++++++++++++++++++++++++------------------
1 file changed, 42 insertions(+), 25 deletions(-)
diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c
index 0d435a36d940..fcc02f315a1b 100644
--- a/sys/netinet/sctp_sysctl.c
+++ b/sys/netinet/sctp_sysctl.c
@@ -203,7 +203,7 @@ sctp_sysctl_copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *st
int error;
/* Turn on all the appropriate scope */
- if (stcb) {
+ if (stcb != NULL) {
/* use association specific values */
loopback_scope = stcb->asoc.scope.loopback_scope;
#ifdef INET
@@ -220,41 +220,53 @@ sctp_sysctl_copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *st
loopback_scope = 1;
#ifdef INET
ipv4_local_scope = 1;
- if (inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6 &&
- SCTP_IPV6_V6ONLY(inp))
- ipv4_addr_legal = 0;
- else
- ipv4_addr_legal = 1;
#endif
#ifdef INET6
local_scope = 1;
site_scope = 1;
- if (inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6)
+#endif
+ if (inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) {
+#ifdef INET6
ipv6_addr_legal = 1;
- else
+#endif
+#ifdef INET
+ if (SCTP_IPV6_V6ONLY(inp)) {
+ ipv4_addr_legal = 0;
+ } else {
+ ipv4_addr_legal = 1;
+ }
+#endif
+ } else {
+#ifdef INET6
ipv6_addr_legal = 0;
#endif
+#ifdef INET
+ ipv4_addr_legal = 1;
+#endif
+ }
}
- /* neither Mac OS X nor FreeBSD support multiple routing functions */
+ /* Neither Mac OS X nor FreeBSD support multiple routing functions. */
if ((vrf = sctp_find_vrf(inp->def_vrf_id)) == NULL) {
SCTP_INP_RUNLOCK(inp);
SCTP_INP_INFO_RUNLOCK();
- return (-1);
+ return (ENOENT);
}
if (inp->sctp_flags & SCTP_PCB_FLAGS_BOUNDALL) {
LIST_FOREACH(sctp_ifn, &vrf->ifnlist, next_ifn) {
- if ((loopback_scope == 0) && SCTP_IFN_IS_IFT_LOOP(sctp_ifn))
- /* Skip loopback if loopback_scope not set */
+ if ((loopback_scope == 0) && SCTP_IFN_IS_IFT_LOOP(sctp_ifn)) {
+ /* Skip loopback if loopback_scope not set. */
continue;
+ }
LIST_FOREACH(sctp_ifa, &sctp_ifn->ifalist, next_ifa) {
- if (stcb) {
+ if (stcb != NULL) {
/*
- * ignore if blacklisted at
- * association level
+ * Ignore if blacklisted at
+ * association level.
*/
- if (sctp_is_addr_restricted(stcb, sctp_ifa))
+ if (sctp_is_addr_restricted(stcb, sctp_ifa)) {
continue;
+ }
}
switch (sctp_ifa->address.sa.sa_family) {
#ifdef INET
@@ -263,14 +275,16 @@ sctp_sysctl_copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *st
struct sockaddr_in *sin;
sin = &sctp_ifa->address.sin;
- if (sin->sin_addr.s_addr == 0)
+ if (sin->sin_addr.s_addr == 0) {
continue;
+ }
if (prison_check_ip4(inp->ip_inp.inp.inp_cred,
&sin->sin_addr) != 0) {
continue;
}
- if ((ipv4_local_scope == 0) && (IN4_ISPRIVATE_ADDRESS(&sin->sin_addr)))
+ if ((ipv4_local_scope == 0) && (IN4_ISPRIVATE_ADDRESS(&sin->sin_addr))) {
continue;
+ }
} else {
continue;
}
@@ -282,18 +296,21 @@ sctp_sysctl_copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *st
struct sockaddr_in6 *sin6;
sin6 = &sctp_ifa->address.sin6;
- if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr))
+ if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
continue;
+ }
if (prison_check_ip6(inp->ip_inp.inp.inp_cred,
&sin6->sin6_addr) != 0) {
continue;
}
if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
- if (local_scope == 0)
+ if (local_scope == 0) {
continue;
+ }
}
- if ((site_scope == 0) && (IN6_IS_ADDR_SITELOCAL(&sin6->sin6_addr)))
+ if ((site_scope == 0) && (IN6_IS_ADDR_SITELOCAL(&sin6->sin6_addr))) {
continue;
+ }
} else {
continue;
}
@@ -307,7 +324,7 @@ sctp_sysctl_copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *st
SCTP_INP_RUNLOCK(inp);
SCTP_INP_INFO_RUNLOCK();
error = SYSCTL_OUT(req, &xladdr, sizeof(struct xsctp_laddr));
- if (error) {
+ if (error != 0) {
return (error);
} else {
SCTP_INP_INFO_RLOCK();
@@ -318,7 +335,7 @@ sctp_sysctl_copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *st
} else {
LIST_FOREACH(laddr, &inp->sctp_addr_list, sctp_nxt_addr) {
/* ignore if blacklisted at association level */
- if (stcb && sctp_is_addr_restricted(stcb, laddr->ifa))
+ if (stcb != NULL && sctp_is_addr_restricted(stcb, laddr->ifa))
continue;
memset((void *)&xladdr, 0, sizeof(struct xsctp_laddr));
memcpy((void *)&xladdr.address, (const void *)&laddr->ifa->address, sizeof(union sctp_sockstore));
@@ -327,7 +344,7 @@ sctp_sysctl_copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *st
SCTP_INP_RUNLOCK(inp);
SCTP_INP_INFO_RUNLOCK();
error = SYSCTL_OUT(req, &xladdr, sizeof(struct xsctp_laddr));
- if (error) {
+ if (error != 0) {
return (error);
} else {
SCTP_INP_INFO_RLOCK();
@@ -341,7 +358,7 @@ sctp_sysctl_copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *st
SCTP_INP_INFO_RUNLOCK();
error = SYSCTL_OUT(req, &xladdr, sizeof(struct xsctp_laddr));
- if (error) {
+ if (error != 0) {
return (error);
} else {
SCTP_INP_INFO_RLOCK();
From nobody Wed Feb 1 22:40:47 2023
X-Original-To: dev-commits-src-branches@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 4P6cMN1DgRz3cDdx;
Wed, 1 Feb 2023 22:40:48 +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 4P6cMN0j7hz4Kvn;
Wed, 1 Feb 2023 22:40:48 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675291248;
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=CM7DuJRzfz9WK/BdDmkCnDYkPM06XfxA72CZbb36Av4=;
b=sUlcNgsBUghInkl/usauJqiT8pQWl5V8myjeEHTtOpe9xfLE/1k0mQ6FfyrzhZUztRJ+wv
H3UVJs114Ad+tWtfaaJ/C4trbx0VNxAYwEPF5y0PKWaL19VuWm4i6BzGdRSmgFrG5D/92i
w4med60UtCRymh1tsslOI1k/x3lTv938cZCTAa87oYeJP9TjFEbr97azElwQDjzXkyeMeF
mP8KDKjAtlxM/M4z4AqBuH2BmHypBlDZcVAo6XbaV28be4uHWflNlbhbzhFJk8oqEJh7G8
AqR3gf/SQ4W+tYgoFUq0kCU8DAdvAUb3Y8R7xM9rKGiSfkUnODWZ5lQWHT4Bbw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675291248;
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=CM7DuJRzfz9WK/BdDmkCnDYkPM06XfxA72CZbb36Av4=;
b=UsYuDMZTMhGca0gWmpkAtx0dv88REH2SDSkuCb3JzJa9sJHeMCjnV2xjIVcrdVkSHHggxb
U207eJVFfDT6oLSMHvYrzM82brcY5WIduI/6PlYVyKAOyiaKVyItJWkbM7CurABBIOn3Ue
sr09iJ0N8rUIns1xtxKRxTQmNzcRCl8niq2dzy6dzA43u4DKyr+z0h2D5+J02u5IOe0vq1
k/tL/hsXX6NHepEqOFszT2JWIvkeXZRLtn1xLXwGnTbr7t4dTzah2e2/RvTOcDlgVKLHkC
tgwewQ8GITcmopKNexhNTkIq3pd9iPq750OaQ96XrZ9ahWxworNap123SqHJ/w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291248; a=rsa-sha256; cv=none;
b=qMMuB/3I29/GP8KaO4x8jELEfljP6R/tvFUbNxIWNZVbxwY6d/tcnnM66ZllzJX3SZdKVH
vXBySMiH7wx6mFAV8aVE+ndpUBzrABsoH2AdO9CubvIaonavkgyqIdJucczVgS7e5k4Ebi
PnBvdYTyDPTi3AsybQxQ31pWsuDlAhOoH5fhqkfY+rkCJykp8417ddYrqSFJEM2p1Cps9X
Q32f5BtUttQTxiH/6y2TuhV/LytgQviD185iHva+YNIu7v098uG/JZI6VNsWZOytpmBS9l
YEdwQ0nFN7N31+5cjz5vyJBBEJyA4MYyJ9xD+xDgE+rFCeGwCJaDlLwS4Su16Q==
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 4P6cMM6vF0zWR5;
Wed, 1 Feb 2023 22:40:47 +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 311MelgU096701;
Wed, 1 Feb 2023 22:40:47 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MelU3096700;
Wed, 1 Feb 2023 22:40:47 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:40:47 GMT
Message-Id: <202302012240.311MelU3096700@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: c7cc79dba23d - stable/13 - sctp: improve locking
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: c7cc79dba23dc7d3b8ee3afd1b0ee2726653f2eb
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=c7cc79dba23dc7d3b8ee3afd1b0ee2726653f2eb
commit c7cc79dba23dc7d3b8ee3afd1b0ee2726653f2eb
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-15 11:58:45 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:40:21 +0000
sctp: improve locking
Hold a refcount while giving up an stcp lock. This issue was
found by running syzkaller.
(cherry picked from commit e0127ea4c6b50a5bf239482d8a99ae418174aee5)
---
sys/netinet/sctp_input.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index 8b6a6446f486..eb4ad6de12f1 100644
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -2326,15 +2326,22 @@ sctp_handle_cookie_echo(struct mbuf *m, int iphlen, int offset,
/*
* compute the signature/digest for the cookie
*/
- ep = &(*inp_p)->sctp_ep;
- l_inp = *inp_p;
- if (l_stcb) {
+ if (l_stcb != NULL) {
+ atomic_add_int(&l_stcb->asoc.refcnt, 1);
SCTP_TCB_UNLOCK(l_stcb);
}
+ l_inp = *inp_p;
SCTP_INP_RLOCK(l_inp);
- if (l_stcb) {
+ if (l_stcb != NULL) {
SCTP_TCB_LOCK(l_stcb);
+ atomic_subtract_int(&l_stcb->asoc.refcnt, 1);
}
+ if (l_inp->sctp_flags & (SCTP_PCB_FLAGS_SOCKET_GONE | SCTP_PCB_FLAGS_SOCKET_ALLGONE)) {
+ SCTP_INP_RUNLOCK(l_inp);
+ sctp_m_freem(m_sig);
+ return (NULL);
+ }
+ ep = &(*inp_p)->sctp_ep;
/* which cookie is it? */
if ((cookie->time_entered.tv_sec < (long)ep->time_of_secret_change) &&
(ep->current_secret_number != ep->last_secret_number)) {
From nobody Wed Feb 1 22:41:44 2023
X-Original-To: dev-commits-src-branches@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 4P6cNS5ytgz3cF4F;
Wed, 1 Feb 2023 22:41:44 +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 4P6cNS5WnQz4Lgw;
Wed, 1 Feb 2023 22:41:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675291304;
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=adCDJUIhYhOvSpMn8IFO6SlGp1MTYE+4/Cd3RoZIOJk=;
b=IGrc9cGGtfo5iqe0TmFXPL+nPfuWSdQ2TQOS3kqlkAnoy3y4p2wZbj7/hSsgE59BHyQImg
nm/aPY28CROcaWKvUGcEumql6qTY8jYayV4je0XiW/uMLU8VqC14Uz5hFFwf8wLh3obnF1
kzlITew3HofCVE7IGDrevnYcOcxXsWI3vg3/A49xp2TaRdoxmgueM9KgoxL0CIXhc8ULHc
n0v6wD063hVy2rj4M7FYMJ+UKTFPng+FqVt7uaCygu5APzwSuMa+e7HQOy+6cKAv4Ex8xZ
5SSIkJHvBpDAoRii0hbWNvy7ZK6w2GGJxRMGpeD4cJ7jx0WNE1XPOoap9AE1aA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675291304;
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=adCDJUIhYhOvSpMn8IFO6SlGp1MTYE+4/Cd3RoZIOJk=;
b=TInUNINrFXSElDcW+ltgyG1Uq/7Elax9MIoGLJJC04OPIPx/aoGkSiNBnojfojo4IkgTEL
mm0oPmQcCRioBWwZvMnkcLhEgK95UrgUkkzFvcbLWaDprLNpu4IllPkZ4mcSAYMkeeCieS
WQrImOo7lEhmmlFgkjGpRUVsCYgSTNXN0+s2ykkN35A9xKyhDoeG1Y/34I2B/dD1VYvCdb
XhlRWW2e/gbWWPd/INYFuIDDDL1uCSEWu1cH9n6x3vorWiRhHo2Um08ikeSQ5arjvCW9/O
2QXobA11bk+JQQRxp9JHWe6S0kVKUitcleZ9ermLaXpQ05l7fPYjSWyHwCP44A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291304; a=rsa-sha256; cv=none;
b=q5hGt+SCme/dCfAEeAstk3ZSa41bBePno8ZHcS0xsdFtFqCs4e3INwZSB0L3xjWM7sjSto
E1MK8upI7U9fABr9b5sRXD2xoQXeB2DvW6OMSxWZCXtPKGdbBHXjfZlhoaYrkoYfzzISSc
TmbEGby7ppz6E2yL1LRQOpzpzybQpa0E1vqmWBjCnreoNqo5In1bQCXtoPUPi/benpZ+tA
VdLJh7YBwb330ExExlHG/qlcQFngV2I2AQAMwZS/43GSoUpEzFFfy7DDAkRKNmlTDwHQzb
v9x18S8GFB7uVnmlzQsMGVOaIp4vwEtHnvbyEuoQ1Ff53zQoPDeJE7OHAS01jQ==
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 4P6cNS4bKzzX0P;
Wed, 1 Feb 2023 22:41:44 +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 311MfiCH000518;
Wed, 1 Feb 2023 22:41:44 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MficF000517;
Wed, 1 Feb 2023 22:41:44 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:41:44 GMT
Message-Id: <202302012241.311MficF000517@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: c2b0f069c42c - stable/13 - sctp: don't keep a pointer to a freed stcb around
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: c2b0f069c42ccd4111db78b85aad9c3cd543bb08
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=c2b0f069c42ccd4111db78b85aad9c3cd543bb08
commit c2b0f069c42ccd4111db78b85aad9c3cd543bb08
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-15 12:00:00 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:41:21 +0000
sctp: don't keep a pointer to a freed stcb around
Reported by: syzbot+b9ef06efdae7cb9ee414@syzkaller.appspotmail.com
Reported by: syzbot+b1e4793e0e6b25b0d510@syzkaller.appspotmail.com
(cherry picked from commit eeba222172170c380450004fdceac80c3612b1e8)
---
sys/netinet/sctp_pcb.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index 9d9760bd0e86..ee1ff6bd56d9 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -3371,8 +3371,10 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from)
cnt_in_sd = 0;
LIST_FOREACH_SAFE(stcb, &inp->sctp_asoc_list, sctp_tcblist, nstcb) {
SCTP_TCB_LOCK(stcb);
+ /* Disconnect the socket please. */
+ stcb->sctp_socket = NULL;
+ SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_CLOSED_SOCKET);
if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) {
- stcb->sctp_socket = NULL;
/* Skip guys being freed */
cnt_in_sd++;
if (stcb->asoc.state & SCTP_STATE_IN_ACCEPT_QUEUE) {
@@ -3404,9 +3406,6 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from)
}
continue;
}
- /* Disconnect the socket please */
- stcb->sctp_socket = NULL;
- SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_CLOSED_SOCKET);
if ((stcb->asoc.size_on_reasm_queue > 0) ||
(stcb->asoc.control_pdapi) ||
(stcb->asoc.size_on_all_streams > 0) ||
From nobody Wed Feb 1 22:42:17 2023
X-Original-To: dev-commits-src-branches@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 4P6cP56w6Yz3cDvW;
Wed, 1 Feb 2023 22:42:17 +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 4P6cP56TGhz4LtC;
Wed, 1 Feb 2023 22:42:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675291337;
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=VGBu9B7xrfQ1KtSFY468/pulAPdF/RyYPoo3dRVFUuo=;
b=kk96ygeLz2SRIUB1SkOq4PlIRz9f+gDzgCy8FlSciAnScMGZ6WeeXKrPf2jt4g/PQeWNRr
YtzSn+PGSZkY2DypxcPIe0DLoLY+qzl99w8m9Q/PkIozX819w50nO1MCiIsq8Rsundh+LF
wAOA8W1qcfJYorhQNR3MZ+WY/rYkwyFM9xAy+hcbInP2xr3vt0b0uWyrvZ8n78ATltWQ8N
dIDISUdGgkSZilf7yAjenSehZ7zzPuEa3TUSqLTTRW3yfLKY7xcNHbM28IHlJDXqJXxORy
z5OxtfqU3mGt+UCpWYopao9u5ZFODB5uFE7FQiULbFWEEcFqCzRcs9vNRXvTdA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675291337;
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=VGBu9B7xrfQ1KtSFY468/pulAPdF/RyYPoo3dRVFUuo=;
b=xbW0MHkYWR6/7zYv+p+gm9ex5CYDD5UMI2LBNlari4c9qJ30IvCMg6SQXVPl43alG5OPaF
EAxi3pqA3VeyJBmF70aN0wS1pchYoRsjz16lj6gY4r7t/XKM8a5ufKL2kg8ID8f0bPvqnE
EwbHFTEir/as8ojFI17WIabWMFbIYkd2bFwGyAA4iZklQm92FJCHRcCTjvqIiB9huumvkv
aMifDW4427+7x/b4c/KuFwmJ8016phFzH4k6jVWczrPvCtc6ksgmYjuwFDrkxi22uUIKrM
ZTbZcn1yaAPXcILLRMsUDVbFLdL4Kzvnx+iP8oPXUDNDUJY9mki+yJ9a21tuwQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291337; a=rsa-sha256; cv=none;
b=ScgMueDVxl+mzvRTo62zx1LKLu55AJg7Pte/aOC0rGZjE0HLef+gN9d0vdbu6t8iFI9lPq
Dmc7GF4MC4EALH3fjcdVMXjKeIOvnSYTPeYbihTXjhjcJZjQqO2ddBfMEcVBcU8MfVi4AI
BvrjfEE8aDFvG893wE1qX7ZBHlSic5Pbq0m1pdCULrfQ66W+MNdVCxHfnSDydvTFNSSZ+g
JpZJNYzXx58EhZIoUBnxDxqooGZ+i1m9J4f/gM4WnZrIsWMUxuozndmE7d4n0lO8zRtVlq
I71XuBFN69uv2kfIW1PG9fBJGgQ3AKQyOM+yGVzj4Tjl/Hu3kf6mVrIu8pb8nw==
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 4P6cP55XK6zWxh;
Wed, 1 Feb 2023 22:42:17 +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 311MgHmB000703;
Wed, 1 Feb 2023 22:42:17 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MgHJF000701;
Wed, 1 Feb 2023 22:42:17 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:42:17 GMT
Message-Id: <202302012242.311MgHJF000701@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: d3336114f7ca - stable/13 - sctp: don't wakeup 1-to-1 listening sockets for data or notifications
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: d3336114f7caafee1381134de0b82e5ca74f47cc
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=d3336114f7caafee1381134de0b82e5ca74f47cc
commit d3336114f7caafee1381134de0b82e5ca74f47cc
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-16 17:42:27 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:41:54 +0000
sctp: don't wakeup 1-to-1 listening sockets for data or notifications
Reported by: syzbot+ec9279d306a4ff0215f8@syzkaller.appspotmail.com
Reported by: syzbot+31d54f6d486333493dd4@syzkaller.appspotmail.com
(cherry picked from commit 3dc57df91e65acf9abfbb437110845f380a8b312)
---
sys/netinet/sctp_usrreq.c | 10 ++++------
sys/netinet/sctputil.c | 5 ++++-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index 1f046fb3189d..5dad0460fea9 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -5074,9 +5074,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
} else {
sctp_feature_off(inp, SCTP_PCB_FLAGS_STREAM_RESETEVNT);
}
- SCTP_INP_WUNLOCK(inp);
- SCTP_INP_RLOCK(inp);
LIST_FOREACH(stcb, &inp->sctp_asoc_list, sctp_tcblist) {
SCTP_TCB_LOCK(stcb);
if (events->sctp_association_event) {
@@ -5136,10 +5134,10 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
* style sockets.
*/
if (events->sctp_sender_dry_event) {
- if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
- (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) {
+ if (((stcb->sctp_ep->sctp_flags & (SCTP_PCB_FLAGS_TCPTYPE | SCTP_PCB_FLAGS_IN_TCPPOOL)) != 0) &&
+ !SCTP_IS_LISTENING(inp)) {
stcb = LIST_FIRST(&inp->sctp_asoc_list);
- if (stcb) {
+ if (stcb != NULL) {
SCTP_TCB_LOCK(stcb);
if (TAILQ_EMPTY(&stcb->asoc.send_queue) &&
TAILQ_EMPTY(&stcb->asoc.sent_queue) &&
@@ -5150,7 +5148,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
}
}
}
- SCTP_INP_RUNLOCK(inp);
+ SCTP_INP_WUNLOCK(inp);
break;
}
case SCTP_ADAPTATION_LAYER:
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index e0ac9e23fc68..d0376f03e8db 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -4836,7 +4836,10 @@ sctp_wakeup_the_read_socket(struct sctp_inpcb *inp,
SCTP_UNUSED
)
{
- if ((inp != NULL) && (inp->sctp_socket != NULL)) {
+ if ((inp != NULL) &&
+ (inp->sctp_socket != NULL) &&
+ (((stcb->sctp_ep->sctp_flags & (SCTP_PCB_FLAGS_TCPTYPE | SCTP_PCB_FLAGS_IN_TCPPOOL)) == 0) ||
+ !SCTP_IS_LISTENING(inp))) {
sctp_sorwakeup(inp, inp->sctp_socket);
}
}
From nobody Wed Feb 1 22:42:56 2023
X-Original-To: dev-commits-src-branches@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 4P6cPr35hjz3cF0W;
Wed, 1 Feb 2023 22:42:56 +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 4P6cPr29XBz4M3X;
Wed, 1 Feb 2023 22:42:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675291376;
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=Lswg6QAWdQPzi+VhDlMVYffrUhBzTXOSc2rupAYU01M=;
b=FYUDgUbCB1lrpg61fu4hjKPmnfwK9SqMlqrrKdqbvHme4ndeYWC+xRUgGZzB1eBKS4cAzo
Z85RDs50yRsnoiKn2XTFKhLCvXWIridROO20dus/Agh9aZEeVhfIbavZ3DoY19Y2ESSyp4
5DwXvvHSkqRrGvGaoyqWY+72LrqoDUIB4a9gjAwbEWUgpzF4+0u6SvpeydVaOQhgreCYVa
xyC46UzRFTkvnAMnPsk6XYrJ9+ewGl7EzH9Fd2ALHY0IXMmHEJhpPPHvmztW44g6CNchmI
MiGRNMdkZnpn0KaigJx/xjHJ32NzeaAZHAnOsV+NfrzbGjLJCzKJ4G56BkdtDg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675291376;
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=Lswg6QAWdQPzi+VhDlMVYffrUhBzTXOSc2rupAYU01M=;
b=mZPaAVQDfmkVXlAvnj5NfqNDopQfvhdcE9QfGi8HU0Oj1lUzFdCAFpTJj5cYFC0wySs1/5
MJogC2A0f+GoNuRpk7RtBtjbc+QCh3h1873dOdBgIsfg73a2ubQQ0wSfCembU9lBxUlHPd
mAyPlmEuPsK+VJ0L/01V0DGWdQk3OeD2TNJPsVSAtmvowYny8vLytPnlNixhLW4Qk0psUy
QdxGjrE87/aHchSEX3hp/DGFKKw8ld1M6V+yvu3fMyz0g4DAqkTACCuYBhDkbHyIqTCuzW
2udFZ+uLLpA3Z2rDW/+ekjzsMTE6PSFT53H75PK+6uKuu2TKXe+8bGyqt1HaOQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291376; a=rsa-sha256; cv=none;
b=sylacj0L0IxP0Bzoqi0UycqB70LlXMujDTi8UrvOiR2Z6DtNVrssdfERA4kFIIYN2gWqaS
6vlKTfKtG8eoKGEM6wg6JBr8/Q0La0AVDrmadbNFbTQHrqFuyXfkaDS+momnSMZk0SupuN
G3Gaex+jIb2upBtaNhp+EXGffUrUpMVkbixmfzqRjQMDlOL0tyUZGDVbJzw2tsP0gCmPSG
H0MhtUH22B36yyt+BQ8DDAKPaNFYsjdoYJWvdarhVNAoob83F4ffKvBO4njNtpZ96JZn7w
kRvJHgVgJdjN0cSEMRdbglhjZ1aO4pS14mnfas69OpXzYpVkArfAFG2xrWvWZw==
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 4P6cPr1CFFzWfr;
Wed, 1 Feb 2023 22:42:56 +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 311MguMK001684;
Wed, 1 Feb 2023 22:42:56 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MguUX001683;
Wed, 1 Feb 2023 22:42:56 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:42:56 GMT
Message-Id: <202302012242.311MguUX001683@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 9bf03ef873e2 - stable/13 - sctp: fix typo introcuded in last commit
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 9bf03ef873e2f3c10dd2f4a0085e56824de20d4d
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=9bf03ef873e2f3c10dd2f4a0085e56824de20d4d
commit 9bf03ef873e2f3c10dd2f4a0085e56824de20d4d
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-16 17:55:33 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:42:31 +0000
sctp: fix typo introcuded in last commit
(cherry picked from commit 5fbf11f70390a043cba06ba893c897f32d005f5d)
---
sys/netinet/sctp_usrreq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index 5dad0460fea9..89ff532bcbec 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -5134,7 +5134,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
* style sockets.
*/
if (events->sctp_sender_dry_event) {
- if (((stcb->sctp_ep->sctp_flags & (SCTP_PCB_FLAGS_TCPTYPE | SCTP_PCB_FLAGS_IN_TCPPOOL)) != 0) &&
+ if (((inp->sctp_flags & (SCTP_PCB_FLAGS_TCPTYPE | SCTP_PCB_FLAGS_IN_TCPPOOL)) != 0) &&
!SCTP_IS_LISTENING(inp)) {
stcb = LIST_FIRST(&inp->sctp_asoc_list);
if (stcb != NULL) {
From nobody Wed Feb 1 22:43:29 2023
X-Original-To: dev-commits-src-branches@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 4P6cQT27Bxz3cF54;
Wed, 1 Feb 2023 22:43:29 +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 4P6cQT1dcLz4MWq;
Wed, 1 Feb 2023 22:43:29 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675291409;
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=nRqJklJFGtG/drSCMEEgNtArQWBT9CavqcOzQDA2i0Q=;
b=N/oqvkHCaF1DFpMsAEU7LPhBuN/rQDY0MlTfsNsiRoiSeZMVReyBOkMI5hmKbkKbch2g8f
gq21mwMcZRXax56n3Anv7wKMVMPHcU5WKPg5wPzEDbyfskU45sj9vLz90F84Rzz0DFSGoN
clK4C/bz91UM47SJSrxhpzUSBV6BrleOCleebwakTpWlRshpm8avHT24m1Cnuvg+RJxD1W
81Nb3AP9OJSjsgkFRgfbm4z8h7HS8PttoL3IDzqpgzWq1KhYYgnUOAlOAkNf+FCeXZeZqS
DNT0kCchvb5h0PGvxwm+NIVRvjXzwniPFntO4tu43EFAxHrduAkjCJtKjVTP6g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675291409;
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=nRqJklJFGtG/drSCMEEgNtArQWBT9CavqcOzQDA2i0Q=;
b=jusGCtPhOan2r/or0FjD7WIWLlTfEWsrOWSODSFOLI4X8aPpG9jDl7YO82ye85ztLwWnLu
H2od6TtHQTcVdx+EXzutawu9KWCSUKT/+4Y7SV7MawgpPnI3Ra1viHuBfPIEt3OOkGIWFK
/QxpCKh+/YxEy+mrcIeJYgNwtSC6uLCOoylAExBK9T7mo+6uIpj7buzKqOO5liNDahGo96
qgvESHqjY8KJj2NQoboABZMGsybVfEjLV2eqWygw28i8d09Z94MYy1HeqRIYUG4W+UNFuh
jEX6gV2vnxIlYzP5qfV6kpv1cRa0oOY01Wp76vlEcU8t3fjmLrqMsG6jGOvGWg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291409; a=rsa-sha256; cv=none;
b=d8Qf7tM95YVZ+M523MlOhqfmA31F+KpxB5ugmEo1DnxqaRzc5Mpc2gFr+URoehBAp9xaRn
dYGGm9QDK5gd9DiNMTSQ2Fh/mc1wD25mUXg+9TmApwcVN5yT+TkpUakf29hyxBx55Jv6w8
2sNYEsYw4MCE5JKLZAxCamgORiA1JLPB14GHhM1rnML7WvtBwIokCe7FDnkclphYE4ZrQs
2nyFyk8hbyZmYcmN+/tLjVNvXramM7jpA8XOcG0wEYGgtIyRBxqLzbTZOD1F/uf+ecVxr7
g4GpcnwysNqXDxeCEsgFNXa4IMHtXzfAEV7kVnw8trvLP0zcFPcwqp8JFY1JsQ==
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 4P6cQT0jqyzWfs;
Wed, 1 Feb 2023 22:43:29 +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 311MhTkA001863;
Wed, 1 Feb 2023 22:43:29 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MhTl5001862;
Wed, 1 Feb 2023 22:43:29 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:43:29 GMT
Message-Id: <202302012243.311MhTl5001862@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 2fe0fea76db6 - stable/13 - sctp: cleanup
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 2fe0fea76db6ada2197c9fc1eb3a8acf07f7bf9c
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=2fe0fea76db6ada2197c9fc1eb3a8acf07f7bf9c
commit 2fe0fea76db6ada2197c9fc1eb3a8acf07f7bf9c
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-16 19:03:16 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:43:07 +0000
sctp: cleanup
(cherry picked from commit bbf3bf32116b0b1ff28a19ec0bc2dbcf23b6a94c)
---
sys/netinet/sctputil.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index d0376f03e8db..45e06ef769e0 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -4838,7 +4838,7 @@ sctp_wakeup_the_read_socket(struct sctp_inpcb *inp,
{
if ((inp != NULL) &&
(inp->sctp_socket != NULL) &&
- (((stcb->sctp_ep->sctp_flags & (SCTP_PCB_FLAGS_TCPTYPE | SCTP_PCB_FLAGS_IN_TCPPOOL)) == 0) ||
+ (((inp->sctp_flags & (SCTP_PCB_FLAGS_TCPTYPE | SCTP_PCB_FLAGS_IN_TCPPOOL)) == 0) ||
!SCTP_IS_LISTENING(inp))) {
sctp_sorwakeup(inp, inp->sctp_socket);
}
From nobody Wed Feb 1 22:44:11 2023
X-Original-To: dev-commits-src-branches@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 4P6cRJ0WnKz3cFB3;
Wed, 1 Feb 2023 22:44: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 4P6cRJ037zz4MvB;
Wed, 1 Feb 2023 22:44:12 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675291452;
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=LtiJcXDFLRgleHwvvvn77TZBVk7jwmM6ko+addaMQ/c=;
b=j1qPrV3epoNHAJvvc9jnV2fzAWB0eeTT0n08Ulo7irHtgju3ku2zAYOAaMYC0ahL19QFzA
/ee2w5V0AElSoW6EVEtiM2Se8Oo2pMa510swEi0+Pf49lqkE8dQxh/kcUfmJ6HeLhrVSBg
7k4ZTyPOUIi17hUaKlibvwOFUsQnD+mKdpvjK2XH7XluGjCBWU9h+ogiKCy9y770CBDLwi
bdBfMNsGB+LTWmFbPRl86vFQ623ahXaIlArzY9hhu/T0u59MsOeRR3fTDWY74D48ew/J+Z
b4ExYWCDXFIfLG0i4y7FgKQgFR0d/2ex1Cz6GtPFKUX+MgKcklqzMaq9vkyQ+w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675291452;
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=LtiJcXDFLRgleHwvvvn77TZBVk7jwmM6ko+addaMQ/c=;
b=NaPIPXbLa903OB/CtzLiqKWrCViBoz6U49RLQj34MOhUQuvpM3gHyuT5IOxfPj90B/uPfN
sOI4VPqMIkHdU27HRmdzdaQiGcTolUsxI+CXChn3jck0Ho5qKYdIJtdo3E3yvCmSEP9mTM
hp9K64VbJ4HGoIQVqecNtwhBkrGj+Esb7rthOIo07uDr9IS9jWmqpazUpZlu4Rf4OCnKQP
NyO4K8L/RJSiaR/ZgEV/JcqBjCxxFboZAanBRMP784BXbPycgaVhv/0cEQC8skf5hRLDrj
0qCc4C7C3SCxfwtKApcT4vtIB7Hi5ivoaHiAlRILxUuYUQ1jqfXWRDy5BCS4ow==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291452; a=rsa-sha256; cv=none;
b=VoUzVzxoYCmlfPjt+ZB/KfdhhGtjtgB9JLFdU2QwyNioc10nExn0eZKnJfnER0/f657PTN
vkvONK48w+T1jB1YDyXTc8cKSIAkKuIY6ebZwUeVdzDqK8Zc6eC/fD8ji031g7fY0C26fd
2iINrVSs8tWi5P6C+tje0L/nNbZS6k9YewmxXCWtNRVYI3GgpWeh3+RPKMFXAo/HhlMeng
p69gRSBURgaPDL68gQf1/KwfMUUvC2UgwRfrdYWuhXxtt8TfW+TbZ3UWMTq2N5Wi9NTSzC
DxGRg1yNza/ADjRG18FnCI+h2QJKH+aQLWRRggMGrAYApbJoarVP27tyrJiU0Q==
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 4P6cRH6BLdzWjx;
Wed, 1 Feb 2023 22:44:11 +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 311MiBia002079;
Wed, 1 Feb 2023 22:44:11 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MiBB3002078;
Wed, 1 Feb 2023 22:44:11 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:44:11 GMT
Message-Id: <202302012244.311MiBB3002078@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 126767e314cc - stable/13 - if_vtnet: improve dumping a kernel
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 126767e314ccdc77c82b6f29aeda3b715b31683a
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=126767e314ccdc77c82b6f29aeda3b715b31683a
commit 126767e314ccdc77c82b6f29aeda3b715b31683a
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-18 22:40:31 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:43:44 +0000
if_vtnet: improve dumping a kernel
Disable software LRO during kernel dumping, because having it enabled
requires to be in a network epoch, which might or might not be the
case depending on the code path resulting in the panic.
Reviewed by: markj
Sponsored by: Netflix, Inc.
Differential Revision: https://reviews.freebsd.org/D34787
(cherry picked from commit 53236f905dbf4f3d58b1d5eff5c9b14f100d0c5d)
---
sys/dev/virtio/network/if_vtnet.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c
index 2b25fbfb6b93..79011a2abfb8 100644
--- a/sys/dev/virtio/network/if_vtnet.c
+++ b/sys/dev/virtio/network/if_vtnet.c
@@ -4388,8 +4388,27 @@ vtnet_debugnet_init(struct ifnet *ifp, int *nrxr, int *ncl, int *clsize)
}
static void
-vtnet_debugnet_event(struct ifnet *ifp __unused, enum debugnet_ev event __unused)
+vtnet_debugnet_event(struct ifnet *ifp, enum debugnet_ev event)
{
+ struct vtnet_softc *sc;
+ static bool sw_lro_enabled = false;
+
+ /*
+ * Disable software LRO, since it would require entering the network
+ * epoch when calling vtnet_txq_eof() in vtnet_debugnet_poll().
+ */
+ sc = if_getsoftc(ifp);
+ switch (event) {
+ case DEBUGNET_START:
+ sw_lro_enabled = (sc->vtnet_flags & VTNET_FLAG_SW_LRO) != 0;
+ if (sw_lro_enabled)
+ sc->vtnet_flags &= ~VTNET_FLAG_SW_LRO;
+ break;
+ case DEBUGNET_END:
+ if (sw_lro_enabled)
+ sc->vtnet_flags |= VTNET_FLAG_SW_LRO;
+ break;
+ }
}
static int
From nobody Wed Feb 1 22:44:57 2023
X-Original-To: dev-commits-src-branches@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 4P6cSB08Vfz3cF33;
Wed, 1 Feb 2023 22:44:58 +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 4P6cS96kkFz4N1l;
Wed, 1 Feb 2023 22:44:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675291497;
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=bjhcXI1rLAPauXZN60W50uFAJj0oWbhlQI2ZvM5qr7E=;
b=stSdO2mIMVH8YdnoC30pfsZwY5GBslhcpNOw6fXNR340eLVTJU5yInli4nVvl7kGG4do3E
uPuFLBtOgApSjuGoraDQVRr4UoPCzaLdh9Go4s8M96dcZnuCkKWTf2q9VAzZmfBbj/551f
LWv11RD9u3S7nu2YqlbzB/7j+PgWcRGr2V+8KD4+pSsmeU/O4nIi0xxx1FqXwwZ3rLZEJe
9+Mpz272oKqXa9xdBEnGNTSViqgLrFBaip7RKINc60PMMZdsuGPwlJUsSVKtt9ZUfB3n04
VewY1DeX3IubrBW+XWf5okM2gM31FUuCjMpmp9Tl7rOPBl98amHXpZIiiK5a2w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675291497;
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=bjhcXI1rLAPauXZN60W50uFAJj0oWbhlQI2ZvM5qr7E=;
b=d+YHMj6nCNFeXL/NBJ/y/SJtbUdTUkiG+ihFruJfOYhmRfxp3RcWGkA2OPkR0ZGE0qK8nX
Cn9mx1CIsifh3suJmQEC40nBZGlLy8NTmHHv/xh9FuBNGGkf+xmfdOBls1Ob+X48xblhbM
+YKmmobm0KePzHSrBURs+GlUKiz+oHhHQqf8vJCuFdv/hq5hZre8l38ApFNgCBO/PC9sPD
f1RblQOd8CmVTxSrDuYpHJHnlrjYsh6DP9sybOSfBrFVlB3BmYen5Iaj25FvPTAhKQ34+5
ekMCwaPpfKNBl6E4To48/fBNX5IE99vVq7LeXBCJ6Pe38l5bWOBkq8JxB7oMrQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291497; a=rsa-sha256; cv=none;
b=fx5uQhB1vWJIBtxWRAbLRuymTNi2XJK/tq5+HeggNFunGE9OhmB6s9GtOiINmKh/EPrco0
XwJt2+zQKn19gj8OYYqtqOtkbCHSjcixvdgPdVYfWSA3KoZZIFbZ6WQECI17bnJTJA8Xfx
VF/6oUJxMvqh0zKEKBH6XzFjMmxxl+Qd6efft84Mpzzy8NTjePQRluijUte2tXotCsLEbS
UP42Tkc7KxJMgpJZ/18AjQQ7aomXvJzRNwQnjsNyBqZf6LIkPxe1LQAa61q1HR7TM1kWBH
HSNDOal9IYqeEa4uyCe8roToAB3Ztb8ntNxRZ9kIaCGA1zLK5738XLWsc76gyw==
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 4P6cS95ndBzWft;
Wed, 1 Feb 2023 22:44:57 +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 311MivCo002266;
Wed, 1 Feb 2023 22:44:57 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311Mivcc002265;
Wed, 1 Feb 2023 22:44:57 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:44:57 GMT
Message-Id: <202302012244.311Mivcc002265@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: a162e6496a7c - stable/13 - sctp: hold the inp lock while calling ip6_output
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a162e6496a7ccd3a1a1b5caf276de915dc3a0e74
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=a162e6496a7ccd3a1a1b5caf276de915dc3a0e74
commit a162e6496a7ccd3a1a1b5caf276de915dc3a0e74
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-19 11:03:08 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:44:25 +0000
sctp: hold the inp lock while calling ip6_output
This fixes an issue with handling IPPROTO_IPV6 level socket
options.
Reported by: syzbot+66ede232c3d1271c6226@syzkaller.appspotmail.com
MFC after: 3 days
(cherry picked from commit a12d89332efe0b02307c580a6f3025652374cd47)
---
sys/netinet/sctp_os_bsd.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h
index e8d08588fbfb..faca8a3b6276 100644
--- a/sys/netinet/sctp_os_bsd.h
+++ b/sys/netinet/sctp_os_bsd.h
@@ -428,9 +428,11 @@ typedef struct route sctp_route_t;
\
m_clrprotoflags(o_pak); \
if (local_inp != NULL) { \
+ INP_RLOCK(&local_inp->ip_inp.inp); \
result = ip6_output(o_pak, \
local_inp->ip_inp.inp.in6p_outputopts, \
(ro), 0, 0, ifp, NULL); \
+ INP_RUNLOCK(&local_inp->ip_inp.inp); \
} else { \
result = ip6_output(o_pak, NULL, (ro), 0, 0, ifp, NULL); \
} \
From nobody Wed Feb 1 22:45:30 2023
X-Original-To: dev-commits-src-branches@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 4P6cSq1BYRz3cF1Y;
Wed, 1 Feb 2023 22:45:31 +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 4P6cSq0jWCz4NBN;
Wed, 1 Feb 2023 22:45:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675291531;
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=ggoJydswjwWi7eeUJUFqSC5lrm3I2rCIanQfS5+1k5o=;
b=kxNbJTT7Orr6iG5uuUFYKzou6etlggxjuIBwevDFO8pcDPlSQZ8met7eytgC9syMSps97k
O5CDiXYx+A0LIPOgbCmvIiwZftuW1ra0QRsvo9oQGtZlbOpCNlpCDU1DnuqdRDpEPRyPhs
Ati6iGzc+riAU82Vr5Rc3cm/aOAfSfgZiCS387VL4onaW3CKm0Zo37ZxgZjhOiGH+CDPza
3Dy+NM/s9zZOVpgV9qAwXJ87WHhw3P7Vmx9Ul796HtKIPngSffuyd/FvV0/9XDsAb2kCFv
ao+1LLtZxVBBXHhwBJNmqF+9JBMXVBpnBieCbFHt5Fjh6N4oMxRwCkMVecUrNA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675291531;
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=ggoJydswjwWi7eeUJUFqSC5lrm3I2rCIanQfS5+1k5o=;
b=Z/mJLuzVAv1Ri17C2ycg07hap2EU0j46HHPReWIkDAH02HK4Tyr/8ujv2Ff7t3vzgczyfW
eTwt6UhDIJI1ntGGeD9kGun377ihuWZpX55sLTHOYK3sU+1+//KDBaO+/b0RstKYrRlH7Q
Q8zvCG8wcQ4LefU+aXHwRXlu8TX6sYCIFDStQmU4K8qiiJbsXf52Ek3EYKNgTflL7se8re
tpdct/ud5T0SY63uYft0ri56xTsf1LfmQG7io2IFD8S+PVzDbU4GOmfvHlwuJ2kc+mW7mB
7kWdpEBe2owBFzaL9j7YUAUA7SVA9H0jS3pt84OLKaoZEc0+5ZgZdVT+hVj3Aw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291531; a=rsa-sha256; cv=none;
b=WKc5+bLdBuN77bycMkORdI/VpL8nMK5uUZPTtmH4PE8rGjvpb+JC3y6+yZ6IoLBERCLnu0
T1R4hloQoE69iR0peESxZnkGIcIHKWbOur+mx/0onmqWMiD/bRh/MDvpE1ir0Vq3PbxHBz
RIymV8xVB81G4THJxJprXSAhJOIqwb1GEYD61SOZRytdzu1ZMAcBY3BM/k76EsdU8Tr7ZI
gfvEylpRfUCtyI545FqoZQ857IRTFeFcqKROFeJXqHOwdlPb3RZWZcm4scARWa3JQyPh2m
NWf9FIzuARfZnlL2Rls5SeIofOXAjoGXUbltA+pjto1Dj8xj6YEDmYaQMviTUQ==
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 4P6cSp6tmJzWmY;
Wed, 1 Feb 2023 22:45:30 +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 311MjUAm002453;
Wed, 1 Feb 2023 22:45:30 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MjUPQ002452;
Wed, 1 Feb 2023 22:45:30 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:45:30 GMT
Message-Id: <202302012245.311MjUPQ002452@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 2a93ba42c49a - stable/13 - sctp: improve stopping of timers
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 2a93ba42c49a130bc56cb3cf2092a8e35a8d2b04
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=2a93ba42c49a130bc56cb3cf2092a8e35a8d2b04
commit 2a93ba42c49a130bc56cb3cf2092a8e35a8d2b04
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-19 19:29:41 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:45:08 +0000
sctp: improve stopping of timers
Reported by: syzbot+c9c70062320aaad19de7@syzkaller.appspotmail.com
MFC after: 3 days
(cherry picked from commit 868868f14efcd7e127dae6e87550357c6cdb9c6d)
---
sys/netinet/sctputil.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 45e06ef769e0..5f18e564cf21 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -2869,20 +2869,23 @@ sctp_timer_stop(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
* counts that were incremented in sctp_timer_start().
*/
if (tmr->ep != NULL) {
- SCTP_INP_DECR_REF(inp);
tmr->ep = NULL;
+ SCTP_INP_DECR_REF(inp);
}
if (tmr->tcb != NULL) {
- atomic_subtract_int(&stcb->asoc.refcnt, 1);
tmr->tcb = NULL;
+ atomic_subtract_int(&stcb->asoc.refcnt, 1);
}
if (tmr->net != NULL) {
+ struct sctp_nets *tmr_net;
+
/*
* Can't use net, since it doesn't work for
* SCTP_TIMER_TYPE_ASCONF.
*/
- sctp_free_remote_addr((struct sctp_nets *)tmr->net);
+ tmr_net = tmr->net;
tmr->net = NULL;
+ sctp_free_remote_addr((struct sctp_nets *)tmr_net);
}
} else {
SCTPDBG(SCTP_DEBUG_TIMER2,
From nobody Wed Feb 1 22:46:02 2023
X-Original-To: dev-commits-src-branches@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 4P6cTQ3Lxtz3cFSn;
Wed, 1 Feb 2023 22:46:02 +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 4P6cTQ2rLFz4NWS;
Wed, 1 Feb 2023 22:46:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675291562;
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=WVtv81YQa10cO8w3sqXv3cwLaoPszwg/ci55hzk6oB4=;
b=IggHMr+vJzKg2q7fgJcEiESCVND8OMmZ1dT5/rdHMIQTFOMj2wGhI7Gqa//LVW91liEkSM
liV8VDmLWjs5Kv3T6B3bmmyNwmxe1WOWJ7aHwm2H/uZj9/E3oDYE72SHcLaKnDaEXO9aAp
RBO2OrJYFW4I+vQuSbILTqAeaUu2sfPlY0xcifl/HgwaKxA+/MJYwXbTGD5AAM1+lBNU5j
G6tPWkb+ZuVq7hgrHDZVzrvVAvu5ktZJ5akRbcRvmAG7jTCQjlctPsU+t+Wc20O6/fwn4S
52x8e9E0K1nLPgaAUDEOFdm8fn1eSmPW8nOhAQw3x1Zh601TYijum+e3FbUN/g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675291562;
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=WVtv81YQa10cO8w3sqXv3cwLaoPszwg/ci55hzk6oB4=;
b=qBHJF3Qc0qC0co+/nmgtetEnk36t+m4+UHom/qq+LxmAaUa0QZi96HAPM1FlIjRNk6BUnI
HOxb2vjJoYHQpNnSiFEDHYQh+YLr9twarbSV0SErddfgJZOOAU1/qHBxuzVEX+UJ1FaKPT
Bc9HKcMYqzwVFKI1j4gPCK+zx3d7YmOPIWp9zYV1bmC/QxB19Ge6HyJ5FSlcGM+FkLLA9Y
Hjwyc1Qq3rmsYiNp3zoyhMTKvJo54Td/s4zho0SKtEMs/9LumvxiXp2usUVyzwqGNJDJ7/
KQaCulVy5qRqkj5wkOCWPPVZQfJVuo/1qXysGqzh9UWwZquRdb8vmFij48WG5w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291562; a=rsa-sha256; cv=none;
b=TtJQnGC8qcHu8ofLvoXzCUPIzUvZS45xljK/+6PerzoVTNLwsQH9wgH8qR2FutYLfv+SO4
bJbHz/aC2+TUlwrgtWzoP9pVlfj0xYc7g32PBWDL2q4q1q6JF3rpO2okjlrVYZoXxPb839
1PRe0isxSP1Jn23xOAo4mGzmR2iiG/GLze8SprPzogpFwItGWItbcugD9bGcXAjtoGgM2o
SOqDQ4TRwvzkFkxPQdWy/vkguO9xVS3yQJoDQGjIKXov7LrWa+ljEasma1+Grxz9Y7XvDL
vVTWkxKI3C3W/ND/o/kzVCRMDUfrH0wBw7K3nzeke/xU/8QzVlbZ4HrGBwPjgQ==
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 4P6cTQ1w6dzWfx;
Wed, 1 Feb 2023 22:46:02 +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 311Mk267002624;
Wed, 1 Feb 2023 22:46:02 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311Mk2pC002623;
Wed, 1 Feb 2023 22:46:02 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:46:02 GMT
Message-Id: <202302012246.311Mk2pC002623@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 78f391a79a4c - stable/13 - sctp: cleanup
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 78f391a79a4c452506e2d29022edc92a48c0b2f0
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=78f391a79a4c452506e2d29022edc92a48c0b2f0
commit 78f391a79a4c452506e2d29022edc92a48c0b2f0
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-19 19:40:22 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:45:42 +0000
sctp: cleanup
MFC after: 3 days
(cherry picked from commit 89c6aba7cfa5327d814eb54336b3e9640cce0fac)
---
sys/netinet/sctputil.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 5f18e564cf21..9405814d3d13 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -2885,7 +2885,7 @@ sctp_timer_stop(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
*/
tmr_net = tmr->net;
tmr->net = NULL;
- sctp_free_remote_addr((struct sctp_nets *)tmr_net);
+ sctp_free_remote_addr(tmr_net);
}
} else {
SCTPDBG(SCTP_DEBUG_TIMER2,
From nobody Wed Feb 1 22:46:37 2023
X-Original-To: dev-commits-src-branches@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 4P6cV53Q9Kz3cFSr;
Wed, 1 Feb 2023 22:46: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 4P6cV52rDvz4Nnd;
Wed, 1 Feb 2023 22:46:37 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675291597;
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=Hlc0udmiydAqCo3BGGVSKmvL9KDuhN1qavVkn17orhg=;
b=qp7s+FuTHcWBFOMnD7yqdRmBWWF16SYY/Byy5Yywk2LQ/58uXNMldoZ0Pz01aP4ZdiF/dh
d894WAH4XQ4b5lN9VPybTkYFvGzvbck9qCoD19fdtloc+k2OBQXpoQgQ09svh9Lz/sAvbj
CVcO4K3iVxbj0xT7ir/SjZiyX0H+iz6AIND0Wcw0ShWOKfUMvU1o99WAIAxcxrQ3NS0vvK
yjnwexvmZ7L6oFo7Se7GorYxpy0U2jPdQ/53jvH+E/PWXAVJqtLfAZDvv8SKUSu6r3afWY
0AM5Pv4AP0EFpeYTAuiBQ7ciNliinGAWs85zB8C2fSD/3nuVjgrDaMERkec8fQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675291597;
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=Hlc0udmiydAqCo3BGGVSKmvL9KDuhN1qavVkn17orhg=;
b=YWlX4zOYVIuhIK6HVexoZerA+mJwdxeN5e9efTtZFn3PW+FuQIbQdVWTN8aOpEbZCx+idY
Z+XhIVcb4FJ1FJdPbuTrqQgUMJqa+Dr2EQziIr7wsWoe8FuLFaLLVvOCyZVYHvfTMnAkWI
KUqwfxjSSVHMjnFAeIhxjmryI/DPUJANZKqYbyVybQc1rJ2dDM3GN8+RoyYv5ZJRfwwT66
bK/QcrU08APw9A1oTG7nzkl0uIhe6Sst6HqNQzmgvUbVON1ld2BlCsVWURb2MGAQGgoMnw
3bLF/I/JynV6mfAhvkzGsvvl8KqCT/3QWl59mObAXTP2V1n/B8/5s7b+/m6D8Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291597; a=rsa-sha256; cv=none;
b=u2ONG+YFYHlaQ78g2z/ZdAzPi0F0DeF1KMoItOGSWDvMwPUhREnIfMBrQPkUGgZ3AfrBpj
5DQHz2cWz+msbEGtkMUDrbXRMqZgdFxp4EG6/PmhuRDxZcQfU/NHPfLH/T32Ku6zRv/nxG
A31CEM0DSQaNSWORbMUJ/RQ/VqXU97SaMIefAbQdtsr55rTSuTNanhNoJV8/S4M5so74xL
WTdgxTRptu3M8IF4dYb+9esUtEf4aQ1330QqVOELU1EE2PorWxz4i8X0cKNGJy6QFd6/+U
mP0HAfIEVhplSwI/mfzKKPp/QUGyha59tN0vAG5K5HJvlgVA3ur8kpLGl0RRWw==
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 4P6cV51vj1zWTD;
Wed, 1 Feb 2023 22:46: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 311MkbUH002810;
Wed, 1 Feb 2023 22:46:37 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MkbOE002809;
Wed, 1 Feb 2023 22:46:37 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:46:37 GMT
Message-Id: <202302012246.311MkbOE002809@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 8c5796ba8e32 - stable/13 - sctp: improve locking
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 8c5796ba8e329c9e202e0e914e8e98fed4cd2248
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=8c5796ba8e329c9e202e0e914e8e98fed4cd2248
commit 8c5796ba8e329c9e202e0e914e8e98fed4cd2248
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-04-27 14:07:31 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:46:14 +0000
sctp: improve locking
While there, do some cleanup.
Reported by: syzbot+f475e054c454310bc26d@syzkaller.appspotmail.com
(cherry picked from commit 490a0f77de77321859eeeecc807f9cc7bb41dbcc)
---
sys/netinet/sctputil.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 9405814d3d13..dad937f15172 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -4870,8 +4870,9 @@ sctp_add_to_readq(struct sctp_inpcb *inp,
#endif
return;
}
- if (inp_read_lock_held == 0)
+ if (inp_read_lock_held == SCTP_READ_LOCK_NOT_HELD) {
SCTP_INP_READ_LOCK(inp);
+ }
if (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_CANT_READ) {
if (!control->on_strm_q) {
sctp_free_remote_addr(control->whoFrom);
@@ -4881,8 +4882,9 @@ sctp_add_to_readq(struct sctp_inpcb *inp,
}
sctp_free_a_readq(stcb, control);
}
- if (inp_read_lock_held == 0)
+ if (inp_read_lock_held == SCTP_READ_LOCK_NOT_HELD) {
SCTP_INP_READ_UNLOCK(inp);
+ }
return;
}
if (!(control->spec_flags & M_NOTIFICATION)) {
@@ -4894,7 +4896,7 @@ sctp_add_to_readq(struct sctp_inpcb *inp,
m = control->data;
control->held_length = 0;
control->length = 0;
- while (m) {
+ while (m != NULL) {
if (SCTP_BUF_LEN(m) == 0) {
/* Skip mbufs with NO length */
if (prev == NULL) {
@@ -4938,11 +4940,12 @@ sctp_add_to_readq(struct sctp_inpcb *inp,
}
TAILQ_INSERT_TAIL(&inp->read_queue, control, next);
control->on_read_q = 1;
- if (inp_read_lock_held == 0)
- SCTP_INP_READ_UNLOCK(inp);
- if (inp && inp->sctp_socket) {
+ if ((inp != NULL) && (inp->sctp_socket != NULL)) {
sctp_wakeup_the_read_socket(inp, stcb, so_locked);
}
+ if (inp_read_lock_held == SCTP_READ_LOCK_NOT_HELD) {
+ SCTP_INP_READ_UNLOCK(inp);
+ }
}
/*************HOLD THIS COMMENT FOR PATCH FILE OF
From nobody Wed Feb 1 22:47:11 2023
X-Original-To: dev-commits-src-branches@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 4P6cVl42bRz3cFJM;
Wed, 1 Feb 2023 22:47:11 +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 4P6cVl3qWzz4PBd;
Wed, 1 Feb 2023 22:47:11 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675291631;
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=Wj+njOQS5wPfN1QN+z78WG30mtXNNKi2XfbFj89n2MI=;
b=mVr9c0UEG1rnouQ8Lmq+1vTWaEeY7SkXxIMcoiMtWjj0XDM47q5ZUv4sAEnKWrVA5nPz4r
VN2muXejt4iYHzEfk7ImvTEoJ8LGb6WjpOnY//2nD3JffZtQGFL/11NxWyS1AwkqMtBKLe
MqwjNVQJYe/HebfYXtYaAGgHUrKiHRoN9BCaU0fGULyHXwZi9iFhjDknWQhbxVLG+u4p4D
PMHFUYl8eKydxmKYlvY4eL2vu5f3OMhJ29GQ/5Ue98jUkDdCbpEwJILlWTumRyzuEwg1Lm
npkMzFRPhIdevPUhf3VlQafYczKhsECuSBqWt1Fc/WcsPE4CQa2BtvPRQsuokA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675291631;
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=Wj+njOQS5wPfN1QN+z78WG30mtXNNKi2XfbFj89n2MI=;
b=d0oU525NnYv+ubI6sG2KSIF4wcuK/DWh50Nvhj2P5uyYIi5vcCriToYlmtevyk2y72mpT1
GXsGuGPonvJKEYcm+3r0Ba/KqxmyP09U+MgCnSLxBC2L32hcBpRvZUHGb4JyGJf0kyUUwD
HSNsfijTmijb3wbklqIj7xY3xIk9Hc/2l3neG9QNeC76NAMNBAVKSQbNpa813bAJKBXxTW
/Ult9pk2JNH4cB99aI27yCPRtAiGl+AGfKdDDJG/fRkmS1tOF1UCFJXXWKtRrPI21qmaRs
3lF7zAwRHqfAPzYn0Y9IXVfe0HUbp4dllzDzfhmZPYvBweDQg1MH97+i5mO8og==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291631; a=rsa-sha256; cv=none;
b=QVTJqy1JLl6qsk9d69Eid1RLLxvGSk7olbUEXxborarVXx3KLETHaRmMDstUxQJur5R2q+
F+pjjsWQunXsCPngfa7pTJrWF1SszqZl6CeA8Xp7LR2r9GKZDN7duoh7EG5sQ0VEudBWzT
CCFqyXURLmNvYrC50itV+RKJZH+Rx3GAb35/uuktI3md1XklnAGr4yHWrIQYUvOc+OXzMm
d6hu9f3SOEVn7EeUqx93OcPEGFeRt9h9RMqRhkzaOt2Fv1crklCO8Sjz1VDNjjvr0N5/6A
ih0BZ5jx3xc5xmy6HhBGLtEmnPOycHXuMjh+iQKiYNBL6XZcPUaPKF/WWt+CNQ==
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 4P6cVl2ZMHzWTF;
Wed, 1 Feb 2023 22:47:11 +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 311MlBKh003038;
Wed, 1 Feb 2023 22:47:11 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MlBHj003037;
Wed, 1 Feb 2023 22:47:11 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:47:11 GMT
Message-Id: <202302012247.311MlBHj003037@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 80972c67922a - stable/13 - sctp: improve consistency
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 80972c67922a74bfd67e036629236004e905fbc9
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=80972c67922a74bfd67e036629236004e905fbc9
commit 80972c67922a74bfd67e036629236004e905fbc9
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-05-14 04:28:19 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:46:49 +0000
sctp: improve consistency
No functional change intended.
(cherry picked from commit 9b2a35b3a96b44019d7884da9de92c4f92d64994)
---
sys/netinet/sctp_asconf.c | 4 ++--
sys/netinet/sctp_indata.c | 4 ++--
sys/netinet/sctp_input.c | 16 ++++++++--------
sys/netinet/sctp_output.c | 9 ++++-----
sys/netinet/sctp_pcb.c | 8 ++++----
sys/netinet/sctp_timer.c | 36 ++++++++++++++++--------------------
sys/netinet/sctp_usrreq.c | 18 ++++++++----------
sys/netinet/sctputil.c | 12 ++++++------
8 files changed, 50 insertions(+), 57 deletions(-)
diff --git a/sys/netinet/sctp_asconf.c b/sys/netinet/sctp_asconf.c
index 675530c65fb6..129ef30b3882 100644
--- a/sys/netinet/sctp_asconf.c
+++ b/sys/netinet/sctp_asconf.c
@@ -541,8 +541,8 @@ sctp_process_asconf_set_primary(struct sockaddr *src,
/* notify upper layer */
sctp_ulp_notify(SCTP_NOTIFY_ASCONF_SET_PRIMARY, stcb, 0, sa, SCTP_SO_NOT_LOCKED);
if ((stcb->asoc.primary_destination->dest_state & SCTP_ADDR_REACHABLE) &&
- (!(stcb->asoc.primary_destination->dest_state & SCTP_ADDR_PF)) &&
- (stcb->asoc.alternate)) {
+ ((stcb->asoc.primary_destination->dest_state & SCTP_ADDR_PF) == 0) &&
+ (stcb->asoc.alternate != NULL)) {
sctp_free_remote_addr(stcb->asoc.alternate);
stcb->asoc.alternate = NULL;
}
diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c
index c4620b7cfa0d..9cbbf69d2421 100644
--- a/sys/netinet/sctp_indata.c
+++ b/sys/netinet/sctp_indata.c
@@ -4162,7 +4162,7 @@ sctp_express_handle_sack(struct sctp_tcb *stcb, uint32_t cumack,
* count, this is optional.
*/
net->error_count = 0;
- if (!(net->dest_state & SCTP_ADDR_REACHABLE)) {
+ if ((net->dest_state & SCTP_ADDR_REACHABLE) == 0) {
/* addr came good */
net->dest_state |= SCTP_ADDR_REACHABLE;
sctp_ulp_notify(SCTP_NOTIFY_INTERFACE_UP, stcb,
@@ -4905,7 +4905,7 @@ hopeless_peer:
* count, this is optional.
*/
net->error_count = 0;
- if (!(net->dest_state & SCTP_ADDR_REACHABLE)) {
+ if ((net->dest_state & SCTP_ADDR_REACHABLE) == 0) {
/* addr came good */
net->dest_state |= SCTP_ADDR_REACHABLE;
sctp_ulp_notify(SCTP_NOTIFY_INTERFACE_UP, stcb,
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index eb4ad6de12f1..6c9720a974ad 100644
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -620,7 +620,7 @@ sctp_handle_heartbeat_ack(struct sctp_heartbeat_chunk *cp,
/* Now lets do a RTO with this */
sctp_calculate_rto(stcb, &stcb->asoc, r_net, &tv,
SCTP_RTT_FROM_NON_DATA);
- if (!(r_net->dest_state & SCTP_ADDR_REACHABLE)) {
+ if ((r_net->dest_state & SCTP_ADDR_REACHABLE) == 0) {
r_net->dest_state |= SCTP_ADDR_REACHABLE;
sctp_ulp_notify(SCTP_NOTIFY_INTERFACE_UP, stcb,
0, (void *)r_net, SCTP_SO_NOT_LOCKED);
@@ -2235,7 +2235,7 @@ sctp_process_cookie_new(struct mbuf *m, int iphlen, int offset,
head = &SCTP_BASE_INFO(sctp_asochash)[SCTP_PCBHASH_ASOC(tag,
SCTP_BASE_INFO(hashasocmark))];
LIST_FOREACH(stcb, head, sctp_asocs) {
- if ((stcb->asoc.my_vtag == tag) && (stcb->rport == rport) && (inp == stcb->sctp_ep)) {
+ if ((stcb->asoc.my_vtag == tag) && (stcb->rport == rport) && (inp == stcb->sctp_ep)) {
-- SEND ABORT - TRY AGAIN --
}
}
@@ -3616,7 +3616,7 @@ sctp_handle_str_reset_request_in(struct sctp_tcb *stcb,
seq = ntohl(req->request_seq);
if (asoc->str_reset_seq_in == seq) {
asoc->last_reset_action[1] = asoc->last_reset_action[0];
- if (!(asoc->local_strreset_support & SCTP_ENABLE_RESET_STREAM_REQ)) {
+ if ((asoc->local_strreset_support & SCTP_ENABLE_RESET_STREAM_REQ) == 0) {
asoc->last_reset_action[0] = SCTP_STREAM_RESET_RESULT_DENIED;
} else if (trunc) {
/* Can't do it, since they exceeded our buffer size */
@@ -3682,7 +3682,7 @@ sctp_handle_str_reset_request_tsn(struct sctp_tcb *stcb,
seq = ntohl(req->request_seq);
if (asoc->str_reset_seq_in == seq) {
asoc->last_reset_action[1] = stcb->asoc.last_reset_action[0];
- if (!(asoc->local_strreset_support & SCTP_ENABLE_CHANGE_ASSOC_REQ)) {
+ if ((asoc->local_strreset_support & SCTP_ENABLE_CHANGE_ASSOC_REQ) == 0) {
asoc->last_reset_action[0] = SCTP_STREAM_RESET_RESULT_DENIED;
} else {
fwdtsn.ch.chunk_length = htons(sizeof(struct sctp_forward_tsn_chunk));
@@ -3754,7 +3754,7 @@ sctp_handle_str_reset_request_out(struct sctp_tcb *stcb,
/* move the reset action back one */
asoc->last_reset_action[1] = asoc->last_reset_action[0];
- if (!(asoc->local_strreset_support & SCTP_ENABLE_RESET_STREAM_REQ)) {
+ if ((asoc->local_strreset_support & SCTP_ENABLE_RESET_STREAM_REQ) == 0) {
asoc->last_reset_action[0] = SCTP_STREAM_RESET_RESULT_DENIED;
} else if (trunc) {
asoc->last_reset_action[0] = SCTP_STREAM_RESET_RESULT_DENIED;
@@ -3825,7 +3825,7 @@ sctp_handle_str_reset_add_strm(struct sctp_tcb *stcb, struct sctp_tmit_chunk *ch
if (asoc->str_reset_seq_in == seq) {
num_stream += stcb->asoc.streamincnt;
stcb->asoc.last_reset_action[1] = stcb->asoc.last_reset_action[0];
- if (!(asoc->local_strreset_support & SCTP_ENABLE_CHANGE_ASSOC_REQ)) {
+ if ((asoc->local_strreset_support & SCTP_ENABLE_CHANGE_ASSOC_REQ) == 0) {
asoc->last_reset_action[0] = SCTP_STREAM_RESET_RESULT_DENIED;
} else if ((num_stream > stcb->asoc.max_inbound_streams) ||
(num_stream > 0xffff)) {
@@ -3915,7 +3915,7 @@ sctp_handle_str_reset_add_out_strm(struct sctp_tcb *stcb, struct sctp_tmit_chunk
/* Now what would be the new total? */
if (asoc->str_reset_seq_in == seq) {
stcb->asoc.last_reset_action[1] = stcb->asoc.last_reset_action[0];
- if (!(asoc->local_strreset_support & SCTP_ENABLE_CHANGE_ASSOC_REQ)) {
+ if ((asoc->local_strreset_support & SCTP_ENABLE_CHANGE_ASSOC_REQ) == 0) {
asoc->last_reset_action[0] = SCTP_STREAM_RESET_RESULT_DENIED;
} else if (stcb->asoc.stream_reset_outstanding) {
/* We must reject it we have something pending */
@@ -4882,7 +4882,7 @@ process_control_chunks:
*/
if ((stcb == NULL) &&
(!SCTP_IS_LISTENING(inp) ||
- (!(inp->sctp_flags & SCTP_PCB_FLAGS_UDPTYPE) &&
+ (((inp->sctp_flags & SCTP_PCB_FLAGS_UDPTYPE) == 0) &&
inp->sctp_socket->sol_qlen >= inp->sctp_socket->sol_qlimit))) {
if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) &&
(SCTP_BASE_SYSCTL(sctp_abort_if_one_2_one_hits_limit))) {
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 63310a6cc48b..306755d659eb 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -2844,8 +2844,7 @@ sctp_select_nth_preferred_addr_from_ifn_boundall(struct sctp_ifn *ifn,
#ifdef INET6
if (stcb && fam == AF_INET6 &&
sctp_is_mobility_feature_on(stcb->sctp_ep, SCTP_MOBILITY_BASE)) {
- if (sctp_v6src_match_nexthop(&sifa->address.sin6, ro)
- == 0) {
+ if (sctp_v6src_match_nexthop(&sifa->address.sin6, ro) == 0) {
continue;
}
}
@@ -7869,7 +7868,7 @@ nothing_to_send:
net->window_probe = 0;
if ((net != stcb->asoc.alternate) &&
((net->dest_state & SCTP_ADDR_PF) ||
- (!(net->dest_state & SCTP_ADDR_REACHABLE)) ||
+ ((net->dest_state & SCTP_ADDR_REACHABLE) == 0) ||
(net->dest_state & SCTP_ADDR_UNCONFIRMED))) {
if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_LOGGING_ENABLE) {
sctp_log_cwnd(stcb, net, 1,
@@ -10033,7 +10032,7 @@ do_it_again:
#endif
/* Check for bad destinations, if they exist move chunks around. */
TAILQ_FOREACH(net, &asoc->nets, sctp_next) {
- if (!(net->dest_state & SCTP_ADDR_REACHABLE)) {
+ if ((net->dest_state & SCTP_ADDR_REACHABLE) == 0) {
/*-
* if possible move things off of this address we
* still may send below due to the dormant state but
@@ -10494,7 +10493,7 @@ sctp_send_sack(struct sctp_tcb *stcb, int so_locked)
a_chk->sent = SCTP_DATAGRAM_UNSENT;
a_chk->whoTo = NULL;
- if (!(asoc->last_data_chunk_from->dest_state & SCTP_ADDR_REACHABLE)) {
+ if ((asoc->last_data_chunk_from->dest_state & SCTP_ADDR_REACHABLE) == 0) {
/*-
* Ok, the destination for the SACK is unreachable, lets see if
* we can select an alternate to asoc->last_data_chunk_from
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index ee1ff6bd56d9..be41276351fe 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -3504,8 +3504,7 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from)
}
}
inp->sctp_socket = NULL;
- if ((inp->sctp_flags & SCTP_PCB_FLAGS_UNBOUND) !=
- SCTP_PCB_FLAGS_UNBOUND) {
+ if ((inp->sctp_flags & SCTP_PCB_FLAGS_UNBOUND) == 0) {
/*
* ok, this guy has been bound. It's port is somewhere in
* the SCTP_BASE_INFO(hash table). Remove it!
@@ -4265,7 +4264,7 @@ sctp_aloc_assoc_locked(struct sctp_inpcb *inp, struct sockaddr *firstaddr,
(sin->sin_addr.s_addr == INADDR_ANY) ||
(sin->sin_addr.s_addr == INADDR_BROADCAST) ||
IN_MULTICAST(ntohl(sin->sin_addr.s_addr)) ||
- (((inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) != 0) &&
+ ((inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) &&
(SCTP_IPV6_V6ONLY(inp) != 0))) {
/* Invalid address */
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_PCB, EINVAL);
@@ -6687,7 +6686,8 @@ sctp_set_primary_addr(struct sctp_tcb *stcb, struct sockaddr *sa,
return (0);
}
stcb->asoc.primary_destination = net;
- if (!(net->dest_state & SCTP_ADDR_PF) && (stcb->asoc.alternate)) {
+ if (((net->dest_state & SCTP_ADDR_PF) == 0) &&
+ (stcb->asoc.alternate != NULL)) {
sctp_free_remote_addr(stcb->asoc.alternate);
stcb->asoc.alternate = NULL;
}
diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c
index 8a7d9be866f8..baaed2c78fb1 100644
--- a/sys/netinet/sctp_timer.c
+++ b/sys/netinet/sctp_timer.c
@@ -107,7 +107,7 @@ sctp_threshold_management(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
}
} else if ((net->pf_threshold < net->failure_threshold) &&
(net->error_count > net->pf_threshold)) {
- if (!(net->dest_state & SCTP_ADDR_PF)) {
+ if ((net->dest_state & SCTP_ADDR_PF) == 0) {
net->dest_state |= SCTP_ADDR_PF;
net->last_active = sctp_get_tick_count();
sctp_send_hb(stcb, net, SCTP_SO_NOT_LOCKED);
@@ -355,7 +355,7 @@ sctp_find_alternate_net(struct sctp_tcb *stcb,
}
if (((alt->dest_state & SCTP_ADDR_REACHABLE) == SCTP_ADDR_REACHABLE) &&
(alt->ro.ro_nh != NULL) &&
- (!(alt->dest_state & SCTP_ADDR_UNCONFIRMED)) &&
+ ((alt->dest_state & SCTP_ADDR_UNCONFIRMED) == 0) &&
(alt != net)) {
/* Found an alternate net, which is reachable. */
break;
@@ -385,7 +385,7 @@ sctp_find_alternate_net(struct sctp_tcb *stcb,
break;
}
}
- if ((!(alt->dest_state & SCTP_ADDR_UNCONFIRMED)) &&
+ if (((alt->dest_state & SCTP_ADDR_UNCONFIRMED) == 0) &&
(alt != net)) {
/*
* Found an alternate net, which is
@@ -933,7 +933,7 @@ sctp_t3rxt_timer(struct sctp_inpcb *inp,
/* Backoff the timer and cwnd */
sctp_backoff_on_timeout(stcb, net, win_probe, num_mk, num_abandoned);
- if ((!(net->dest_state & SCTP_ADDR_REACHABLE)) ||
+ if (((net->dest_state & SCTP_ADDR_REACHABLE) == 0) ||
(net->dest_state & SCTP_ADDR_PF)) {
/* Move all pending over too */
sctp_move_chunks_from_net(stcb, net);
@@ -942,7 +942,7 @@ sctp_t3rxt_timer(struct sctp_inpcb *inp,
* Get the address that failed, to force a new src address
* selection and a route allocation.
*/
- if (net->ro._s_addr) {
+ if (net->ro._s_addr != NULL) {
sctp_free_ifa(net->ro._s_addr);
net->ro._s_addr = NULL;
}
@@ -960,7 +960,7 @@ sctp_t3rxt_timer(struct sctp_inpcb *inp,
* change-primary then this flag must be cleared
* from any net structures.
*/
- if (stcb->asoc.alternate) {
+ if (stcb->asoc.alternate != NULL) {
sctp_free_remote_addr(stcb->asoc.alternate);
}
stcb->asoc.alternate = alt;
@@ -1159,7 +1159,7 @@ sctp_strreset_timer(struct sctp_inpcb *inp, struct sctp_tcb *stcb)
atomic_add_int(&alt->ref_count, 1);
}
}
- if (!(net->dest_state & SCTP_ADDR_REACHABLE)) {
+ if ((net->dest_state & SCTP_ADDR_REACHABLE) == 0) {
/*
* If the address went un-reachable, we need to move to
* alternates for ALL chk's in queue
@@ -1255,7 +1255,7 @@ sctp_asconf_timer(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
chk->sent = SCTP_DATAGRAM_RESEND;
chk->flags |= CHUNK_FLAGS_FRAGMENT_OK;
}
- if (!(net->dest_state & SCTP_ADDR_REACHABLE)) {
+ if ((net->dest_state & SCTP_ADDR_REACHABLE) == 0) {
/*
* If the address went un-reachable, we need to move
* to the alternate for ALL chunks in queue
@@ -1413,15 +1413,11 @@ int
sctp_heartbeat_timer(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
struct sctp_nets *net)
{
- uint8_t net_was_pf;
+ bool net_was_pf;
- if (net->dest_state & SCTP_ADDR_PF) {
- net_was_pf = 1;
- } else {
- net_was_pf = 0;
- }
+ net_was_pf = (net->dest_state & SCTP_ADDR_PF) != 0;
if (net->hb_responded == 0) {
- if (net->ro._s_addr) {
+ if (net->ro._s_addr != NULL) {
/*
* Invalidate the src address if we did not get a
* response last time.
@@ -1437,7 +1433,7 @@ sctp_heartbeat_timer(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
}
}
/* Zero PBA, if it needs it */
- if (net->partial_bytes_acked) {
+ if (net->partial_bytes_acked > 0) {
net->partial_bytes_acked = 0;
}
if ((stcb->asoc.total_output_queue_size > 0) &&
@@ -1445,11 +1441,11 @@ sctp_heartbeat_timer(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
(TAILQ_EMPTY(&stcb->asoc.sent_queue))) {
sctp_audit_stream_queues_for_size(inp, stcb);
}
- if (!(net->dest_state & SCTP_ADDR_NOHB) &&
- !((net_was_pf == 0) && (net->dest_state & SCTP_ADDR_PF))) {
+ if (((net->dest_state & SCTP_ADDR_NOHB) == 0) &&
+ (net_was_pf || ((net->dest_state & SCTP_ADDR_PF) == 0))) {
/*
- * when move to PF during threshold management, a HB has
- * been queued in that routine
+ * When moving to PF during threshold management, a HB has
+ * been queued in that routine.
*/
uint32_t ms_gone_by;
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index 89ff532bcbec..0a7d28d978f0 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -1420,8 +1420,7 @@ sctp_do_connect_x(struct socket *so, struct sctp_inpcb *inp, void *optval,
}
}
#endif /* INET6 */
- if ((inp->sctp_flags & SCTP_PCB_FLAGS_UNBOUND) ==
- SCTP_PCB_FLAGS_UNBOUND) {
+ if (inp->sctp_flags & SCTP_PCB_FLAGS_UNBOUND) {
/* Bind a ephemeral port */
error = sctp_inpcb_bind(so, NULL, NULL, p);
if (error) {
@@ -5325,8 +5324,8 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
if (net != NULL) {
/************************NET SPECIFIC SET ******************/
if (paddrp->spp_flags & SPP_HB_DISABLE) {
- if (!(net->dest_state & SCTP_ADDR_UNCONFIRMED) &&
- !(net->dest_state & SCTP_ADDR_NOHB)) {
+ if (((net->dest_state & SCTP_ADDR_UNCONFIRMED) == 0) &&
+ ((net->dest_state & SCTP_ADDR_NOHB) == 0)) {
sctp_timer_stop(SCTP_TIMER_TYPE_HEARTBEAT, inp, stcb, net,
SCTP_FROM_SCTP_USRREQ + SCTP_LOC_9);
}
@@ -5482,9 +5481,9 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
}
if (paddrp->spp_flags & SPP_HB_DISABLE) {
TAILQ_FOREACH(net, &stcb->asoc.nets, sctp_next) {
- if (!(net->dest_state & SCTP_ADDR_NOHB)) {
+ if ((net->dest_state & SCTP_ADDR_NOHB) == 0) {
net->dest_state |= SCTP_ADDR_NOHB;
- if (!(net->dest_state & SCTP_ADDR_UNCONFIRMED)) {
+ if ((net->dest_state & SCTP_ADDR_UNCONFIRMED) == 0) {
sctp_timer_stop(SCTP_TIMER_TYPE_HEARTBEAT,
inp, stcb, net,
SCTP_FROM_SCTP_USRREQ + SCTP_LOC_15);
@@ -5798,11 +5797,11 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
if ((stcb != NULL) && (net != NULL)) {
if (net != stcb->asoc.primary_destination) {
- if (!(net->dest_state & SCTP_ADDR_UNCONFIRMED)) {
+ if ((net->dest_state & SCTP_ADDR_UNCONFIRMED) == 0) {
/* Ok we need to set it */
if (sctp_set_primary_addr(stcb, (struct sockaddr *)NULL, net) == 0) {
if ((stcb->asoc.alternate) &&
- (!(net->dest_state & SCTP_ADDR_PF)) &&
+ ((net->dest_state & SCTP_ADDR_PF) == 0) &&
(net->dest_state & SCTP_ADDR_REACHABLE)) {
sctp_free_remote_addr(stcb->asoc.alternate);
stcb->asoc.alternate = NULL;
@@ -7013,8 +7012,7 @@ sctp_connect(struct socket *so, struct sockaddr *addr, struct thread *p)
goto out_now;
}
#endif
- if ((inp->sctp_flags & SCTP_PCB_FLAGS_UNBOUND) ==
- SCTP_PCB_FLAGS_UNBOUND) {
+ if (inp->sctp_flags & SCTP_PCB_FLAGS_UNBOUND) {
/* Bind a ephemeral port */
error = sctp_inpcb_bind(so, NULL, NULL, p);
if (error) {
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index dad937f15172..29d8c6a5e964 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -1911,7 +1911,7 @@ sctp_timeout_handler(void *t)
#ifdef SCTP_AUDITING_ENABLED
sctp_auditing(4, inp, stcb, net);
#endif
- if (!(net->dest_state & SCTP_ADDR_NOHB)) {
+ if ((net->dest_state & SCTP_ADDR_NOHB) == 0) {
sctp_timer_start(SCTP_TIMER_TYPE_HEARTBEAT, inp, stcb, net);
sctp_chunk_output(inp, stcb, SCTP_OUTPUT_FROM_HB_TMR, SCTP_SO_NOT_LOCKED);
did_output = true;
@@ -2278,7 +2278,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
#endif
}
if ((net->dest_state & SCTP_ADDR_NOHB) &&
- !(net->dest_state & SCTP_ADDR_UNCONFIRMED)) {
+ ((net->dest_state & SCTP_ADDR_UNCONFIRMED) == 0)) {
SCTPDBG(SCTP_DEBUG_TIMER2,
"Timer type %d not started: inp=%p, stcb=%p, net=%p.\n",
t_type, inp, stcb, net);
@@ -2300,8 +2300,8 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
} else {
to_ticks = UINT32_MAX;
}
- if (!(net->dest_state & SCTP_ADDR_UNCONFIRMED) &&
- !(net->dest_state & SCTP_ADDR_PF)) {
+ if (((net->dest_state & SCTP_ADDR_UNCONFIRMED) == 0) &&
+ ((net->dest_state & SCTP_ADDR_PF) == 0)) {
if (net->heart_beat_delay < (UINT32_MAX - to_ticks)) {
to_ticks += net->heart_beat_delay;
} else {
@@ -4887,7 +4887,7 @@ sctp_add_to_readq(struct sctp_inpcb *inp,
}
return;
}
- if (!(control->spec_flags & M_NOTIFICATION)) {
+ if ((control->spec_flags & M_NOTIFICATION) == 0) {
atomic_add_int(&inp->total_recvs, 1);
if (!control->do_not_ref_stcb) {
atomic_add_int(&stcb->total_recvs, 1);
@@ -5054,7 +5054,7 @@ sctp_release_pr_sctp_chunk(struct sctp_tcb *stcb, struct sctp_tmit_chunk *tp1,
sid = tp1->rec.data.sid;
mid = tp1->rec.data.mid;
- if (sent || !(tp1->rec.data.rcv_flags & SCTP_DATA_FIRST_FRAG)) {
+ if (sent || ((tp1->rec.data.rcv_flags & SCTP_DATA_FIRST_FRAG) == 0)) {
stcb->asoc.abandoned_sent[0]++;
stcb->asoc.abandoned_sent[PR_SCTP_POLICY(tp1->flags)]++;
stcb->asoc.strmout[sid].abandoned_sent[0]++;
From nobody Wed Feb 1 22:47:49 2023
X-Original-To: dev-commits-src-branches@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 4P6cWT43bDz3cFVJ;
Wed, 1 Feb 2023 22:47:49 +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 4P6cWT3J7mz4Psf;
Wed, 1 Feb 2023 22:47:49 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675291669;
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=60rtUCFXjCFjfHCKDIatVxgZGs6SmMA70bMeVVyB1NM=;
b=A5lvTOCKk44obRy8mmU567TyzdchSEL9no6KFWtyTmX8EYMATCGUpjKNcyqBGsL80QN2B2
G7yjBm1mD0Gzxl1MMrFwU089DJ+YDK7zyzKD625DBXaXodGPtkmSabfSZFCFdxSJngqmYS
NJrqy3xzja1V/z8UzQTOfOVuhPIijzvv3pSkYsoOXhBBbRKE9aS+nUqBi8Jk1dgpQ8kQMX
WSjsic1s1XQIu5i+qLyH/Ht5394tUyRaPyLC77RZyfLMzZl/2XybIH3/TvicRAYwWhhz/1
KfPGfHRzk5rsn/h/QH+iOU+WnGXlO7U0JTdQbO+l8guUfifelvE+Z786FDiSBA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675291669;
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=60rtUCFXjCFjfHCKDIatVxgZGs6SmMA70bMeVVyB1NM=;
b=tfyQByPOO8Wtd1XxLoiVJbA3CLyeGXZ7os0U8zPoYW+k/AQJWrmQDGmbdeS8T0veP/6kXL
nkg2NOJC4Uh93oHEBK01FFpAf1UIERwXjhXXN7YPMwf7XbPsuwOFj7FepCs81v2mVogiML
wSIHXqiBbWiUu4/UmXPgjj6hmPVzMg7oQkBQMGqvQMiL0q8hrNj4qM1twJQNAKUGVMEDdK
eTMxqFfeXksYaIzCh0ztuG6Z2lvY5Ox9iSe0UaiCxTN0/Nkb1xe22w/RElZof16Tnq3Brs
fBt0vtraf0Da9e2QSh7wtXW5tqj/lPlAEqgfi9pW3a2RtvzIbN4bEuUbnoD3bQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291669; a=rsa-sha256; cv=none;
b=ci23RxwHngwOtHDqeNcCo5QDR9e29mOfKnoJMXn63Z4yeLhRU64y9eFNHeX1UKptMdj+8e
gK5IaWfuT2eGmelTVIHH+CqmhbnBHhT6rGVi02isAuSh90JXut0N2PirJF9NCgS3wUR+LC
aOyNuhO8LFwLvGWqJ9KHmzDh1UjuLp6Mati8sIlRafICg/fDf+eIfsz8lJ2qvNyd4VJXCw
FDwy+aKw/jDUaCUd75aVSG9xUSzNNvVBU/gv+eSn5yYlrx04hL+UHkbgwHS5k3GVEGetIr
BUGw2E/YaMDfCWIwautAqjzBiyCTOnKobO9eaxZlqolla/qfpLu5Y0QshlAg4w==
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 4P6cWT2M3szWmm;
Wed, 1 Feb 2023 22:47:49 +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 311Mlnab003500;
Wed, 1 Feb 2023 22:47:49 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MlnE9003499;
Wed, 1 Feb 2023 22:47:49 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:47:49 GMT
Message-Id: <202302012247.311MlnE9003499@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 429c706669e8 - stable/13 - sctp: improve path verification
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 429c706669e887139aa64e7b573757865a40a2bc
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=429c706669e887139aa64e7b573757865a40a2bc
commit 429c706669e887139aa64e7b573757865a40a2bc
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-05-14 06:05:03 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:47:23 +0000
sctp: improve path verification
When sending path confirmation heartbeats, do not take HB.interval
into account when the path is still reachable.
Thanks to Alexander Funke for finding the issue and suggesting a fix.
(cherry picked from commit 9312ba239e05b035c965e5790f70fe71a4ed2e8c)
---
sys/netinet/sctputil.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 29d8c6a5e964..f2065beb2bb2 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -2300,7 +2300,8 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
} else {
to_ticks = UINT32_MAX;
}
- if (((net->dest_state & SCTP_ADDR_UNCONFIRMED) == 0) &&
+ if (!((net->dest_state & SCTP_ADDR_UNCONFIRMED) &&
+ (net->dest_state & SCTP_ADDR_REACHABLE)) &&
((net->dest_state & SCTP_ADDR_PF) == 0)) {
if (net->heart_beat_delay < (UINT32_MAX - to_ticks)) {
to_ticks += net->heart_beat_delay;
From nobody Wed Feb 1 22:48:31 2023
X-Original-To: dev-commits-src-branches@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 4P6cXH44gwz3cFdD;
Wed, 1 Feb 2023 22:48:31 +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 4P6cXH3S4pz4Q5D;
Wed, 1 Feb 2023 22:48:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675291711;
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=7pX6iJ5bSJP6m30/RqaR9QtHivZb8w5yNOQX7jk0jis=;
b=nka5JZL+j2/xFHZfbVE5dphDN06qNDSSsMDyb3SmSp787v7QHcYLbIaRkl+DaXn2Tij7BD
sBUjHpKWWrI0Fr/qqmzWOKPP1Wdxf3RiG1pNg99XWjJqZZJDASv7BrKMvT7ijn2yR108v6
sVCL2wm3LcqGnvBQ5qsf+C9ocijlgP6p4Bv7AzkGDmNF45l6qr4Z76XE3guQd4w6KZOVeU
zGx36qKEPRbKoMS8gliWYDtXkdyVtDSUbWfTuyNXwGAUu9thBo/0wdT3gJFQ6gxelJhiQQ
+GBUQRmc/KZc5OQfnnVusy0F/Yba+VgNLu6ASydKG8V9XhRI7/A4NmXKBoQCYA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675291711;
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=7pX6iJ5bSJP6m30/RqaR9QtHivZb8w5yNOQX7jk0jis=;
b=QPJf5so3bhMOiEfc+bWuV5tfn2rBmCdzaa0XhlZn84Wzp6hzpk1bQO1yywju9ZrwBagHo6
0m9fluQrSoB19S+fpb0FKHo5AfAmmSlg75fWRZzDphfkOrNaJr2unmgQsYewb9p1XhhB6E
HbPWr/g7kFdnAfet/7aJF9vXAz/y5elHbrUIoSBN7q8WpIM/wULmJv30y+SqpqcJYTQx8t
mABNp+QqwMCWYuymS4udsn1ZzxE4+GVP7gi8tvcAvm7li3/u29x8FtyHT9PsEQRIyxQw0A
1ILQjza9G39300TfMOV5n95isD1Lz0Msv48/sJBHsEVYnFvRvelKPEIqSr0q2Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291711; a=rsa-sha256; cv=none;
b=utbDQ4sCMKgpQGcIJmllTXK5+yV7G3SnfQQaFo4WzDTvnRpMNB/SDJh5Gdm/0USw8XYnKX
d6TDv12XJqKg6L0fs7u259Y0AaMPND5NJQBnJceM+WWx0OjkRGdV6BJej9+k5UYcEMGocG
tlG15cvhGzSDk96L9+tbMf8OoOEx/r5Efw8CJRYCDeruoGWlkkFvRI7FkgKlelbsa4EuuY
obnjjMhKYPH6jGAtrbTdjqucafcdQiBc0mORa/d6z+Y7L4M+DIRQEUy6OeKSDJGdAEN9Nm
KaLI+wkR81FP9B4GudCfXEoeqDT83rS2/5IczfpsfvxOVUg2xQKknlvj7yFryw==
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 4P6cXH2W3wzWTJ;
Wed, 1 Feb 2023 22:48:31 +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 311MmVGQ003700;
Wed, 1 Feb 2023 22:48:31 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MmVea003699;
Wed, 1 Feb 2023 22:48:31 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:48:31 GMT
Message-Id: <202302012248.311MmVea003699@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 4e681215ff62 - stable/13 - sctp: improve path verification
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 4e681215ff62e691d8d3cd6e884ed035f486f93c
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=4e681215ff62e691d8d3cd6e884ed035f486f93c
commit 4e681215ff62e691d8d3cd6e884ed035f486f93c
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-05-14 06:07:28 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:48:07 +0000
sctp: improve path verification
Ensure that a HB can be sent faster than a HB.Interval when performing
path verification of a reachable peer address.
Thanks to Alexander Funke for finding the issue and proposing a fix.
(cherry picked from commit aab6e5bd1e2b2919604eed68f76d4a7bb73ccb0c)
---
sys/netinet/sctp_timer.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c
index baaed2c78fb1..c808b6751384 100644
--- a/sys/netinet/sctp_timer.c
+++ b/sys/netinet/sctp_timer.c
@@ -1441,7 +1441,8 @@ sctp_heartbeat_timer(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
(TAILQ_EMPTY(&stcb->asoc.sent_queue))) {
sctp_audit_stream_queues_for_size(inp, stcb);
}
- if (((net->dest_state & SCTP_ADDR_NOHB) == 0) &&
+ if ((((net->dest_state & SCTP_ADDR_NOHB) == 0) ||
+ (net->dest_state & SCTP_ADDR_UNCONFIRMED)) &&
(net_was_pf || ((net->dest_state & SCTP_ADDR_PF) == 0))) {
/*
* When moving to PF during threshold management, a HB has
@@ -1461,6 +1462,7 @@ sctp_heartbeat_timer(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
ms_gone_by = 0xffffffff;
}
if ((ms_gone_by >= net->heart_beat_delay) ||
+ (net->dest_state & SCTP_ADDR_UNCONFIRMED) ||
(net->dest_state & SCTP_ADDR_PF)) {
sctp_send_hb(stcb, net, SCTP_SO_NOT_LOCKED);
}
From nobody Wed Feb 1 22:49:09 2023
X-Original-To: dev-commits-src-branches@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 4P6cY208dHz3cFld;
Wed, 1 Feb 2023 22:49:10 +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 4P6cY16l3lz4QFM;
Wed, 1 Feb 2023 22:49:09 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675291749;
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=UtHmG4vb7nm4sPIn7Z9mdLVvqU6XbI9bChRrZTBlFCg=;
b=OUVFrp3R0t4VAn0VfSfbV2GhM3At9sRoWA4o9dYw9x92ZTjEdvmTLJMH/2lQe1EVJiSlf8
DV+OoJdAscVWCuEQQlD/oajnnU/gqTmnypcynWm9fusdp7iS9YB6X2qAhc18sLUxkOqaMc
RINPWfXo4bYKEiiZq9aXzcCp8A7hFA2Vwk1qHeOrMhwknjn4h3f+fNNsiigBATdBjUrkTe
8YyxakqJBUU65oUFZD3AVhTijcF6lfGY0+UvxfIVztc/E1ABFmqdD92iJDxPmenwAejg8c
7ZtfHcF9gpHW3GcRZbVVDjAI4RGScAoojfTDkCTL3TOwRwkJ0UVQKtdmHm+jqA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675291749;
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=UtHmG4vb7nm4sPIn7Z9mdLVvqU6XbI9bChRrZTBlFCg=;
b=RsKRfQz7saRRd+QWcoJ7XUX3SH0mkGDOn/go/i2By59ByCUQOijXGFJPJhsI3q/Zp8bW8d
LapOsshPevciJFVq4nJUKw4R+SB/yFj+uLVGk7JaXyhMHFTkTEpX+UqmzUBIAfCON/emNK
e1N1Ja9vKhaUL9QAMoWYcZoottYsVe2crBm07sGq2B72/1PoNyB2VPwarQFxV4lAPbvci5
V8Yb2Ovhj3c4WlEL/nL25hgJSdX3VIXQaIQvowI+Bh0EabMyYFBcSv80t7rwIsfBgGvjbu
BkshLqjebByl8p3ZA65kLXY5/YDSnvUAjOweobeWi4sB776rDQrSxusZL6jkhw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291749; a=rsa-sha256; cv=none;
b=e21LzgLOK6/LG92hN0+CqxLNvTNZ6cjzPwI8QbUwf0cWaoDPIG4j1GqkmdvZXzwreg5Xot
UBDh0XndU5T/Y19IST/nfjAEK92gYcrDfGyIIDExkD9jHW5GzvHxkEbBGDecwtuduM3nnr
JoQETSre8CzaHYuNkAD0U9c1qj+ADTGlmrz/5VI7IhadE1zItPKKNTiWsEfcfqU8aSYH58
JFSVmjXz/q/GCtrN1UMW5b7axGUijpD63fWYgP0+C3xHzMaIZ7ztFE342qI3A2MFvlpl5L
ztPA3bxDcCesoPhMDuDW4eOlBNljqKhri/tMzroGuXrmTm70K6dRjirfs8xOkQ==
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 4P6cY15nTBzX91;
Wed, 1 Feb 2023 22:49:09 +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 311Mn993003886;
Wed, 1 Feb 2023 22:49:09 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311Mn9WT003885;
Wed, 1 Feb 2023 22:49:09 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:49:09 GMT
Message-Id: <202302012249.311Mn9WT003885@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 33b2501870c7 - stable/13 - sctp: cleanup, no functional change intended
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 33b2501870c7f508b8619850cde575d0a248d42a
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=33b2501870c7f508b8619850cde575d0a248d42a
commit 33b2501870c7f508b8619850cde575d0a248d42a
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-05-14 06:30:41 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:48:46 +0000
sctp: cleanup, no functional change intended
(cherry picked from commit f210e4fbc54ab78711bd5197b7097002ff3ae891)
---
sys/netinet/sctp_input.c | 2 +-
sys/netinet/sctp_usrreq.c | 8 ++------
sys/netinet/sctputil.c | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index 6c9720a974ad..95e3be69123e 100644
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -992,7 +992,7 @@ sctp_handle_shutdown_ack(struct sctp_shutdown_ack_chunk *cp SCTP_UNUSED,
if (stcb->sctp_socket) {
if ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
(stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) {
- stcb->sctp_socket->so_snd.sb_cc = 0;
+ SCTP_SB_CLEAR(stcb->sctp_socket->so_snd);
}
sctp_ulp_notify(SCTP_NOTIFY_ASSOC_DOWN, stcb, 0, NULL, SCTP_SO_NOT_LOCKED);
}
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index 0a7d28d978f0..b6eae2b061d6 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -844,18 +844,14 @@ sctp_flush(struct socket *so, int how)
inp->sctp_flags |= SCTP_PCB_FLAGS_SOCKET_CANT_READ;
SCTP_INP_READ_UNLOCK(inp);
SCTP_INP_WUNLOCK(inp);
- so->so_rcv.sb_cc = 0;
- so->so_rcv.sb_mbcnt = 0;
- so->so_rcv.sb_mb = NULL;
+ SCTP_SB_CLEAR(so->so_rcv);
}
if ((how == PRU_FLUSH_WR) || (how == PRU_FLUSH_RDWR)) {
/*
* First make sure the sb will be happy, we don't use these
* except maybe the count
*/
- so->so_snd.sb_cc = 0;
- so->so_snd.sb_mbcnt = 0;
- so->so_snd.sb_mb = NULL;
+ SCTP_SB_CLEAR(so->so_snd);
}
return (0);
}
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index f2065beb2bb2..23631e5a20d5 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -5674,7 +5674,7 @@ restart_nosblocks:
#ifdef INVARIANTS
panic("Huh, its non zero and nothing on control?");
#endif
- so->so_rcv.sb_cc = 0;
+ SCTP_SB_CLEAR(so->so_rcv);
}
SCTP_INP_READ_UNLOCK(inp);
hold_rlock = 0;
From nobody Wed Feb 1 22:57:04 2023
X-Original-To: dev-commits-src-branches@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 4P6ck86qsTz3cGV0;
Wed, 1 Feb 2023 22:57:04 +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 4P6ck86KPrz3D6R;
Wed, 1 Feb 2023 22:57:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675292224;
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=67LTPNSksvocktcOYDlFJyYvJXoLi5UswFzRLjR3QP8=;
b=Bgz/5p7dEtSnnzKzjs/fzCERDBQ7WomDRYaESDB4wobBt5isT8dV/Mfd0TJO3ySHnQWWhF
QgP6R+2e3g+Br0fFNEQnuDQctCEyhFO15mgYWJVkmXiPDJgthCt48UkYrTj9V0i+NZI+WI
pwZGlWV13PGH5T9DZHt/qQk+91v1+PheG6UiK3CfOg8lnap2QNhG73M5VIH37CcsrM/swn
Zk9m/opj7Cmu4nmD6f4iRzH2nZKHeEcP/u+wjb5OMYgabdQrTzHrMxA2oblDmCsOnRO3Vv
RubZSmkZNNSPDp4tW039qdsTCMaojHihPG0Q9kcBcwCaOtg3rC9hsjXJ9CIr3g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675292224;
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=67LTPNSksvocktcOYDlFJyYvJXoLi5UswFzRLjR3QP8=;
b=c7aRn82306hIs4rzNvncHj81RzaG7oTwolE2JEZNpTqYI2Aww9nms3BjjWx0p333pOIZm/
1lLZafaHEmVXNs15098zKF65iA9kyJOPO9pP1JkMPtaxK4xjfHevxviBxlPOSQpdTEoqgs
z45kCq7v9wfgvZMgk8z4QccnA81442ky/2xB2UtleWG1VoAPTAnPz2+PMfOkShEC9iBIPo
Kez3cZYJUfLdA0BnYQlETMhJIWel0Xi1Jnz/UJ341yZB1sWN1dTVOFfNlrZcpsLzXM/IS/
PdNo7JRksRukd5evq9OVW0TgqLPdjyVWP5UGndRHuxpl8wAHLddoytj53ZpxpQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675292224; a=rsa-sha256; cv=none;
b=cySuXjECGJnjDXHNrgpOnrBCmXx4J0x1+F0Pr++Cw1/nSYmrh0fGmrjCHMN14uSNBwglBd
/HUgKGRCNSuLeSZfAc01F6afg3XwPdu+mJrC59knqtRdZj1QbMMYaQvypEp+1FNxMUOC+m
y9oAODl1Y7uqCxZvO6+fRx9lPAxl9P468nbQc4d43L5SLmgHRd1duLTHPTXCueRgqthePz
pohfKofIrVpEeMYB8KMMbjobljC1q9ELBWr4yQFrivZ5AJcMysnJzd2nGl5pODeqaj9cj6
81jeep7eShHIq8ogeD/p3OCWQYKAZ+NHDa1JPb1k8UTjkB0c6YOrodAZc+1OSA==
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 4P6ck85NnCzWgj;
Wed, 1 Feb 2023 22:57:04 +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 311Mv4ee017477;
Wed, 1 Feb 2023 22:57:04 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311Mv4ig017476;
Wed, 1 Feb 2023 22:57:04 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:57:04 GMT
Message-Id: <202302012257.311Mv4ig017476@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: a1742f61f4b7 - stable/13 - sctp: use sb_avail() when accessing sb_acc for reading
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a1742f61f4b79c84eb36ab12d83e577f714551d8
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=a1742f61f4b79c84eb36ab12d83e577f714551d8
commit a1742f61f4b79c84eb36ab12d83e577f714551d8
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-05-14 10:38:43 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:56:33 +0000
sctp: use sb_avail() when accessing sb_acc for reading
This is a cleanup to simplify a patch for PR 260116.
PR: 260116
(cherry picked from commit edc5b6ea881d7e196fee8df7ebcd372f8f5b4469)
---
sys/netinet/sctp_indata.c | 2 +-
sys/netinet/sctp_os_bsd.h | 2 ++
sys/netinet/sctp_output.c | 2 +-
sys/netinet/sctp_pcb.c | 2 +-
sys/netinet/sctp_usrreq.c | 7 +++----
sys/netinet/sctputil.c | 30 +++++++++++++++---------------
6 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c
index 9cbbf69d2421..d3c969bb47b1 100644
--- a/sys/netinet/sctp_indata.c
+++ b/sys/netinet/sctp_indata.c
@@ -1942,7 +1942,7 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struct sctp_association *asoc,
* When we have NO room in the rwnd we check to make sure
* the reader is doing its job...
*/
- if (stcb->sctp_socket->so_rcv.sb_cc) {
+ if (SCTP_SBAVAIL(&stcb->sctp_socket->so_rcv) > 0) {
/* some to read, wake-up */
sctp_sorwakeup(stcb->sctp_ep, stcb->sctp_socket);
}
diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h
index faca8a3b6276..8240fca64c48 100644
--- a/sys/netinet/sctp_os_bsd.h
+++ b/sys/netinet/sctp_os_bsd.h
@@ -381,6 +381,8 @@ typedef struct callout sctp_os_timer_t;
#define SCTP_SORESERVE(so, send, recv) soreserve(so, send, recv)
/* wakeup a socket */
#define SCTP_SOWAKEUP(so) wakeup(&(so)->so_timeo)
+/* number of bytes ready to read */
+#define SCTP_SBAVAIL(sb) sbavail(sb)
/* clear the socket buffer state */
#define SCTP_SB_CLEAR(sb) \
(sb).sb_cc = 0; \
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 306755d659eb..f35bb0bbafc3 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -11517,7 +11517,7 @@ jump_out:
drp->current_onq = htonl(asoc->size_on_reasm_queue +
asoc->size_on_all_streams +
asoc->my_rwnd_control_len +
- stcb->sctp_socket->so_rcv.sb_cc);
+ SCTP_SBAVAIL(&stcb->sctp_socket->so_rcv));
} else {
/*-
* If my rwnd is 0, possibly from mbuf depletion as well as
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index be41276351fe..60aa6f175366 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -3409,7 +3409,7 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from)
if ((stcb->asoc.size_on_reasm_queue > 0) ||
(stcb->asoc.control_pdapi) ||
(stcb->asoc.size_on_all_streams > 0) ||
- (so && (so->so_rcv.sb_cc > 0))) {
+ ((so != NULL) && (SCTP_SBAVAIL(&so->so_rcv) > 0))) {
/* Left with Data unread */
struct mbuf *op_err;
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index b6eae2b061d6..78ece9dd4641 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -543,7 +543,7 @@ sctp_close(struct socket *so)
if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) == 0) {
inp->sctp_flags |= SCTP_PCB_FLAGS_SOCKET_GONE | SCTP_PCB_FLAGS_CLOSE_IP;
if (((so->so_options & SO_LINGER) && (so->so_linger == 0)) ||
- (so->so_rcv.sb_cc > 0)) {
+ (SCTP_SBAVAIL(&so->so_rcv) > 0)) {
#ifdef SCTP_LOG_CLOSING
sctp_log_closing(inp, NULL, 13);
#endif
@@ -705,9 +705,8 @@ sctp_disconnect(struct socket *so)
return (0);
}
NET_EPOCH_ENTER(et);
- if (((so->so_options & SO_LINGER) &&
- (so->so_linger == 0)) ||
- (so->so_rcv.sb_cc > 0)) {
+ if (((so->so_options & SO_LINGER) && (so->so_linger == 0)) ||
+ (SCTP_SBAVAIL(&so->so_rcv) > 0)) {
if (SCTP_GET_STATE(stcb) != SCTP_STATE_COOKIE_WAIT) {
/* Left with Data unread */
struct mbuf *op_err;
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 23631e5a20d5..7746740ea6c1 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -76,7 +76,7 @@ sctp_sblog(struct sockbuf *sb, struct sctp_tcb *stcb, int from, int incr)
struct sctp_cwnd_log sctp_clog;
sctp_clog.x.sb.stcb = stcb;
- sctp_clog.x.sb.so_sbcc = sb->sb_cc;
+ sctp_clog.x.sb.so_sbcc = SCTP_SBAVAIL(sb);
if (stcb)
sctp_clog.x.sb.stcb_sbcc = stcb->asoc.sb_cc;
else
@@ -5565,11 +5565,11 @@ sctp_sorecvmsg(struct socket *so,
in_eeor_mode = sctp_is_feature_on(inp, SCTP_PCB_FLAGS_EXPLICIT_EOR);
if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_RECV_RWND_LOGGING_ENABLE) {
sctp_misc_ints(SCTP_SORECV_ENTER,
- rwnd_req, in_eeor_mode, so->so_rcv.sb_cc, (uint32_t)uio->uio_resid);
+ rwnd_req, in_eeor_mode, SCTP_SBAVAIL(&so->so_rcv), (uint32_t)uio->uio_resid);
}
if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_RECV_RWND_LOGGING_ENABLE) {
sctp_misc_ints(SCTP_SORECV_ENTERPL,
- rwnd_req, block_allowed, so->so_rcv.sb_cc, (uint32_t)uio->uio_resid);
+ rwnd_req, block_allowed, SCTP_SBAVAIL(&so->so_rcv), (uint32_t)uio->uio_resid);
}
error = SOCK_IO_RECV_LOCK(so, SBLOCKWAIT(in_flags));
@@ -5588,21 +5588,21 @@ restart_nosblocks:
(inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE)) {
goto out;
}
- if ((so->so_rcv.sb_state & SBS_CANTRCVMORE) && (so->so_rcv.sb_cc == 0)) {
+ if ((so->so_rcv.sb_state & SBS_CANTRCVMORE) && SCTP_SBAVAIL(&so->so_rcv) == 0) {
if (so->so_error) {
error = so->so_error;
if ((in_flags & MSG_PEEK) == 0)
so->so_error = 0;
goto out;
} else {
- if (so->so_rcv.sb_cc == 0) {
+ if (SCTP_SBAVAIL(&so->so_rcv) == 0) {
/* indicate EOF */
error = 0;
goto out;
}
}
}
- if (so->so_rcv.sb_cc <= held_length) {
+ if (SCTP_SBAVAIL(&so->so_rcv) <= held_length) {
if (so->so_error) {
error = so->so_error;
if ((in_flags & MSG_PEEK) == 0) {
@@ -5610,7 +5610,7 @@ restart_nosblocks:
}
goto out;
}
- if ((so->so_rcv.sb_cc == 0) &&
+ if ((SCTP_SBAVAIL(&so->so_rcv) == 0) &&
((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
(inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) {
if ((inp->sctp_flags & SCTP_PCB_FLAGS_CONNECTED) == 0) {
@@ -5670,7 +5670,7 @@ restart_nosblocks:
SCTP_INP_READ_LOCK(inp);
}
control = TAILQ_FIRST(&inp->read_queue);
- if ((control == NULL) && (so->so_rcv.sb_cc != 0)) {
+ if ((control == NULL) && (SCTP_SBAVAIL(&so->so_rcv) > 0)) {
#ifdef INVARIANTS
panic("Huh, its non zero and nothing on control?");
#endif
@@ -5805,8 +5805,8 @@ restart_nosblocks:
* <or> fragment interleave is NOT on. So stuff the sb_cc
* into the our held count, and its time to sleep again.
*/
- held_length = so->so_rcv.sb_cc;
- control->held_length = so->so_rcv.sb_cc;
+ held_length = SCTP_SBAVAIL(&so->so_rcv);
+ control->held_length = SCTP_SBAVAIL(&so->so_rcv);
goto restart;
}
/* Clear the held length since there is something to read */
@@ -6255,7 +6255,7 @@ wait_some_more:
(sctp_is_feature_on(inp, SCTP_PCB_FLAGS_FRAG_INTERLEAVE))) {
goto release;
}
- if (so->so_rcv.sb_cc <= control->held_length) {
+ if (SCTP_SBAVAIL(&so->so_rcv) <= control->held_length) {
error = sbwait(&so->so_rcv);
if (error) {
goto release;
@@ -6282,8 +6282,8 @@ wait_some_more:
}
goto done_with_control;
}
- if (so->so_rcv.sb_cc > held_length) {
- control->held_length = so->so_rcv.sb_cc;
+ if (SCTP_SBAVAIL(&so->so_rcv) > held_length) {
+ control->held_length = SCTP_SBAVAIL(&so->so_rcv);
held_length = 0;
}
goto wait_some_more;
@@ -6432,13 +6432,13 @@ out:
freed_so_far,
(uint32_t)((uio) ? (slen - uio->uio_resid) : slen),
stcb->asoc.my_rwnd,
- so->so_rcv.sb_cc);
+ SCTP_SBAVAIL(&so->so_rcv));
} else {
sctp_misc_ints(SCTP_SORECV_DONE,
freed_so_far,
(uint32_t)((uio) ? (slen - uio->uio_resid) : slen),
0,
- so->so_rcv.sb_cc);
+ SCTP_SBAVAIL(&so->so_rcv));
}
}
stage_left:
From nobody Wed Feb 1 22:57:53 2023
X-Original-To: dev-commits-src-branches@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 4P6cl610G7z3cGny;
Wed, 1 Feb 2023 22:57:54 +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 4P6cl60W4xz3DP8;
Wed, 1 Feb 2023 22:57:54 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675292274;
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=MAo3wd0LwR+Co6rtidYCzZPcQXqmjqrua3Hg9vBdoKg=;
b=mr1BAydCGIVRHHPbdOel4oUde153PkOLatY2qlacm00rmebrnd+s7mOj0GokkE8lQ0deTb
DXCNfllA3R55+pZHHBKytEy2r43RUm0CfIMHRi63uiA3iOiSm7u+eD5vkm5oPlTckam+Ul
UQfuspA6PCvoRw50Ae/W6jJ9Xv+os47i1Q5r0Vvc4eUmqaFdGh/TnS3LisZBXqETe3CFgd
XuoiqrCWaLPgqq7LcQhihAvKLOF3yVpPv7+MMifzTTdbVFQu9EhZS7orgLSQFdd6S1bv2h
YrgpHoLQA0CQ2q70eftfWktF1OnaRqMoiVRs3Tl9EJ/hJN2uyTN1sQGjZlBLlg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675292274;
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=MAo3wd0LwR+Co6rtidYCzZPcQXqmjqrua3Hg9vBdoKg=;
b=s03iLbKiPoWuO7kHUCUqpQpm05leUiCMvLqn/L9u9srgt4yi94FQCnXNiFCsRf2AXEkxuj
b2Kpz93jgOY7MlHjsZ/ZnHOo5ukAQqNP5Bso/t9cNupjsVeMjOz/wu/0eS7ZK9tNFW8+2O
p+gjw/bLVpVyeA8j1CzLJRB7G9TV8bXqSKuxXBGEDfpHprlBWz91OVf2bfDEEtScr/813B
bwk0X29vOE+RBI/febWydkeZPSBWI7Ix4JJKl5XBSLHTcDhyxMLWtN9u5nYKA04cQxiq8A
VFHbx0v46cma83itjr+cp8gvtqeketz42b1a6QBWDYHwxZBm3Tixr8A9H+LkaQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675292274; a=rsa-sha256; cv=none;
b=S4hiv/oH7KIsMjIUJI3y4ju2VegKj0eJkhd83MaETHA8mv+S3SJ/O3rSZzuN5Wiu6+Ma2C
irxafqURArMIaRy7fcNgcC+VvebsAuNVpsBTE5K+vMqbdZR30cThs8VTHx0ZCde8TmKsT8
u2dJlXGG4NqFlnBN5EkFMCqmHtWwz0ds95woupUWVfJHYKxnHsJMwtMOtJqoyqLqM+mJfG
Xu+k2KWbvverQG1Z1NQW1XXXUSEL9OBSvMN9HW4VioRmyfKx3BxqdzKNUaagtu0LpmB88C
APbW3szF6ghYyPDFKzzuuLdhVlWO0PD87Tl4ONztxiYDiII442ztB6rWmq6KiQ==
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 4P6cl56NfhzXF5;
Wed, 1 Feb 2023 22:57:53 +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 311Mvrcw017696;
Wed, 1 Feb 2023 22:57:53 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311Mvrg6017695;
Wed, 1 Feb 2023 22:57:53 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:57:53 GMT
Message-Id: <202302012257.311Mvrg6017695@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 0a0782655a3c - stable/13 - sctp: more sb_cc related cleanups
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 0a0782655a3ca190f552e4e7a558cee305b985e0
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=0a0782655a3ca190f552e4e7a558cee305b985e0
commit 0a0782655a3ca190f552e4e7a558cee305b985e0
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-05-23 14:09:23 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:57:27 +0000
sctp: more sb_cc related cleanups
No functional change intended. It allows a simpler patch for PR 260116.
(cherry picked from commit 5cebd8305afecad82f5d9628d8f7981d33559037)
---
sys/netinet/sctp_var.h | 2 +-
sys/netinet/sctputil.c | 15 +++++++--------
sys/netinet/sctputil.h | 24 ------------------------
3 files changed, 8 insertions(+), 33 deletions(-)
diff --git a/sys/netinet/sctp_var.h b/sys/netinet/sctp_var.h
index a18dbb5e66e2..d1dec9e39d08 100644
--- a/sys/netinet/sctp_var.h
+++ b/sys/netinet/sctp_var.h
@@ -85,7 +85,7 @@ extern struct pr_usrreqs sctp_usrreqs;
#define sctp_sbspace(asoc, sb) ((long) ((sctp_maxspace(sb) > (asoc)->sb_cc) ? (sctp_maxspace(sb) - (asoc)->sb_cc) : 0))
-#define sctp_sbspace_failedmsgs(sb) ((long) ((sctp_maxspace(sb) > (sb)->sb_cc) ? (sctp_maxspace(sb) - (sb)->sb_cc) : 0))
+#define sctp_sbspace_failedmsgs(sb) ((long) ((sctp_maxspace(sb) > SCTP_SBAVAIL(sb)) ? (sctp_maxspace(sb) - SCTP_SBAVAIL(sb)) : 0))
#define sctp_sbspace_sub(a,b) (((a) > (b)) ? ((a) - (b)) : 0)
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 7746740ea6c1..905bd2be129b 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -5003,7 +5003,6 @@ sctp_generate_no_user_data_cause(uint32_t tsn)
return (m);
}
-#ifdef SCTP_MBCNT_LOGGING
void
sctp_free_bufspace(struct sctp_tcb *stcb, struct sctp_association *asoc,
struct sctp_tmit_chunk *tp1, int chk_cnt)
@@ -5011,7 +5010,8 @@ sctp_free_bufspace(struct sctp_tcb *stcb, struct sctp_association *asoc,
if (tp1->data == NULL) {
return;
}
- asoc->chunks_on_out_queue -= chk_cnt;
+ atomic_subtract_int(&asoc->chunks_on_out_queue, chk_cnt);
+#ifdef SCTP_MBCNT_LOGGING
if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_MBCNT_LOGGING_ENABLE) {
sctp_log_mbcnt(SCTP_LOG_MBCNT_DECREASE,
asoc->total_output_queue_size,
@@ -5019,24 +5019,23 @@ sctp_free_bufspace(struct sctp_tcb *stcb, struct sctp_association *asoc,
0,
tp1->mbcnt);
}
+#endif
if (asoc->total_output_queue_size >= tp1->book_size) {
- atomic_add_int(&asoc->total_output_queue_size, -tp1->book_size);
+ atomic_subtract_int(&asoc->total_output_queue_size, tp1->book_size);
} else {
asoc->total_output_queue_size = 0;
}
-
- if (stcb->sctp_socket && (((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) ||
+ if ((stcb->sctp_socket != NULL) &&
+ (((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) ||
((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE)))) {
if (stcb->sctp_socket->so_snd.sb_cc >= tp1->book_size) {
- stcb->sctp_socket->so_snd.sb_cc -= tp1->book_size;
+ atomic_subtract_int(&((stcb)->sctp_socket->so_snd.sb_cc), tp1->book_size);
} else {
stcb->sctp_socket->so_snd.sb_cc = 0;
}
}
}
-#endif
-
int
sctp_release_pr_sctp_chunk(struct sctp_tcb *stcb, struct sctp_tmit_chunk *tp1,
uint8_t sent, int so_locked)
diff --git a/sys/netinet/sctputil.h b/sys/netinet/sctputil.h
index 8253fde829e1..1105ea14e1ad 100644
--- a/sys/netinet/sctputil.h
+++ b/sys/netinet/sctputil.h
@@ -239,34 +239,10 @@ sctp_bindx_delete_address(struct sctp_inpcb *inp, struct sockaddr *sa,
int sctp_local_addr_count(struct sctp_tcb *stcb);
-#ifdef SCTP_MBCNT_LOGGING
void
sctp_free_bufspace(struct sctp_tcb *, struct sctp_association *,
struct sctp_tmit_chunk *, int);
-#else
-#define sctp_free_bufspace(stcb, asoc, tp1, chk_cnt) \
-do { \
- if (tp1->data != NULL) { \
- atomic_subtract_int(&((asoc)->chunks_on_out_queue), chk_cnt); \
- if ((asoc)->total_output_queue_size >= tp1->book_size) { \
- atomic_subtract_int(&((asoc)->total_output_queue_size), tp1->book_size); \
- } else { \
- (asoc)->total_output_queue_size = 0; \
- } \
- if (stcb->sctp_socket && ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || \
- (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { \
- if (stcb->sctp_socket->so_snd.sb_cc >= tp1->book_size) { \
- atomic_subtract_int(&((stcb)->sctp_socket->so_snd.sb_cc), tp1->book_size); \
- } else { \
- stcb->sctp_socket->so_snd.sb_cc = 0; \
- } \
- } \
- } \
-} while (0)
-
-#endif
-
#define sctp_free_spbufspace(stcb, asoc, sp) \
do { \
if (sp->data != NULL) { \
From nobody Wed Feb 1 22:58:33 2023
X-Original-To: dev-commits-src-branches@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 4P6cls359wz3cGZb;
Wed, 1 Feb 2023 22:58:33 +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 4P6cls2ffbz3DjP;
Wed, 1 Feb 2023 22:58:33 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675292313;
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=kN4SJAFPUwOd6HR1CWY6PnNmxkjWRRoAzulBYlxPtbo=;
b=OyBFjA+arAdWRRm4cv+KZX6/FI7bU9UAZofPqyVJShuQGBOQWXhFTRp6YNpipmD+PLEQHo
UnRU/f6zOtL6Kx3Zvypk4wZuu8G8Hhm8AccLsD4H9q6kOgUapBIhfd0hXZT0qXtaFE6fbn
lvV+6g2R/X89mnblGUxLKEhWAbl7HHc+btSxcDMhXBvVjZsNqEXZZz94OVnToWvr5afGpc
KSUbUqUCNAR5v87pKJe7ZAs3jY/jFcRBW24UUMHBtdi7XN+5s8PDk20MaFV7QY0mbIt0T6
+06xKlDRgwpSXQlQi7zWNzyCrEsUiAOEkX7qKvoX/JdHsMp8WPII33hgFN9/fA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675292313;
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=kN4SJAFPUwOd6HR1CWY6PnNmxkjWRRoAzulBYlxPtbo=;
b=ySxgKArNQjOwwQTAYCOpkb0m45y8BrYrOCdmmzWStEl9DCSzCT48Q3AvGMbVepEBEporlC
IVj/GYW84O7ObcqKJ0dqY5KqhRhbkvedvP2CQbJFHOgpzLeo4i7mu+A77XjsLHwc7bv0OX
mPHOXxggiCEf0voUivXoeCHzer1MCz6hitFUoZ6Ud+TLeIAm0IN0kWcekB4stt0U7gdgwe
16PMD4cp4G12/0YveqwrrTUX+2K3em5F/cNfaZcBFZ4UpSSXcs+ioYPIQb0H+3GnZrPfdm
RSM/XUyyewT2sIkqkSFVitnVGSWmaTeoSWO0HCpI8JSooPZ3D5fpNb0U2YIsaA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675292313; a=rsa-sha256; cv=none;
b=g09VWeSx6JPnUZJ1LsbBRwPiYm6XkqX2PmQFB1FEirXdSyzfVlhmDewCGbinnZ1+N8I7FP
5a4kIbSawa0tvlM73rsnblCJSsXgwXPVmhw5gvVN3MA2ek4Ka3BlPx/fm3xNnFG8tTgewV
4sKmbH2JdyOnzSnCIjrr01/sHE2e+1u7aAdua/M04ptnRW2FZkdmojdpdDb01kPhpmnVsd
9ysUV25pbzMGJZdRpw8jhC1ZdxXGtMcxjI9u4nWQewNuKir9DAK+b4g2dGrjEkKCDOUTvs
wQ/2eadATrMQdkXD9N+pKXHtqiudS0Jjmc0NruPD/pfAAEdjwrrnsDaI0Mc2zQ==
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 4P6cls1jszzXFD;
Wed, 1 Feb 2023 22:58:33 +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 311MwXjM017891;
Wed, 1 Feb 2023 22:58:33 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MwXgf017890;
Wed, 1 Feb 2023 22:58:33 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:58:33 GMT
Message-Id: <202302012258.311MwXgf017890@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 2450e717321e - stable/13 - sctp: cleanup, no functional change except on error paths
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 2450e717321e94fae39b89eeefcc09edf932d32c
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=2450e717321e94fae39b89eeefcc09edf932d32c
commit 2450e717321e94fae39b89eeefcc09edf932d32c
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-05-28 09:34:20 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:58:10 +0000
sctp: cleanup, no functional change except on error paths
(cherry picked from commit 9cb70cb4769d2ef3a2e3b6d8bae8e0e59a4689e8)
---
sys/netinet/sctp_output.c | 163 ++++++++++++++++++++++------------------------
1 file changed, 79 insertions(+), 84 deletions(-)
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index f35bb0bbafc3..4de6fe4a8b3e 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -11572,7 +11572,7 @@ sctp_send_cwr(struct sctp_tcb *stcb, struct sctp_nets *net, uint32_t high_tsn, u
chk->rec.chunk_id.id = SCTP_ECN_CWR;
chk->rec.chunk_id.can_take_data = 1;
chk->flags = 0;
- chk->asoc = &stcb->asoc;
+ chk->asoc = asoc;
chk->send_size = sizeof(struct sctp_cwr_chunk);
chk->data = sctp_get_mbuf_for_msg(chk->send_size, 0, M_NOWAIT, 1, MT_HEADER);
if (chk->data == NULL) {
@@ -11590,7 +11590,7 @@ sctp_send_cwr(struct sctp_tcb *stcb, struct sctp_nets *net, uint32_t high_tsn, u
cwr->ch.chunk_flags = override;
cwr->ch.chunk_length = htons(sizeof(struct sctp_cwr_chunk));
cwr->tsn = htonl(high_tsn);
- TAILQ_INSERT_TAIL(&stcb->asoc.control_send_queue, chk, sctp_next);
+ TAILQ_INSERT_TAIL(&asoc->control_send_queue, chk, sctp_next);
asoc->ctrl_queue_cnt++;
}
@@ -12458,34 +12458,10 @@ sctp_lower_sosend(struct socket *so,
net = NULL;
stcb = NULL;
- t_inp = inp = (struct sctp_inpcb *)so->so_pcb;
- if (inp == NULL) {
- error = EINVAL;
- goto out_unlocked;
- }
if ((uio == NULL) && (top == NULL)) {
error = EINVAL;
goto out_unlocked;
}
- user_marks_eor = sctp_is_feature_on(inp, SCTP_PCB_FLAGS_EXPLICIT_EOR);
- atomic_add_int(&inp->total_sends, 1);
- if (uio != NULL) {
- if (uio->uio_resid < 0) {
- error = EINVAL;
- goto out_unlocked;
- }
- sndlen = uio->uio_resid;
- } else {
- sndlen = SCTP_HEADER_LEN(top);
- }
- SCTPDBG(SCTP_DEBUG_OUTPUT1, "Send called addr:%p send length %zd\n",
- (void *)addr, sndlen);
- if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) &&
- SCTP_IS_LISTENING(inp)) {
- /* The listener can NOT send. */
- error = EINVAL;
- goto out_unlocked;
- }
if (addr != NULL) {
union sctp_sockstore *raddr = (union sctp_sockstore *)addr;
@@ -12515,6 +12491,39 @@ sctp_lower_sosend(struct socket *so,
} else {
port = 0;
}
+ if (uio != NULL) {
+ if (uio->uio_resid < 0) {
+ error = EINVAL;
+ goto out_unlocked;
+ }
+ sndlen = uio->uio_resid;
+ } else {
+ sndlen = SCTP_HEADER_LEN(top);
+ }
+ SCTPDBG(SCTP_DEBUG_OUTPUT1, "Send called addr:%p send length %zd\n",
+ (void *)addr, sndlen);
+
+ t_inp = inp = (struct sctp_inpcb *)so->so_pcb;
+ if (inp == NULL) {
+ error = EINVAL;
+ goto out_unlocked;
+ }
+ user_marks_eor = sctp_is_feature_on(inp, SCTP_PCB_FLAGS_EXPLICIT_EOR);
+ if ((uio == NULL) && (user_marks_eor != 0)) {
+ /*-
+ * We do not support eeor mode for
+ * sending with mbuf chains (like sendfile).
+ */
+ error = EINVAL;
+ goto out_unlocked;
+ }
+ atomic_add_int(&inp->total_sends, 1);
+ if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) &&
+ SCTP_IS_LISTENING(inp)) {
+ /* The listener can NOT send. */
+ error = EINVAL;
+ goto out_unlocked;
+ }
if (srcv != NULL) {
sinfo_flags = srcv->sinfo_flags;
@@ -12524,8 +12533,9 @@ sctp_lower_sosend(struct socket *so,
error = EINVAL;
goto out_unlocked;
}
- if (srcv->sinfo_flags != 0)
+ if (srcv->sinfo_flags != 0) {
SCTP_STAT_INCR(sctps_sends_with_flags);
+ }
} else {
sinfo_flags = inp->def_send.sinfo_flags;
sinfo_assoc_id = inp->def_send.sinfo_assoc_id;
@@ -12700,6 +12710,7 @@ sctp_lower_sosend(struct socket *so,
KASSERT(stcb != NULL, ("stcb is NULL"));
KASSERT(hold_tcblock, ("hold_tcblock is false"));
SCTP_TCB_LOCK_ASSERT(stcb);
+
asoc = &stcb->asoc;
if ((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) ||
(asoc->state & SCTP_STATE_WAS_ABORTED)) {
@@ -12711,10 +12722,13 @@ sctp_lower_sosend(struct socket *so,
}
goto out_unlocked;
}
+ if ((SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_WAIT) ||
+ (SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_ECHOED)) {
+ queue_only = 1;
+ }
/* Keep the stcb from being freed under our feet. */
atomic_add_int(&asoc->refcnt, 1);
free_cnt_applied = true;
-
if (srcv == NULL) {
srcv = (struct sctp_sndrcvinfo *)&asoc->def_send;
sinfo_flags = srcv->sinfo_flags;
@@ -12726,10 +12740,11 @@ sctp_lower_sosend(struct socket *so,
}
}
if (sinfo_flags & SCTP_ADDR_OVER) {
- if (addr != NULL)
+ if (addr != NULL) {
net = sctp_findnet(stcb, addr);
- else
+ } else {
net = NULL;
+ }
if ((net == NULL) ||
((port != 0) && (port != stcb->rport))) {
error = EINVAL;
@@ -12742,20 +12757,34 @@ sctp_lower_sosend(struct socket *so,
net = asoc->primary_destination;
}
}
- atomic_add_int(&stcb->total_sends, 1);
-
+ /* Is the stream no. valid? */
+ if (srcv->sinfo_stream >= asoc->streamoutcnt) {
+ /* Invalid stream number */
+ error = EINVAL;
+ goto out_unlocked;
+ }
+ if ((asoc->strmout[srcv->sinfo_stream].state != SCTP_STREAM_OPEN) &&
+ (asoc->strmout[srcv->sinfo_stream].state != SCTP_STREAM_OPENING)) {
+ /*
+ * Can't queue any data while stream reset is underway.
+ */
+ if (asoc->strmout[srcv->sinfo_stream].state > SCTP_STREAM_OPEN) {
+ error = EAGAIN;
+ } else {
+ error = EINVAL;
+ }
+ goto out_unlocked;
+ }
if (sctp_is_feature_on(inp, SCTP_PCB_FLAGS_NO_FRAGMENT)) {
if (sndlen > (ssize_t)asoc->smallest_mtu) {
error = EMSGSIZE;
goto out_unlocked;
}
}
- if (SCTP_SO_IS_NBIO(so)
- || (flags & (MSG_NBIO | MSG_DONTWAIT)) != 0
- ) {
+ atomic_add_int(&stcb->total_sends, 1);
+ if (SCTP_SO_IS_NBIO(so) || (flags & (MSG_NBIO | MSG_DONTWAIT)) != 0) {
non_blocking = true;
}
- /* would we block? */
if (non_blocking) {
ssize_t amount;
@@ -12775,46 +12804,9 @@ sctp_lower_sosend(struct socket *so,
}
goto out_unlocked;
}
- asoc->sb_send_resv += (uint32_t)sndlen;
- } else {
- atomic_add_int(&asoc->sb_send_resv, (int)sndlen);
}
+ atomic_add_int(&asoc->sb_send_resv, (int)sndlen);
local_soresv = sndlen;
- /* Is the stream no. valid? */
- if (srcv->sinfo_stream >= asoc->streamoutcnt) {
- /* Invalid stream number */
- error = EINVAL;
- goto out_unlocked;
- }
- if ((asoc->strmout[srcv->sinfo_stream].state != SCTP_STREAM_OPEN) &&
- (asoc->strmout[srcv->sinfo_stream].state != SCTP_STREAM_OPENING)) {
- /*
- * Can't queue any data while stream reset is underway.
- */
- if (asoc->strmout[srcv->sinfo_stream].state > SCTP_STREAM_OPEN) {
- error = EAGAIN;
- } else {
- error = EINVAL;
- }
- goto out_unlocked;
- }
- if ((SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_WAIT) ||
- (SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_ECHOED)) {
- queue_only = 1;
- }
- if ((SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_SENT) ||
- (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_RECEIVED) ||
- (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_ACK_SENT) ||
- (asoc->state & SCTP_STATE_SHUTDOWN_PENDING)) {
- if ((sinfo_flags & SCTP_ABORT) == 0) {
- error = EPIPE;
- goto out_unlocked;
- }
- }
- /* Ok, we will attempt a msgsnd :> */
- if (p != NULL) {
- p->td_ru.ru_msgsnd++;
- }
KASSERT(stcb != NULL, ("stcb is NULL"));
KASSERT(hold_tcblock, ("hold_tcblock is false"));
@@ -12835,7 +12827,7 @@ sctp_lower_sosend(struct socket *so,
(SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_ECHOED)) {
/* It has to be up before we abort. */
error = EINVAL;
- goto out;
+ goto out_unlocked;
}
/* How big is the user initiated abort? */
if (top != NULL) {
@@ -12932,6 +12924,18 @@ sctp_lower_sosend(struct socket *so,
KASSERT((asoc->state & SCTP_STATE_WAS_ABORTED) == 0,
("Association was aborted"));
+ if ((SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_SENT) ||
+ (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_RECEIVED) ||
+ (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_ACK_SENT) ||
+ (asoc->state & SCTP_STATE_SHUTDOWN_PENDING)) {
+ error = EPIPE;
+ goto out_unlocked;
+ }
+ /* Ok, we will attempt a msgsnd :> */
+ if (p != NULL) {
+ p->td_ru.ru_msgsnd++;
+ }
+
/* Calculate the maximum we can send */
inqueue_bytes = asoc->total_output_queue_size - (asoc->chunks_on_out_queue * SCTP_DATA_CHUNK_OVERHEAD(stcb));
if (SCTP_SB_LIMIT_SND(so) > inqueue_bytes) {
@@ -12946,15 +12950,6 @@ sctp_lower_sosend(struct socket *so,
error = EMSGSIZE;
goto out_unlocked;
}
- if ((uio == NULL) && (user_marks_eor != 0)) {
- /*-
- * We do not support eeor mode for
- * sending with mbuf chains (like sendfile).
- */
- error = EINVAL;
- goto out_unlocked;
- }
-
if (user_marks_eor != 0) {
local_add_more = (ssize_t)min(SCTP_SB_LIMIT_SND(so), SCTP_BASE_SYSCTL(sctp_add_more_threshold));
} else {
From nobody Wed Feb 1 22:59:08 2023
X-Original-To: dev-commits-src-branches@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 4P6cmX5Nw3z3cGmR;
Wed, 1 Feb 2023 22:59:08 +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 4P6cmX4xmNz3DvR;
Wed, 1 Feb 2023 22:59:08 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675292348;
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=FDsOJ6PL+VNk1hFoq8oAK4cKHifE0EvF0BTLWV/MXTs=;
b=MYIoHkL699Nb0yoVFOz4MDSi0q6Ejswf+qbY2R6P7Dq+SaT5X92Bi/mN2UVnvOIfaFXUuu
4sEMRGr5y4hmmDR1w77BW/HTxj9AafUE20ue+JxVpY+CUA/wX85G6F9cCZDuYfBdOdj1wt
VQGeqzuqU3BEIgi8FNrqSn7NqnnmDOVf6OQDceL3/65cHNNbC6Ns4fVNxLsrar6gz8jpL2
k59t5pkPOR2sbLV2HGVXJyS7t7TVfYOWoTPMIMb1rwRYmJtC7hkF6tRH7sTrrHZIOmPFaA
97EKiTdSnnV+FyUY+15DrjDyC0qo0T3gCLgtYsQwpQnZtiuLcD/UEky9955POA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675292348;
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=FDsOJ6PL+VNk1hFoq8oAK4cKHifE0EvF0BTLWV/MXTs=;
b=WA8ZDSBdRJ4e6rnLF4x0/1fVz5su9+oVQFow2U+2kZGby4xc7rgh+B6j2ogTYC89+ZDyNe
Mame6aeUY/vXp62+di6r1+DAHZWJC63qTtsIjpNFNiBcp1tdT/LGeCvygKRqcL/Dor6wxJ
iB9mM39jM8bVZa39VgTTN5AHdFxdTiBEA8CiHB3BT8TVugoKEfTzUZiOXjl+/13PLcVEop
kcpXlYvKL75tPbxWrnxUjsVZEnPBVDlvJJ6T0nUXvi2KDa2AtfN8xUNI6G0bYTpj1wg4XW
mRpjRrSxCUgnVZVdBUodRAbIoJPHCI3PGSty3eUwF+oAWuU7ej0ejbb3zRSg3A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675292348; a=rsa-sha256; cv=none;
b=LBIkclmCFvX6IqIlORpzRQBXIryHO6UWoyTY2gG0V6bx3SLYckKOUjGHCGCKZfHXuLrHOk
jAZFEMaOtiAe6D+fjGEROcMJ3eO40VCOcWrAgyK4NrUVzf3lSq+uAaeReHmgE5ABZMgNbu
gZksw4/O+gZS+4FOWRREIhilWL7zKYLuvfrFaIkXQr/8AFU3q9GQSHHtoWjz8j6+UJKrI9
k0nqQurp5g/mnZiWld5qyfdCMMDVoN5sMrBGnWjmADnu6uVy2x8edsXjl+NstMzTTM/Jks
BtcnswopQ1Kd+d97i6ZF/13ykqhXoIWAFX6XzlDXYSH+axm3Pu6ZdUWUFzOv3Q==
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 4P6cmX41YNzXFF;
Wed, 1 Feb 2023 22:59:08 +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 311Mx83W018071;
Wed, 1 Feb 2023 22:59:08 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311Mx8Gu018070;
Wed, 1 Feb 2023 22:59:08 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:59:08 GMT
Message-Id: <202302012259.311Mx8Gu018070@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 7e995a75013c - stable/13 - sctp: cleanup of error paths
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 7e995a75013c11adc1208d9741fca3a09a54be43
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=7e995a75013c11adc1208d9741fca3a09a54be43
commit 7e995a75013c11adc1208d9741fca3a09a54be43
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-05-28 15:15:14 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:58:46 +0000
sctp: cleanup of error paths
(cherry picked from commit f21168e61404eacc6ad58a74ed9af92a8e5072df)
---
sys/netinet/sctp_output.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 4de6fe4a8b3e..45a27e5d2e1d 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -12248,8 +12248,9 @@ sctp_copy_resume(struct uio *uio,
m = m_uiotombuf(uio, M_WAITOK, max_send_len, 0,
(M_PKTHDR | (user_marks_eor ? M_EOR : 0)));
if (m == NULL) {
- SCTP_LTRACE_ERR_RET(NULL, NULL, NULL, SCTP_FROM_SCTP_OUTPUT, ENOBUFS);
- *error = ENOBUFS;
+ /* The only possible error is EFAULT. */
+ SCTP_LTRACE_ERR_RET(NULL, NULL, NULL, SCTP_FROM_SCTP_OUTPUT, EFAULT);
+ *error = EFAULT;
} else {
*sndout = m_length(m, NULL);
*new_tail = m_last(m);
@@ -12262,13 +12263,12 @@ sctp_copy_one(struct sctp_stream_queue_pending *sp,
struct uio *uio,
int resv_upfront)
{
- sp->data = m_uiotombuf(uio, M_WAITOK, sp->length,
- resv_upfront, 0);
+ sp->data = m_uiotombuf(uio, M_WAITOK, sp->length, resv_upfront, 0);
if (sp->data == NULL) {
- SCTP_LTRACE_ERR_RET(NULL, NULL, NULL, SCTP_FROM_SCTP_OUTPUT, ENOBUFS);
- return (ENOBUFS);
+ /* The only possible error is EFAULT. */
+ SCTP_LTRACE_ERR_RET(NULL, NULL, NULL, SCTP_FROM_SCTP_OUTPUT, EFAULT);
+ return (EFAULT);
}
-
sp->tail_mbuf = m_last(sp->data);
return (0);
}
@@ -12319,7 +12319,6 @@ sctp_copy_it_in(struct sctp_tcb *stcb,
sp->context = srcv->sinfo_context;
sp->fsn = 0;
(void)SCTP_GETTIME_TIMEVAL(&sp->ts);
-
sp->sid = srcv->sinfo_stream;
sp->length = (uint32_t)min(uio->uio_resid, max_send_len);
if ((sp->length == (uint32_t)uio->uio_resid) &&
@@ -12517,13 +12516,13 @@ sctp_lower_sosend(struct socket *so,
error = EINVAL;
goto out_unlocked;
}
- atomic_add_int(&inp->total_sends, 1);
if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) &&
SCTP_IS_LISTENING(inp)) {
/* The listener can NOT send. */
error = EINVAL;
goto out_unlocked;
}
+ atomic_add_int(&inp->total_sends, 1);
if (srcv != NULL) {
sinfo_flags = srcv->sinfo_flags;
From nobody Wed Feb 1 22:59:46 2023
X-Original-To: dev-commits-src-branches@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 4P6cnG54jMz3cGjy;
Wed, 1 Feb 2023 22:59:46 +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 4P6cnG4XPqz3FFB;
Wed, 1 Feb 2023 22:59:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675292386;
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=B8F29H/BRFgpscLhs0lNPgvmiSDd35ayU7Yb8+75fBM=;
b=vrNjEHG4Yky6JC2DQKgA8jseMrGFiybjKLYxne7xAiBOzO+uxx71ffQ6Q5v6SdQ3f69TNr
XMM+TFjyI7cR13V6F/owlu6sFwS5F6wgpX4aCW6Q67UDnpT84M6evDephRlhX4j/FxC8zy
xc4nwBqwYuAuWLP6o/g2aHDUBOQDHTfVtDXswXM7/ziqr40naptr0Q9p/mcw5+fUAMsZ0/
0zeyGKtfWhdx0cpwdp18hB4ef9yDI/Fx93pUU7pcuP4tGoCQ2v+sr65uRygv2G2VuuaHeG
FvZc7fxc14p9+NGMpd/t/8QFLmdRTry+gtm2QQNzJdfThaiXc+F7tOyLHDiqhA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675292386;
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=B8F29H/BRFgpscLhs0lNPgvmiSDd35ayU7Yb8+75fBM=;
b=vo5YlqenB06FhulNbt2seQBUsOj1kl427JByf9sDCqziLOitHeyYbdEXDY/SGa+IH1g9o1
OfnUHLeg1p0PK0VkfO9R0DD4vf9Hpc4xKyP/+J+Gy+/tTLM9ZLH8E5ZF5nQcs3w6dKq6uA
1kIv8PVgggV3A6qtt96uxBU5WLvBRVP3mZk62t/WruMHW5hnpKitS/Q0qNALhaqp5G2jvu
5lhLrAkMhy3RXOeNybTN7SCcea0e537+n/Qi1exoMiUFlIf42pOJZGnHBFGD9Qp63/68Ll
NesTkX00ySKW4R+r+suPYzJ7teVTKp2/IX+F3/aU/7GIN/WPkSYDvBz67q3ckA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675292386; a=rsa-sha256; cv=none;
b=i64FR4hkX9/i07xu/pCcBraAyu7S+Zx+VllE29c1bKwDn1ZhzwnY+Y3+h+ctFUPZxf1NTp
6YDwVLqkR9z6OnELez3AA2w0dDZExJYDIc/U9gnv9DVoARFGfuin/042Hc/HygogW04L7P
EZCqP0Bnlo81D8YV9c6HfkFsK9aRCTPBvuzLvfYpUghkxTNqIxJkhfPsaTJZnodO+sn/bx
s1tHTgv1bZ+7R8Xv34okuUhnea7f3taSoLO+wvdFXmjreGk/Ey3SEKTodpg38dltqVHjn8
+uxxBYB4LYOp4NAb8CHbYwf8iQmOb9bhBs2ERgA3lQn+H+keC/kjC4ZIeyILYQ==
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 4P6cnG3ZvCzWTs;
Wed, 1 Feb 2023 22:59:46 +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 311MxkSe018247;
Wed, 1 Feb 2023 22:59:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MxkvS018246;
Wed, 1 Feb 2023 22:59:46 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 22:59:46 GMT
Message-Id: <202302012259.311MxkvS018246@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: f25aa6dc17d7 - stable/13 - sctp: improve handling of send() when association is shutdown
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: f25aa6dc17d761c4cf2727e630f5aee128f10403
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=f25aa6dc17d761c4cf2727e630f5aee128f10403
commit f25aa6dc17d761c4cf2727e630f5aee128f10403
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-05-28 15:40:17 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 22:59:22 +0000
sctp: improve handling of send() when association is shutdown
Accept send() calls only when the association is not being
shut down or the expicit message EOR mode is used and the
application provides follow-up data.
Reported by: syzbot+341e9ebd9d24ca7dc62a@syzkaller.appspotmail.com
(cherry picked from commit 64b297e803bd8123bfef3fecaa1f8ceae9eea0e6)
---
sys/netinet/sctp_output.c | 45 +++++++++++++++++++++++++--------------------
1 file changed, 25 insertions(+), 20 deletions(-)
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 45a27e5d2e1d..dfad4e5dfa08 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -6348,8 +6348,8 @@ sctp_msg_append(struct sctp_tcb *stcb,
(SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_RECEIVED) ||
(stcb->asoc.state & SCTP_STATE_SHUTDOWN_PENDING)) {
/* got data while shutting down */
- SCTP_LTRACE_ERR_RET(NULL, stcb, NULL, SCTP_FROM_SCTP_OUTPUT, ECONNRESET);
- error = ECONNRESET;
+ SCTP_LTRACE_ERR_RET(NULL, stcb, NULL, SCTP_FROM_SCTP_OUTPUT, EPIPE);
+ error = EPIPE;
goto out_now;
}
sctp_alloc_a_strmoq(stcb, sp);
@@ -12291,20 +12291,10 @@ sctp_copy_it_in(struct sctp_tcb *stcb,
* sb is locked however. When data is copied the protocol processing
* should be enabled since this is a slower operation...
*/
- struct sctp_stream_queue_pending *sp = NULL;
+ struct sctp_stream_queue_pending *sp;
int resv_in_first;
*error = 0;
- /* Now can we send this? */
- if ((SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_SENT) ||
- (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_ACK_SENT) ||
- (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_RECEIVED) ||
- (asoc->state & SCTP_STATE_SHUTDOWN_PENDING)) {
- /* got data while shutting down */
- SCTP_LTRACE_ERR_RET(NULL, stcb, NULL, SCTP_FROM_SCTP_OUTPUT, ECONNRESET);
- *error = ECONNRESET;
- goto out_now;
- }
sctp_alloc_a_strmoq(stcb, sp);
if (sp == NULL) {
SCTP_LTRACE_ERR_RET(NULL, stcb, net, SCTP_FROM_SCTP_OUTPUT, ENOMEM);
@@ -12923,13 +12913,6 @@ sctp_lower_sosend(struct socket *so,
KASSERT((asoc->state & SCTP_STATE_WAS_ABORTED) == 0,
("Association was aborted"));
- if ((SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_SENT) ||
- (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_RECEIVED) ||
- (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_ACK_SENT) ||
- (asoc->state & SCTP_STATE_SHUTDOWN_PENDING)) {
- error = EPIPE;
- goto out_unlocked;
- }
/* Ok, we will attempt a msgsnd :> */
if (p != NULL) {
p->td_ru.ru_msgsnd++;
@@ -13084,6 +13067,28 @@ skip_preblock:
if (error != 0) {
goto out;
}
+ /*
+ * Reject the sending of a new user message, if the
+ * association is about to be shut down.
+ */
+ if ((SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_SENT) ||
+ (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_RECEIVED) ||
+ (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_ACK_SENT) ||
+ (asoc->state & SCTP_STATE_SHUTDOWN_PENDING)) {
+ if (sp->data != 0) {
+ sctp_m_freem(sp->data);
+ sp->data = NULL;
+ sp->tail_mbuf = NULL;
+ sp->length = 0;
+ }
+ if (sp->net != NULL) {
+ sctp_free_remote_addr(sp->net);
+ sp->net = NULL;
+ }
+ sctp_free_a_strmoq(stcb, sp, SCTP_SO_LOCKED);
+ error = EPIPE;
+ goto out_unlocked;
+ }
/* The out streams might be reallocated. */
strm = &asoc->strmout[srcv->sinfo_stream];
if (sp->msg_is_complete) {
From nobody Wed Feb 1 23:00:24 2023
X-Original-To: dev-commits-src-branches@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 4P6cp04Lsmz3cH2k;
Wed, 1 Feb 2023 23:00:24 +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 4P6cp03np7z3Fjj;
Wed, 1 Feb 2023 23:00:24 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675292424;
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=ZETE6Qwkcb2fyKjCxsmcdpd8bW6zfXZ7RtSWd9wui8g=;
b=rH9aH+EWHUyAYt+vpn2FNZvAJ1Se1czmmNaNhQysNJZdK5lrTHjL37+PxmCbK8bQy3QAEF
6IcmKuhVymRWyOwVl83Fgf2TjiuzMqcE1vboGlDvvSKb2zRhJ1GBnPFoUcos89zpJ7VZGX
n04ZvvO6OeptSZreRZVPs2uwOwUdgrISC9BdL/JoQ3TM/OtgO8p9Yf4uMCUk5vA2JdVUgC
hKl0L7DJ3k26TQlOTdRf6ydiPdetTJA0mL6l4yTF6LGhSn0sIclXfoWXTQs1envmBDMah3
M+JKS9fPDcLRIuV9Ne8HJ+XyrD5TftQ6dSR5EScN0Ljhe4U4rxgvIA6XQjUFkw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675292424;
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=ZETE6Qwkcb2fyKjCxsmcdpd8bW6zfXZ7RtSWd9wui8g=;
b=lybUVfXN9UvwnVUnG0umg+f35KbMwaWqfPBWFVqerryZ9OCkeinKm0bL6DKTo8VtRU3Pbz
fG5xXvahoeu7ep70666ZvsrENjXqKTx91yZherphHUs/aILRMiXNlHEhdX9wjyAfGn2n2w
JkarFxjd/xNSWKVuqUIdmjFaSFqJDubPc2eWQk9NFFy2hIWMjD3RMa+tw1OHDxMnzdnEf4
ucLqHOwgkfYErHZ0T9MkG5cT7a461Q7I4Wx9sqE43kA+IuRuxHIE/rru9C2y34iRYNe18D
AZ1RyXqDDud/iB1L6cQWXvLtlmzIRD0K/fXX1GkN93L09TMNOMODSw/LS4/MkA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675292424; a=rsa-sha256; cv=none;
b=byiytzjNXERD/xfAiDwZUR/HEqgkYwA28MCSVp1nARjNq77fmrk4R2dA0ltYiKzMqPnMVi
+oFk/RVxQ5cH0q21O22A5n8I9qfjH3JlC2KtlbJEUgJ3hoYnB38r62q1lZLY/BpOBjMvDh
ukyERLwLIH48r0KtwPfxFHjjBHvcVOGcQaYxlJip1V02qMtdCmLt9oqA1KaguV4NaZeUix
HfVPD9Ti+gd27kYdW+lIL8XmfnBPcv2CBPz99DhqlpG0Z/GOtzucC0RLIVaZpq6+xRJs9N
wkEa/Bb4vPdtN56K2xpzO4MSUHvGvanCAaXEcx8XB4OhQTcz9VH93bQgAD36KQ==
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 4P6cp02rXVzWvn;
Wed, 1 Feb 2023 23:00:24 +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 311N0OtV027669;
Wed, 1 Feb 2023 23:00:24 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311N0OlC027668;
Wed, 1 Feb 2023 23:00:24 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:00:24 GMT
Message-Id: <202302012300.311N0OlC027668@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 094bf09d81d0 - stable/13 - sctp: ignore SCTP_SENDALL flag on 1-to-1 style sockets
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 094bf09d81d01c28c22c1969498abf241148fd06
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=094bf09d81d01c28c22c1969498abf241148fd06
commit 094bf09d81d01c28c22c1969498abf241148fd06
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-05-28 17:07:10 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:00:00 +0000
sctp: ignore SCTP_SENDALL flag on 1-to-1 style sockets
(cherry picked from commit e2ceff302833ee5f90ac2437efe3670cafcbdd46)
---
sys/netinet/sctp_output.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index dfad4e5dfa08..7c0c953c7504 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -12535,17 +12535,19 @@ sctp_lower_sosend(struct socket *so,
if (flags & MSG_EOF) {
sinfo_flags |= SCTP_EOF;
}
- if (sinfo_flags & SCTP_SENDALL) {
- error = sctp_sendall(inp, uio, top, srcv);
- top = NULL;
- goto out_unlocked;
- }
if ((sinfo_flags & SCTP_ADDR_OVER) && (addr == NULL)) {
error = EINVAL;
goto out_unlocked;
}
- /* Now we must find the association. */
SCTP_INP_RLOCK(inp);
+ if ((sinfo_flags & SCTP_SENDALL) &&
+ (inp->sctp_flags & SCTP_PCB_FLAGS_UDPTYPE)) {
+ SCTP_INP_RUNLOCK(inp);
+ error = sctp_sendall(inp, uio, top, srcv);
+ top = NULL;
+ goto out_unlocked;
+ }
+ /* Now we must find the association. */
if ((inp->sctp_flags & SCTP_PCB_FLAGS_CONNECTED) ||
(inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) {
stcb = LIST_FIRST(&inp->sctp_asoc_list);
From nobody Wed Feb 1 23:01:03 2023
X-Original-To: dev-commits-src-branches@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 4P6cpm0mN9z3cH89;
Wed, 1 Feb 2023 23:01:04 +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 4P6cpm0Lbmz3FtD;
Wed, 1 Feb 2023 23:01:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675292464;
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=634J0eV463uIXjLUqyQZXOt1KdFQrZk7I0I33T7I1ts=;
b=nuOJHsT5LvqYOHdnfwLA8Sfl+7CW2DkoBL4EVkqCJih9Ei1If4ClElVB+UsjEKju4KgLch
PGFCJ3OM8/O51g+PtP4odp0e9X8Lq5fQKxL26/B+3VLcAR6ppAD0S4dogXfa1AvQAfIJiW
kQ/70ZGbcf340WDfVJ+bTaHMup7WobVyHywV6taWyDuRX8vbku/QRLBKu2hndCHhRlVok7
J4htADkSmVSBX5/IKvoAskumytruDGUHp7FRAapk+Y121ixEIKFIudjOqyGmBy8fv87KVm
ERHf4+tPmKRGZPmDFsLdRk7YDoZVhUn20ovCRpra64mAC+jY8k0vZvDSMVM8mQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675292464;
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=634J0eV463uIXjLUqyQZXOt1KdFQrZk7I0I33T7I1ts=;
b=Py2ZiMBMVFa2yF7iQVnKCbSCus4KFXNUg5LwDUpFA5MpihHoInhqU/VRfuYH/GTqOBAwtR
V4UyKymGaaEFiY+cOZPjc7krcCS7n6ObJk/N3C4AJXzjF3Z0zSKV6i1fSzPFDamNqRF/Bm
L3MGrvpEior8LvIFLNiJaVRZD2QfisGSGVqZ3VxJmDYSASdLMGifZJJefwIOWIBnRdH1me
IqjEFsekIUSnCxt5F5AUhWzZlBzbPhZsw45IMCsW1gv0/2Itf2YTfGdfGN3NCJkynfA/A4
/boUAqkkxOXmvvbaxKPD+RZhbjE94Dewvgcp99aaIq5DGNN1Y8PtuanLYRwQ0g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675292464; a=rsa-sha256; cv=none;
b=nwK2bL9+oR82nbmFMp6ID5ab7jvXup8Nyds5s1CHEjxGPcV4xoHik29SIeOC5tqImcDgED
8W55EZPRcafcPdfLF82add98nNAQdAaTfD9QJFbaUk4Rpq4pXLMqRuW4yg3cDfAB+/raP9
BAKZTmb6aErpW1Vxp6HC2jRPRr73zrqOrPzemg8zMBHz1VYgz9cVnyqm4b/asmSVD0HSFG
jSqxXlPqIDwewGR0JeWb7qpL5QnZ2DsZafTNQrPy32vSbVIw7WkvRR45VL+kqeFCcPqwiK
RuVBwa2P7I7ZBWsVowqo0icP3vnx1ZYIA1rvo28io/Yv97ydaCab2XolSjvosA==
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 4P6cpl6W7rzX1t;
Wed, 1 Feb 2023 23:01:03 +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 311N13xH028835;
Wed, 1 Feb 2023 23:01:03 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311N13B5028834;
Wed, 1 Feb 2023 23:01:03 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:01:03 GMT
Message-Id: <202302012301.311N13B5028834@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 821f1352112e - stable/13 - sctp: use a consistent view of the send parameters
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 821f1352112e0af022ffb7cefc1c5fb81b1574be
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=821f1352112e0af022ffb7cefc1c5fb81b1574be
commit 821f1352112e0af022ffb7cefc1c5fb81b1574be
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-05-28 17:35:58 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:00:40 +0000
sctp: use a consistent view of the send parameters
Reported by: syzbot+e26628a755f78bacff16@syzkaller.appspotmail.com
(cherry picked from commit 2646cd085850f047eb17c7df53823b1d48deca82)
---
sys/netinet/sctp_output.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 7c0c953c7504..7695784aafff 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -12416,6 +12416,7 @@ sctp_lower_sosend(struct socket *so,
struct thread *p
)
{
+ struct sctp_nonpad_sndrcvinfo sndrcvninfo;
struct epoch_tracker et;
ssize_t sndlen = 0, max_len, local_add_more;
int error;
@@ -12721,7 +12722,9 @@ sctp_lower_sosend(struct socket *so,
atomic_add_int(&asoc->refcnt, 1);
free_cnt_applied = true;
if (srcv == NULL) {
- srcv = (struct sctp_sndrcvinfo *)&asoc->def_send;
+ /* Use a local copy to have a consistent view. */
+ sndrcvninfo = asoc->def_send;
+ srcv = (struct sctp_sndrcvinfo *)&sndrcvninfo;
sinfo_flags = srcv->sinfo_flags;
if (flags & MSG_EOR) {
sinfo_flags |= SCTP_EOR;
From nobody Wed Feb 1 23:18:04 2023
X-Original-To: dev-commits-src-branches@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 4P6dBN5qrrz3cK48;
Wed, 1 Feb 2023 23:18:04 +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 4P6dBN5LYGz3HCy;
Wed, 1 Feb 2023 23:18:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675293484;
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=boy16oTXxK9LJ1s37QfQbrOLJ5GSEztSC0QqV3mxBqw=;
b=lV3k17grk+mRkro1aPR66Y4o19Mjb/Nt7m/7ya2IlU8blfA6QjdXmL50A1dJ0y8hzLLJl4
U+7N3jodyWdi+zflyvQDQ5pLdkvkj7dcWTFPt95P8WFv4DfGFRHNwL1MJC6kQzdT7L5D5l
jjYwxrOERrutRYZZbDD3jDRekKvP72TRLbGRc6Z0rXwqmh9EsNomcceelSS9S2+8171g4s
IgmyLSpUySXJEU71r4TbOhQ55Bp9zntwy4Qfm/3jGeO9yzw5lt70X/4Cj7ENjhz1VEo1G4
YiTCxJvrDds3bEOCgRbqH9r3az/dFZurhJ0FsMuC3DolKjk09UjPQc7ZjvMjEA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675293484;
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=boy16oTXxK9LJ1s37QfQbrOLJ5GSEztSC0QqV3mxBqw=;
b=c/VfqnzLu6uZYZjWgne5DHzL2o9Q58Dhy7mJ50RhrrcerFEdqrU66JX9fMvQJHbd3VKsk3
UFk9d0+j0YwZpNC8EW38wdXwFbGtaKp9PGHKhLI0Hra0zKqQYVtcetBgUJCsDxcACqsLCF
MMjVFl5Wv/KaXzak5AskAyQNHOTazuEH43ZjowYsDYJNZd7YMRpwY2L7Fyo5+ogdVVP5Xh
W2HBn6DGBVejjPnIftEsdKqDNN3ZKvK7NzqrVf4DaGs/4LXkNKKWO2SDx4K7ZFZ8GF7ls9
j+YysD6yfHVOMT8S55R8rSTlJlUjaCtgAOjAc8IQXd9VtojdDBVnyb75+xRJeg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675293484; a=rsa-sha256; cv=none;
b=HHxr/yw2Qjl5STc2g06YUQZw8x/Jt8B29oz89G3xg5rGscFvWT6BcvtzIOBBwuClRTxGPN
SN+g1PAA+Zhc6T/R/xLI6PoDdKMczZpJ36Afh+xD5UVp5XFgs7xRBo3YG2G2/tcVjMmM72
yPhZvU5N4B+jE1G1X7zOrSazlHdM/FMmEvyVrB1YHhO/ko7E9hU3OENXR1ykw3EuxZcMeV
9JmPMud1P+ZjkaRuPi4ExbRrR//oTqt51+0N/Ms7P3sGhjlHHW8BQIq0rRq1d+9ZISv1n8
0QU53tfvnBaOEL7ggdFq4vP5JsxwISwlyReUvDL/2w7Tx1bS1958zE2tOv2SBw==
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 4P6dBN4PXDzXgq;
Wed, 1 Feb 2023 23:18:04 +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 311NI4Ii047626;
Wed, 1 Feb 2023 23:18:04 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NI4XY047625;
Wed, 1 Feb 2023 23:18:04 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:18:04 GMT
Message-Id: <202302012318.311NI4XY047625@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: f997df3164c5 - stable/13 - sctp: improve handling of sctp inpcb flags
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: f997df3164c53be1519ba87b769fc3a87a50fc34
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=f997df3164c53be1519ba87b769fc3a87a50fc34
commit f997df3164c53be1519ba87b769fc3a87a50fc34
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-06-04 05:35:54 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:17:29 +0000
sctp: improve handling of sctp inpcb flags
Use an atomic operation when the inp is not write locked.
Reported by: syzbot+bf27083e9a3f8fde8b4d@syzkaller.appspotmail.com
(cherry picked from commit a5c2009dd8ab562435fb7cc2ac0922668f9511a8)
---
sys/netinet/sctp_constants.h | 8 ++++----
sys/netinet/sctp_input.c | 9 ++++-----
sys/netinet/sctp_pcb.c | 15 +++++++++++++++
sys/netinet/sctp_pcb.h | 3 +++
sys/netinet/sctputil.c | 2 +-
5 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/sys/netinet/sctp_constants.h b/sys/netinet/sctp_constants.h
index 66f2cca5ab6d..3df6ad6db2aa 100644
--- a/sys/netinet/sctp_constants.h
+++ b/sys/netinet/sctp_constants.h
@@ -968,7 +968,7 @@ __FBSDID("$FreeBSD$");
#define sctp_sowwakeup(inp, so) \
do { \
if (inp->sctp_flags & SCTP_PCB_FLAGS_DONT_WAKE) { \
- inp->sctp_flags |= SCTP_PCB_FLAGS_WAKEOUTPUT; \
+ sctp_pcb_add_flags(inp, SCTP_PCB_FLAGS_WAKEOUTPUT); \
} else { \
sowwakeup(so); \
} \
@@ -977,8 +977,8 @@ do { \
#define sctp_sowwakeup_locked(inp, so) \
do { \
if (inp->sctp_flags & SCTP_PCB_FLAGS_DONT_WAKE) { \
+ sctp_pcb_add_flags(inp, SCTP_PCB_FLAGS_WAKEOUTPUT); \
SOCKBUF_UNLOCK(&((so)->so_snd)); \
- inp->sctp_flags |= SCTP_PCB_FLAGS_WAKEOUTPUT; \
} else { \
sowwakeup_locked(so); \
} \
@@ -987,7 +987,7 @@ do { \
#define sctp_sorwakeup(inp, so) \
do { \
if (inp->sctp_flags & SCTP_PCB_FLAGS_DONT_WAKE) { \
- inp->sctp_flags |= SCTP_PCB_FLAGS_WAKEINPUT; \
+ sctp_pcb_add_flags(inp, SCTP_PCB_FLAGS_WAKEINPUT); \
} else { \
sorwakeup(so); \
} \
@@ -996,7 +996,7 @@ do { \
#define sctp_sorwakeup_locked(inp, so) \
do { \
if (inp->sctp_flags & SCTP_PCB_FLAGS_DONT_WAKE) { \
- inp->sctp_flags |= SCTP_PCB_FLAGS_WAKEINPUT; \
+ sctp_pcb_add_flags(inp, SCTP_PCB_FLAGS_WAKEINPUT); \
SOCKBUF_UNLOCK(&((so)->so_rcv)); \
} else { \
sorwakeup_locked(so); \
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index 95e3be69123e..6fa4d0323d94 100644
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -1491,8 +1491,7 @@ sctp_process_cookie_existing(struct mbuf *m, int iphlen, int offset,
* init/init-ack/cookie done before the
* init-ack came back..
*/
- stcb->sctp_ep->sctp_flags |=
- SCTP_PCB_FLAGS_CONNECTED;
+ sctp_pcb_add_flags(stcb->sctp_ep, SCTP_PCB_FLAGS_CONNECTED);
soisconnected(stcb->sctp_socket);
}
/* notify upper layer */
@@ -1689,7 +1688,7 @@ sctp_process_cookie_existing(struct mbuf *m, int iphlen, int offset,
if (((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
(stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) &&
(!SCTP_IS_LISTENING(inp))) {
- stcb->sctp_ep->sctp_flags |= SCTP_PCB_FLAGS_CONNECTED;
+ sctp_pcb_add_flags(stcb->sctp_ep, SCTP_PCB_FLAGS_CONNECTED);
soisconnected(stcb->sctp_socket);
}
if (SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_ECHOED)
@@ -2182,7 +2181,7 @@ sctp_process_cookie_new(struct mbuf *m, int iphlen, int offset,
*
* XXXMJ unlocked
*/
- stcb->sctp_ep->sctp_flags |= SCTP_PCB_FLAGS_CONNECTED;
+ sctp_pcb_add_flags(stcb->sctp_ep, SCTP_PCB_FLAGS_CONNECTED);
soisconnected(stcb->sctp_socket);
} else if ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) &&
(SCTP_IS_LISTENING(inp))) {
@@ -2793,7 +2792,7 @@ sctp_handle_cookie_ack(struct sctp_cookie_ack_chunk *cp SCTP_UNUSED,
sctp_ulp_notify(SCTP_NOTIFY_ASSOC_UP, stcb, 0, NULL, SCTP_SO_NOT_LOCKED);
if ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
(stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) {
- stcb->sctp_ep->sctp_flags |= SCTP_PCB_FLAGS_CONNECTED;
+ sctp_pcb_add_flags(stcb->sctp_ep, SCTP_PCB_FLAGS_CONNECTED);
if ((stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET) == 0) {
soisconnected(stcb->sctp_socket);
}
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index 60aa6f175366..e1a2b74d02f3 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -7067,3 +7067,18 @@ sctp_initiate_iterator(inp_func inpf,
/* sa_ignore MEMLEAK {memory is put on the tailq for the iterator} */
return (0);
}
+
+/*
+ * Atomically add flags to the sctp_flags of an inp.
+ * To be used when the write lock of the inp is not held.
+ */
+void
+sctp_pcb_add_flags(struct sctp_inpcb *inp, uint32_t flags)
+{
+ uint32_t old_flags, new_flags;
+
+ do {
+ old_flags = inp->sctp_flags;
+ new_flags = old_flags | flags;
+ } while (atomic_cmpset_int(&inp->sctp_flags, old_flags, new_flags) == 0);
+}
diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h
index 736b0f9d54e9..687ccf6a1c50 100644
--- a/sys/netinet/sctp_pcb.h
+++ b/sys/netinet/sctp_pcb.h
@@ -619,6 +619,9 @@ int sctp_swap_inpcb_for_listen(struct sctp_inpcb *inp);
void sctp_clean_up_stream(struct sctp_tcb *stcb, struct sctp_readhead *rh);
+void
+ sctp_pcb_add_flags(struct sctp_inpcb *, uint32_t);
+
/*-
* Null in last arg inpcb indicate run on ALL ep's. Specific inp in last arg
* indicates run on ONLY assoc's of the specified endpoint.
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 905bd2be129b..1b2ba9371021 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -4340,7 +4340,7 @@ sctp_abort_notification(struct sctp_tcb *stcb, bool from_peer, bool timeout,
if ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL) ||
((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) &&
(stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_CONNECTED))) {
- stcb->sctp_ep->sctp_flags |= SCTP_PCB_FLAGS_WAS_ABORTED;
+ sctp_pcb_add_flags(stcb->sctp_ep, SCTP_PCB_FLAGS_WAS_ABORTED);
}
if ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) ||
(stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) ||
From nobody Wed Feb 1 23:18:47 2023
X-Original-To: dev-commits-src-branches@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 4P6dCC6y9Hz3cJwP;
Wed, 1 Feb 2023 23:18:47 +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 4P6dCC6PK3z3HYL;
Wed, 1 Feb 2023 23:18:47 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675293527;
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=yH8e7Dz5AnrrpqVfr5SaGRGH8+/ikdYLwfJ49oUfFsw=;
b=O5lSf55X4Q8dLODNq+y9ol50MEtqHpKuj2flRQMJtqkTsYuXx17RIfvMuSbjED5azEiDZ8
OuQ0/alwP2D/1D9Cx75zS09x2oVp3Eb/HyC8i+wBENg5varTaWhanastzuxxPsuEy4KKUA
edFpDNWpnvCxjLOHCv3W4Y6LqxvA2cGQ5vXkYqZd/qaviBBMKAcfI0RsNcUpZaWkFNJhAi
eCLCS+H52cuB9PylJcdftOEIEzGm/QumHsgHUcRhKgog3Vav2O/kjvu5EXLFcn/HyrzW12
Q8xMbMDbMyFi1sYcIXQPdYFkaB3dSHqT29vJx86r9mMWlYpqiXsOrBoSnfs4eg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675293527;
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=yH8e7Dz5AnrrpqVfr5SaGRGH8+/ikdYLwfJ49oUfFsw=;
b=XOabeLB5//gXbTByz2/Ejup0ilNbW3Rda+3lnYYfwumF1uVc74ew0XGWsRT3CkGBAytLIc
dkLPNd/iLJOhQ1sPxnAq9vIpQZbYdW/AMZm6PUEMIXWqA/em9HjOG8bIQbIWpH77p+c8lh
DYcUMFmAw2/NMjTOFNks2ErgoAKfdNrR12pLbrLV/yKuQF6WKO/tAfTN9FTvRd8mprlYib
itI9xwx9M51Cwji+Jf5EL1YWxqsyft8AdbLv15N2obq+mARPmtE6p/iW9RhvkL0xbtjcWe
nCPXU0K6GMedo05KOnKXnUh0gQWCOMnnPYrwEBN0Rjv9OjxfbERo70jNcDVfcw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675293527; a=rsa-sha256; cv=none;
b=hzW3AvlA3dk2S8xPUWhSfPMnlU/vZXJI21y/aOItgvE1WnhIRn1peQVFw1enZFgQt1vD9I
WIOOaitwRVHu5QkpFCI51sC/WiQEd8q+406HtS5okLVzqEWyhtBpQRQlt5rAwOR0GjvYwq
Z1XsUYq7xlX014rrL6TYZi11cECeFg1IQi17QfsbYodkjjoS7zK/UkTYB6qIqibqt3S+NH
aYq6XVls4tQQZa+uYwOZkvQKFV4YW/1DnNm3Aah0DIraKYGkyLcySdPTlK4saw1q7m2psL
0fNFo5MA71LZtueMIexYyRlRkhbaftBk8cft0z6BfiVcvqNnPF07S5KtKcmfDQ==
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 4P6dCC57xjzXsm;
Wed, 1 Feb 2023 23:18:47 +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 311NIlUQ047839;
Wed, 1 Feb 2023 23:18:47 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NIlIZ047838;
Wed, 1 Feb 2023 23:18:47 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:18:47 GMT
Message-Id: <202302012318.311NIlIZ047838@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: cce40fca85ce - stable/13 - sctp: cleanup, no functional change
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: cce40fca85ce4af528f4c387d8d51ee3c2a5f16c
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=cce40fca85ce4af528f4c387d8d51ee3c2a5f16c
commit cce40fca85ce4af528f4c387d8d51ee3c2a5f16c
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-06-08 20:35:14 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:18:24 +0000
sctp: cleanup, no functional change
(cherry picked from commit ad6ae52d1c2144b6bb6bca8edc485f3a97de2f4b)
---
sys/netinet/sctp_output.c | 134 +++++++++++++++++++++++----------------------
sys/netinet/sctp_structs.h | 42 +++++++-------
2 files changed, 89 insertions(+), 87 deletions(-)
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 7695784aafff..7dcd2eab8ed2 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -3452,7 +3452,7 @@ sctp_source_address_selection(struct sctp_inpcb *inp,
return (answer);
}
-static int
+static bool
sctp_find_cmsg(int c_type, void *data, struct mbuf *control, size_t cpsize)
{
struct cmsghdr cmh;
@@ -3460,13 +3460,13 @@ sctp_find_cmsg(int c_type, void *data, struct mbuf *control, size_t cpsize)
struct sctp_prinfo prinfo;
struct sctp_authinfo authinfo;
int tot_len, rem_len, cmsg_data_len, cmsg_data_off, off;
- int found;
+ bool found;
/*
* Independent of how many mbufs, find the c_type inside the control
* structure and copy out the data.
*/
- found = 0;
+ found = false;
tot_len = SCTP_BUF_LEN(control);
for (off = 0; off < tot_len; off += CMSG_ALIGN(cmh.cmsg_len)) {
rem_len = tot_len - off;
@@ -3505,7 +3505,7 @@ sctp_find_cmsg(int c_type, void *data, struct mbuf *control, size_t cpsize)
struct sctp_sndrcvinfo *sndrcvinfo;
sndrcvinfo = (struct sctp_sndrcvinfo *)data;
- if (found == 0) {
+ if (!found) {
if (cpsize < sizeof(struct sctp_sndrcvinfo)) {
return (found);
}
@@ -3546,7 +3546,7 @@ sctp_find_cmsg(int c_type, void *data, struct mbuf *control, size_t cpsize)
default:
return (found);
}
- found = 1;
+ found = true;
}
}
}
@@ -6136,7 +6136,7 @@ do_a_abort:
static void
sctp_prune_prsctp(struct sctp_tcb *stcb,
struct sctp_association *asoc,
- struct sctp_sndrcvinfo *srcv,
+ struct sctp_nonpad_sndrcvinfo *srcv,
int dataout)
{
int freed_spc = 0;
@@ -6317,7 +6317,7 @@ static int
sctp_msg_append(struct sctp_tcb *stcb,
struct sctp_nets *net,
struct mbuf *m,
- struct sctp_sndrcvinfo *srcv)
+ struct sctp_nonpad_sndrcvinfo *srcv)
{
int error = 0;
struct mbuf *at;
@@ -6825,7 +6825,7 @@ sctp_copy_out_all(struct uio *uio, ssize_t len)
static int
sctp_sendall(struct sctp_inpcb *inp, struct uio *uio, struct mbuf *m,
- struct sctp_sndrcvinfo *srcv)
+ struct sctp_nonpad_sndrcvinfo *srcv)
{
int ret;
struct sctp_copy_all *ca;
@@ -6844,7 +6844,7 @@ sctp_sendall(struct sctp_inpcb *inp, struct uio *uio, struct mbuf *m,
memset(ca, 0, sizeof(struct sctp_copy_all));
ca->inp = inp;
- if (srcv) {
+ if (srcv != NULL) {
memcpy(&ca->sndrcv, srcv, sizeof(struct sctp_nonpad_sndrcvinfo));
}
@@ -12276,7 +12276,7 @@ sctp_copy_one(struct sctp_stream_queue_pending *sp,
static struct sctp_stream_queue_pending *
sctp_copy_it_in(struct sctp_tcb *stcb,
struct sctp_association *asoc,
- struct sctp_sndrcvinfo *srcv,
+ struct sctp_nonpad_sndrcvinfo *srcv,
struct uio *uio,
struct sctp_nets *net,
ssize_t max_send_len,
@@ -12361,25 +12361,22 @@ sctp_sosend(struct socket *so,
struct mbuf *top,
struct mbuf *control,
int flags,
- struct thread *p
-)
+ struct thread *p)
{
- int error, use_sndinfo = 0;
struct sctp_sndrcvinfo sndrcvninfo;
- struct sockaddr *addr_to_use;
#if defined(INET) && defined(INET6)
struct sockaddr_in sin;
#endif
+ struct sockaddr *addr_to_use;
+ int error;
+ bool use_sndinfo;
- if (control) {
+ if (control != NULL) {
/* process cmsg snd/rcv info (maybe a assoc-id) */
- if (sctp_find_cmsg(SCTP_SNDRCV, (void *)&sndrcvninfo, control,
- sizeof(sndrcvninfo))) {
- /* got one */
- use_sndinfo = 1;
- }
+ use_sndinfo = sctp_find_cmsg(SCTP_SNDRCV, (void *)&sndrcvninfo, control, sizeof(sndrcvninfo));
+ } else {
+ use_sndinfo = false;
}
- addr_to_use = addr;
#if defined(INET) && defined(INET6)
if ((addr != NULL) && (addr->sa_family == AF_INET6)) {
struct sockaddr_in6 *sin6;
@@ -12392,15 +12389,17 @@ sctp_sosend(struct socket *so,
if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
in6_sin6_2_sin(&sin, sin6);
addr_to_use = (struct sockaddr *)&sin;
+ } else {
+ addr_to_use = addr;
}
+ } else {
+ addr_to_use = addr;
}
+#else
+ addr_to_use = addr;
#endif
- error = sctp_lower_sosend(so, addr_to_use, uio, top,
- control,
- flags,
- use_sndinfo ? &sndrcvninfo : NULL
- ,p
- );
+ error = sctp_lower_sosend(so, addr_to_use, uio, top, control, flags,
+ use_sndinfo ? &sndrcvninfo : NULL, p);
return (error);
}
@@ -12411,38 +12410,38 @@ sctp_lower_sosend(struct socket *so,
struct mbuf *top,
struct mbuf *control,
int flags,
- struct sctp_sndrcvinfo *srcv
- ,
- struct thread *p
-)
+ struct sctp_sndrcvinfo *srcv,
+ struct thread *p)
{
- struct sctp_nonpad_sndrcvinfo sndrcvninfo;
+ struct sctp_nonpad_sndrcvinfo sndrcvninfo_buf;
struct epoch_tracker et;
- ssize_t sndlen = 0, max_len, local_add_more;
- int error;
- int queue_only = 0, queue_only_for_init = 0;
- bool free_cnt_applied = false;
- int un_sent;
- int now_filled = 0;
- unsigned int inqueue_bytes = 0;
+ struct timeval now;
struct sctp_block_entry be;
struct sctp_inpcb *inp;
struct sctp_tcb *stcb = NULL;
- struct timeval now;
struct sctp_nets *net;
struct sctp_association *asoc;
struct sctp_inpcb *t_inp;
+ struct sctp_nonpad_sndrcvinfo *sndrcvninfo;
+ ssize_t sndlen = 0, max_len, local_add_more;
+ ssize_t local_soresv = 0;
+ sctp_assoc_t sinfo_assoc_id;
int user_marks_eor;
- bool create_lock_applied = false;
int nagle_applies = 0;
+ int error;
+ int queue_only = 0, queue_only_for_init = 0;
+ int un_sent;
+ int now_filled = 0;
+ unsigned int inqueue_bytes = 0;
+ uint16_t port;
+ uint16_t sinfo_flags;
+ uint16_t sinfo_stream;
+ bool create_lock_applied = false;
+ bool free_cnt_applied = false;
bool some_on_control;
bool got_all_of_the_send = false;
bool hold_tcblock = false;
bool non_blocking = false;
- ssize_t local_soresv = 0;
- uint16_t port;
- uint16_t sinfo_flags;
- sctp_assoc_t sinfo_assoc_id;
error = 0;
net = NULL;
@@ -12516,17 +12515,19 @@ sctp_lower_sosend(struct socket *so,
atomic_add_int(&inp->total_sends, 1);
if (srcv != NULL) {
- sinfo_flags = srcv->sinfo_flags;
- sinfo_assoc_id = srcv->sinfo_assoc_id;
+ sndrcvninfo = (struct sctp_nonpad_sndrcvinfo *)srcv;
+ sinfo_assoc_id = sndrcvninfo->sinfo_assoc_id;
+ sinfo_flags = sndrcvninfo->sinfo_flags;
if (INVALID_SINFO_FLAG(sinfo_flags) ||
PR_SCTP_INVALID_POLICY(sinfo_flags)) {
error = EINVAL;
goto out_unlocked;
}
- if (srcv->sinfo_flags != 0) {
+ if (sinfo_flags != 0) {
SCTP_STAT_INCR(sctps_sends_with_flags);
}
} else {
+ sndrcvninfo = NULL;
sinfo_flags = inp->def_send.sinfo_flags;
sinfo_assoc_id = inp->def_send.sinfo_assoc_id;
}
@@ -12544,7 +12545,7 @@ sctp_lower_sosend(struct socket *so,
if ((sinfo_flags & SCTP_SENDALL) &&
(inp->sctp_flags & SCTP_PCB_FLAGS_UDPTYPE)) {
SCTP_INP_RUNLOCK(inp);
- error = sctp_sendall(inp, uio, top, srcv);
+ error = sctp_sendall(inp, uio, top, sndrcvninfo);
top = NULL;
goto out_unlocked;
}
@@ -12721,11 +12722,11 @@ sctp_lower_sosend(struct socket *so,
/* Keep the stcb from being freed under our feet. */
atomic_add_int(&asoc->refcnt, 1);
free_cnt_applied = true;
- if (srcv == NULL) {
+ if (sndrcvninfo == NULL) {
/* Use a local copy to have a consistent view. */
- sndrcvninfo = asoc->def_send;
- srcv = (struct sctp_sndrcvinfo *)&sndrcvninfo;
- sinfo_flags = srcv->sinfo_flags;
+ sndrcvninfo_buf = asoc->def_send;
+ sndrcvninfo = &sndrcvninfo_buf;
+ sinfo_flags = sndrcvninfo->sinfo_flags;
if (flags & MSG_EOR) {
sinfo_flags |= SCTP_EOR;
}
@@ -12751,18 +12752,19 @@ sctp_lower_sosend(struct socket *so,
net = asoc->primary_destination;
}
}
+ sinfo_stream = sndrcvninfo->sinfo_stream;
/* Is the stream no. valid? */
- if (srcv->sinfo_stream >= asoc->streamoutcnt) {
+ if (sinfo_stream >= asoc->streamoutcnt) {
/* Invalid stream number */
error = EINVAL;
goto out_unlocked;
}
- if ((asoc->strmout[srcv->sinfo_stream].state != SCTP_STREAM_OPEN) &&
- (asoc->strmout[srcv->sinfo_stream].state != SCTP_STREAM_OPENING)) {
+ if ((asoc->strmout[sinfo_stream].state != SCTP_STREAM_OPEN) &&
+ (asoc->strmout[sinfo_stream].state != SCTP_STREAM_OPENING)) {
/*
* Can't queue any data while stream reset is underway.
*/
- if (asoc->strmout[srcv->sinfo_stream].state > SCTP_STREAM_OPEN) {
+ if (asoc->strmout[sinfo_stream].state > SCTP_STREAM_OPEN) {
error = EAGAIN;
} else {
error = EINVAL;
@@ -13044,16 +13046,16 @@ skip_preblock:
uint32_t sndout;
if ((asoc->stream_locked) &&
- (asoc->stream_locked_on != srcv->sinfo_stream)) {
+ (asoc->stream_locked_on != sinfo_stream)) {
error = EINVAL;
goto out;
}
- strm = &asoc->strmout[srcv->sinfo_stream];
+ strm = &asoc->strmout[sinfo_stream];
if (strm->last_msg_incomplete == 0) {
do_a_copy_in:
SCTP_TCB_UNLOCK(stcb);
hold_tcblock = false;
- sp = sctp_copy_it_in(stcb, asoc, srcv, uio, net, max_len, user_marks_eor, &error);
+ sp = sctp_copy_it_in(stcb, asoc, sndrcvninfo, uio, net, max_len, user_marks_eor, &error);
SCTP_TCB_LOCK(stcb);
hold_tcblock = true;
if ((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) ||
@@ -13095,7 +13097,7 @@ skip_preblock:
goto out_unlocked;
}
/* The out streams might be reallocated. */
- strm = &asoc->strmout[srcv->sinfo_stream];
+ strm = &asoc->strmout[sinfo_stream];
if (sp->msg_is_complete) {
strm->last_msg_incomplete = 0;
asoc->stream_locked = 0;
@@ -13107,7 +13109,7 @@ skip_preblock:
strm->last_msg_incomplete = 1;
if (asoc->idata_supported == 0) {
asoc->stream_locked = 1;
- asoc->stream_locked_on = srcv->sinfo_stream;
+ asoc->stream_locked_on = sinfo_stream;
}
sp->sender_all_done = 0;
}
@@ -13239,7 +13241,7 @@ skip_preblock:
* This is ugly but we must assure locking
* order
*/
- sctp_prune_prsctp(stcb, asoc, srcv, (int)sndlen);
+ sctp_prune_prsctp(stcb, asoc, sndrcvninfo, (int)sndlen);
inqueue_bytes = asoc->total_output_queue_size - (asoc->chunks_on_out_queue * SCTP_DATA_CHUNK_OVERHEAD(stcb));
if (SCTP_SB_LIMIT_SND(so) > inqueue_bytes)
max_len = SCTP_SB_LIMIT_SND(so) - inqueue_bytes;
@@ -13403,13 +13405,13 @@ skip_preblock:
("Association was aborted"));
/* The out streams might be reallocated. */
- strm = &asoc->strmout[srcv->sinfo_stream];
+ strm = &asoc->strmout[sinfo_stream];
if (sp != NULL) {
if (sp->msg_is_complete == 0) {
strm->last_msg_incomplete = 1;
if (asoc->idata_supported == 0) {
asoc->stream_locked = 1;
- asoc->stream_locked_on = srcv->sinfo_stream;
+ asoc->stream_locked_on = sinfo_stream;
}
} else {
sp->sender_all_done = 1;
@@ -13426,7 +13428,7 @@ skip_preblock:
got_all_of_the_send = true;
}
} else {
- error = sctp_msg_append(stcb, net, top, srcv);
+ error = sctp_msg_append(stcb, net, top, sndrcvninfo);
top = NULL;
if ((sinfo_flags & SCTP_EOF) != 0) {
got_all_of_the_send = true;
diff --git a/sys/netinet/sctp_structs.h b/sys/netinet/sctp_structs.h
index 026e3319dd23..e28c2265589d 100644
--- a/sys/netinet/sctp_structs.h
+++ b/sys/netinet/sctp_structs.h
@@ -129,6 +129,26 @@ struct sctp_mcore_ctrl {
};
#endif
+/* This struct is here to cut out the compatiabilty
+ * pad that bulks up both the inp and stcb. The non
+ * pad portion MUST stay in complete sync with
+ * sctp_sndrcvinfo... i.e. if sinfo_xxxx is added
+ * this must be done here too.
+ */
+struct sctp_nonpad_sndrcvinfo {
+ uint16_t sinfo_stream;
+ uint16_t sinfo_ssn;
+ uint16_t sinfo_flags;
+ uint32_t sinfo_ppid;
+ uint32_t sinfo_context;
+ uint32_t sinfo_timetolive;
+ uint32_t sinfo_tsn;
+ uint32_t sinfo_cumtsn;
+ sctp_assoc_t sinfo_assoc_id;
+ uint16_t sinfo_keynumber;
+ uint16_t sinfo_keynumber_valid;
+};
+
struct sctp_iterator {
TAILQ_ENTRY(sctp_iterator) sctp_nxt_itr;
struct vnet *vn;
@@ -159,7 +179,7 @@ TAILQ_HEAD(sctpiterators, sctp_iterator);
struct sctp_copy_all {
struct sctp_inpcb *inp; /* ep */
struct mbuf *m;
- struct sctp_sndrcvinfo sndrcv;
+ struct sctp_nonpad_sndrcvinfo sndrcv;
ssize_t sndlen;
int cnt_sent;
int cnt_failed;
@@ -675,26 +695,6 @@ struct sctp_fs_spec_log {
uint8_t decr;
};
-/* This struct is here to cut out the compatiabilty
- * pad that bulks up both the inp and stcb. The non
- * pad portion MUST stay in complete sync with
- * sctp_sndrcvinfo... i.e. if sinfo_xxxx is added
- * this must be done here too.
- */
-struct sctp_nonpad_sndrcvinfo {
- uint16_t sinfo_stream;
- uint16_t sinfo_ssn;
- uint16_t sinfo_flags;
- uint32_t sinfo_ppid;
- uint32_t sinfo_context;
- uint32_t sinfo_timetolive;
- uint32_t sinfo_tsn;
- uint32_t sinfo_cumtsn;
- sctp_assoc_t sinfo_assoc_id;
- uint16_t sinfo_keynumber;
- uint16_t sinfo_keynumber_valid;
-};
-
/*
* JRS - Structure to hold function pointers to the functions responsible
* for congestion control.
From nobody Wed Feb 1 23:22:35 2023
X-Original-To: dev-commits-src-branches@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 4P6dHb4207z3cKGW;
Wed, 1 Feb 2023 23:22:35 +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 4P6dHb3Txlz3JDv;
Wed, 1 Feb 2023 23:22:35 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675293755;
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=fPZSe4l5XEMrP/K6JOfRZpnCkZpHOOa2qigzON8GPVU=;
b=WUN8+9zMOZyR0eRLbK3dRrK5HkS0Q2+7nhAvVWnygljfjbUm64zv1UF7pitYfKY/81U6n/
rX1jWyR9/rMl/0K2WXfUH5os8b+mJzqWjxVDH6YbsyxeZgdTSI4aUeZWLGtwNCe5eLC2xs
NFle/EIbFJASetYeHWcXDvP7Q5kxHrG8m9d0ujZdyZrRpYYB1kqPHbru+ey9T6nDmpieL/
4aZpy9Ya3sbb/B/GZUr7dhnV6sk9eAyQLl2C/2jih424PcKApuu+in2fsjjPG2RxAG1xdK
jQ6vQNc6h0dfamgfRYBrmneoiXClM7XXryTg4gcKchvVqk8GhcdtEbR5InrJHQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675293755;
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=fPZSe4l5XEMrP/K6JOfRZpnCkZpHOOa2qigzON8GPVU=;
b=GkgIIjLJWVeKHwxJ2OybxIoZChtz+zZyy3gvkM6LjPKaaot6w3/kbvDO7PPFgqfLn27ECT
DyCH7hxXDSB2Od+FewyqTJh+RF3r7pZa6VzC3V0C/uMDe2tdOwtROKJtpKwCwqw522bbUA
/jcN+pr2eMEM/+0h/qO47n389kQ+PJRnM/fXOnMvND9Gz+C70XqM4cGSMM9bsPyc2rTJVr
3vH/hSRyVNuLPaAawjWo8QhACb9SMWoMH7wnMdI1J05NlX9fG5A5HiY2hDKNbzED6hGKtp
hgpScy69Kjuddw9J4pLVps9ZVlLJ7VSUySwiOGIsO8x4xLmr7eQwJhf9KwCnuw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675293755; a=rsa-sha256; cv=none;
b=Tt0VJFjK7J80kXl81hWIj33unYIxjpEF8llwVgJXFHPq3yMHcUzCKZguyPsIgXzvo5wKHx
3GLhVfiP6VfMa3UtgJWwIeRVoYMWEyhoNVEyoUqBVAC7mctvisBl9K9qdfMDRNRJeOzp6Z
o3E0RrVG39x76D8ogIdwXWDKORflJrCv5x9D+rAQFfEB81I2AL+RZ1yzrTo5r7mD8/OpMd
GuAiFySX2uCepuryg3F5FtjpLmeQbTfZZEat1q5/NOCORPuZd521ppHs0Q6/TiuLeimWr7
wenWLXjglSBE8UrmH4vNQymwDcZZ/UA9iHk/kT5Qq5kN1WnohBGZR9IN0LhNYA==
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 4P6dHb2XcnzXfK;
Wed, 1 Feb 2023 23:22:35 +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 311NMZGs060940;
Wed, 1 Feb 2023 23:22:35 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NMZw5060939;
Wed, 1 Feb 2023 23:22:35 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:22:35 GMT
Message-Id: <202302012322.311NMZw5060939@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 1d8d5348645f - stable/13 - sctp: remove book keeping not needed anymore
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 1d8d5348645f3dcdc65562c4ad9765cb62156251
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=1d8d5348645f3dcdc65562c4ad9765cb62156251
commit 1d8d5348645f3dcdc65562c4ad9765cb62156251
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-06-08 21:30:52 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:22:04 +0000
sctp: remove book keeping not needed anymore
(cherry picked from commit ee9ee699d6b5ee7613c6a166d2db5dbb59389cfc)
---
sys/netinet/sctp_output.c | 38 ++------------------------------------
1 file changed, 2 insertions(+), 36 deletions(-)
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 7dcd2eab8ed2..6736f7e9f948 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -12440,7 +12440,6 @@ sctp_lower_sosend(struct socket *so,
bool free_cnt_applied = false;
bool some_on_control;
bool got_all_of_the_send = false;
- bool hold_tcblock = false;
bool non_blocking = false;
error = 0;
@@ -12555,7 +12554,6 @@ sctp_lower_sosend(struct socket *so,
stcb = LIST_FIRST(&inp->sctp_asoc_list);
if (stcb != NULL) {
SCTP_TCB_LOCK(stcb);
- hold_tcblock = true;
}
SCTP_INP_RUNLOCK(inp);
} else if (sinfo_assoc_id > SCTP_ALL_ASSOC) {
@@ -12563,7 +12561,6 @@ sctp_lower_sosend(struct socket *so,
SCTP_INP_RUNLOCK(inp);
if (stcb != NULL) {
SCTP_TCB_LOCK_ASSERT(stcb);
- hold_tcblock = true;
}
} else if (addr != NULL) {
/*-
@@ -12580,7 +12577,6 @@ sctp_lower_sosend(struct socket *so,
SCTP_INP_WUNLOCK(inp);
} else {
SCTP_TCB_LOCK_ASSERT(stcb);
- hold_tcblock = true;
}
} else {
SCTP_INP_RUNLOCK(inp);
@@ -12589,11 +12585,9 @@ sctp_lower_sosend(struct socket *so,
#ifdef INVARIANTS
if (stcb != NULL) {
SCTP_TCB_LOCK_ASSERT(stcb);
- KASSERT(hold_tcblock, ("tcb lock hold, hold_tcblock is false"));
- } else {
- KASSERT(!hold_tcblock, ("hold_tcblock is true, but stcb is NULL"));
}
#endif
+
if ((stcb == NULL) && (addr != NULL)) {
/* Possible implicit send? */
SCTP_ASOC_CREATE_LOCK(inp);
@@ -12624,7 +12618,6 @@ sctp_lower_sosend(struct socket *so,
SCTP_INP_WUNLOCK(inp);
} else {
SCTP_TCB_LOCK_ASSERT(stcb);
- hold_tcblock = true;
SCTP_ASOC_CREATE_UNLOCK(inp);
create_lock_applied = false;
}
@@ -12667,7 +12660,6 @@ sctp_lower_sosend(struct socket *so,
goto out_unlocked;
}
SCTP_TCB_LOCK_ASSERT(stcb);
- hold_tcblock = true;
SCTP_ASOC_CREATE_UNLOCK(inp);
create_lock_applied = false;
/*
@@ -12681,7 +12673,6 @@ sctp_lower_sosend(struct socket *so,
if (sctp_process_cmsgs_for_init(stcb, control, &error)) {
sctp_free_assoc(inp, stcb, SCTP_NORMAL_PROC,
SCTP_FROM_SCTP_OUTPUT + SCTP_LOC_6);
- hold_tcblock = false;
stcb = NULL;
KASSERT(error != 0,
("error is 0 although sctp_process_cmsgs_for_init() indicated an error"));
@@ -12701,7 +12692,6 @@ sctp_lower_sosend(struct socket *so,
KASSERT(!create_lock_applied, ("create_lock_applied is true"));
KASSERT(stcb != NULL, ("stcb is NULL"));
- KASSERT(hold_tcblock, ("hold_tcblock is false"));
SCTP_TCB_LOCK_ASSERT(stcb);
asoc = &stcb->asoc;
@@ -12805,7 +12795,6 @@ sctp_lower_sosend(struct socket *so,
local_soresv = sndlen;
KASSERT(stcb != NULL, ("stcb is NULL"));
- KASSERT(hold_tcblock, ("hold_tcblock is false"));
SCTP_TCB_LOCK_ASSERT(stcb);
KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
("Association about to be freed"));
@@ -12861,10 +12850,8 @@ sctp_lower_sosend(struct socket *so,
SCTP_BUF_LEN(mm) = (int)(tot_out + sizeof(struct sctp_paramhdr));
if (top == NULL) {
SCTP_TCB_UNLOCK(stcb);
- hold_tcblock = false;
error = uiomove((caddr_t)ph, (int)tot_out, uio);
SCTP_TCB_LOCK(stcb);
- hold_tcblock = true;
if ((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) ||
(asoc->state & SCTP_STATE_WAS_ABORTED)) {
sctp_m_freem(mm);
@@ -12913,7 +12900,6 @@ sctp_lower_sosend(struct socket *so,
}
KASSERT(stcb != NULL, ("stcb is NULL"));
- KASSERT(hold_tcblock, ("hold_tcblock is false"));
SCTP_TCB_LOCK_ASSERT(stcb);
KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
("Association about to be freed"));
@@ -12972,7 +12958,6 @@ sctp_lower_sosend(struct socket *so,
be.error = 0;
stcb->block_entry = &be;
SCTP_TCB_UNLOCK(stcb);
- hold_tcblock = false;
error = sbwait(&so->so_snd);
if (error == 0) {
if (so->so_error != 0) {
@@ -12984,7 +12969,6 @@ sctp_lower_sosend(struct socket *so,
}
SOCKBUF_UNLOCK(&so->so_snd);
SCTP_TCB_LOCK(stcb);
- hold_tcblock = true;
stcb->block_entry = NULL;
if (error != 0) {
goto out_unlocked;
@@ -13019,7 +13003,6 @@ sctp_lower_sosend(struct socket *so,
skip_preblock:
KASSERT(stcb != NULL, ("stcb is NULL"));
- KASSERT(hold_tcblock, ("hold_tcblock is false"));
SCTP_TCB_LOCK_ASSERT(stcb);
KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
("Association about to be freed"));
@@ -13054,10 +13037,8 @@ skip_preblock:
if (strm->last_msg_incomplete == 0) {
do_a_copy_in:
SCTP_TCB_UNLOCK(stcb);
- hold_tcblock = false;
sp = sctp_copy_it_in(stcb, asoc, sndrcvninfo, uio, net, max_len, user_marks_eor, &error);
SCTP_TCB_LOCK(stcb);
- hold_tcblock = true;
if ((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) ||
(asoc->state & SCTP_STATE_WAS_ABORTED)) {
if (asoc->state & SCTP_STATE_WAS_ABORTED) {
@@ -13142,7 +13123,6 @@ skip_preblock:
}
KASSERT(stcb != NULL, ("stcb is NULL"));
- KASSERT(hold_tcblock, ("hold_tcblock is false"));
SCTP_TCB_LOCK_ASSERT(stcb);
KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
("Association about to be freed"));
@@ -13163,12 +13143,10 @@ skip_preblock:
((max_len > 0) && (SCTP_SB_LIMIT_SND(so) < SCTP_BASE_SYSCTL(sctp_add_more_threshold))) ||
(uio->uio_resid <= max_len)) {
SCTP_TCB_UNLOCK(stcb);
- hold_tcblock = false;
sndout = 0;
new_tail = NULL;
mm = sctp_copy_resume(uio, (int)max_len, user_marks_eor, &error, &sndout, &new_tail);
SCTP_TCB_LOCK(stcb);
- hold_tcblock = true;
if ((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) ||
(asoc->state & SCTP_STATE_WAS_ABORTED)) {
/*
@@ -13224,7 +13202,6 @@ skip_preblock:
}
KASSERT(stcb != NULL, ("stcb is NULL"));
- KASSERT(hold_tcblock, ("hold_tcblock is false"));
SCTP_TCB_LOCK_ASSERT(stcb);
KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
("Association about to be freed"));
@@ -13354,7 +13331,6 @@ skip_preblock:
be.error = 0;
stcb->block_entry = &be;
SCTP_TCB_UNLOCK(stcb);
- hold_tcblock = false;
error = sbwait(&so->so_snd);
if (error == 0) {
if (so->so_error != 0)
@@ -13365,7 +13341,6 @@ skip_preblock:
}
SOCKBUF_UNLOCK(&so->so_snd);
SCTP_TCB_LOCK(stcb);
- hold_tcblock = true;
stcb->block_entry = NULL;
if ((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) ||
(asoc->state & SCTP_STATE_WAS_ABORTED)) {
@@ -13397,7 +13372,6 @@ skip_preblock:
}
KASSERT(stcb != NULL, ("stcb is NULL"));
- KASSERT(hold_tcblock, ("hold_tcblock is false"));
SCTP_TCB_LOCK_ASSERT(stcb);
KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
("Association about to be freed"));
@@ -13440,7 +13414,6 @@ skip_preblock:
dataless_eof:
KASSERT(stcb != NULL, ("stcb is NULL"));
- KASSERT(hold_tcblock, ("hold_tcblock is false"));
SCTP_TCB_LOCK_ASSERT(stcb);
KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
("Association about to be freed"));
@@ -13517,7 +13490,6 @@ dataless_eof:
sctp_abort_an_association(stcb->sctp_ep, stcb,
op_err, false, SCTP_SO_LOCKED);
NET_EPOCH_EXIT(et);
- hold_tcblock = false;
stcb = NULL;
error = ECONNABORTED;
goto out;
@@ -13531,7 +13503,6 @@ dataless_eof:
skip_out_eof:
KASSERT(stcb != NULL, ("stcb is NULL"));
- KASSERT(hold_tcblock, ("hold_tcblock is false"));
SCTP_TCB_LOCK_ASSERT(stcb);
KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
("Association about to be freed"));
@@ -13553,7 +13524,6 @@ skip_out_eof:
}
KASSERT(stcb != NULL, ("stcb is NULL"));
- KASSERT(hold_tcblock, ("hold_tcblock is false"));
SCTP_TCB_LOCK_ASSERT(stcb);
KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
("Association about to be freed"));
@@ -13603,7 +13573,6 @@ skip_out_eof:
}
KASSERT(stcb != NULL, ("stcb is NULL"));
- KASSERT(hold_tcblock, ("hold_tcblock is false"));
SCTP_TCB_LOCK_ASSERT(stcb);
KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
("Association about to be freed"));
@@ -13634,7 +13603,6 @@ skip_out_eof:
asoc->total_output_queue_size, error);
KASSERT(stcb != NULL, ("stcb is NULL"));
- KASSERT(hold_tcblock, ("hold_tcblock is false"));
SCTP_TCB_LOCK_ASSERT(stcb);
KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
("Association about to be freed"));
@@ -13650,12 +13618,10 @@ out_unlocked:
if (local_soresv) {
atomic_subtract_int(&asoc->sb_send_resv, (int)sndlen);
}
- if (hold_tcblock) {
- SCTP_TCB_UNLOCK(stcb);
- }
if (free_cnt_applied) {
atomic_subtract_int(&asoc->refcnt, 1);
}
+ SCTP_TCB_UNLOCK(stcb);
}
if (top != NULL) {
sctp_m_freem(top);
From nobody Wed Feb 1 23:24:00 2023
X-Original-To: dev-commits-src-branches@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 4P6dKF0SC4z3cKjW;
Wed, 1 Feb 2023 23:24:01 +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 4P6dKD73Hhz3JRh;
Wed, 1 Feb 2023 23:24:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675293841;
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=EtZIIryvcJQVdudf6/IBtXzBGH2EtkiuO/+i57/9VBY=;
b=BvJ5pR3kw7EZ72JFHXXj81ZC5d4HMc3V83BUtLbB99HwkmhjkHRI0bjeMEg7lkwJXXT0gy
8nm/0Olrwx153AOoXJDs5OMjK8MRUQPc7jrE8Oz9PoYAyMEcB5whTWv5YnClnj75n3MMMj
WGae8mvvB0gbFNwEGcliy35+sJBxcBCbibd928Q+J86S0ShvbAWmnLzKx+t/qzvI6S9tWS
5UuBzpbU80cDSB4iEbuvcnBtrY9QzBhXGkLAB3Fs9LO6BsRG5+bidF2FTbsRPhqf+x/HBk
dLx4BIgOQ2c9+YPwl59kcHlT7nqzLJ0yWBpSpk/VRAZ4aMJvVapMT/YfaqMQMQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675293841;
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=EtZIIryvcJQVdudf6/IBtXzBGH2EtkiuO/+i57/9VBY=;
b=mvN84kDOxHScCh55XcBlBjDIeJ+i5bFNLeTBHbGgX26AEGjzTTVFlhD8zFwvi8wQyJyu56
4Nnf5VpRuT6gaIGCJWVVZDOT3AKAsySPIYddTraIGnzMg5ZiVDC8FlNkwVhevYdFjirbpR
PNtupzXQPN50HOG6mA6pwFzzMgHYDX/4RCgH/MOqmyfgsvZOy5TAZxSxiMbzt+5D0GIQlR
zVrGMulN3Ao90G+2Z0sL4s3pjjmwC3YJToLaj7bHknSaNQrsgx/F6tYSuoqa9/hC6OZP7T
py29HJDP1sCFExsszghq15zcNUuF1FB6vHX0gOBe/cp1FxXIkm47hLygzO47Gg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675293841; a=rsa-sha256; cv=none;
b=sKbrctPFmecmDyM9n7rWkChGjWQ1hkK0EsUYswASx4mu6MxYqKkQpsRNM16tAXF4xSpbdr
I35/gJx2rI75aIFQY6MF/AQesj2J0vIkqmhMGhv+zTMo31JvCKDC+AL2N7AqYLgmin7EqI
Q3ED528kTO6nEtj9JrTse3tMU+FGGWjdYvJDyjNZU+2W6WsMm5uNvTGEVIUITovpZscF0n
d85+tlWv8cvnlQV/JVbrLgHl6ZykI1bTTKFYUJ9gAECjGjYrGHiCfffKD0D4yeVpqJk0g+
cyOThswzQjX3Y6Wfb+iMjf+8dYl1bfm5VjWyNVHEb5SOt1WLi8YOQdavF60hFA==
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 4P6dKD66SvzXx0;
Wed, 1 Feb 2023 23:24:00 +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 311NO04T061214;
Wed, 1 Feb 2023 23:24:00 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NO092061213;
Wed, 1 Feb 2023 23:24:00 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:24:00 GMT
Message-Id: <202302012324.311NO092061213@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: e178d8601b79 - stable/13 - tcp: fix TCPPCAP for kernels enabling VNET
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: e178d8601b79639de137e8f3f31f5463330dfa91
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=e178d8601b79639de137e8f3f31f5463330dfa91
commit e178d8601b79639de137e8f3f31f5463330dfa91
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-06-15 21:28:54 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:22:47 +0000
tcp: fix TCPPCAP for kernels enabling VNET
Reviewed by: rscheff
Sponsored by: Netflix, Inc.
Differential Revision: https://reviews.freebsd.org/D35503
(cherry picked from commit bf6c6162c7631b361f81e89b8539154dd738e828)
---
sys/netinet/tcp_pcap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/netinet/tcp_pcap.c b/sys/netinet/tcp_pcap.c
index b387faada0ab..1faa1500ec5a 100644
--- a/sys/netinet/tcp_pcap.c
+++ b/sys/netinet/tcp_pcap.c
@@ -75,7 +75,7 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcp_pcap_alloc_new_mbuf,
VNET_DEFINE(int, tcp_pcap_packets) = 0;
#define V_tcp_pcap_packets VNET(tcp_pcap_packets)
SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcp_pcap_packets,
- CTLFLAG_RW, &VNET_NAME(tcp_pcap_packets), 0,
+ CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(tcp_pcap_packets), 0,
"Default number of packets saved per direction per TCPCB");
/* Initialize the values. */
From nobody Wed Feb 1 23:25:41 2023
X-Original-To: dev-commits-src-branches@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 4P6dMB0nFpz3cKTm;
Wed, 1 Feb 2023 23:25:42 +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 4P6dMB08cTz3JrK;
Wed, 1 Feb 2023 23:25:42 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675293942;
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=nNKczUa/IsurSeF9EMMVZ2AaQEuLjuPnvfKwqk8wwd8=;
b=vOBT5AyD6ueaGja7USI2VV7FtOWNszkXsUVLuAHqeTB44/CFhUBoE4mRauHYYa/buF4SHL
7XJvs4/BGWHRRDaoXeCeY/+mC76GNj06p4UIMH5z7OLzGilOhPnqldCCIUdrx3pk2X1UWR
fqlcgkiyYWcpvA8RFQf9cw+u44d1oRpsZL95xgcs3ipu48NmvpfHClHnVM2H6PT8sVABO7
oIE7UDPc2Ro7NkWTP3dFhVQ/rLElGvJ6rR8uPvsMlStYwpG5YcE26hXHNjYzFFo8ZpgbPs
VnzATbgtDqy6UoCqS7Nrf5GQwYx3iPv7aeRRaXnILztT5n8mxwmw24u2n6EKFg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675293942;
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=nNKczUa/IsurSeF9EMMVZ2AaQEuLjuPnvfKwqk8wwd8=;
b=b79CQqqD4AdZgpA9ACpNIzRvfCz2M41Jfr4iRivBTvuOlWWYiHBVeFhsr/iQTqScMhHfZf
njfj1eoXRT+IFERETG7bP3/dEUts5z4sqq6k7SBDTPENwkgO0bVAxtCaH6cYvUgZZoDCE9
yxJQHV6zzVie2mc1nJwaKL27W2/EpKQWVLJYTo7HaRj02yoIoaTC4CKjT7izfpndfMr8Cv
94gRdLZqJaNVQ/6dKs5NQMymw0C3XcAUVu7psXLO0rDevFVPu3qUlT0LYJKJPJJGJnaKWx
olNJ5yEiXy4fjCLa/vmlwZnZLAj+ioJvrLyknHva7ZRCNY1pu0QQuQkv5kQBUA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675293942; a=rsa-sha256; cv=none;
b=fSv3sxqbkx5HZoPlBm53Y9D0anI3q2dzy+RF43xQQhKOwFJsC47YBbVm7jIeFUYpKDpNTV
Iavc8S93Z/ebzob4NAmIj164JMPxPM0uZCbVqc4sHhFVu1pRIx3hQI8bYAUqRCBnHnqDcT
h3EYQVkAJeOyQFXdMImzq2urglUXS6nRfk24LleM1FxwkJbmHpeTIVTFcDOZw0i6MsHTmi
BJ/yHuZXfRUNuTLYiwuoS9jpqRSYA9VkYOeWSy1Njcwfv1CdEBuVuz4Qii5iZnr6DK1Z+t
MojXybz9wiH57szi+4wAQRossC9N7lOgPo3DeVOX1MCu9+EjEhEbIG9IWKjeLQ==
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 4P6dM962V5zXc8;
Wed, 1 Feb 2023 23:25:41 +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 311NPfup061530;
Wed, 1 Feb 2023 23:25:41 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NPfoH061529;
Wed, 1 Feb 2023 23:25:41 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:25:41 GMT
Message-Id: <202302012325.311NPfoH061529@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 4f6edd4a4c2b - stable/13 - sctp: add KASSERTs to ensure correct handling of listeners
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 4f6edd4a4c2b5ba498f6997357e63e02ea489073
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=4f6edd4a4c2b5ba498f6997357e63e02ea489073
commit 4f6edd4a4c2b5ba498f6997357e63e02ea489073
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-06-27 17:04:45 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:24:28 +0000
sctp: add KASSERTs to ensure correct handling of listeners
This was suggested by markj@.
(cherry picked from commit 121ecca0d82b4a5ccee1a8bb01e50b026a22bb3f)
---
sys/netinet/sctp_usrreq.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index 78ece9dd4641..d7a4d71760a8 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -452,13 +452,10 @@ sctp_abort(struct socket *so)
sctp_inpcb_free(inp, SCTP_FREE_SHOULD_USE_ABORT,
SCTP_CALLED_AFTER_CMPSET_OFCLOSE);
SOCK_LOCK(so);
+ KASSERT(!SOLISTENING(so),
+ ("sctp_abort: called on listening socket %p", so));
SCTP_SB_CLEAR(so->so_snd);
- /*
- * same for the rcv ones, they are only here for the
- * accounting/select.
- */
SCTP_SB_CLEAR(so->so_rcv);
-
/* Now null out the reference, we are completely detached. */
so->so_pcb = NULL;
SOCK_UNLOCK(so);
@@ -843,14 +840,22 @@ sctp_flush(struct socket *so, int how)
inp->sctp_flags |= SCTP_PCB_FLAGS_SOCKET_CANT_READ;
SCTP_INP_READ_UNLOCK(inp);
SCTP_INP_WUNLOCK(inp);
+ SOCK_LOCK(so);
+ KASSERT(!SOLISTENING(so),
+ ("sctp_flush: called on listening socket %p", so));
SCTP_SB_CLEAR(so->so_rcv);
+ SOCK_UNLOCK(so);
}
if ((how == PRU_FLUSH_WR) || (how == PRU_FLUSH_RDWR)) {
/*
* First make sure the sb will be happy, we don't use these
* except maybe the count
*/
+ SOCK_LOCK(so);
+ KASSERT(!SOLISTENING(so),
+ ("sctp_flush: called on listening socket %p", so));
SCTP_SB_CLEAR(so->so_snd);
+ SOCK_UNLOCK(so);
}
return (0);
}
From nobody Wed Feb 1 23:28:08 2023
X-Original-To: dev-commits-src-branches@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 4P6dQ064h1z3cKQg;
Wed, 1 Feb 2023 23:28:08 +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 4P6dQ05d08z3K3Q;
Wed, 1 Feb 2023 23:28:08 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675294088;
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=8HHL0pAzdEFnTEPdvqXL/MHEns6bWueaUF79043J+AU=;
b=mTZaJyc7pVLy4U4h7f2wyiFzN/4DKNfKc/w3+FvSO8uKKAfkvO81Rxrz27+hQwhmaamDeZ
xn0PYodIrAC4YGGlss6fCuQBnUwtLDWveQSL644pKYCvHBH7bOOxPxC7M5saVfaNSTXNbA
bJYy5sEZrcj2AA9sv0x1nyUEnvAiwWeKXnrm1wy14kOn61TDnsE+3E1hijPkmpVpC+0jOF
ube+gFw2Ph22g7VGmLh7JwkuHVGZpFEgh4lHrMus/q+s+f2Igd9hmq6gjXBZ5LxK+iY6m/
WvWbeukct6dY5glopxRuGbpvglh+llPG8xjlvFCLKpQ7C8keAj1HjYJXlQysHw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675294088;
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=8HHL0pAzdEFnTEPdvqXL/MHEns6bWueaUF79043J+AU=;
b=Mw85scmpmLqeSMWXT0w+CZrSqG8Nz59LX08rshT3S46IKFLcDAaqf7MMV35F5hei0WFiMz
g8y//j2umFtZjw6ocX96uaB9/iiCXbfxLiZbK55hE0qSqYX7b1TgT++/gIeZKjjWzrklbp
zAdm/floPrNMdwIBx3JqSuoHf2PQInw3SzogAHcIb7p7cxDMfKuqp/9NZTra9nQO6U9Wmy
vz5TcFNT9v4LIrsCu/33I6IwP7EPDCd/Dlks2k5SQxL152/mp/jhwnXC/NvEocU9J51F5M
Ch2hXrEd5NgBgoScqURgpgHeJCcCWYtmSTXoXrm+ucKNR1dKrTr4kuYBNQZiPA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675294088; a=rsa-sha256; cv=none;
b=OmTmywce3cIC1qQkiBLTyWA7Vc5xkhCxLxum1SCdLLCofMkhoLno0NSdA7tIdJi7Zkkscg
TmDtiyDS2cWPk2bM+ctn3HYjLFxYPsbYXiby4y1bErS1jD+Dhp4hGjKMjosqQvsuEkCBlR
JJQPfgNcfofqs1q/36DPhehLXoFNazVFb8uJeRgBj2nKMRfZJ0zcblAtKOzEKg2jH2+94C
U7i+qDA5hSNPpZvu4jNPbMLGdnY5UFhycLRBVSNBbYmd13oTQmVrfJbv53wtsvBI885ukG
nBIGZ1VVja+A8N32RGMUf1jLJ9ZaU08+itdyfAR8Gsf6+eI8a0OtVDxfF/nUww==
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 4P6dQ04g1lzXvh;
Wed, 1 Feb 2023 23:28:08 +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 311NS834061951;
Wed, 1 Feb 2023 23:28:08 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NS8CE061950;
Wed, 1 Feb 2023 23:28:08 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:28:08 GMT
Message-Id: <202302012328.311NS8CE061950@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: a00dbd88cc2d - stable/13 - sctp: do not clobber listening socket with sockbuf operations
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a00dbd88cc2da19a9624f0b24d3d9d4e5a13721a
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=a00dbd88cc2da19a9624f0b24d3d9d4e5a13721a
commit a00dbd88cc2da19a9624f0b24d3d9d4e5a13721a
Author: Gleb Smirnoff <glebius@FreeBSD.org>
AuthorDate: 2022-06-27 16:21:45 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:27:30 +0000
sctp: do not clobber listening socket with sockbuf operations
The problem was here since 779f106aa16, but a4fc41423f7 turned it
into a panic.
Reviewed by: tuexen
Reported by: syzcaller
(cherry picked from commit bafe71fd27201523ae91ef8320f551a609cda1a1)
---
sys/netinet/sctp_usrreq.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index d7a4d71760a8..7a0b60a9e030 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -560,13 +560,10 @@ sctp_close(struct socket *so)
* the SCTP association.
*/
SOCK_LOCK(so);
- SCTP_SB_CLEAR(so->so_snd);
- /*
- * same for the rcv ones, they are only here for the
- * accounting/select.
- */
- SCTP_SB_CLEAR(so->so_rcv);
-
+ if (!SOLISTENING(so)) {
+ SCTP_SB_CLEAR(so->so_snd);
+ SCTP_SB_CLEAR(so->so_rcv);
+ }
/* Now null out the reference, we are completely detached. */
so->so_pcb = NULL;
SOCK_UNLOCK(so);
From nobody Wed Feb 1 23:30:41 2023
X-Original-To: dev-commits-src-branches@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 4P6dSx5y8rz3cLGj;
Wed, 1 Feb 2023 23:30:41 +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 4P6dSx5S2Vz3KTF;
Wed, 1 Feb 2023 23:30:41 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675294241;
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=u8oOFzga5jsYNzL37Mhp3xpCSu4lBuRiKMh7sBE9/3w=;
b=FjRHhygT5gT7ZwEIP6pyPLGaDLE38JQj/DXvCnBW/2QYkiWtZ7zZt8BtJyQ8Zfg8h1MnZY
g4bqZf4LasoWlC0GqRGlqmRb9Ae60dHxrbfFcghM8RZUT4oFwJyUpOqwy2NAhnqLa3xTri
rNtjvvxoGOxDIZwYW0eGlwJzL1vmnc0GqJNM4JFeTKUSkRavPE65jm81WQux4Lcow5OeP3
1NuEEr2t+76glmHSp7fK6FrTkx4z3tbFDuED7r3vayZTtcHHv1SAGD56su82qN+9FjA+A9
32GFVFWa3zDuAGgbCqhwwsMYdIYAUxnRBJijVfNZib90ADS4i7f+aJ7wXajdTA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675294241;
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=u8oOFzga5jsYNzL37Mhp3xpCSu4lBuRiKMh7sBE9/3w=;
b=YdDaokvyz6f0MNRNTLhAnOl6HrLjiUJ+7WLFhsghm/7VrpVwAqoNDCbMFqrCofjGVgKWrs
MS3oTcmTcrOX47xLt5Uwl9iGi7eqcU/VNTkG7ZUL4svq+KgesNYj2XDL4+lHcNDMnUwq78
uQEwEukL7v01VVDgZ6zIog70VWytq4JgZPnY8zJLco0Y8fqvuQ/jtz9nxtE9/+JfLC7uVx
3hN7KAhuEzhfjw88G7gto/0+Qxqll/vyPmqiWqSWki0KUc9kfIjp+P/OpUwDp33aZV9MBM
fuzHkyRugEXiUMiqcxJfCRpDdWOpvzaiBbX+Y7cfIMedOthQBnJSl/i3Erh/tw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675294241; a=rsa-sha256; cv=none;
b=vzdOIMZrU9md52ni285f7Tfz6q/tDrpgK/umGUpTMNFnk4wLJMCM7GPkHCW4kSlJezJlrD
p2g//5QkNPxALhS8AETEnlWOUI+I4LghsqE7YnGHGAwqM+mJ1TDH5g5zX1zIjCsK30H8C2
Tf4KKeFa8W0DWwNID1HbqEFxL1fZmsWjGzs9ROmh0V0nZNfFs+X2FHUsFzTBbkTEVh5sis
KGe8kAA09UKxCY1IfM/2xi5Tjdlz1pbpgyN6rKX3PSc0M6GlA6WGFqDZmDzpaZ1fWib2E3
h4dY13qiZKCCnYqEpzR3LkAS0PsYTEkldc9RGialGf192BxMLpfuL0Kk+7EvZg==
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 4P6dSx4W8LzY6t;
Wed, 1 Feb 2023 23:30:41 +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 311NUfYv070778;
Wed, 1 Feb 2023 23:30:41 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NUfgL070776;
Wed, 1 Feb 2023 23:30:41 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:30:41 GMT
Message-Id: <202302012330.311NUfgL070776@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 36d33812f387 - stable/13 - tcp rack: fix switching to RACK when FIN has been sent
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 36d33812f387f1dbc3b9e7b15fd94004bb81fb4e
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=36d33812f387f1dbc3b9e7b15fd94004bb81fb4e
commit 36d33812f387f1dbc3b9e7b15fd94004bb81fb4e
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-07-19 18:28:25 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:30:03 +0000
tcp rack: fix switching to RACK when FIN has been sent
Fix the rack sendmap entry in case a FIN has been sent when the
stack is switched over to RACK.
Reported by: syzbot+dd55e316428419e9354b@syzkaller.appspotmail.com
Reviewed by: rrs
Sponsored by: Netflix, Inc.
Differential Revision: https://reviews.freebsd.org/D35731
(cherry picked from commit 5b741298b11cdaec71877fa24b72764d1e697a33)
---
sys/netinet/tcp_stacks/rack.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c
index 1cf89388399c..e11351e5c515 100644
--- a/sys/netinet/tcp_stacks/rack.c
+++ b/sys/netinet/tcp_stacks/rack.c
@@ -12283,12 +12283,9 @@ rack_init(struct tcpcb *tp)
rsm->r_tim_lastsent[0] = rack_to_usec_ts(&rack->r_ctl.act_rcv_time);
rsm->r_rtr_cnt = 1;
rsm->r_rtr_bytes = 0;
- if (tp->t_flags & TF_SENTFIN) {
- rsm->r_end = tp->snd_max - 1;
+ if (tp->t_flags & TF_SENTFIN)
rsm->r_flags |= RACK_HAS_FIN;
- } else {
- rsm->r_end = tp->snd_max;
- }
+ rsm->r_end = tp->snd_max;
if (tp->snd_una == tp->iss) {
/* The data space is one beyond snd_una */
rsm->r_flags |= RACK_HAS_SYN;
From nobody Wed Feb 1 23:31:26 2023
X-Original-To: dev-commits-src-branches@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 4P6dTp4STNz3cLLl;
Wed, 1 Feb 2023 23:31:26 +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 4P6dTp42Sdz3KqR;
Wed, 1 Feb 2023 23:31:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675294286;
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=WtRVGS042/oGTEZ1u+kvv7yv9WrUNoL1OxneOpfqTTs=;
b=ashfLyxQ7Bo+/fu0Zzat1xyNoJbtetaTpLAZhZkiKV4Iz57CF9Tlo0TNBaiz120m1k01z9
pZsIZqlj5klfWT4EoHxkN+4JipsuHyBorj4z+pCGMZJPLu5Ek9HKqbc3IgVCEvCSDT1R1B
DT+khVOuuukC7AqXVt4HEyaMS+gEzNc0L1pegPEJ4xRK4tDQE5lfM/FY5awRtZSNsgSeIR
Syk/r2wSfHGFQqv+yWawqwu4awAcGBVwOQ4yFP3Y+IMiX2/Q6OPc3tT0GUa8qlvI16mvq6
nlQGk68mvFo1aTH8RGJ+FP/HxgG+gby+vlyfPgOcYLRJKrqe5vsaaqnSsAVnHA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675294286;
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=WtRVGS042/oGTEZ1u+kvv7yv9WrUNoL1OxneOpfqTTs=;
b=AwnYr8JVcKB+kTiW/gUVfC13Jv7MfID8B6YqtSaEoaWt4UbykSZ/3LlOHyuPha1Q7z1KF/
4u/Q3DcqTPK+2I90jAMBh2SpjtptZsKfiqwPsBrURjabuTtq9UGPi0p6wybffMyl03dey9
2d93J83tKtUlaX+RuUrgjNQ5f2FNrUYN3GAiOdt2eE3va1yEa5BvyR9YObfiJ9rEkzs0Ou
63XpKUeWhnsp2yhEBNzAMnSdEq9W4h2+FSP39KhoQ8g/CkPzq4d/5NFHSVw+X3SHvvsDpH
tqRkfKUu2sfSnRUuYrlF5qvotgXOxf1f36t9rthpECPdT/2suN4JF0N1qYx8gw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675294286; a=rsa-sha256; cv=none;
b=FdbsjFZQ8X0IOjWeSFyXjEuznHsOB0SYQ3n42aGfg72XaMJwIN3OO8PDZNMNWFbIqZzP6x
5ViUnnBDDl+P6SfTjH1DASo1W6dRlsiDi5OC2InuiVFVF4ll0TUpJZfWyL+tdkm6goLh9g
RdJDssAV0x5T2ykVrOtOT6VmWhkt2ss5Vgr7CcXMUoe24u2QbIiYaf7otizE63xhycUlzy
wKoiiRq81dVNXn51k3u0vnaEhGNJl5TX+5xWLacFPkoM6CuNt2HMogEOUidXTg3ycraWj1
GwdS2ACJe/ijsnpQkm5YsUyNegG46BP+ACYwKkx0kn3dW/WZVxzqLRi/KdAh9g==
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 4P6dTp34sRzY9f;
Wed, 1 Feb 2023 23:31:26 +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 311NVQDq074419;
Wed, 1 Feb 2023 23:31:26 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NVQMx074418;
Wed, 1 Feb 2023 23:31:26 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:31:26 GMT
Message-Id: <202302012331.311NVQMx074418@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: f450156bea76 - stable/13 - tcp rack: simplify computation of rsm start and end
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: f450156bea766c71d5728e907c08f3ef142caf45
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=f450156bea766c71d5728e907c08f3ef142caf45
commit f450156bea766c71d5728e907c08f3ef142caf45
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-08-02 10:45:56 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:30:58 +0000
tcp rack: simplify computation of rsm start and end
While there, also fix the setting of the SYN related flag.
Reviewed by: rrs
Sponsored by: Netflix, Inc.
Differential Revision: https://reviews.freebsd.org/D35862
(cherry picked from commit 1abc27dd52e5fd151472439004f20dc798887ae1)
---
sys/netinet/tcp_stacks/rack.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c
index e11351e5c515..162b1c928ef7 100644
--- a/sys/netinet/tcp_stacks/rack.c
+++ b/sys/netinet/tcp_stacks/rack.c
@@ -12285,14 +12285,11 @@ rack_init(struct tcpcb *tp)
rsm->r_rtr_bytes = 0;
if (tp->t_flags & TF_SENTFIN)
rsm->r_flags |= RACK_HAS_FIN;
- rsm->r_end = tp->snd_max;
- if (tp->snd_una == tp->iss) {
- /* The data space is one beyond snd_una */
+ if ((tp->snd_una == tp->iss) &&
+ !TCPS_HAVEESTABLISHED(tp->t_state))
rsm->r_flags |= RACK_HAS_SYN;
- rsm->r_start = tp->iss;
- rsm->r_end = rsm->r_start + (tp->snd_max - tp->snd_una);
- } else
- rsm->r_start = tp->snd_una;
+ rsm->r_start = tp->snd_una;
+ rsm->r_end = tp->snd_max;
rsm->r_dupack = 0;
if (rack->rc_inp->inp_socket->so_snd.sb_mb != NULL) {
rsm->m = sbsndmbuf(&rack->rc_inp->inp_socket->so_snd, 0, &rsm->soff);
From nobody Wed Feb 1 23:32:09 2023
X-Original-To: dev-commits-src-branches@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 4P6dVd3Lc0z3cL73;
Wed, 1 Feb 2023 23:32:09 +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 4P6dVd2vj1z3LGR;
Wed, 1 Feb 2023 23:32:09 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675294329;
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=KEQNdTMv5SpgyhChbGXVO5YhMAoWVrOVZgZ4HiCOyXI=;
b=gi5AKhk8tiQFaJ5DtDNkMiUxYFQsjbVROOq03kPBYi0fxm2l4aIYz7JCxQYd8/HC5st/dF
6fy1KYS1yWEn/k3UM4XXxGnO6krA4SfMR7QHf14jpBcLkMDiEC06/E6a+wLa2N8ufKEh5h
owXZd3j8dZGAS2gI7+RR0mErhoT5aZoDQ0pHPugZXn3yHpz3QgIm14+95hXmx9gRe+ijJi
Oj+/pPNFbJup9mpSLpu7YtlAoaNpmuXa7VB8WrD/1cGmFoYh3yYAxvW5npGBlTgI2Rv8ky
wO+Mq0JysERIvn/7n4eM5Ughdq0JVl8bB2D5Z0WS4NF1brf6uBEvhsbfIkQzDg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675294329;
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=KEQNdTMv5SpgyhChbGXVO5YhMAoWVrOVZgZ4HiCOyXI=;
b=J7g7XqugU6cpm6sYCcyxTKRl6fsep7HqvXZQNG/rbXNBPJJoVxDjSTf9TWJTWFRDQdzqh5
/cpCCsn1mtPhwy+1xshLpj5R7ay77Kd1p+16PLvnGdWipNlngyWFs0CJ5m8bomzcpx6S6Q
aHfx9s5oQ66W8w9HpFgj6jOjV+LPvUpPvk0HWLYhssYIRhjOPvtQyRtN11buh00hqipoYy
5e5+L3HblRiB0sVJOdGkPezBTtf1Qi7CcQhnyi+GzwfTDQh3KpGEmPdZ6iJnOqo/osNL04
WNENCMEPePMECp7WZK25nbtevyg9e3Ii1TQSM2ECvtHD9hEQ/m7R0gmG42z8LA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675294329; a=rsa-sha256; cv=none;
b=hsi0xsVzckrsQTrUGf16CKeS9xCk4bIAgBqb03PaWT5wzVCr5XXTU0bCtnu6jjhfDeXFPu
2o7QnhNkfzzfxEUiM5tq/0+nPxwNYK5DMtjJbT3Eal8oJNOPi2WuIHVWDhs8hwvV4AfCDE
R3vfXoa/Xodcr0EbuEHvriUuD17z0c5J9o07vBWvwdpq7i86J+hM6OwWSdi3kcRiXZjJt2
Ba18DvBy9R/KiWrZPaLPrY0kC45uaoBmgne6s6kvM+GzsAjUOax+Odi1KepcSKuLWMsrpC
Nw4FkB4kBSXnKV64Zi2UlKTMEP/fg4gFcByQ28S9d9u8x9sHxkt5gjEXpi8D/g==
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 4P6dVd1zwBzYMK;
Wed, 1 Feb 2023 23:32:09 +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 311NW9f4074630;
Wed, 1 Feb 2023 23:32:09 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NW9RO074629;
Wed, 1 Feb 2023 23:32:09 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:32:09 GMT
Message-Id: <202302012332.311NW9RO074629@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: ec4646fe25fe - stable/13 - sctp: tweak panic message
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: ec4646fe25fe590db7a354992fdf1f2cd7ae9eeb
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=ec4646fe25fe590db7a354992fdf1f2cd7ae9eeb
commit ec4646fe25fe590db7a354992fdf1f2cd7ae9eeb
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-08-03 15:28:15 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:31:46 +0000
sctp: tweak panic message
(cherry picked from commit 979bc32c7c14f944a340058fcd1a580a7492f785)
---
sys/netinet/sctp_indata.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c
index d3c969bb47b1..b8bfaf164904 100644
--- a/sys/netinet/sctp_indata.c
+++ b/sys/netinet/sctp_indata.c
@@ -3837,10 +3837,9 @@ static int
sctp_fs_audit(struct sctp_association *asoc)
{
struct sctp_tmit_chunk *chk;
- int inflight = 0, inbetween = 0;
+ int inflight = 0, resend = 0, inbetween = 0, acked = 0, above = 0;
int ret;
#ifndef INVARIANTS
- int resend = 0, acked = 0, above = 0;
int entry_flight, entry_cnt;
#endif
@@ -3860,29 +3859,23 @@ sctp_fs_audit(struct sctp_association *asoc)
chk->snd_count);
inflight++;
} else if (chk->sent == SCTP_DATAGRAM_RESEND) {
-#ifndef INVARIANTS
resend++;
-#endif
} else if (chk->sent < SCTP_DATAGRAM_ACKED) {
inbetween++;
} else if (chk->sent > SCTP_DATAGRAM_ACKED) {
-#ifndef INVARIANTS
above++;
-#endif
} else {
-#ifndef INVARIANTS
acked++;
-#endif
}
}
if ((inflight > 0) || (inbetween > 0)) {
#ifdef INVARIANTS
- panic("Flight size-express incorrect? \n");
+ panic("Flight size-express incorrect F: %d I: %d R: %d Ab: %d ACK: %d",
+ inflight, inbetween, resend, above, acked);
#else
SCTP_PRINTF("asoc->total_flight: %d cnt: %d\n",
entry_flight, entry_cnt);
-
SCTP_PRINTF("Flight size-express incorrect F: %d I: %d R: %d Ab: %d ACK: %d\n",
inflight, inbetween, resend, above, acked);
ret = 1;
From nobody Wed Feb 1 23:32:51 2023
X-Original-To: dev-commits-src-branches@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 4P6dWS1yNYz3cLMc;
Wed, 1 Feb 2023 23:32:52 +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 4P6dWS1DS5z3Lv9;
Wed, 1 Feb 2023 23:32:52 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675294372;
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=qUht1eLBgmpb7SKMQria38BCbUq/ybRi7wCEFsnJ/MY=;
b=k08oqKHfJ2VKzMpm2q/A9Zq8A5F3PWCa6vu4R7Y15pP8cFXCJjOBPUmUPvHNSTANBba9po
VPbO3qq1IqgJ5OuUIcKYHk8bWeR3MLoRBKhtSE6MMDlIT2gfKCcyXVJPDSagrshAhsoK/K
tu+nfr++wXmI5qQsgKeWejmRyqT8zZxMeGIUlMVd7sKWqFNi0DovwQmS76KMngimxATG+n
Y4m4KtCKdC+iydo5rTY1Z2XbCwCf+3E5aOiXWRmBmR8AqoUd9Z3PW5ntZacPmpZghmNk1m
/dIvllPe+8m7g27m48v/+T7dw5RCW+ylwajyrUvJDzCRxfqBqY5sMYgjbA7oLA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675294372;
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=qUht1eLBgmpb7SKMQria38BCbUq/ybRi7wCEFsnJ/MY=;
b=HwcMDwASlqevnq6WTwcOo5KumErXN/HvKOkWCDGi+HI58utl89RGxz/UnNDPzsaiGnGJfv
KDe3aerO0AcEFBen4q8imUfcbHh2+qjKO3M193CiSWpU8jhi5P5CxoA1CqewZB9i27ZXi9
+YQKHk8IZHASA51IEa3T7tyt5HgfKF/+PL85dMnD6NvCzayMPtE7eArAo9WRYSUwzZB41t
u+slubUNpOmH1XRpJHxVGpVGeFveiYteaW3DsPxxFigvdRryCvi3+V4IS42uQMXPVnAMqA
qGsVPUdLZE6V8ksVHT4hMsm4DknPjofG3fhluHrYjXD9oya6J/Uhv65zkSiO2Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675294372; a=rsa-sha256; cv=none;
b=YOPKD6jfEMf+7bmL8XNjBSX+4NX+HFWX9FsFDMtfe1EUCivzGQU8WGPw7t5F8crYXXcx68
ltUvwBIhI4ShBJaC/F4PTSLq7ztFT9g5cBszS0zQtQoUMaXwLtYIXyJXL2CeSaeSlEn+TZ
PbJuXGqFCqs1tq/baml+9IS7G897ZM0blzOlHL9x6ik50sqtPf+YfhxtIbwZn5gOxyvFNE
VPzmX2fsp6w65t6CDga/S5vIUIi7mgsYGS4ksr/cX2Wi4+kYOSOS1nMH2gGSxRG/5vxuwj
ylp/QkePmtrCU01cWL7Dusskglth8vPqGUTkROn42Y2lKOpYse4gkyiv0H8KhQ==
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 4P6dWS0GXQzYQ7;
Wed, 1 Feb 2023 23:32:52 +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 311NWpPp075749;
Wed, 1 Feb 2023 23:32:51 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NWpJn075747;
Wed, 1 Feb 2023 23:32:51 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:32:51 GMT
Message-Id: <202302012332.311NWpJn075747@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: cb15bf432533 - stable/13 - sctp: improve handling of send() calls with no user data`
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: cb15bf432533997e47fad2c4375c19e6826f4b2b
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=cb15bf432533997e47fad2c4375c19e6826f4b2b
commit cb15bf432533997e47fad2c4375c19e6826f4b2b
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-08-08 10:53:42 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:32:26 +0000
sctp: improve handling of send() calls with no user data`
In particular, don't report EAGAIN on send() calls with no user
data, which might trigger a KASSERT in asyc IO.
Reported by: syzbot+3b4dc5d1d63e9bd01eda@syzkaller.appspotmail.com
(cherry picked from commit bb995f2ef0e75e2e9cc784fc36fc3eb02d3e3113)
---
sys/netinet/sctp_output.c | 186 ++++++++++++++++++++++++----------------------
1 file changed, 98 insertions(+), 88 deletions(-)
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 6736f7e9f948..6ea139795be0 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -6342,6 +6342,18 @@ sctp_msg_append(struct sctp_tcb *stcb,
error = EINVAL;
goto out_now;
}
+ if ((stcb->asoc.strmout[srcv->sinfo_stream].state != SCTP_STREAM_OPEN) &&
+ (stcb->asoc.strmout[srcv->sinfo_stream].state != SCTP_STREAM_OPENING)) {
+ /*
+ * Can't queue any data while stream reset is underway.
+ */
+ if (stcb->asoc.strmout[srcv->sinfo_stream].state > SCTP_STREAM_OPEN) {
+ error = EAGAIN;
+ } else {
+ error = EINVAL;
+ }
+ goto out_now;
+ }
/* Now can we send this? */
if ((SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_SENT) ||
(SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_ACK_SENT) ||
@@ -12724,83 +12736,6 @@ sctp_lower_sosend(struct socket *so,
sinfo_flags |= SCTP_EOF;
}
}
- if (sinfo_flags & SCTP_ADDR_OVER) {
- if (addr != NULL) {
- net = sctp_findnet(stcb, addr);
- } else {
- net = NULL;
- }
- if ((net == NULL) ||
- ((port != 0) && (port != stcb->rport))) {
- error = EINVAL;
- goto out_unlocked;
- }
- } else {
- if (asoc->alternate != NULL) {
- net = asoc->alternate;
- } else {
- net = asoc->primary_destination;
- }
- }
- sinfo_stream = sndrcvninfo->sinfo_stream;
- /* Is the stream no. valid? */
- if (sinfo_stream >= asoc->streamoutcnt) {
- /* Invalid stream number */
- error = EINVAL;
- goto out_unlocked;
- }
- if ((asoc->strmout[sinfo_stream].state != SCTP_STREAM_OPEN) &&
- (asoc->strmout[sinfo_stream].state != SCTP_STREAM_OPENING)) {
- /*
- * Can't queue any data while stream reset is underway.
- */
- if (asoc->strmout[sinfo_stream].state > SCTP_STREAM_OPEN) {
- error = EAGAIN;
- } else {
- error = EINVAL;
- }
- goto out_unlocked;
- }
- if (sctp_is_feature_on(inp, SCTP_PCB_FLAGS_NO_FRAGMENT)) {
- if (sndlen > (ssize_t)asoc->smallest_mtu) {
- error = EMSGSIZE;
- goto out_unlocked;
- }
- }
- atomic_add_int(&stcb->total_sends, 1);
- if (SCTP_SO_IS_NBIO(so) || (flags & (MSG_NBIO | MSG_DONTWAIT)) != 0) {
- non_blocking = true;
- }
- if (non_blocking) {
- ssize_t amount;
-
- inqueue_bytes = asoc->total_output_queue_size - (asoc->chunks_on_out_queue * SCTP_DATA_CHUNK_OVERHEAD(stcb));
- if (user_marks_eor == 0) {
- amount = sndlen;
- } else {
- amount = 1;
- }
- if ((SCTP_SB_LIMIT_SND(so) < (amount + inqueue_bytes + asoc->sb_send_resv)) ||
- (asoc->chunks_on_out_queue >= SCTP_BASE_SYSCTL(sctp_max_chunks_on_queue))) {
- if ((sndlen > (ssize_t)SCTP_SB_LIMIT_SND(so)) &&
- (user_marks_eor == 0)) {
- error = EMSGSIZE;
- } else {
- error = EWOULDBLOCK;
- }
- goto out_unlocked;
- }
- }
- atomic_add_int(&asoc->sb_send_resv, (int)sndlen);
- local_soresv = sndlen;
-
- KASSERT(stcb != NULL, ("stcb is NULL"));
- SCTP_TCB_LOCK_ASSERT(stcb);
- KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
- ("Association about to be freed"));
- KASSERT((asoc->state & SCTP_STATE_WAS_ABORTED) == 0,
- ("Association was aborted"));
-
/* Are we aborting? */
if (sinfo_flags & SCTP_ABORT) {
struct mbuf *mm;
@@ -12899,6 +12834,92 @@ sctp_lower_sosend(struct socket *so,
goto out_unlocked;
}
+ KASSERT(stcb != NULL, ("stcb is NULL"));
+ SCTP_TCB_LOCK_ASSERT(stcb);
+ KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
+ ("Association about to be freed"));
+ KASSERT((asoc->state & SCTP_STATE_WAS_ABORTED) == 0,
+ ("Association was aborted"));
+
+ if (sinfo_flags & SCTP_ADDR_OVER) {
+ if (addr != NULL) {
+ net = sctp_findnet(stcb, addr);
+ } else {
+ net = NULL;
+ }
+ if ((net == NULL) ||
+ ((port != 0) && (port != stcb->rport))) {
+ error = EINVAL;
+ goto out_unlocked;
+ }
+ } else {
+ if (asoc->alternate != NULL) {
+ net = asoc->alternate;
+ } else {
+ net = asoc->primary_destination;
+ }
+ }
+ if (sndlen == 0) {
+ if (sinfo_flags & SCTP_EOF) {
+ got_all_of_the_send = true;
+ goto dataless_eof;
+ } else {
+ error = EINVAL;
+ goto out_unlocked;
+ }
+ }
+ if (sctp_is_feature_on(inp, SCTP_PCB_FLAGS_NO_FRAGMENT)) {
+ if (sndlen > (ssize_t)asoc->smallest_mtu) {
+ error = EMSGSIZE;
+ goto out_unlocked;
+ }
+ }
+ sinfo_stream = sndrcvninfo->sinfo_stream;
+ /* Is the stream no. valid? */
+ if (sinfo_stream >= asoc->streamoutcnt) {
+ /* Invalid stream number */
+ error = EINVAL;
+ goto out_unlocked;
+ }
+ if ((asoc->strmout[sinfo_stream].state != SCTP_STREAM_OPEN) &&
+ (asoc->strmout[sinfo_stream].state != SCTP_STREAM_OPENING)) {
+ /*
+ * Can't queue any data while stream reset is underway.
+ */
+ if (asoc->strmout[sinfo_stream].state > SCTP_STREAM_OPEN) {
+ error = EAGAIN;
+ } else {
+ error = EINVAL;
+ }
+ goto out_unlocked;
+ }
+ atomic_add_int(&stcb->total_sends, 1);
+ if (SCTP_SO_IS_NBIO(so) || (flags & (MSG_NBIO | MSG_DONTWAIT)) != 0) {
+ non_blocking = true;
+ }
+ if (non_blocking) {
+ ssize_t amount;
+
+ inqueue_bytes = asoc->total_output_queue_size - (asoc->chunks_on_out_queue * SCTP_DATA_CHUNK_OVERHEAD(stcb));
+ if (user_marks_eor == 0) {
+ amount = sndlen;
+ } else {
+ amount = 1;
+ }
+ if ((SCTP_SB_LIMIT_SND(so) < (amount + inqueue_bytes + asoc->sb_send_resv)) ||
+ (asoc->chunks_on_out_queue >= SCTP_BASE_SYSCTL(sctp_max_chunks_on_queue))) {
+ if ((sndlen > (ssize_t)SCTP_SB_LIMIT_SND(so)) &&
+ (user_marks_eor == 0)) {
+ error = EMSGSIZE;
+ } else {
+ error = EWOULDBLOCK;
+ }
+ goto out_unlocked;
+ }
+ }
+ atomic_add_int(&asoc->sb_send_resv, (int)sndlen);
+ local_soresv = sndlen;
+
KASSERT(stcb != NULL, ("stcb is NULL"));
SCTP_TCB_LOCK_ASSERT(stcb);
KASSERT((asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0,
@@ -12910,7 +12931,6 @@ sctp_lower_sosend(struct socket *so,
if (p != NULL) {
p->td_ru.ru_msgsnd++;
}
-
/* Calculate the maximum we can send */
inqueue_bytes = asoc->total_output_queue_size - (asoc->chunks_on_out_queue * SCTP_DATA_CHUNK_OVERHEAD(stcb));
if (SCTP_SB_LIMIT_SND(so) > inqueue_bytes) {
@@ -13013,16 +13033,6 @@ skip_preblock:
* sndlen covers for mbuf case uio_resid covers for the non-mbuf
* case NOTE: uio will be null when top/mbuf is passed
*/
- if (sndlen == 0) {
- if (sinfo_flags & SCTP_EOF) {
- got_all_of_the_send = true;
- goto dataless_eof;
- } else {
- error = EINVAL;
- goto out;
- }
- }
-
if (top == NULL) {
struct sctp_stream_queue_pending *sp;
struct sctp_stream_out *strm;
From nobody Wed Feb 1 23:33:38 2023
X-Original-To: dev-commits-src-branches@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 4P6dXL5vyvz3cL7T;
Wed, 1 Feb 2023 23:33:38 +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 4P6dXL5QZlz3M85;
Wed, 1 Feb 2023 23:33:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675294418;
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=LQGUSKaHpwgPxzsgaI95R2GjKl3GktvoHmOSgXWuwyQ=;
b=ASoPGi6PGeWmSj1JcuDh3vNS0W2gSaNMN/Vbc4tLbR+YK4yDpcfC5fkXnDpavtnKYmjYpu
Ytz0qmMbb46mEt9u6PfrEz1O6m3Zqddjbeloxtup+FcAgBHKcawzt22lue75bDCqdthr55
zPjexnhyfHGQxQ4o3GPH3Opxr2E1xgiy+SSylefSvyOQ88hVUIncFCYbHa6bGATgTb13/X
1kRPHaEaywUSpS+hvKv66qqy0cdY6SAcDcxzLCvWKPgyBBOlmaoxQ2PIzsQ4O0nPUNVyEa
H0DPJPp3XxEQk43G9FzwrCMTm4EWzAwzwkb54a5+gpPf22FKI0u2azWE3O5czw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675294418;
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=LQGUSKaHpwgPxzsgaI95R2GjKl3GktvoHmOSgXWuwyQ=;
b=NY2nHdGVl2udoyl6q/kcsDm6xtkYs81FX6hrATToA/2EDy8wJMfAMvxthOx3YtsLp8vA11
hJ8W5Lim/WeBUmqOGwMB6ylPq7CAyRnpUZRiHDk9qF5uU44l3GPLBvhQB3WBw/P6gHOGHZ
Q7NCBDsDatJS/r2iY3ZRBQYX68sqrYauKP+d7/xKrP7ElbypflskRFQ7Njb2lka68rwWcB
hWrMYdriCrHisHnfCovvYJ9TAtl2Rqqvr/lXGnkPPsJtRvRU4E7of6leuxVSbPV8olROY8
z/wwOp4m+ZNSUVsq7qAOKvyLtzE4bPhSwfDLThF3XotvNNtE7xOUzDhJEcG9uA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675294418; a=rsa-sha256; cv=none;
b=m3Klrn8J0Ho0p8/o4jo16kyT3gBQ0Eolg5bLLg5A8CJ9V6KmAIhqKpQjELGhwOybZsPn4Y
5im8dzlF9IGeOgSKaoWW5zHyS/kVZc65SPrRX8FDIRj38lTuqKSvKSoa50ovGjkDRk+8Sk
ZFOCGWM4AZyCR0ogcLCm2wQy+KqgQwtqmPGCLt8kudLQkRrPHVxxekdxF+X0Q8nqH6O7lR
D5teLot4MAjsLiWzSgha0AS8g7zbFIA40Np6dWWywoSwPC6oxAki5SPTO3mrua3GgIT7OE
hDtmFzbY286mRWyuJs9eLi8r4Lfj3J3btVmtz48d7lxvQp/ErbI1MPENrPXAJA==
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 4P6dXL4VlYzYW1;
Wed, 1 Feb 2023 23:33:38 +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 311NXcKS076011;
Wed, 1 Feb 2023 23:33:38 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NXc4x076010;
Wed, 1 Feb 2023 23:33:38 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:33:38 GMT
Message-Id: <202302012333.311NXc4x076010@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 423b1e36a64f - stable/13 - tcp: improve BBLog for output events when using the FreeBSD stack
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 423b1e36a64f187f6bf2eea01c8864d24cc40658
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=423b1e36a64f187f6bf2eea01c8864d24cc40658
commit 423b1e36a64f187f6bf2eea01c8864d24cc40658
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-08-08 11:07:10 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:33:06 +0000
tcp: improve BBLog for output events when using the FreeBSD stack
Put the return value of ip_output()/ip6_output in the output event
instead of adding another one in case of an error. This improves
consistency with other similar places.
Reviewed by: rscheff
Sponsored by: Netflix, Inc.
Differential Revision: https://reviews.freebsd.org/D36085
(cherry picked from commit bd30a1216e03e14cfaa7e91b1fc72ad76e9cd240)
---
sys/netinet/tcp_output.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index a30f8eab389d..fea54cdcc5cb 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -219,6 +219,7 @@ tcp_output(struct tcpcb *tp)
int tso, mtu;
struct tcpopt to;
struct udphdr *udp = NULL;
+ struct tcp_log_buffer *lgb;
unsigned int wanted_cookie = 0;
unsigned int dont_sendalot = 0;
#if 0
@@ -1452,8 +1453,13 @@ send:
TCP_PROBE3(debug__output, tp, th, m);
/* We're getting ready to send; log now. */
- TCP_LOG_EVENT(tp, th, &so->so_rcv, &so->so_snd, TCP_LOG_OUT, ERRNO_UNK,
- len, NULL, false);
+ /* XXXMT: We are not honoring verbose logging. */
+ if (tp->t_logstate != TCP_LOG_STATE_OFF)
+ lgb = tcp_log_event_(tp, th, &so->so_rcv, &so->so_snd,
+ TCP_LOG_OUT, ERRNO_UNK, len, NULL, false, NULL, NULL, 0,
+ NULL);
+ else
+ lgb = NULL;
/*
* Fill in IP length and desired time to live and
@@ -1553,6 +1559,10 @@ send:
}
#endif /* INET */
+ if (lgb != NULL) {
+ lgb->tlb_errno = error;
+ lgb = NULL;
+ }
out:
if (error == 0)
tcp_account_for_send(tp, len, (tp->snd_nxt != tp->snd_max), 0, hw_tls);
@@ -1666,10 +1676,6 @@ timer:
tcp_clean_dsack_blocks(tp);
}
if (error) {
- /* Record the error. */
- TCP_LOG_EVENT(tp, NULL, &so->so_rcv, &so->so_snd, TCP_LOG_OUT,
- error, 0, NULL, false);
-
/*
* We know that the packet was lost, so back out the
* sequence number advance, if any.
From nobody Wed Feb 1 23:34:22 2023
X-Original-To: dev-commits-src-branches@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 4P6dYC2DjQz3cLnW;
Wed, 1 Feb 2023 23:34: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 4P6dYC1MG6z3MSs;
Wed, 1 Feb 2023 23:34:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675294463;
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=WyKaJkgX0UzIb5pfCyw0suuhld47ZXDsdW2MFPSdNgo=;
b=WYYLT7kD+aJo8P4OR5zPSqREDo8HI7GBJRds+2svHZbIP+bSDz4YXVo3Z5ZIK2CNggvdZc
5shoFQEcjIFsUS3GX2zcIN6TXAXRERgC99s7/dJ+c4i0JgDLeXaIro32HbWk1BbGEgK2Vn
pTr+kCrw5bgp1lDx92cQ3tva3u6/m2xssxh6e9wLpYcoGgLFuimIb/ehZyLsvUhUZoT6iI
5LpwePaZFL9OdVeJ4B95OBu/XV7d4OuTbyVEDRG7sxcFPckLqCItzhzRZ1Av/xpQkJM1qC
dFZ3v6diUMAlIC1CB0ApnudO0LKstVkEmCTuyVEdgiDdM7xKmDmL7SWBkopCOw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675294463;
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=WyKaJkgX0UzIb5pfCyw0suuhld47ZXDsdW2MFPSdNgo=;
b=XlytZ2PrycVQOd1ciVBA9aNpO+9LXZ3aOFBC2dy1HSynjXKcFjRjnwYu41WqDyanvA5ScK
g0gndY1i2nO+XVboq4J3nFSVjMejv8yQLzushCW2+po8dp1uNmoBUQbkqMo9ZbHPtjQsl6
mvAN9anNsHy2YMyyrzZ09OTxJdnN61mVOAOnMY5RWRgl5scyU/INCQwDTc66XyzuKIwdxb
V7lz3muzswySbF69jxHr39sjq5W4DpEgeMlnHbgaVQqMDP3c3Ay6pbybSmyDqMm9SOjxPJ
i3p+chnaact0dOWM4ATxnJNrwTbMGRt7XbuXKPhTM0fMecJWlvKY84Wa8AdrGw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675294463; a=rsa-sha256; cv=none;
b=SOS68MQl6fgnJ/NmC1Q+h+fMy9OYOBwHo4JDko6IWkzFyd5ItAfkfjzXAXvsg0z1Bc4kU1
n7YuLVNFZYabzpYdgT4dM5CLNs5DFcxPlUahpAWWFE7xo1PU2mcFlsZEqtFFLsh2g1pvtP
WFZzSPhZsUeLL9WW6OjYO/Z7n/uzU86rNuFBXKrqTVwpkE4Fuuz39oTsAHOXi19gTuQS6B
yJy6x1e+SeUsHIZNVRx1eIl49gVpWlXGq6ykbb8qzxhV++EiamDFBXbZV9A5kGS39Eq9EH
wyR3LiBFM+EaBcQ0RSICzll0SJ7R29mTnzgc4se487ScoK1j4/QP4NVQdAaE/g==
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 4P6dYC0NR3zY7X;
Wed, 1 Feb 2023 23:34: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 311NYMa3076194;
Wed, 1 Feb 2023 23:34:22 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NYMOf076193;
Wed, 1 Feb 2023 23:34:22 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:34:22 GMT
Message-Id: <202302012334.311NYMOf076193@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: a18afeac4902 - stable/13 - tcp: fix stats counter for SYN_RCVD state when TCP-FO is used
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a18afeac4902f8e50f2ce3ab78705de7e7ae8a59
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=a18afeac4902f8e50f2ce3ab78705de7e7ae8a59
commit a18afeac4902f8e50f2ce3ab78705de7e7ae8a59
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-08-28 16:45:59 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:33:56 +0000
tcp: fix stats counter for SYN_RCVD state when TCP-FO is used
Reviewed by: glebius
Sponsored by: Netflix, Inc.
Differential Revision: https://reviews.freebsd.org/D36384
(cherry picked from commit c624b9a549f0fe82dd74dc66c9369e5da856b506)
---
sys/netinet/tcp_syncache.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index 54bcf8173c86..2282373a2c1d 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -1368,6 +1368,7 @@ syncache_tfo_expand(struct syncache *sc, struct socket **lsop, struct mbuf *m,
tp->snd_max = tp->iss;
tp->snd_nxt = tp->iss;
tp->t_tfo_pending = pending_counter;
+ TCPSTATES_INC(TCPS_SYN_RECEIVED);
TCPSTAT_INC(tcps_sc_completed);
}
}
From nobody Wed Feb 1 23:37:51 2023
X-Original-To: dev-commits-src-branches@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 4P6ddC2y2rz3cM6T;
Wed, 1 Feb 2023 23:37:51 +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 4P6ddC2RfLz3Ml5;
Wed, 1 Feb 2023 23:37:51 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675294671;
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=hYgfMC1p8rXsFt0loj92s9oWxIZH9b39PvPz6nVPjPI=;
b=DEm2dhH2+/HuIQvbU/dBgYxoadMsO7hr9bNex27ZlqA7aLK5GTGj4zTCc9bDxc3H4SbLtH
rRRkDOgdiozlyk185hGNDlhLSLvYRbgU3jtccQMTZMjQZc2qTDDqA6XtXHzXlSQ8+nTXu/
pMpo2btf5rWUlR9gfNdsvOqHL6OXur6PN3/fmdarUBlF2PU9DDqcHIr84fODHXWAtNq/3j
BzeJe3wFZIGOBhVSuoF4XTxLN/0CD9/DbP/pz8HAPewFDMI/VtgW3Or2Yz3WytOxlPVNT7
ZZxJooAOhkZOaDDfNoYavsq0HzhrT+THoaBJvQU8wih1pnzT79vX78s9n41ycw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675294671;
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=hYgfMC1p8rXsFt0loj92s9oWxIZH9b39PvPz6nVPjPI=;
b=euxJ63jqLEA4rb3VD8c0+rcjPAxwJp813CvNLpAZxZMhRJ5TLRZovXC3Hrgr/+4BADDAAF
0RS1g2SYIgabOY8PM55eiPSyfH1VTUPcP+ViMZ2ImjQXyn8i6qYt4o8lzU7rCJUPnHySmX
FIRKCw6J+a7Jb4euATvudarGhCNzeM+PcV2uMSDSbi3UH9UtltQ24wjKo3sdU+M0BnuyIg
RMKaZYA4E6OrNq8zL2mJI5r3n+JhvF+BhJLmjrO3PGKa/NIX4lhlGe06UV/R37n6Vh0xcj
k4rCT4K4/r3SCcrYMPrEFi4BxfVM3kiJAvw40K8yQ74bjChxc6KvnOmdc9eMhg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675294671; a=rsa-sha256; cv=none;
b=WT++U2ZolOxe5UEtpPowkN62GK1Xx90sP9ifjxXjGoEYTHNefyLK1cb5gqg8XRsGNPNMwb
mhjvgoaouoUOxoAu+eZWtyV3nZlaWX4lwtA051UotzizbVDfrY98o78z0KYBAPLcfjud/P
X0pGitPjiFDbIy0JLheoEuhD9ju0AUMUQkFTkrmkmv/XlktVQvqJY9rpiP4FJmuchcG9i+
EsFK8AKAWxrR/r2b/eJ3ubon6PekCU/QCJeBdYUB6Tl+eEvP3TMd8wyP17q3OPRIG7ufrO
r4SkhqoZIduHzMh6syg2B2UzzkTWB91PmDnqdgE9StAK+gax1y6xmTZDaO4uRg==
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 4P6ddC1LVGzYW2;
Wed, 1 Feb 2023 23:37:51 +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 311NbpGR076708;
Wed, 1 Feb 2023 23:37:51 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NbpFh076707;
Wed, 1 Feb 2023 23:37:51 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:37:51 GMT
Message-Id: <202302012337.311NbpFh076707@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: e52b662a3b5f - stable/13 - tcp: honor drop_synfin sysctl variable in TIME-WAIT
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: e52b662a3b5f509c3b4b6676b38beaa620b8c1a5
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=e52b662a3b5f509c3b4b6676b38beaa620b8c1a5
commit e52b662a3b5f509c3b4b6676b38beaa620b8c1a5
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-10-03 10:48:30 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:37:21 +0000
tcp: honor drop_synfin sysctl variable in TIME-WAIT
Reviewed by: rrs@
Sponsored by: Netflix, Inc.
Differential Revision: https://reviews.freebsd.org/D36862
(cherry picked from commit f8b5681094dd752604bfa0603ba0be2873698f46)
---
sys/netinet/tcp_timewait.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index 970f46274791..f15cf6dae762 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -50,9 +50,7 @@ __FBSDID("$FreeBSD$");
#include <sys/proc.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
-#ifndef INVARIANTS
#include <sys/syslog.h>
-#endif
#include <sys/protosw.h>
#include <sys/random.h>
@@ -389,6 +387,7 @@ tcp_twcheck(struct inpcb *inp, struct tcpopt *to, struct tcphdr *th,
struct mbuf *m, int tlen)
{
struct tcptw *tw;
+ char *s;
int thflags;
tcp_seq seq;
@@ -439,6 +438,17 @@ tcp_twcheck(struct inpcb *inp, struct tcpopt *to, struct tcphdr *th,
*/
#endif
+ /* Honor the drop_synfin sysctl variable. */
+ if ((thflags & TH_SYN) && (thflags & TH_FIN) && V_drop_synfin) {
+ if ((s = tcp_log_addrs(&inp->inp_inc, th, NULL, NULL))) {
+ log(LOG_DEBUG, "%s; %s: "
+ "SYN|FIN segment ignored (based on "
+ "sysctl setting)\n", s, __func__);
+ free(s, M_TCPLOG);
+ }
+ goto drop;
+ }
+
/*
* If a new connection request is received
* while in TIME_WAIT, drop the old connection
From nobody Wed Feb 1 23:48:39 2023
X-Original-To: dev-commits-src-branches@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 4P6dsh16Ccz3cMp1;
Wed, 1 Feb 2023 23:48:40 +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 4P6dsh0ZFpz3Ql7;
Wed, 1 Feb 2023 23:48:40 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675295320;
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=3AUciznX5OvwwaPwyvOfuF4rypaDP31O0+pLPMdMCto=;
b=kCEFEkMEoNhh7fKfnlIcSERSocjFgd5FHRQJhXEtTVvlbQuRTnCnPv2+vbv0Aw3KV5k3yU
sy2tCh1VxDG4H4SPQOTXfacvBY9s7XbUuf8P13EdgJNSMu3ujzhHBu56bSuwTtAVO8kweq
g5aVQLuHMWROo5yLzhqIwDIK04bUWFRp1NV5H/9xJ7LhwsJAbcEEuomp4ZfKMigSWFOVay
gRHJwVSj6Z5mvqZrZQKdKjG0ItZA2BVnlfbNuO92z3W+QGVwijGde2MNFHdhUkDNeOrzN/
RNUb2mwAI1tq9Fv4VRaEJuYERrddCCnLhv/XZS7vmEZIOzY2jO4YbqYWIfpmvQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675295320;
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=3AUciznX5OvwwaPwyvOfuF4rypaDP31O0+pLPMdMCto=;
b=J6LDbOCN8+7P4cLu4dK/cNwSFGMvmII4PfNplT4betZ8Y/QY9YbGv2yfzE7wEFmc63lnMa
jW0Zeq2ftywW+T19BfcTaM5ezywcTtG2/8lwFdWpGFHu2b2qDTJgBUXzgHd91tK7AAJHJg
HlW6LNOj08TSlVZlau7qgqJ+jIV1loQCr4KAWhsUyV+GtUUcbbZgeNg4Asf0S+Z0ipnVi0
wgyfFrZYwgEL8DlYS0HKUi93rOKFuwHWVxxkJ+gdbRRaO0/d8QApr5erxuiyQvAgUQLLPg
XjgAfVkSMNjruN8KZ5d1LjzcgDIMQS9vHpiKQnitky0se2C/sLIQ6Q42DXwIMQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675295320; a=rsa-sha256; cv=none;
b=Egd1hY0kMwCeccz1PSk8asza05s4tPkJ+trdrLNqCl7jjMZXiDYzpTBdOjp92Fk0SAPu+C
u2y6smVMx1KWkgFhlowIPsx/b1IyEUjBodwPXaVi8PikU42bXHwOZ8wCmHMdkUu5MSL955
jy2CQ/t7lPZiniynN0rJT5W2LIFDTI+D+kP73qTPyvZ7X65qdYBE6VzBuDiQA/MugDDGKS
DRCy7zWIx+Id2p7iV4kg9d4BVWPBYIuCmWg9T6C+z4eFEixTDC08ay0478qi93qSpCO9RN
76/+yvY3ePydjFT29S+mJflf0I8IA59iegK4ETuXK2zpXUjQQWuY/aIDbbecWA==
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 4P6dsg6gbBzYXq;
Wed, 1 Feb 2023 23:48:39 +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 311NmdXd090950;
Wed, 1 Feb 2023 23:48:39 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NmdPL090949;
Wed, 1 Feb 2023 23:48:39 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:48:39 GMT
Message-Id: <202302012348.311NmdPL090949@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: cd4974672ad3 - stable/13 - tcp: improve handling of SYN-ACK segments in TIMEWAIT state
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: cd4974672ad3204ebb27efb623f3aabfcc2b82ef
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=cd4974672ad3204ebb27efb623f3aabfcc2b82ef
commit cd4974672ad3204ebb27efb623f3aabfcc2b82ef
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-10-03 12:46:47 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:47:53 +0000
tcp: improve handling of SYN-ACK segments in TIMEWAIT state
Only consider segments with the SYN bit set and the ACK bit cleared
as "new connection attempts", which result in re-using a connection
being in TIMEWAIT state. This results in consistent handling of
SYN-ACK segments.
Reviewed by: rscheff@
Sponsored by: Netflix, Inc.
Differential Revision: https://reviews.freebsd.org/D36864
(cherry picked from commit 2515552e6216095c3fa61d93ee024bb8861e07c2)
---
sys/netinet/tcp_timewait.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index f15cf6dae762..86c5e62fc9b6 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -456,7 +456,8 @@ tcp_twcheck(struct inpcb *inp, struct tcpopt *to, struct tcphdr *th,
* are above the previous ones.
* Allow UDP port number changes in this case.
*/
- if ((thflags & TH_SYN) && SEQ_GT(th->th_seq, tw->rcv_nxt)) {
+ if (((thflags & (TH_SYN | TH_ACK)) == TH_SYN) &&
+ SEQ_GT(th->th_seq, tw->rcv_nxt)) {
tcp_twclose(tw, 0);
TCPSTAT_INC(tcps_tw_recycles);
return (1);
From nobody Wed Feb 1 23:50:44 2023
X-Original-To: dev-commits-src-branches@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 4P6dw46JP6z3cNhJ;
Wed, 1 Feb 2023 23:50:44 +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 4P6dw45kSTz3RGf;
Wed, 1 Feb 2023 23:50:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675295444;
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=N/bl5rWmVk0J/33Qsg0CL0OdK3yWAmZRlx0F785clNY=;
b=siCQ+YHc8ST4wSLOy6ZRjFDOTfUN/KaHh6Eri04UupZ49R6uzDOQRhvSn77Jza3tBPWjeT
pQAhkRNpM1HVd+eQi9jkmA3tFp0Blm6lu6J282NAg0lp1p2+vE8zKvEUyirRL78rFfd9SK
gmGG9L3JGKUYT5JMXXNbEiP+nnD4NxCBMvKpH1VDT1QEbS0uiFvN4TfOLMYTvzORm5pGBd
sGh0pB7f1m0hC6fFJ82bx+ETOb2kF4kofde1X850Zoq/SWtBOLDHsFvKkiNd88MFMNvWJR
3RlnNuUvpUwPjLPz78hG9IgLbSGBkgPzAVfQSKb1krzCkTv/jZcM9V8eaQhJWw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675295444;
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=N/bl5rWmVk0J/33Qsg0CL0OdK3yWAmZRlx0F785clNY=;
b=qpJY5YvEAOoVCCpOvrbwzMiakJHRpJ9zC9W6+TiEB6wvnBVOvLgLxjTwVGLF7i3DwH8syU
pMmUE1N967dGCO+KbfDoPwJA8ph34sFIOQITC6UifU6OAORb0kQcifl5NdwzZxLbK61tJm
h3zM/jCU3CX2kreGwLhITUWMLVrgoMAM3rLuiW/Qq+B9Y2ax+OEXPlHSAaU3tZ7bC5Gp6f
HwQwBjYyKoV/WyKz/nofBPECWjWPELEpi4K5P64bwHx35yA0EgdoUi+bGYUb162KqXM0d7
XBzppoZwWDoeDVpI9YznmAIAQOqq+C25FGR/uhtxP1G2/iVQx1rGnQAocHCu2A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675295444; a=rsa-sha256; cv=none;
b=YyB/F8q0a24Spq+97P3MqsCZNc2ggCZiN9+/Nhaal4gp6C2PXmgamjUo52LDZeqIExwJFR
P1Z7F3CN0Sm2N2ZNIX4wJ6rU/y5Ovbc+WrZJW3hN+RiuSsD/XLluASkPJ7S3MW2TW2mCqx
rN27PvtR5CWQONs7ISZQ2y6o+uchp1SP+nMQcO87VBw3qKJTeEut+a3K4xwd+7xok3vEaJ
IMP4dw9CRbCfXk8uKt0BXHrefUwJek2T0rfhgnaZGmUv2NoRq4JDL/FglgleCsZCm0xlVH
U1TCppDtCpUQGhGa/AItpfev0FcX9kGVnz57z/hXkEZQbZJzaFAIXFs0/iZ5Tg==
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 4P6dw44nVpzYQs;
Wed, 1 Feb 2023 23:50:44 +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 311NoiPS099642;
Wed, 1 Feb 2023 23:50:44 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311Noill099641;
Wed, 1 Feb 2023 23:50:44 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:50:44 GMT
Message-Id: <202302012350.311Noill099641@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 0c38bb448caa - stable/13 - traceroute6: fix capabilities for the rcv socket
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 0c38bb448caa426b7f238853d7841219819024be
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=0c38bb448caa426b7f238853d7841219819024be
commit 0c38bb448caa426b7f238853d7841219819024be
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-10-04 21:34:58 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:49:35 +0000
traceroute6: fix capabilities for the rcv socket
On the receive socket, recvmsg() and poll()/select() is called.
Therefore, CAP_EVENT is needed in addition to CAP_RECV.
While there, check the socket for readbility before calling recvmsg().
Reviewed by: markj@
Sponsored by: Netflix, Inc.
Differential Revision: https://reviews.freebsd.org/D36878
(cherry picked from commit 8ff4fc03e6933dd69f99a8f34f2aa0760300f248)
---
usr.sbin/traceroute6/traceroute6.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index a071c084ad07..d887acf5ae53 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -937,7 +937,7 @@ main(int argc, char *argv[])
strerror(errno));
exit(1);
}
- cap_rights_init(&rights, CAP_RECV);
+ cap_rights_init(&rights, CAP_RECV, CAP_EVENT);
if (caph_rights_limit(rcvsock, &rights) < 0) {
fprintf(stderr, "caph_rights_limit rcvsock: %s\n",
strerror(errno));
@@ -1039,7 +1039,8 @@ wait_for_reply(int sock, struct msghdr *mhdr)
pfd[0].events = POLLIN;
pfd[0].revents = 0;
- if (poll(pfd, 1, waittime * 1000) > 0)
+ if (poll(pfd, 1, waittime * 1000) > 0 &&
+ pfd[0].revents & POLLIN)
cc = recvmsg(rcvsock, mhdr, 0);
return (cc);
From nobody Wed Feb 1 23:59:11 2023
X-Original-To: dev-commits-src-branches@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 4P6f5q2qppz3cPHG;
Wed, 1 Feb 2023 23:59:11 +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 4P6f5q2Hv0z3hVr;
Wed, 1 Feb 2023 23:59:11 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675295951;
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=5yhPbT62LsYVuPNdLhQ7q97ZTBwwKs1epQJiWn/IHOY=;
b=WXtCKM/C/qGbHw+eltneqKoTkT3ri8G9H3b1mfr8YZw/Go+GT45TsW33jfZtPDEYTs3PUl
2sL5IJ6qHW+hCR1BdUoTTv/SLHbXWQzBrE6Uyou8h71E3DQ+tY8qsZNLQJcE8cKoVj4YYk
89rpL2vfnITk74M4ExHAsVccJ38W4PhIjjFnRpAJdpUtX6RgddWhQr4cAxDKwPNLGxAa06
6YuRB2hIXv9vaRIo3Dwc6koTj4/N2FVfFOZgJY9Vq5f5WcUzBYH/8XFyMg4jxmxHpo5faW
ctrukpLxpcbcEVpyr3TaoWaRkv327qQMc0mSSgRMH2pl1O2nNquTfmbJh0LTbg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675295951;
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=5yhPbT62LsYVuPNdLhQ7q97ZTBwwKs1epQJiWn/IHOY=;
b=wwl4jooUJNS5qn9JAB7LMc1qTP64+0I5OdU/xu3oK6BXab12COGrLJwvmoSPOcrQWUSC1E
+TWOcSBtct5scOq8A+V+aFImilJu+UUcQj+aLSZLg/bexn4MXp+wVbtcAr1dWO8KL95lU0
r367Vfb9dj/WeYW6SEHgP79NM5d30VJGlKGvR+r/1rvbEq5crCZgL0APQKS78G50h8XqqB
SoyrG4ZGcYbTMSt6SXv/aSHc6hpjNTbJInkJ718vEkoF1lMYKzRqIXHSGlIULuc8L7i5Fx
ibj5NerET82K/BPJyqHCxHtJvV5T4DcpcEklKRTh0BC3vIIZUnB92187raJpAw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675295951; a=rsa-sha256; cv=none;
b=fxpzhw6UgeEiEnkbMuDptZuWa8oMFXwyEf8/7VudUvzJqS4dxf9NWCjHCd9NGffEuz+Fsg
mrG+jdMtAfHD4CgltdrWvk3YM6Jk5R9RbIzErIKQfRk4veDWejvsrDgaMIjdj0WtB8cXBU
Wrnr0Ny5VUxATaxBCkKWYcYF1n5CcbL/dIHySLUDPhcW0pgqsM+4+oVwgSfaohNLqAnjiU
SpaCTbZ0M1bGHKmQke/dy28BwHPfVDcvu/LTsIBj3e6mcVB4xdgPxpl2lkG8UVxLixZLXE
D8BdnkjF0Zvq1Jsm5Oyte+B0M/lWNo1o9FSenSGDsW2lRZaikhzUiMeTxAyUsg==
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 4P6f5q1FXVzYdL;
Wed, 1 Feb 2023 23:59:11 +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 311NxBmB005738;
Wed, 1 Feb 2023 23:59:11 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NxBbc005737;
Wed, 1 Feb 2023 23:59:11 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:59:11 GMT
Message-Id: <202302012359.311NxBbc005737@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 09cecd5711a8 - stable/13 - Sync TCP related kernel config options
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 09cecd5711a8e3c6f0299fdb91185df057f8fd03
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=09cecd5711a8e3c6f0299fdb91185df057f8fd03
commit 09cecd5711a8e3c6f0299fdb91185df057f8fd03
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-10-10 13:40:26 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:58:28 +0000
Sync TCP related kernel config options
Add TCP_BLACKBOX to the remaining platforms (arm64, RISC-V) and add
TCP_RFC7413 to the remaining platform (RISC-V).
Reviewed by: rscheff@
Sponsored by: Netflix, Inc.
Differential Revision: https://reviews.freebsd.org/D36918
(cherry picked from commit ad20efdde208485db97027a00c4b08a7daa9c663)
---
sys/arm64/conf/GENERIC | 1 +
sys/riscv/conf/GENERIC | 2 ++
2 files changed, 3 insertions(+)
diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC
index 9470c04646f0..f8842d672c0e 100644
--- a/sys/arm64/conf/GENERIC
+++ b/sys/arm64/conf/GENERIC
@@ -34,6 +34,7 @@ options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5
options ROUTE_MPATH # Multipath routing support
options FIB_ALGO # Modular fib lookups
options TCP_OFFLOAD # TCP offload
+options TCP_BLACKBOX # Enhanced TCP event logging
options TCP_HHOOK # hhook(9) framework for TCP
options TCP_RFC7413 # TCP Fast Open
options SCTP_SUPPORT # Allow kldload of SCTP
diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC
index 6cce48b884c0..7d158269cde0 100644
--- a/sys/riscv/conf/GENERIC
+++ b/sys/riscv/conf/GENERIC
@@ -33,6 +33,8 @@ options TCP_HHOOK # hhook(9) framework for TCP
options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5
options ROUTE_MPATH # Multipath routing support
options TCP_OFFLOAD # TCP offload
+options TCP_BLACKBOX # Enhanced TCP event logging
+options TCP_RFC7413 # TCP Fast Open
options SCTP_SUPPORT # Allow kldload of SCTP
options FFS # Berkeley Fast Filesystem
options SOFTUPDATES # Enable FFS soft updates support
From nobody Wed Feb 1 23:59:58 2023
X-Original-To: dev-commits-src-branches@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 4P6f6l0w1sz3cPZy;
Wed, 1 Feb 2023 23:59:59 +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 4P6f6l0S53z3hV3;
Wed, 1 Feb 2023 23:59:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675295999;
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=7gdDoA0jq+NiPis3ZYOGNNnShDgvHy/+uHOu1iiDq80=;
b=xXmxz4VYEhpenCsJQzsqFRrzxhEuKBDU3dnmhPPbhOiAIC3vMzFNb3N8lnNhbyFMpDS9Vp
EFXZL8mQ1/RLlAubGMOHy8237OBi+lpsVr+glfLIcx/9jCpNNu4wd0rP0QI7VBnaFPB5lB
2rs3xgkzzqN/QFddBUMcRUncuO3C0xFEzkG6yPCwa+o53I2YRyXd1ibAyqUgIGlb1MeAnj
rkGmhugtaEE8CQB4Xnsm01aOIbznQfl1cqWvQar6A75gDRS/op76JyrzN0rHS9fBMqBdfO
nDjQfxOcx/e7MPRRtovU4h5Zz1nAURWGbVXjcmGPKfiXc/QggYjM7RPE2i0GwQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675295999;
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=7gdDoA0jq+NiPis3ZYOGNNnShDgvHy/+uHOu1iiDq80=;
b=poShiKqLSlHUQl16joF4PoxF1pCoYlogpqA1iBpG6GFHTehc0HfikQz3ncy+Jrk2Re5mgy
AzpRpTF5WhjtDvZlrB1prRZ2ofTA86ajtzxcDwK0ao7GqqKj0wzYwRDV3AGkxhp2XdrA4D
v0+BGOhUWJ81F03rfub56Xs8/fBErgVthKU4LSkRngKuNM8ZWZdaJe3mfHobvb4Z8RciVZ
m4igc0kqVbptlI0OVcuFzZen6EvV/1CYD4eFCEHv+LQQculePLNjJxe5uA5rgdfS9DdqnA
O6hVHM5bu90pMv7cuH0iVWVbG0sD4XlYMit1aFaFhKUqa34WZJ/GuJT+Mi4g0g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675295999; a=rsa-sha256; cv=none;
b=FSKvyhTuD4Zpb0r13YWtYOSHae19EJxHPzc9aaWLGaOCBpF/jZQfOl54vcjkV2UOes4BKy
jACzfzr9WTmjqjC2FYwj5Wrk/mSeS/8uukA72yvJKYRKMbV9e1YjSn4FtBLzvPdUo3igMN
Wo8WRCGR7vq1r6qpZ6J+pmbAq7w2hDJ06Pjv0+MyPrG0SjdUoIfI0S4O4bZCql2Lz10r2I
KWKZXGiaL2pHRXtHn6c0VzFv+dezECPt2ox8ID/N9BtJFAco09pz7n4B7GhiOCnLsIIRgD
hcrkmw4XEsYJg5rI54LD1iTZbm3kFYm/KletvKYP6DVkR7PyDqDIEEN3N9ezMw==
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 4P6f6k6dbgzYGH;
Wed, 1 Feb 2023 23:59:58 +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 311Nxw6p005930;
Wed, 1 Feb 2023 23:59:58 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311Nxwav005929;
Wed, 1 Feb 2023 23:59:58 GMT
(envelope-from git)
Date: Wed, 1 Feb 2023 23:59:58 GMT
Message-Id: <202302012359.311Nxwav005929@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 91a9ebe24a70 - stable/13 - sctp: improve sending of ABORT packets in response to INIT-ACKs
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 91a9ebe24a70f6fdb9e4f1e8d91e5ded52541f12
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=91a9ebe24a70f6fdb9e4f1e8d91e5ded52541f12
commit 91a9ebe24a70f6fdb9e4f1e8d91e5ded52541f12
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-10-12 23:05:44 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-01 23:59:34 +0000
sctp: improve sending of ABORT packets in response to INIT-ACKs
Ensure that the initiate tag of the INIT-ACK chunk is used as the
verification tag of the packet containing the ABORT chunk.
Reported by: Suganya Dharma
(cherry picked from commit dd36606b1bc90d1459e0d04be4ea5859d3eabb16)
---
sys/netinet/sctp_input.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index 6fa4d0323d94..836f09f4887f 100644
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -412,7 +412,10 @@ sctp_process_init_ack(struct mbuf *m, int iphlen, int offset,
&nat_friendly, &cookie_found);
if (abort_flag) {
/* Send an abort and notify peer */
- sctp_abort_an_association(stcb->sctp_ep, stcb, op_err, false, SCTP_SO_NOT_LOCKED);
+ sctp_abort_association(stcb->sctp_ep, stcb, m, iphlen,
+ src, dst, sh, op_err,
+ mflowtype, mflowid,
+ vrf_id, net->port);
*abort_no_unlock = 1;
return (-1);
}
From nobody Thu Feb 2 00:01:29 2023
X-Original-To: dev-commits-src-branches@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 4P6f8T6rFGz3cPy8;
Thu, 2 Feb 2023 00:01:29 +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 4P6f8T629rz3hyq;
Thu, 2 Feb 2023 00:01:29 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675296089;
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=rkviVGQ0+S3lsq8AW5hWNnkz720Q3kE07V94HlOvY+Y=;
b=UD159gzkbd2aTyhczBV7izfGKAV3Vz4FzRuOl8WOa9DW/PWHQV7z+1gisyexh0/YNqx2Hf
Dm69kuKQXNEVBrQAyf4dDg0f+B0ztUv1+dgl5+nu8QLpzpVw75vBrO9PC3kfOb0XrZLQvi
FXcDyeklY57sHfMvvQlHFaeXN0Kn/Flq6tQ9cvUkCfGzMxSLxLIqkSMdzAQi67L+hD5DTe
xsP7CwZ7LJvY+UlbW5MhsU+yHdAH9FN+xlQdyU/Po1qY3jH/h9SF6uo3yaXS2ngBNDmSlF
ycuYmAUz/gfgL2MWPVm46FNVOsLLPfwXARXoH21LAUd5j4KIYZFyRF5C6nXz9g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675296089;
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=rkviVGQ0+S3lsq8AW5hWNnkz720Q3kE07V94HlOvY+Y=;
b=MuJiYTw0JmUJAOJY/42AmVewy83Rk3WOsAOzLOrOziLXfwuXNjFCLXYWuNz6b8bOb4zjFp
/c0Ye2TUrl5zQ0VBMOldqS0Kxwox8oC/bHSDnb2K0RTB3TGvf23zEyBFGpjDrK1KrMqmzy
3koe151zYOhXMU8NU+eK6imu00tiNs+PNduRmYOFzjCCgdfAygiSxNowtZrKn5zTXlZQ36
eSSKDCzF/sIZUdpqiBU688+2kufvBg5TCu3W4kkOJGiYkkDfDPXy61Cvf7xPpPQJkxe3iD
AtnVH679A+XWvHr400A3d311mZoTfyFVVUT6VEyc0NqTOmU4LeZMJWAiTKFmOw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675296089; a=rsa-sha256; cv=none;
b=ZKa9+jjNy2/ByrepjA3nganLcbyNC0TWMj/pR+hFaTFwrD8OZtNj4bV6hNmfRrZNJDiYWf
fF4K1xSU+UKHYEWPAXg22HQ57QF3r8IACT7PXmmbe6one3cOvnCU9l9qswqEQMP4dfe4IQ
gMImKA6PojC4jsZ+tNc+az4SdrVpQJyAcTS6M9OVYzkcgnMa6/hMDRkSgj0t1fn6Bnmvsy
4bWYmbbbWSiTfLWoNr4aMKMpotwG+yWo5ZQOS9/Yc/hgIPMi+QmsryQAtR5pl4j+MdMNgY
25t8omxrwQiLPgDA3xx2pk7ymng5CmjOx+XiOVEGvQiVWxnnsE7vutPgaw7/YQ==
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 4P6f8T539hzZ6Q;
Thu, 2 Feb 2023 00:01:29 +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 31201TCF015562;
Thu, 2 Feb 2023 00:01:29 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31201TUk015561;
Thu, 2 Feb 2023 00:01:29 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 00:01:29 GMT
Message-Id: <202302020001.31201TUk015561@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 9983b0126bba - stable/13 - Unbreak builds having SCTP support compiled in
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 9983b0126bbad586e7b1748719da5c8132ec3e4d
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=9983b0126bbad586e7b1748719da5c8132ec3e4d
commit 9983b0126bbad586e7b1748719da5c8132ec3e4d
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-11-07 07:50:51 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-02 00:01:06 +0000
Unbreak builds having SCTP support compiled in
Including sctp_var.h requires INET to be defined if IPv4 support
is needed.
(cherry picked from commit 126f8248ccfee8e9252a8b449694b8619738599f)
---
sys/netinet/ip_input.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 62de3ef92bf2..750ddfc3a46f 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -35,6 +35,7 @@
__FBSDID("$FreeBSD$");
#include "opt_bootp.h"
+#include "opt_inet.h"
#include "opt_ipstealth.h"
#include "opt_ipsec.h"
#include "opt_route.h"
From nobody Thu Feb 2 00:02:18 2023
X-Original-To: dev-commits-src-branches@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 4P6f9Q6CGsz3cQ2V;
Thu, 2 Feb 2023 00:02:18 +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 4P6f9Q5mzgz3jDr;
Thu, 2 Feb 2023 00:02:18 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675296138;
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=WXzlpbFFU4V8MjcMLGFA72GFlt6z2PnJ1Q1Rp6RO41o=;
b=HzMBa8X1HAS8tG7Paujfhjd2ARyUOThiHQO+OpcqNSYmFLX0StOBD5Cx1YtFUQXqfJdokg
4UjnxuOJw7AjB5T7wpvKO2pbh0Ls+2pHLTbIs12MhWvbBpIfb1xywCdskzW3KxCMzAeevg
bAG4ts87qs5svRYJssltBixCfhQXOfxhZ4kUkW/NgM5UhlmTd9adOVmurBG2G8yuOmDHf7
tMw1LhTw3PaanX1LffGQqEpUkNcotc+eyK8/05zXznovLMqU5VZOVoLwFz93jJy8DmI7bk
aCjheW/0gw6f2z8mVHrG0jACekusEkYhjfKdgpXgULiIFy3HcYYH2osLqtZxiQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675296138;
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=WXzlpbFFU4V8MjcMLGFA72GFlt6z2PnJ1Q1Rp6RO41o=;
b=dp24dZTXB2fWGxnnOLxc/e+nk3Q/0ZK9g1+ggMC8FFXWCfWkBEICjnTh+koR8uwrc6Y2Es
XckO0CAaN5gJSaMuWMntd3tCgp5LoDNs5MxpwhwrYGDM1MuN9A4ayFClTvDlHl/8RMVO56
qjbQwypfcK7AwgfHeGBannQ2FCEN8fNMfEjn5yNoxjUcy8Y33BxiwxTPQyrFsL+juaOAqL
tXwgKCRpHYGif3fnneya7mlarQT8A+25WUXEKAIownN+FdDeXRMZ/v35FOjPZDk1WokzkB
58Czcc1fdYMYROBP6JG7CiimQ4eopf3lTKnZZqVSMjFiTltZKC2xTN3n6NkD7Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675296138; a=rsa-sha256; cv=none;
b=VV1+tGaDQlj3+B66UsGSegTSj5DPWngdkz9qKpKo8ieatx8fLkjN9vSMfYAUo6xF76COw5
JaDWz/x9sX/WfcjV0i+B0pj4fM3+qJCusyrn+tU0ylBLoYXJ3op/8JTaUS92N8ltiBFivt
naBpvDK5AhAAxO0vpTdpJb51HvRmG90g8iIRV3Z3DaVnfws2nygKijkD1Qr5dwk3qI1yDo
8rNvMykzbeFXt2/Lee6jZDoXoLAR2w1DzulS6RBr6wrfrMXTab1NvT2sOLTIwW8nYxflYb
X1UNpqhFRXqyp92StsWKKbthFx26XGBcB/4cAdsnMewMD4Kn+ixly/6TItaTcg==
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 4P6f9Q4qcnzZ1T;
Thu, 2 Feb 2023 00:02:18 +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 31202IA0019963;
Thu, 2 Feb 2023 00:02:18 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31202Ix0019962;
Thu, 2 Feb 2023 00:02:18 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 00:02:18 GMT
Message-Id: <202302020002.31202Ix0019962@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 39844782bf1e - stable/13 - libalias: improve handling of invalid SCTP packets
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 39844782bf1e648fa85eec40484af4d221d45fa8
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=39844782bf1e648fa85eec40484af4d221d45fa8
commit 39844782bf1e648fa85eec40484af4d221d45fa8
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-11-15 20:05:02 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-02 00:01:43 +0000
libalias: improve handling of invalid SCTP packets
In case of a paritial chunk only pretend the result is OK if
the packet is not the last fragment and there is a valid association.
PR: 267476
(cherry picked from commit 9a714376212ec1685fdc4cf254f2136a07ae6d2c)
---
sys/netinet/libalias/alias_sctp.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/sys/netinet/libalias/alias_sctp.c b/sys/netinet/libalias/alias_sctp.c
index b88ad2b28ca8..41d1d5337a85 100644
--- a/sys/netinet/libalias/alias_sctp.c
+++ b/sys/netinet/libalias/alias_sctp.c
@@ -754,8 +754,11 @@ SctpAlias(struct libalias *la, struct ip *pip, int direction)
case SN_PARSE_OK:
break;
case SN_PARSE_ERROR_CHHL:
- /* Not an error if there is a chunk length parsing error and this is a fragmented packet */
- if (ntohs(pip->ip_off) & IP_MF) {
+ /*
+ * Not an error, if there is a chunk length parsing error,
+ * this is a fragmented packet, and we have a valid assoc.
+ */
+ if ((assoc != NULL) && (ntohs(pip->ip_off) & IP_MF)) {
rtnval = SN_PARSE_OK;
break;
}
@@ -1067,6 +1070,8 @@ sctp_PktParser(struct libalias *la, int direction, struct ip *pip,
* Also, I am only interested in the content of INIT and ADDIP chunks
*/
+ sm->msg = SN_SCTP_OTHER;/* Initialise to largest value*/
+ sm->chunk_length = 0; /* only care about length for key chunks */
// no mbuf stuff from Paolo yet so ...
sm->ip_hdr = pip;
/* remove ip header length from the bytes_left */
@@ -1114,8 +1119,6 @@ sctp_PktParser(struct libalias *la, int direction, struct ip *pip,
chunk_count = 1;
/* Real packet parsing occurs below */
- sm->msg = SN_SCTP_OTHER;/* Initialise to largest value*/
- sm->chunk_length = 0; /* only care about length for key chunks */
while (IS_SCTP_CONTROL(chunk_hdr)) {
switch (chunk_hdr->chunk_type) {
case SCTP_INITIATION:
From nobody Thu Feb 2 00:03:30 2023
X-Original-To: dev-commits-src-branches@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 4P6fBq5vkyz3cQ17;
Thu, 2 Feb 2023 00:03:31 +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 4P6fBp4tDKz3k0j;
Thu, 2 Feb 2023 00:03:30 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675296210;
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=Yw5xBr3/sD8U9yuN1kHQ+LFat0Y4KrMR/t/osEAMGCE=;
b=weYOiZ9rRh4vr7lJSxB63EoVNlZU+yTiqd+v/AatPGroQJfs12jJLRcIq3gXz3cDfYX7oM
KZxuok2G9itomk2qQUClCqyxFIQigMfl7flKyND8a2em8ziwKbEzLWZur6CFvVxo4OVWHf
P7chRXHRnayWOlENSdVv/ms49MIys2Q5neRmscTJwU5uRnPLm35Pkbdo8sEv2g2G8o9xGi
fwiqOtCrsX6P9K7rFp0Zl0IePUHNUbEu+4Q8LEj0N9+WV4sI0us4GbfP3TxXr2PsJAYSDS
RBOu1syK32B3YpD4HTICBYT9J66+rTa5Br6cNHKZ+iNvQboANxvuMSG2jfG+4g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675296210;
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=Yw5xBr3/sD8U9yuN1kHQ+LFat0Y4KrMR/t/osEAMGCE=;
b=IPXmnLvs9qZ+vJsBNW5OgFHzurhRikVj0E5QYrJh65tcDjCyzAAkUEcZEeayHGf7YVfQff
T+K9GWtjnGeEDCq46ObYF/dk81eM5yCH0QZQwXx2JjCuF7yBEZiPf9zXotXgzBu+cDh3ox
SYkA3Nc670BSA/0tpxjh75T7R8H4sUIrzo8fbOnV9kwNgRz0W2qAQfSLV465xipi6/z8wz
nVCaEA8qUKuSEQnkbH/7GTsvhI+jcxS44zcguvt4Ha6P9YJpjTK2NrprDc2WWakbICb30k
3laUpVoucxIz3olIpxBEyI0GsFiDI1B3CSLgqQSP7bYtEdbqGSJ4Cw1qcRDOAw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675296210; a=rsa-sha256; cv=none;
b=lxkwYP14hLd9byyoYZ91+IJjVaih1aHeSbZDeeZmQVDSDN0RZ4au54PP/sMtCeS6sIcAlZ
nbXTxYegImXxLfezbu24F2Zbk0ORl2nMiTuZ5L/uOVeUYyjOOsW+ddJt+7yf7DEGuvKDJ5
cDp6mYcLl6Tde+oFBkOusBL7AuLAsp7s7oWU/EjiuUheqcERYdOThxvaF5jFYSUorWPlSM
LP4P0eYgm/EF1Hz/Ou0PktVuHTi4CRuIghmyRxXZGeg+5JGFPJjAZgSvzRkePMgapfwWVK
wV8zJuo4Sbz2agzdMtxAN69bMe5HMNbv/mHWRhHf/NvXH9artTIb8O89R4/voA==
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 4P6fBp3rXVzYmx;
Thu, 2 Feb 2023 00:03:30 +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 31203UiV020345;
Thu, 2 Feb 2023 00:03:30 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31203U5L020344;
Thu, 2 Feb 2023 00:03:30 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 00:03:30 GMT
Message-Id: <202302020003.31203U5L020344@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: e97522a1b7ea - stable/13 - tcp: remove unused t_rttbest
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: e97522a1b7ea023961d604221eb38960fd170fa9
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=e97522a1b7ea023961d604221eb38960fd170fa9
commit e97522a1b7ea023961d604221eb38960fd170fa9
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-11-16 10:22:13 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-02 00:02:30 +0000
tcp: remove unused t_rttbest
No functional change intended.
Reviewed by: rscheff@
Sponsored by: Netflix, Inc.
Differential Revision: https://reviews.freebsd.org/D37401
(cherry picked from commit bd4f986644b3804e19b92d39f1f90ffabff83e14)
---
sys/netinet/tcp_input.c | 4 ----
sys/netinet/tcp_stacks/bbr.c | 3 ---
sys/netinet/tcp_stacks/rack.c | 3 ---
sys/netinet/tcp_usrreq.c | 5 ++---
sys/netinet/tcp_var.h | 2 --
5 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 94e9d0b71cb8..1c2fe014c7f3 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -410,7 +410,6 @@ cc_conn_init(struct tcpcb *tp)
if (tp->t_srtt == 0 && (rtt = metrics.rmx_rtt)) {
tp->t_srtt = rtt;
- tp->t_rttbest = tp->t_srtt + TCP_RTT_SCALE;
TCPSTAT_INC(tcps_usedrtt);
if (metrics.rmx_rttvar) {
tp->t_rttvar = metrics.rmx_rttvar;
@@ -3642,8 +3641,6 @@ tcp_xmit_timer(struct tcpcb *tp, int rtt)
delta -= tp->t_rttvar >> (TCP_RTTVAR_SHIFT - TCP_DELTA_SHIFT);
if ((tp->t_rttvar += delta) <= 0)
tp->t_rttvar = 1;
- if (tp->t_rttbest > tp->t_srtt + tp->t_rttvar)
- tp->t_rttbest = tp->t_srtt + tp->t_rttvar;
} else {
/*
* No rtt measurement yet - use the unsmoothed rtt.
@@ -3652,7 +3649,6 @@ tcp_xmit_timer(struct tcpcb *tp, int rtt)
*/
tp->t_srtt = rtt << TCP_RTT_SHIFT;
tp->t_rttvar = rtt << (TCP_RTTVAR_SHIFT - 1);
- tp->t_rttbest = tp->t_srtt + tp->t_rttvar;
}
tp->t_rtttime = 0;
tp->t_rxtshift = 0;
diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c
index 42c66ac57891..1b4abfb6f5c4 100644
--- a/sys/netinet/tcp_stacks/bbr.c
+++ b/sys/netinet/tcp_stacks/bbr.c
@@ -6395,8 +6395,6 @@ tcp_bbr_xmit_timer_commit(struct tcp_bbr *bbr, struct tcpcb *tp, uint32_t cts)
tp->t_rttvar += delta;
if (tp->t_rttvar <= 0)
tp->t_rttvar = 1;
- if (tp->t_rttbest > tp->t_srtt + tp->t_rttvar)
- tp->t_rttbest = tp->t_srtt + tp->t_rttvar;
} else {
/*
* No rtt measurement yet - use the unsmoothed rtt. Set the
@@ -6405,7 +6403,6 @@ tcp_bbr_xmit_timer_commit(struct tcp_bbr *bbr, struct tcpcb *tp, uint32_t cts)
*/
tp->t_srtt = rtt_ticks << TCP_RTT_SHIFT;
tp->t_rttvar = rtt_ticks << (TCP_RTTVAR_SHIFT - 1);
- tp->t_rttbest = tp->t_srtt + tp->t_rttvar;
}
KMOD_TCPSTAT_INC(tcps_rttupdated);
tp->t_rttupdated++;
diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c
index 162b1c928ef7..ead81528ace5 100644
--- a/sys/netinet/tcp_stacks/rack.c
+++ b/sys/netinet/tcp_stacks/rack.c
@@ -7737,8 +7737,6 @@ tcp_rack_xmit_timer_commit(struct tcp_rack *rack, struct tcpcb *tp)
tp->t_rttvar += (delta >> 3);
if (tp->t_rttvar <= 0)
tp->t_rttvar = 1;
- if (tp->t_rttbest > tp->t_srtt + tp->t_rttvar)
- tp->t_rttbest = tp->t_srtt + tp->t_rttvar;
} else {
/*
* No rtt measurement yet - use the unsmoothed rtt. Set the
@@ -7747,7 +7745,6 @@ tcp_rack_xmit_timer_commit(struct tcp_rack *rack, struct tcpcb *tp)
*/
tp->t_srtt = rtt;
tp->t_rttvar = rtt >> 1;
- tp->t_rttbest = tp->t_srtt + tp->t_rttvar;
}
rack->rc_srtt_measure_made = 1;
KMOD_TCPSTAT_INC(tcps_rttupdated);
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 74bf2925870f..0706e55f439b 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -2919,9 +2919,8 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent)
tp->t_rxtcur, tp->t_maxseg, tp->t_srtt);
db_print_indent(indent);
- db_printf("t_rttvar: %d t_rxtshift: %d t_rttmin: %u "
- "t_rttbest: %u\n", tp->t_rttvar, tp->t_rxtshift, tp->t_rttmin,
- tp->t_rttbest);
+ db_printf("t_rttvar: %d t_rxtshift: %d t_rttmin: %u\n",
+ tp->t_rttvar, tp->t_rxtshift, tp->t_rttmin);
db_print_indent(indent);
db_printf("t_rttupdated: %lu max_sndwnd: %u t_softerror: %d\n",
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 4a05f0f5ab2e..2474f3787903 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -212,8 +212,6 @@ struct tcpcb {
int t_blackhole_exit; /* when to exit blackhole detection */
u_int t_rttmin; /* minimum rtt allowed */
- u_int t_rttbest; /* best rtt we've seen */
-
int t_softerror; /* possible error not yet reported */
uint32_t max_sndwnd; /* largest window peer has offered */
/* Cache line 5 */
From nobody Thu Feb 2 00:04:15 2023
X-Original-To: dev-commits-src-branches@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 4P6fCg72kgz3cPpY;
Thu, 2 Feb 2023 00:04:15 +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 4P6fCg6XcXz3kWS;
Thu, 2 Feb 2023 00:04:15 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675296255;
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=jIUBQCs8pYnX7nhFwkAIexapXS8YP3F/UMTL5yff1VQ=;
b=yvq8I1amWbq2mEK67ZOCh9ouyo5mmnKi7Cj8ISeu7Q4r4zGaPv/nrkfyZbQ5HBiywpmO2m
cD7xm3T/kEakh6o+qXCygbgKajH3fhoqc63rMKFCJX+UdcHUGUeEHX8VbbnXV2i2nE8mNR
nR1BTxHUoGv5wkyRF6+MMcw9S0wfnvBZYSjugE9gHSG/FhmBZ4x1MXWS45b1AaJrqx9G3W
LJlrpF59aWd1IvcdfwnhtqcxPaGd4bjmZCjS1sYW8GyvbUAGD8ZjuHwgnehAzK9MnaDWRJ
zfmGBe1kiSVTcSbUHU8tHiJkwIuj0KlrW8NI2FQJXwlU3+psDFbZ4qOE35f30A==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675296255;
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=jIUBQCs8pYnX7nhFwkAIexapXS8YP3F/UMTL5yff1VQ=;
b=PMf6Jn6+/XtltY0QAudw2dSLU8XY8zhYcpyfKosBXbgi+cQpfRoKTCPcubDREEtM1pd3Nm
be1WzYk9w5l21u4U0iklwVcEgfukmLKiy2faUkJM5YpCzPoG/XF1orMSM/FFH3boEyI7t5
JT/3iKx7rT55b83W2nh3/606/DUAIyInK9QVpDCSqdZouHBmTYuz5YJ8xNRNHfU53dArZB
2TvRhX75orB3rT6CgPFxW2KXpA9Gqg7emBE2dwZkWBy74XMi2/NmvId6oTzZlbsHVAh99s
OyF8HyILh0q5Os0Qlg8v0jcctWWeEDtFwjIO9C5pZZLhh/ooKimd7kHHIOBVXw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675296255; a=rsa-sha256; cv=none;
b=bJaBcXZsNHP7up1Ib8As7Dq927WHD8aKQ2LFewcTAJTgdiLQvSwfs0I3r9GwOg0jf7e0Qx
hOnF6cdbgdWTkyf0u+VoaLNP+sKI5xEFwmDZw51wGb0ladEFwtKirDfPM2ZOCKzlNTQZo+
yN0DYFGeaaQd0BpWFX6Yda2IbFyZ33qTSjQbwIdLfGxvXGBhTAN8AblSjKLqZWmX7FIf07
2NVkLafMspPvyfJ78xC05Q7RIxbQDXz92DLiq8MMJHYUI94kuBi+104sZXmYSVR5wZth5z
ynZiAmbHI5SMOUdn0powlo0CORUhA28EGAiIRbPm8pUHZ1JjMwTOX9xnTtsLLQ==
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 4P6fCg5bkFzYRq;
Thu, 2 Feb 2023 00:04:15 +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 31204FXk020537;
Thu, 2 Feb 2023 00:04:15 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31204FvA020536;
Thu, 2 Feb 2023 00:04:15 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 00:04:15 GMT
Message-Id: <202302020004.31204FvA020536@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 301bff9bdd62 - stable/13 - ppp: improve MSS clamping
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 301bff9bdd628f27af7d0a6cda440b9525fde336
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=301bff9bdd628f27af7d0a6cda440b9525fde336
commit 301bff9bdd628f27af7d0a6cda440b9525fde336
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2022-12-08 08:48:29 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-02 00:03:50 +0000
ppp: improve MSS clamping
ppp supports MSS clamping for TCP/IPv4. This patch
* improves MSS clamping for TCP/IPv4 by using the MSS as specified
in RFC 6691.
* adds support for MSS clamping for TCP/IPv6.
Reported by: Timo Voelker
Reviewed by: thj
Differential Revision: https://reviews.freebsd.org/D37624
(cherry picked from commit cef3c4e0bab8bd5e84ab8cfa2fa48a1e3dca5876)
---
usr.sbin/ppp/tcpmss.c | 76 +++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 62 insertions(+), 14 deletions(-)
diff --git a/usr.sbin/ppp/tcpmss.c b/usr.sbin/ppp/tcpmss.c
index 765668e9d137..cbf85dbf2a09 100644
--- a/usr.sbin/ppp/tcpmss.c
+++ b/usr.sbin/ppp/tcpmss.c
@@ -35,6 +35,9 @@
#include <netinet/in_systm.h>
#include <netinet/in.h>
#include <netinet/ip.h>
+#ifndef NOINET6
+#include <netinet/ip6.h>
+#endif
#include <netinet/tcp.h>
#include <sys/un.h>
@@ -69,10 +72,12 @@
/*-
- * We are in a liberal position about MSS
- * (RFC 879, section 7).
+ * Compute the MSS as described in RFC 6691.
*/
-#define MAXMSS(mtu) ((mtu) - sizeof(struct ip) - sizeof(struct tcphdr) - 12)
+#define MAXMSS4(mtu) ((mtu) - sizeof(struct ip) - sizeof(struct tcphdr))
+#ifndef NOINET6
+#define MAXMSS6(mtu) ((mtu) - sizeof(struct ip6_hdr) - sizeof(struct tcphdr))
+#endif
/*-
@@ -146,6 +151,10 @@ static struct mbuf *
tcpmss_Check(struct bundle *bundle, struct mbuf *bp)
{
struct ip *pip;
+#ifndef NOINET6
+ struct ip6_hdr *pip6;
+ struct ip6_frag *pfrag;
+#endif
size_t hlen, plen;
if (!Enabled(bundle, OPT_TCPMSSFIXUP))
@@ -153,19 +162,58 @@ tcpmss_Check(struct bundle *bundle, struct mbuf *bp)
bp = m_pullup(bp);
plen = m_length(bp);
+ if (plen < sizeof(struct ip))
+ return bp;
pip = (struct ip *)MBUF_CTOP(bp);
- hlen = pip->ip_hl << 2;
-
- /*
- * Check for MSS option only for TCP packets with zero fragment offsets
- * and correct total and header lengths.
- */
- if (pip->ip_p == IPPROTO_TCP && (ntohs(pip->ip_off) & IP_OFFMASK) == 0 &&
- ntohs(pip->ip_len) == plen && hlen <= plen &&
- plen >= sizeof(struct tcphdr) + hlen)
- MSSFixup((struct tcphdr *)(MBUF_CTOP(bp) + hlen), plen - hlen,
- MAXMSS(bundle->iface->mtu));
+ switch (pip->ip_v) {
+ case IPVERSION:
+ /*
+ * Check for MSS option only for TCP packets with zero fragment offsets
+ * and correct total and header lengths.
+ */
+ hlen = pip->ip_hl << 2;
+ if (pip->ip_p == IPPROTO_TCP && (ntohs(pip->ip_off) & IP_OFFMASK) == 0 &&
+ ntohs(pip->ip_len) == plen && hlen <= plen &&
+ plen >= sizeof(struct tcphdr) + hlen)
+ MSSFixup((struct tcphdr *)(MBUF_CTOP(bp) + hlen), plen - hlen,
+ MAXMSS4(bundle->iface->mtu));
+ break;
+#ifndef NOINET6
+ case IPV6_VERSION >> 4:
+ /*
+ * Check for MSS option only for TCP packets with no extension headers
+ * or a single extension header which is a fragmentation header with
+ * offset 0. Furthermore require that the length field is correct.
+ */
+ if (plen < sizeof(struct ip6_hdr))
+ break;
+ pip6 = (struct ip6_hdr *)MBUF_CTOP(bp);
+ if (ntohs(pip6->ip6_plen) + sizeof(struct ip6_hdr) != plen)
+ break;
+ hlen = 0;
+ switch (pip6->ip6_nxt) {
+ case IPPROTO_TCP:
+ hlen = sizeof(struct ip6_hdr);
+ break;
+ case IPPROTO_FRAGMENT:
+ if (plen >= sizeof(struct ip6_frag) + sizeof(struct ip6_hdr)) {
+ pfrag = (struct ip6_frag *)(MBUF_CTOP(bp) + sizeof(struct ip6_hdr));
+ if (pfrag->ip6f_nxt == IPPROTO_TCP &&
+ ntohs(pfrag->ip6f_offlg & IP6F_OFF_MASK) == 0)
+ hlen = sizeof(struct ip6_hdr)+ sizeof(struct ip6_frag);
+ }
+ break;
+ }
+ if (hlen > 0 && plen >= sizeof(struct tcphdr) + hlen)
+ MSSFixup((struct tcphdr *)(MBUF_CTOP(bp) + hlen), plen - hlen,
+ MAXMSS6(bundle->iface->mtu));
+ break;
+#endif
+ default:
+ log_Printf(LogDEBUG, "tcpmss_Check: Unknown IP family %u\n", pip->ip_v);
+ break;
+ }
return bp;
}
From nobody Thu Feb 2 00:05:14 2023
X-Original-To: dev-commits-src-branches@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 4P6fDp4btgz3cQH5;
Thu, 2 Feb 2023 00:05:14 +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 4P6fDp45tbz3kYF;
Thu, 2 Feb 2023 00:05:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675296314;
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=lp1u+uhqjKeD12spwC+Mvz3jMKuGJvu6Bs9YVV3dCxE=;
b=EhuZlnBgEqSigvFKz3WQ40QmFMkMsKcL7jvVUIjECO804OYOxjHAE9vY8BPGn+Af0oqi5R
2/Venc7wZGyN8v0KpJIeewLf8E2stNEN87H59PFlCP8vn5qKaGvibFbdB2kU/A0E3UsXnz
Fj9Psww8+MIOsYuogiu/AdOA+mCsKA24HQsqrKhstekJB9IXBhEB5rjKCVNVuT7yIV7TjN
mrTRAQEiBhmLz81eaqUREp8e1dlhyyWMqcm5jbT5cp5sVsi6lKIf/jZDBw1YcTGMAgOFFp
3podyE3eZPeJLpXTB99roM0Pt1skSF9XLnlaNGt7cZIM0qUObs/+kW6Oj13uLg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675296314;
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=lp1u+uhqjKeD12spwC+Mvz3jMKuGJvu6Bs9YVV3dCxE=;
b=g5pyLqhCFOusxAr4tsnS1RrDZi1sZtsneWhkQIBMlyG1zY7H/w7F76gjuVpPZLmNTOM3b6
O8jrpfPcqFDKPHhDVfcUv5MfH8CEQoK7a/okaHdexSGyMinmyvnh3LH3FDZaJjz709Gsww
UVbQ28uhtpclZr2F0M4PJsB18Oi6yEoKDVlnqQjl4XuAxUT7yKhfj37ufkHqRc+7rf/FQw
Se4FwDDat5zPpFx4mLZbFNiTzSQnpYLPKABh4hRY6hG2YPIw5Uxo2DaFw7FiYFvHfdtNDj
Y2XpspvFecyS5Y5fPEo7rPq8uUUSYYQ77fMLlyFVl6bNuMawwCmutpiPkuqNnA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675296314; a=rsa-sha256; cv=none;
b=rVkkp42Je5xg0ypCX2IFhBKD0Xj/GTrQTAI7EWO8R++KIbDpzbkP6gWlRgw2EmgyYCWGPF
pxIFBRcRcl2xk+ExTX+4XnftbLPH6XFYD9stGhUHj2yEs4QVwHF0imVAkefBmfiTyb8yFs
b94DBCNsp8dClWhYi2Or5xHAkqs1ZIXc9xjx1ktARlHBjCfTkta9h9JRJPLjiECeQl+0gm
PCPa57/LpRo+wHF8hBBcz/NH1jtCQE8hD+C88YyqlF5wvImXcT8QsTMtMxOxAkAzKkkZnB
nrBQLBnjLpzFzWxvqhCL4aJq70+dHkHJUSOsKnGBW2G/YZbPpZNDud2siYaZYA==
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 4P6fDp3C6KzZ1b;
Thu, 2 Feb 2023 00:05:14 +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 31205Eus020773;
Thu, 2 Feb 2023 00:05:14 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31205EDn020772;
Thu, 2 Feb 2023 00:05:14 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 00:05:14 GMT
Message-Id: <202302020005.31205EDn020772@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: b5ca1cd6abad - stable/13 - BBLog: improve sysctl variables
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: tuexen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: b5ca1cd6abad63f25b20b1081dd14069d3f7d883
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=b5ca1cd6abad63f25b20b1081dd14069d3f7d883
commit b5ca1cd6abad63f25b20b1081dd14069d3f7d883
Author: Cheng Cui <Cheng.Cui@netapp.com>
AuthorDate: 2022-12-24 21:10:31 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-02 00:04:30 +0000
BBLog: improve sysctl variables
Correct the format in sysctl net.inet.tcp.bb.disable_all and
sysctl net.inet.tcp.bb.log_auto_all.
Correct the format and the description in
net.inet.tcp.bb.log_auto_mode.
Reviewed by: rscheff, tuexen
Sponsored by: NetApp, Inc.
Differential Revision: https://reviews.freebsd.org/D37776
(cherry picked from commit 57cc27a3325af74553e852851d5e84e308ae79f4)
---
sys/netinet/tcp_log_buf.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/netinet/tcp_log_buf.c b/sys/netinet/tcp_log_buf.c
index 296f2dce2c0f..c2c84efb7d58 100644
--- a/sys/netinet/tcp_log_buf.c
+++ b/sys/netinet/tcp_log_buf.c
@@ -114,18 +114,18 @@ SYSCTL_U32(_net_inet_tcp_bb, OID_AUTO, log_version, CTLFLAG_RD, &tcp_log_version
0, "Version of log formats exported");
SYSCTL_U32(_net_inet_tcp_bb, OID_AUTO, disable_all, CTLFLAG_RW,
- &tcp_disable_all_bb_logs, TCP_LOG_STATE_HEAD_AUTO,
+ &tcp_disable_all_bb_logs, 0,
"Disable all BB logging for all connections");
SYSCTL_ULONG(_net_inet_tcp_bb, OID_AUTO, log_auto_ratio, CTLFLAG_RW,
&tcp_log_auto_ratio, 0, "Do auto capturing for 1 out of N sessions");
SYSCTL_U32(_net_inet_tcp_bb, OID_AUTO, log_auto_mode, CTLFLAG_RW,
- &tcp_log_auto_mode, TCP_LOG_STATE_HEAD_AUTO,
- "Logging mode for auto-selected sessions (default is TCP_LOG_STATE_HEAD_AUTO)");
+ &tcp_log_auto_mode, 0,
+ "Logging mode for auto-selected sessions (default is TCP_LOG_STATE_TAIL)");
SYSCTL_BOOL(_net_inet_tcp_bb, OID_AUTO, log_auto_all, CTLFLAG_RW,
- &tcp_log_auto_all, false,
+ &tcp_log_auto_all, 0,
"Auto-select from all sessions (rather than just those with IDs)");
#ifdef TCPLOG_DEBUG_COUNTERS
From nobody Thu Feb 2 06:46:55 2023
X-Original-To: dev-commits-src-branches@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 4P6q8J2LqZz3c3FV;
Thu, 2 Feb 2023 06:46:56 +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 4P6q8J1vhHz4KDT;
Thu, 2 Feb 2023 06:46:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675320416;
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=2y0y9y/qWmjCBrDbXWsc1+kD6GsS6zZUaNYvE1liN/U=;
b=O+DxCpjb/vOO8bbIii8WSUGS9CGX4jfd6BQpeHR4gY7zfEB+ieqK29b1Q6olgpx/uH9+9G
osnztd5zXoVn7Tlng3Yk96t0uBpr/czt5sgGag32ttOFHUKJ03ZLkV9lzZZVHxriRu5VEv
mBXBa6F2xE93nTbKbzVgc4L9fGF8IYSfxG6WOWsG0vuAyAqGcbF5X5E5hdGf3i6mwrRB0r
nCXnqh0+nNrYkJqmnH9YsASyz9nGlzOLvbkb17NBxie/0l/kJwiQhxqJFTIx3Cv+siogkF
llRKjhZ3eDY7OWoyuCRJVpTUL3XUPzx6lEqZDHrkX7YZHehVBCN4hJzCyCQPWw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675320416;
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=2y0y9y/qWmjCBrDbXWsc1+kD6GsS6zZUaNYvE1liN/U=;
b=Xm/15QOPqC66PZuyF4yMRA8U+89JgQ+PTtVXZ4ia1jX281BVhPfC6m8h4dWsLnvT2bGSi7
v/SNd+3CaFsWqvdmda3Yzl2o6lD9miPuux/4ZR76gWPsiTY3stvQH5CfYmDWkRQgGMw/Wv
6M9yIpny4m8ej8lZP/l7hv1cTjF1HNkmFqgTYGN4K3QZMFuofZMYI0w+k86GlNbOL7hy45
m/4IXPRYuaOQlr78jwK1BlcDvz2MOI9EayoVeXXt7oJzSU06uVYH5ijKNy6LDoFn/W621B
4t6Ok6VeruZWB4NN+vYt7CD0c7fs4qe4TegdfP590COKMPc0Sz2gRtW8pE0Iqw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675320416; a=rsa-sha256; cv=none;
b=s1i3sMHriJGqXMhoRUnUEY6xjphBuKpaY35UL03gIadMl1s9ggk4hGgpfWbY23o1/NgX2t
AIlYHfj/OQWTV2WZS002ldnH960EFm4RB7/lWfF+rucAObCeMdUP8kurV3q8eoz/bR+q/q
0H4T8K7gB5VliMvjit/P+OAVaxu5GbM59kicHMC6BPy+WMzZbQmeQQL808hxduWNgqntEc
JnzMc1wHsjcDAZq9AePUFK3r2KBX2+VXugOXgZQyOIXIrft7+YSuDv6UbiTatEeYeHFfJT
M5J0DKUx8pG7G0zMlBJ8MYuekOntZp7plGCad9buFi+eY3Zl3bzq2JfUqjNhKQ==
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 4P6q8J0pg5zlMR;
Thu, 2 Feb 2023 06:46:56 +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 3126ktuf089616;
Thu, 2 Feb 2023 06:46:55 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3126ktm5089614;
Thu, 2 Feb 2023 06:46:55 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 06:46:55 GMT
Message-Id: <202302020646.3126ktm5089614@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: e5624479d191 - stable/13 - arm64: rockchip: pinctrl: Do not rely on the node name
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: e5624479d191780a4a49e2d391b79570b4bc0bac
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=e5624479d191780a4a49e2d391b79570b4bc0bac
commit e5624479d191780a4a49e2d391b79570b4bc0bac
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-08-10 13:47:22 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 06:38:06 +0000
arm64: rockchip: pinctrl: Do not rely on the node name
Node names for gpio bank were made generic in Linux 5.16 so stop
using them to map the gpio controller to the pin controller bank unit.
Sponsored by: Beckhoff Automation GmbH & Co. KG
(cherry picked from commit 8d6b3a85701062ee795a5aeabb0771c93a8f6f72)
---
sys/arm64/rockchip/rk_pinctrl.c | 60 +++++++----------------------------------
1 file changed, 9 insertions(+), 51 deletions(-)
diff --git a/sys/arm64/rockchip/rk_pinctrl.c b/sys/arm64/rockchip/rk_pinctrl.c
index 24ad7798eef0..5b62f67201d0 100644
--- a/sys/arm64/rockchip/rk_pinctrl.c
+++ b/sys/arm64/rockchip/rk_pinctrl.c
@@ -1191,21 +1191,6 @@ done:
return (rv);
}
-static int
-rk_pinctrl_register_gpio(struct rk_pinctrl_softc *sc, char *gpio_name,
- device_t gpio_dev)
-{
- int i;
-
- for(i = 0; i < sc->conf->ngpio_bank; i++) {
- if (strcmp(gpio_name, sc->conf->gpio_bank[i].gpio_name) != 0)
- continue;
- sc->conf->gpio_bank[i].gpio_dev = gpio_dev;
- return(0);
- }
- return (ENXIO);
-}
-
static int
rk_pinctrl_probe(device_t dev)
{
@@ -1226,8 +1211,7 @@ rk_pinctrl_attach(device_t dev)
struct rk_pinctrl_softc *sc;
phandle_t node;
device_t cdev;
- char *gpio_name, *eptr;
- int rv;
+ int rv, gpio_unit;
sc = device_get_softc(dev);
sc->dev = dev;
@@ -1264,51 +1248,25 @@ rk_pinctrl_attach(device_t dev)
bus_generic_probe(dev);
/* Attach child devices */
- for (node = OF_child(node); node > 0; node = OF_peer(node)) {
+ for (node = OF_child(node), gpio_unit = 0; node > 0;
+ node = OF_peer(node)) {
if (!ofw_bus_node_is_compatible(node, "rockchip,gpio-bank"))
continue;
-
- rv = OF_getprop_alloc(node, "name", (void **)&gpio_name);
- if (rv <= 0) {
- device_printf(sc->dev, "Cannot GPIO subdevice name.\n");
- continue;
- }
-
cdev = simplebus_add_device(dev, node, 0, NULL, -1, NULL);
if (cdev == NULL) {
- device_printf(dev, " Cannot add GPIO subdevice: %s\n",
- gpio_name);
- OF_prop_free(gpio_name);
+ device_printf(dev, " Cannot add GPIO subdevice\n");
+ gpio_unit += 1;
continue;
}
-
rv = device_probe_and_attach(cdev);
if (rv != 0) {
device_printf(sc->dev,
- "Cannot attach GPIO subdevice: %s\n", gpio_name);
- OF_prop_free(gpio_name);
- continue;
- }
-
- /* Grep device name from name property */
- eptr = gpio_name;
- strsep(&eptr, "@");
- if (gpio_name == eptr) {
- device_printf(sc->dev,
- "Unrecognized format of GPIO subdevice name: %s\n",
- gpio_name);
- OF_prop_free(gpio_name);
- continue;
- }
- rv = rk_pinctrl_register_gpio(sc, gpio_name, cdev);
- if (rv != 0) {
- device_printf(sc->dev,
- "Cannot register GPIO subdevice %s: %d\n",
- gpio_name, rv);
- OF_prop_free(gpio_name);
+ "Cannot attach GPIO subdevice\n");
+ gpio_unit += 1;
continue;
}
- OF_prop_free(gpio_name);
+ sc->conf->gpio_bank[gpio_unit].gpio_dev = cdev;
+ gpio_unit += 1;
}
fdt_pinctrl_configure_tree(dev);
From nobody Thu Feb 2 06:46:57 2023
X-Original-To: dev-commits-src-branches@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 4P6q8K3DClz3c3FY;
Thu, 2 Feb 2023 06:46:57 +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 4P6q8K2Tqcz4Kbq;
Thu, 2 Feb 2023 06:46:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675320417;
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=HEqw/JHfJII2TQRv9nXnPK1RYnUP8FO6kiLY9vqm/5g=;
b=jNBXvJgGQG6518BlD1dTQoVZTW4PvxdriHftCRs4gHfYJfaYGPU+uAulSBNLugeKuPmtgK
m3BE05umK4dE73p7ngCmrMGkfKMqNWa8M44MKw4smcLAJTrzqNvPZprkgbL0Ou0PSDxe7X
9HQlhkAhokQAGh3fqeNr+/kNd+4+RWaYf3LMFzRUaN/bNNKE2joBr2hArRJS6CZk4mWijP
/3TMI2mbvVusTnsUpS1Sy4lE3rkcsgHQs42H9YdMGALbgYE5uznbPRe2O3OWdeJCyDlbDi
fnPK9ufV4LYCi2MSPEP55QkirCqcXhfsZhbfa1sVsdEfLycxfeZOS2kCtfccGA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675320417;
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=HEqw/JHfJII2TQRv9nXnPK1RYnUP8FO6kiLY9vqm/5g=;
b=VWnavkB3ZVQVvVpO4Uz6J0sONhbPGk68KCfaAMwJlnONkX+bu0lPku0fZuwvTzmcHsuGW0
LD1QYAbLGMPXN3HBThsnncchlvMiKMrkLvV/PTiP7mEZtbIlK75MsNfei0L4pq0/GPY78l
1/W5WWaA/u8lNz8QhPUDHL2gGWkxWFVi1vJIEWiNLxB5iFeXk770uhj+TcVhZHPozKN0my
Pce3RqkqFW08b85S9ZxSsTURL/gK92o5H9LZCn8dKjR7vcmIsNqgf9uoJ/oun9vdpnAGh4
eMdNrrEBRBpmvA5hCJ8lijWy1GdV3i13OMNDsM1ocuPwC7ztvCg7XVQlbppRdw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675320417; a=rsa-sha256; cv=none;
b=PcQoHNUn98vXMmB4uisskUpq4wyXrePV0gfVMXLdV1KaU9vztun0OlnTnc9e0rQ8zawex9
vO7DR4mLmSKr8Zq/JEb4p0yGdPpPVx6KfmmmUXtEw5HiTgMB20B9GYx2ywhx8pjALpiVPZ
sC/AgRi57yghr4/rsLMMkEZdEOEGsXYEwosPOaqVqMSC2jjdR5SD9FRzHk+Tx97ODGXsVm
/eQu4H0HyDI8OwPFM6iBNvH5dYcWGxESP6PL03Jd6X6CeDGrNJwdJFK4lIrPpp4v2b3DQW
YB7aURzyK2Xp/i2WM1ctequnYTQFveubsIV92R01I1HkN9O0vNKioAS/pJTvfQ==
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 4P6q8K1YvtzlBh;
Thu, 2 Feb 2023 06:46:57 +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 3126kvGJ089643;
Thu, 2 Feb 2023 06:46:57 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3126kv27089642;
Thu, 2 Feb 2023 06:46:57 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 06:46:57 GMT
Message-Id: <202302020646.3126kv27089642@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: a540d9f2d4c8 - stable/13 - arm64: rockchip: rk_gpio: Improve mode switching
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a540d9f2d4c8bee3074f4f35c679d564a44ecc11
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=a540d9f2d4c8bee3074f4f35c679d564a44ecc11
commit a540d9f2d4c8bee3074f4f35c679d564a44ecc11
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-09-22 14:55:54 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 06:38:07 +0000
arm64: rockchip: rk_gpio: Improve mode switching
Changing mode on a pin (input/output/pullup/pulldown) is a bit slow.
Improve this by caching what we can.
We need to check if the pin is in gpio mode, do that the first time
that we have a request for this pin and cache the result. We can't do
that at attach as we are a child of rk_pinctrl and it didn't finished
its attach then.
Cache also the flags specific to the pinctrl (pullup or pulldown) if the
pin is in input mode.
Cache the registers that deals with input/output mode and output value. Also
remove some register reads when we change the direction of a pin or when we
change the output value since the bit changed in the registers only affect output
pins.
(cherry picked from commit 87f642ac03e3cefea7048cb46b17810d01e97dd5)
---
sys/arm64/rockchip/rk_gpio.c | 94 ++++++++++++++++++++++++++------------------
1 file changed, 55 insertions(+), 39 deletions(-)
diff --git a/sys/arm64/rockchip/rk_gpio.c b/sys/arm64/rockchip/rk_gpio.c
index d3623b2302ec..564059fe5d23 100644
--- a/sys/arm64/rockchip/rk_gpio.c
+++ b/sys/arm64/rockchip/rk_gpio.c
@@ -73,6 +73,14 @@ __FBSDID("$FreeBSD$");
#define RK_GPIO_DEFAULT_CAPS (GPIO_PIN_INPUT | GPIO_PIN_OUTPUT | \
GPIO_PIN_PULLUP | GPIO_PIN_PULLDOWN)
+#define GPIO_FLAGS_PINCTRL GPIO_PIN_PULLUP | GPIO_PIN_PULLDOWN
+#define RK_GPIO_MAX_PINS 32
+
+struct pin_cached {
+ uint8_t is_gpio;
+ uint32_t flags;
+};
+
struct rk_gpio_softc {
device_t sc_dev;
device_t sc_busdev;
@@ -82,6 +90,9 @@ struct rk_gpio_softc {
bus_space_handle_t sc_bsh;
clk_t clk;
device_t pinctrl;
+ uint32_t swporta;
+ uint32_t swporta_ddr;
+ struct pin_cached pin_cached[RK_GPIO_MAX_PINS];
};
static struct ofw_compat_data compat_data[] = {
@@ -125,7 +136,7 @@ rk_gpio_attach(device_t dev)
{
struct rk_gpio_softc *sc;
phandle_t node;
- int err;
+ int err, i;
sc = device_get_softc(dev);
sc->sc_dev = dev;
@@ -166,6 +177,15 @@ rk_gpio_attach(device_t dev)
return (ENXIO);
}
+ /* Set the cached value to unknown */
+ for (i = 0; i < RK_GPIO_MAX_PINS; i++)
+ sc->pin_cached[i].is_gpio = 2;
+
+ RK_GPIO_LOCK(sc);
+ sc->swporta = RK_GPIO_READ(sc, RK_GPIO_SWPORTA_DR);
+ sc->swporta_ddr = RK_GPIO_READ(sc, RK_GPIO_SWPORTA_DDR);
+ RK_GPIO_UNLOCK(sc);
+
return (0);
}
@@ -229,28 +249,25 @@ static int
rk_gpio_pin_getflags(device_t dev, uint32_t pin, uint32_t *flags)
{
struct rk_gpio_softc *sc;
- uint32_t reg;
int rv;
- bool is_gpio;
sc = device_get_softc(dev);
- rv = FDT_PINCTRL_IS_GPIO(sc->pinctrl, dev, pin, &is_gpio);
- if (rv != 0)
- return (rv);
- if (!is_gpio)
- return (EINVAL);
+ if (__predict_false(sc->pin_cached[pin].is_gpio != 1)) {
+ rv = FDT_PINCTRL_IS_GPIO(sc->pinctrl, dev, pin, (bool *)&sc->pin_cached[pin].is_gpio);
+ if (rv != 0)
+ return (rv);
+ if (sc->pin_cached[pin].is_gpio == 0)
+ return (EINVAL);
+ }
*flags = 0;
rv = FDT_PINCTRL_GET_FLAGS(sc->pinctrl, dev, pin, flags);
if (rv != 0)
return (rv);
+ sc->pin_cached[pin].flags = *flags;
- RK_GPIO_LOCK(sc);
- reg = RK_GPIO_READ(sc, RK_GPIO_SWPORTA_DDR);
- RK_GPIO_UNLOCK(sc);
-
- if (reg & (1 << pin))
+ if (sc->swporta_ddr & (1 << pin))
*flags |= GPIO_PIN_OUTPUT;
else
*flags |= GPIO_PIN_INPUT;
@@ -270,31 +287,32 @@ static int
rk_gpio_pin_setflags(device_t dev, uint32_t pin, uint32_t flags)
{
struct rk_gpio_softc *sc;
- uint32_t reg;
int rv;
- bool is_gpio;
sc = device_get_softc(dev);
- rv = FDT_PINCTRL_IS_GPIO(sc->pinctrl, dev, pin, &is_gpio);
- if (rv != 0)
- return (rv);
- if (!is_gpio)
- return (EINVAL);
+ if (__predict_false(sc->pin_cached[pin].is_gpio != 1)) {
+ rv = FDT_PINCTRL_IS_GPIO(sc->pinctrl, dev, pin, (bool *)&sc->pin_cached[pin].is_gpio);
+ if (rv != 0)
+ return (rv);
+ if (sc->pin_cached[pin].is_gpio == 0)
+ return (EINVAL);
+ }
- rv = FDT_PINCTRL_SET_FLAGS(sc->pinctrl, dev, pin, flags);
- if (rv != 0)
- return (rv);
+ if (__predict_false((flags & GPIO_PIN_INPUT) && ((flags & GPIO_FLAGS_PINCTRL) != sc->pin_cached[pin].flags))) {
+ rv = FDT_PINCTRL_SET_FLAGS(sc->pinctrl, dev, pin, flags);
+ sc->pin_cached[pin].flags = flags & GPIO_FLAGS_PINCTRL;
+ if (rv != 0)
+ return (rv);
+ }
RK_GPIO_LOCK(sc);
-
- reg = RK_GPIO_READ(sc, RK_GPIO_SWPORTA_DDR);
if (flags & GPIO_PIN_INPUT)
- reg &= ~(1 << pin);
+ sc->swporta_ddr &= ~(1 << pin);
else if (flags & GPIO_PIN_OUTPUT)
- reg |= (1 << pin);
+ sc->swporta_ddr |= (1 << pin);
- RK_GPIO_WRITE(sc, RK_GPIO_SWPORTA_DDR, reg);
+ RK_GPIO_WRITE(sc, RK_GPIO_SWPORTA_DDR, sc->swporta_ddr);
RK_GPIO_UNLOCK(sc);
return (0);
@@ -321,17 +339,15 @@ static int
rk_gpio_pin_set(device_t dev, uint32_t pin, unsigned int value)
{
struct rk_gpio_softc *sc;
- uint32_t reg;
sc = device_get_softc(dev);
RK_GPIO_LOCK(sc);
- reg = RK_GPIO_READ(sc, RK_GPIO_SWPORTA_DR);
if (value)
- reg |= (1 << pin);
+ sc->swporta |= (1 << pin);
else
- reg &= ~(1 << pin);
- RK_GPIO_WRITE(sc, RK_GPIO_SWPORTA_DR, reg);
+ sc->swporta &= ~(1 << pin);
+ RK_GPIO_WRITE(sc, RK_GPIO_SWPORTA_DR, sc->swporta);
RK_GPIO_UNLOCK(sc);
return (0);
@@ -341,17 +357,15 @@ static int
rk_gpio_pin_toggle(device_t dev, uint32_t pin)
{
struct rk_gpio_softc *sc;
- uint32_t reg;
sc = device_get_softc(dev);
RK_GPIO_LOCK(sc);
- reg = RK_GPIO_READ(sc, RK_GPIO_SWPORTA_DR);
- if (reg & (1 << pin))
- reg &= ~(1 << pin);
+ if (sc->swporta & (1 << pin))
+ sc->swporta &= ~(1 << pin);
else
- reg |= (1 << pin);
- RK_GPIO_WRITE(sc, RK_GPIO_SWPORTA_DR, reg);
+ sc->swporta |= (1 << pin);
+ RK_GPIO_WRITE(sc, RK_GPIO_SWPORTA_DR, sc->swporta);
RK_GPIO_UNLOCK(sc);
return (0);
@@ -370,6 +384,7 @@ rk_gpio_pin_access_32(device_t dev, uint32_t first_pin, uint32_t clear_pins,
reg = RK_GPIO_READ(sc, RK_GPIO_SWPORTA_DR);
if (orig_pins)
*orig_pins = reg;
+ sc->swporta = reg;
if ((clear_pins | change_pins) != 0) {
reg = (reg & ~clear_pins) ^ change_pins;
@@ -410,6 +425,7 @@ rk_gpio_pin_config_32(device_t dev, uint32_t first_pin, uint32_t num_pins,
reg &= ~mask;
reg |= set;
RK_GPIO_WRITE(sc, RK_GPIO_SWPORTA_DDR, reg);
+ sc->swporta_ddr = reg;
RK_GPIO_UNLOCK(sc);
return (0);
From nobody Thu Feb 2 06:47:28 2023
X-Original-To: dev-commits-src-branches@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 4P6q8x0Y1tz3c31y;
Thu, 2 Feb 2023 06:47:29 +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 4P6q8w6sk7z4L5P;
Thu, 2 Feb 2023 06:47:28 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675320449;
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=/JPq1fyZoieOFs6HhCXwWwLkWVrzARf8eOOx5Mif/DE=;
b=m7muzpJDlzfv8jCjvXgY6isbbvosfSOx3EDWdB5YimRqOIt5ONTBkOYC5i7Q/KzSGPTJxm
HPSzuDc/LPSMU08KP3E0mpAhFDCVE+P9wAl4O+iz/O3qJIHWhmk3CoLdLOdOCVQgx+2VkE
fUYTEBEHvGaIj5JkSBeD4+0gPiElbcKsKdQGg5Elu2qOfAnHL5GVtQeEXCuqR53rxI7ncN
FqBwRoHHb2vHXfvRCyWuDjzpbgUTi4//3EEyGXCOqgzvtK5HnNgkMqNMne3wE79EhrVTlW
yCYpL9XHPRgUlDwYm73OvuzzuT0qTdKD1K/gosPT/Ber1p0PChFSVae3/ZDImA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675320449;
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=/JPq1fyZoieOFs6HhCXwWwLkWVrzARf8eOOx5Mif/DE=;
b=koAsjgbsYMrmVnSObiI5FVekhG9wWAyZz989fR5dpvblLMTUXzp18e4NY2BklTzzapCssl
ZZSfwWTXWL4rPlx+CqsG7yFXWxOmMiCedo947g9ltots6F6zN0Y6CupEPFgGBOafb87YUn
ecFNGELalU+LMwmKej3R+iz/x1qlrFgl7n0w7VPhnQbyvNXynaiYCCIdVD0oJMu7LqURMx
JXOPXa8DMi8+EyGnW08+GpAGTMdBW5cn6yqPnd1uvsQB3fnImcs83OKyO/wJeMLbBQoypZ
nrB1ejhJg4fuJqqCEuxOPv/6AtYFHlvTrPV1XNvOMtcZeDQcLYQSWhOE4dlxtg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675320449; a=rsa-sha256; cv=none;
b=jK1GZbZmg/YJMY849XvOpqh0YKgY0ZArCIWUKfe8hUBi8Bp4QRdS+wRnmZMKSdR1LSfcwC
xKagV2ALTmRiyZLFLytorhpJbG+DHhTsSML8Yg+q8bIzDAzCoUdkZtDiPt4JBuN6kxMUpK
r493Y3ZtcbM1MJswZwciOYqC/pBtKkFobrms8gHESg9y8tf/kP6nnk2XbtKrAuDV+IrQaH
EWHHn4S9jm+IGAkZolg6ey+lJgGuyh0vnfNWnTl4HE9w+fDgsEaCYjOm2I/zkTCdEoiUaj
qMCxaG6qgdrSmZDeMH6cnkugrfT6P2qpHdFd1mGGbTalBCqdXJ13Tm70Iv/uhA==
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 4P6q8w5wJvzlBj;
Thu, 2 Feb 2023 06:47:28 +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 3126lSBF089823;
Thu, 2 Feb 2023 06:47:28 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3126lSlv089822;
Thu, 2 Feb 2023 06:47:28 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 06:47:28 GMT
Message-Id: <202302020647.3126lSlv089822@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: f661bce8632c - stable/13 - modules: aw_mmc: Add mmc_pwrseq_if to the source
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: f661bce8632ca89161e7adaa2b3e41f7cf1ffbae
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=f661bce8632ca89161e7adaa2b3e41f7cf1ffbae
commit f661bce8632ca89161e7adaa2b3e41f7cf1ffbae
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-11-14 19:52:44 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 06:47:02 +0000
modules: aw_mmc: Add mmc_pwrseq_if to the source
Needed by the module.
(cherry picked from commit fbc50a695433b870275c5da112af4eb1cab7fe94)
---
sys/modules/allwinner/aw_mmc/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys/modules/allwinner/aw_mmc/Makefile b/sys/modules/allwinner/aw_mmc/Makefile
index 5421b4fc7d66..ebca6fec5418 100644
--- a/sys/modules/allwinner/aw_mmc/Makefile
+++ b/sys/modules/allwinner/aw_mmc/Makefile
@@ -9,6 +9,7 @@ SRCS+= \
bus_if.h \
clknode_if.h \
device_if.h \
+ mmc_pwrseq_if.h \
ofw_bus_if.h
.include <bsd.kmod.mk>
From nobody Thu Feb 2 06:47:29 2023
X-Original-To: dev-commits-src-branches@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 4P6q8y18Nqz3c320;
Thu, 2 Feb 2023 06:47:30 +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 4P6q8y0QXQz4KsX;
Thu, 2 Feb 2023 06:47:30 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675320450;
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=YiHmkJaLtt0WRa0xWMJVGtqOEB6geGJeJIrdWDHGLUs=;
b=lXBxkwyLCvzYXNiN6NKls4fJLq5R15bu6et0O64cl2lQvj/X5Qmm6BK4+HGqqeHXihmQDS
SHP1O/yXicJ4IYJDwa5+pIzr/U7RU8CTFvzfiQj9tMOfEPav06J/eX4EKdhMrsqKYPSWaO
oVuc4qGuJtT9o4JDFqVkwZCL1ExkOe6iO3He5o7V302WRSyIDsFlbYELQq7Xe16sQiIAhg
SxJJwAdMx+CwdOtX/Y6NYojFi/ejy+7PSQeFYIOUW4fb4mErzILMZ3WA0c0GbnJSCWRXSx
D2xRQ0Yn1FeNcU8yvCLMhdZ6gUTnbli3ZYv4PBi4Qzj0eE5bydVx/fefdbcqUg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675320450;
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=YiHmkJaLtt0WRa0xWMJVGtqOEB6geGJeJIrdWDHGLUs=;
b=oJqIg0AC4wZAuLyaRXbPV2f8UHNyzS6coQKYVkrC8LqjJY//BG6zjul0mtEfUQXUN6cwtw
4b+K0tnKbVy68HKrvSTQO94Zt5Nujar6949CaOmLPSIc3vRpz16Ex3jEJcLV80welfa56/
/gvgrVu4/SHpJr97ijwy9+tAzI9vaX9WrKKx1I/scMBr2YKuw/0B4r+gBCdEovhm9t3Nuu
SDzadmjY99VxlWVJBW4MaHoCroCLwy8/7NkRkqLjI5txJe/0OAJKWeHwnC+QRooH01mgGc
X48QSKk7ZuQf3glkblU9FMYUdMX690Y77jX4ifbmgxyZQqcDS4UTxMe5Pdx+6A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675320450; a=rsa-sha256; cv=none;
b=gkP1PKhNBL5DptyS4yxtBZpe7DN/C+d7g3cVX4+UEIgl+4LUZ4dfVNiYFAhMOiMOChtt9K
8VDFIcOhQrzOLbfEmMMsVclknn0BTlbEl88g1/JTEtQ1flZjXxI0PjD3LJ6MyEgHJfm0pI
/XUKkOLtmwCEAAqY017EmCRBTa796UppxwJBw0Hp4LiIGwu8qW56B93Ik1pIR0kxUNpgIC
l+5melO4CjmY7891tJfIoy4+X3+bvY8mbX1Nmfs0axpiJgI9nLtmZL4IrYq9jIuibcjplr
UHS/VOda9jaVH9yC0RhfgS3+hyU7+7FMWy95svFFyNpvTofO1r+FCD6B2D3sBw==
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 4P6q8x6fKjzlbN;
Thu, 2 Feb 2023 06:47:29 +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 3126lTlR089847;
Thu, 2 Feb 2023 06:47:29 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3126lT5k089846;
Thu, 2 Feb 2023 06:47:29 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 06:47:29 GMT
Message-Id: <202302020647.3126lT5k089846@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 8d52425fc93a - stable/13 - modules: if_awg: Add miibus_if.h to the source
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 8d52425fc93ab7e4c63e10e604357bf3198c6830
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=8d52425fc93ab7e4c63e10e604357bf3198c6830
commit 8d52425fc93ab7e4c63e10e604357bf3198c6830
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-11-14 19:53:10 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 06:47:02 +0000
modules: if_awg: Add miibus_if.h to the source
Needed by the module.
(cherry picked from commit d38a784b61e35d4281b06c94bcedbc26d25982a1)
---
sys/modules/allwinner/if_awg/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys/modules/allwinner/if_awg/Makefile b/sys/modules/allwinner/if_awg/Makefile
index 25cb34632e02..ffef575c7cd4 100644
--- a/sys/modules/allwinner/if_awg/Makefile
+++ b/sys/modules/allwinner/if_awg/Makefile
@@ -9,6 +9,7 @@ SRCS+= \
bus_if.h \
clknode_if.h \
device_if.h \
- ofw_bus_if.h \
+ miibus_if.h \
+ ofw_bus_if.h
.include <bsd.kmod.mk>
From nobody Thu Feb 2 06:57:14 2023
X-Original-To: dev-commits-src-branches@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 4P6qNC0B2tz3c4Md;
Thu, 2 Feb 2023 06:57:15 +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 4P6qNB6plJz4Lhw;
Thu, 2 Feb 2023 06:57:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675321035;
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=W8N0XnIQCe4twzR1oDkJ5uPQ7O1MYM5ZLknak69ySgI=;
b=MTzJPDtQdCPHxhB6QQ3QqlIHNlBGpHMCu6Cygnd3wR1JCUFiu4qpxtMYTznF92xhwe4VmG
bdbzlqNPk1zJwwSO1yMQ9xdaCzPWL6HCcnvqR8F6YFYlMfs2gNxjtOzCfgXt99szyi7pec
8rUPCPh4HQnb68iQ36HERQavIck+TaJF2ghQUwV+8lDegswSalMLATqvm4F+unmiCaFaxv
UZsshnvoQkrdhW3clu9BHNmX/ZVhYxxm5XJ/t5bfSPLQqK9eMe7cDbRIvKx77LMtVDBlki
o8E05rY5EzJeuhmPQd5fdAK0T9lkhHlq90o8VH+qzv9hKxoITD7mxdEB/tf8Vw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675321035;
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=W8N0XnIQCe4twzR1oDkJ5uPQ7O1MYM5ZLknak69ySgI=;
b=XC5VH9l7YpDnAY17I8EoBRNrCQz7Iri/ajKf7D3AIIA0kh7lMCimezjXvvQzVYf+p0rSBK
ek8pBcF+H0cqpvj2vY/tjOww1jiRWPOye4k8Oa++g8F1HxK0jW37W/Wob42QXv93bon028
mbPLSVtu46ELxzl5eLTCpM63DHcd7qgYiJgac7EYBbD6ejXNsoPcaHBW4K1BUHLGF/h2qW
UleaS/RhQDRCVyNlijGB+5J40mpnFrIAwGIV2GHr2TPfKZWA2M7FCriwi/VYvE2P786W2V
Ou2aZ/A5cJQndgFwjyDigvhX/cU6wlsJFv2C9kEYaKy8WpjL/m4z2D3ucK2DKQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675321035; a=rsa-sha256; cv=none;
b=NQCurS+PMN7rPXO63xotCPwSTXfXYGYzEOowjUexUpzjOB8HwBQ6bFGO8vac8mHy1dqabC
QtrEeKRZyVezdOixi+w7pkpWkBnsRLtdnXVDoHQ04tFPu0coC8+dFJCovFxe8rHzSeLAYm
NQfDK3kWcB69Wsp2QvQ7JNi5qCu2Wg+rSnGyYc2hPZS3J3WB7fItv8GxHw7J0dso0mcjEY
jLzqAa1P1U0PkKRoU1fnc/Utc5P0a5j8EOksozDDpiAWErG4Knhe33TYFTatbhn1sN9z8L
8xx7P+6Pl2dGRb2RLrFcquIz1YjC3RFMu1QnMjnbbaH6T8DnADatC4kzpmR7+A==
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 4P6qNB5P6zzlr1;
Thu, 2 Feb 2023 06:57:14 +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 3126vED8003689;
Thu, 2 Feb 2023 06:57:14 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3126vECA003688;
Thu, 2 Feb 2023 06:57:14 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 06:57:14 GMT
Message-Id: <202302020657.3126vECA003688@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: a829b880ea23 - stable/13 - sdio: Always use increment address for read/write_4
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a829b880ea234aa84843a9f3922053b61b42c990
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=a829b880ea234aa84843a9f3922053b61b42c990
commit a829b880ea234aa84843a9f3922053b61b42c990
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-05-21 11:33:34 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 06:47:33 +0000
sdio: Always use increment address for read/write_4
SDIO CMD53 (RW Extented) can either write to the same address (useful for FIFO)
or auto increment the destination address (to write to multiple registers).
It is more logical to have read/write_4 to use incremental mode and make other
helper function for writing to a FIFO destination especially since most FIFO
write/read will be 8bits based and not 32bits based.
(cherry picked from commit 1ee7a8049218e6dc0a520e6e298626d11d254a2b)
---
sys/dev/sdio/sdio_subr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/dev/sdio/sdio_subr.c b/sys/dev/sdio/sdio_subr.c
index e2a6573abc6f..67703f88bf27 100644
--- a/sys/dev/sdio/sdio_subr.c
+++ b/sys/dev/sdio/sdio_subr.c
@@ -173,7 +173,7 @@ sdio_readl(struct sdio_func *f, uint32_t addr, int *err)
uint32_t v;
error = SDIO_READ_EXTENDED(device_get_parent(f->dev), f->fn, addr,
- sizeof(v), (uint8_t *)&v, false);
+ sizeof(v), (uint8_t *)&v, true);
if (error) {
if (err != NULL)
*err = error;
@@ -191,7 +191,7 @@ sdio_writel(struct sdio_func *f, uint32_t val, uint32_t addr, int *err)
int error;
error = SDIO_WRITE_EXTENDED(device_get_parent(f->dev), f->fn, addr,
- sizeof(val), (uint8_t *)&val, false);
+ sizeof(val), (uint8_t *)&val, true);
if (err != NULL)
*err = error;
}
From nobody Thu Feb 2 06:57:15 2023
X-Original-To: dev-commits-src-branches@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 4P6qND0zBTz3c48h;
Thu, 2 Feb 2023 06:57:16 +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 4P6qND0NCZz4Lv1;
Thu, 2 Feb 2023 06:57:16 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675321036;
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=KIgFDA05w0l6WIQbr0M4AgGNv8V+b7esbb+Q4Ydedto=;
b=pBrfUzVeLy8QRwlx2YRXw+y7sT2OSOKoJlF0VT+bG732+D2Qz2y269qrO/L7o2NS/2dM2y
2stbvWK2Rk9Yi6K7a82yPQzA1rotUhV4WahZtkVPtOlxVhTkQf0zticmtuyFbLxkRaJqQP
0D5ybS5z1c1upMDMjfFpH8ccmJkzoxCHgyID+/L1odnq0YmiO4AzmCmlBH/PYMc3Lqt/Xj
bq5bm881nKkncRk0J/TMEsELQFWQqTv+nsw43n/PwiWpfGtcBFNW94KccYCTJ4LpIZnH2q
lYvh8fAdZ3NphJW8be8t5mU4Ui6Q/xnqyxWui8aqdQeyvQjzYEm816PwHJz4ZQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675321036;
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=KIgFDA05w0l6WIQbr0M4AgGNv8V+b7esbb+Q4Ydedto=;
b=qpST1nv4Ogprw/TINLJmyGWBOHQF0Z6sGGMh8c8LckajcXvWMLnhyVxXARYlluUr81gLFQ
64iZ4VB9KxLVVkEUi3B6ml8oowKZbRHi7cF684oXNseLzonnXb1MwyZ92uU5Utnt5Cy/HY
r6udKzaYZJqH06ASIzMTJzBmpUMg1iTwjsFGos/G5ztDFV+QAXt1ZdyiLup4o6L8fwvnoe
9zZ83U4Bu0M88+E6Ze04vm/20aOXS/qzt/B1jt3xRz3rIFkufY71rZHb8f4Oi8JbDVZoVV
KV1JFUM0V+8d6qijCdr4+yO/Hk1EyhARQAMktMSC1fiOiNZTiUFezy52k6c4Cw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675321036; a=rsa-sha256; cv=none;
b=HICSTvtKDMk/ANFPzZBFL8bHI94Qu8AvSbX1pCU1xoGwaSHmGqjVUcR3LMhGjrlQ8ScGjb
gLW/Cqo7ycYjC48FMF9puMzrDcC0xjr+gH89xUYr+ndH6lvTd8W+q4P9voUhfMQplcM9al
AHIJgPg5JLquL9RD1eWWkTMl657cvg1QsS199rckz/s7RsUdQiPMgnVZzvN/OA229KlkvY
uaKGKJ26AI2ggGOkUdj1dyYA4MCdJnUsJVS1K0wzzikKxTspVXjvFQG7bsdpnwGt96H3Cv
MGQWvji9alxp3GzrRKUphJq2p6LTEEpJbkskT7DZFAUzoZWlyOsb2EyX34Uzqw==
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 4P6qNC6Xg3zlMy;
Thu, 2 Feb 2023 06:57:15 +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 3126vF9E003714;
Thu, 2 Feb 2023 06:57:15 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3126vFE4003713;
Thu, 2 Feb 2023 06:57:15 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 06:57:15 GMT
Message-Id: <202302020657.3126vFE4003713@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 2745ac8c9179 - stable/13 - sdio: Change the sdio helper name and arg order
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 2745ac8c9179080265f28ec3ef90c63afaaba3a1
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=2745ac8c9179080265f28ec3ef90c63afaaba3a1
commit 2745ac8c9179080265f28ec3ef90c63afaaba3a1
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-05-21 09:56:39 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 06:47:34 +0000
sdio: Change the sdio helper name and arg order
Do not use b/l but _1/_4 also address comes first and then data.
This makes them closer to something like bus_space_{read,write}
We have no users in the tree.
(cherry picked from commit b9db5e0a8f38cfcfada7238a9895ad45f39f10a9)
---
sys/dev/sdio/sdio_subr.c | 12 ++++++------
sys/dev/sdio/sdio_subr.h | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/sys/dev/sdio/sdio_subr.c b/sys/dev/sdio/sdio_subr.c
index 67703f88bf27..0885b16550a6 100644
--- a/sys/dev/sdio/sdio_subr.c
+++ b/sys/dev/sdio/sdio_subr.c
@@ -139,7 +139,7 @@ sdio_set_block_size(struct sdio_func *f, uint16_t bs)
}
uint8_t
-sdio_readb(struct sdio_func *f, uint32_t addr, int *err)
+sdio_read_1(struct sdio_func *f, uint32_t addr, int *err)
{
int error;
uint8_t v;
@@ -157,7 +157,7 @@ sdio_readb(struct sdio_func *f, uint32_t addr, int *err)
}
void
-sdio_writeb(struct sdio_func *f, uint8_t val, uint32_t addr, int *err)
+sdio_write_1(struct sdio_func *f, uint32_t addr, uint8_t val, int *err)
{
int error;
@@ -167,7 +167,7 @@ sdio_writeb(struct sdio_func *f, uint8_t val, uint32_t addr, int *err)
}
uint32_t
-sdio_readl(struct sdio_func *f, uint32_t addr, int *err)
+sdio_read_4(struct sdio_func *f, uint32_t addr, int *err)
{
int error;
uint32_t v;
@@ -186,7 +186,7 @@ sdio_readl(struct sdio_func *f, uint32_t addr, int *err)
}
void
-sdio_writel(struct sdio_func *f, uint32_t val, uint32_t addr, int *err)
+sdio_write_4(struct sdio_func *f, uint32_t addr, uint32_t val, int *err)
{
int error;
@@ -197,7 +197,7 @@ sdio_writel(struct sdio_func *f, uint32_t val, uint32_t addr, int *err)
}
uint8_t
-sdio_f0_readb(struct sdio_func *f, uint32_t addr, int *err)
+sdio_f0_read_1(struct sdio_func *f, uint32_t addr, int *err)
{
int error;
uint8_t v;
@@ -215,7 +215,7 @@ sdio_f0_readb(struct sdio_func *f, uint32_t addr, int *err)
}
void
-sdio_f0_writeb(struct sdio_func *f, uint8_t val, uint32_t addr, int *err)
+sdio_f0_write_1(struct sdio_func *f, uint32_t addr, uint8_t val, int *err)
{
int error;
diff --git a/sys/dev/sdio/sdio_subr.h b/sys/dev/sdio/sdio_subr.h
index f16826298e13..43a5b10857cc 100644
--- a/sys/dev/sdio/sdio_subr.h
+++ b/sys/dev/sdio/sdio_subr.h
@@ -95,13 +95,13 @@ int sdio_enable_func(struct sdio_func *);
int sdio_disable_func(struct sdio_func *);
int sdio_set_block_size(struct sdio_func *, uint16_t);
-uint8_t sdio_readb(struct sdio_func *, uint32_t, int *);
-void sdio_writeb(struct sdio_func *, uint8_t, uint32_t, int *);
-uint32_t sdio_readl(struct sdio_func *, uint32_t, int *);
-void sdio_writel(struct sdio_func *, uint32_t, uint32_t, int *);
+uint8_t sdio_read_1(struct sdio_func *, uint32_t, int *);
+void sdio_write_1(struct sdio_func *, uint32_t, uint8_t, int *);
+uint32_t sdio_read_4(struct sdio_func *, uint32_t, int *);
+void sdio_write_4(struct sdio_func *, uint32_t, uint32_t, int *);
-uint8_t sdio_f0_readb(struct sdio_func *, uint32_t, int *);
-void sdio_f0_writeb(struct sdio_func *, uint8_t, uint32_t, int *);
+uint8_t sdio_f0_read_1(struct sdio_func *, uint32_t, int *);
+void sdio_f0_write_1(struct sdio_func *, uint32_t, uint8_t, int *);
#endif /* _KERNEL */
#endif /* _SDIO_SUBR_H_ */
From nobody Thu Feb 2 06:57:16 2023
X-Original-To: dev-commits-src-branches@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 4P6qNF4XkSz3c4Mg;
Thu, 2 Feb 2023 06:57:17 +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 4P6qNF1Vlfz4MGD;
Thu, 2 Feb 2023 06:57:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675321037;
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=2nUZwc7zcEq/8muYOeAp8cSb/DnXvxcyxAwGeW5lh0Q=;
b=GAFxfz4n99Qcnu1yYFtlNBu+IaVW2VXeKOlDjo3+sl/0k7mwpfzNBeAnC48JDfAnw+/05N
7OF4wAZEvAuzU817klj5HB8W2S/aRIaxjCHi0+SIcqnCbFmmJNhfVyBvJm9qMFN2KmhOVe
gJTb/Hz4J9sn5VlFI62K1nfOSCkahPC0ba91y0IrwhLulu8xWK/L6g3XIqHNgFCnrB1YEX
GCSJjqVRaCKJNxl4cGdC23CaX0WsHXBHIEoRoBqmT2lipPqpsX0fV1OejZMdEexmkWMuFs
O7RmQn2VcidagohH0M6qhj9VW16n9+BWk0W+f3cYoMCXcb/6KEPJpPjZTKIqpA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675321037;
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=2nUZwc7zcEq/8muYOeAp8cSb/DnXvxcyxAwGeW5lh0Q=;
b=DL2JyGnkrIh4MNs2Hm+VO+X3OLH9XoCZdLFaT0GAUNOsObVKKjHGkPz65Cza6WHJcyS7rm
IO/zN1NDgF2dZaeg+9+zXva9e0yIsGDQPALqzvQrpsQaIioCIWKvJjmdQqOJZDk33/lYRe
9b0U/vlZ1St9EH1Ni2YZXbeDwu+N/N+ypblTLmnmtzLnESjKj2QfWZWqsLhpZkKP3Q2Q2W
d+519LlhnmrGr/a4mKZjFT80Yuh0AONsVcJqxYvZfa4kScP21vmMXSsXx4FEAJnNjjR6jO
4eMzepSWKmYUYgACDnMo+WjHiZyw6J74YmO/vkaRYxDa8k4xJK1484+7+Cz1KA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675321037; a=rsa-sha256; cv=none;
b=kCnchhZX9gAhK7kuGsV97kpU8simXB6VJ5TPAc85uJ+sAYSAjQE9BFfzBAj9mcBQpBpJKj
WNOIgH9s7SgkDV4VCiBD/lmVQUzK+Eo+EGSu2Cl10c8SRLC1H1aOlRlAfHyT0Ngx5FoKWu
NTLReO1XcmSKmg3XTAnqCFY6UuDHZqgKjtBW8XJPclATeO1W4cohaIjexlBTRjRBt+vLAU
TyrkF2yX6nNYKczPAC9M7jhBaS7Y82kqrj8w40ceJ2+NDH+y7cQdON91Zr0XKv/ShVNA2U
dbE7ST3pBkP/SghEVlZ79CRVB/mmT5NpqouezZARIiRkWFaA5dKfpFfQ49nTwA==
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 4P6qNF0QW2zlr2;
Thu, 2 Feb 2023 06:57:17 +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 3126vGEu003741;
Thu, 2 Feb 2023 06:57:16 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3126vGRn003740;
Thu, 2 Feb 2023 06:57:16 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 06:57:16 GMT
Message-Id: <202302020657.3126vGRn003740@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 9294c98c5c7a - stable/13 - sdio: Add CCCR speed defines
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 9294c98c5c7a97d1550b20c19725cf61a4093f74
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=9294c98c5c7a97d1550b20c19725cf61a4093f74
commit 9294c98c5c7a97d1550b20c19725cf61a4093f74
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-07-14 15:25:36 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 06:47:34 +0000
sdio: Add CCCR speed defines
Those are the defines needed to change speed on a SDIO card.
(cherry picked from commit 348164aa9e5d862b65c8436861a3eb2b33bcb16e)
---
sys/dev/mmc/mmcreg.h | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/sys/dev/mmc/mmcreg.h b/sys/dev/mmc/mmcreg.h
index 8fc6ba06ff87..97ddb6dbeeb6 100644
--- a/sys/dev/mmc/mmcreg.h
+++ b/sys/dev/mmc/mmcreg.h
@@ -568,9 +568,21 @@ struct mmc_request {
#define CCCR_BUS_WIDTH_4 (1 << 1)
#define CCCR_BUS_WIDTH_1 (1 << 0)
#define SD_IO_CCCR_CARDCAP 0x08 /* SDIO card capabilities */
-#define CCCR_CC_SMB (1 << 1) /* CMD53 block mode support */
+#define CCCR_CC_SMB (1 << 1) /* CMD53 block mode support */
+#define CCCR_CC_LSC (1 << 6)
+
#define SD_IO_CCCR_CISPTR 0x09 /* 0x09 - 0x0B */
#define SD_IO_CCCR_FN0_BLKSZ 0x10 /* 0x10 - 0x11 */
+#define SD_IO_CCCR_SPEED 0x13
+#define CCCR_SPEED_SHS (1 << 0)
+#define CCCR_SPEED_BSS_MASK (0x7 << 1)
+#define CCCR_SPEED_EHS (1 << 1)
+#define CCCR_SPEED_SDR12 (0 << 1)
+#define CCCR_SPEED_SDR25 (1 << 1)
+#define CCCR_SPEED_SDR50 (2 << 1)
+#define CCCR_SPEED_SDR104 (3 << 1)
+#define CCCR_SPEED_DDR50 (4 << 1)
+
/* Function Basic Registers (FBR) */
#define SD_IO_FBR_START 0x00100 /* Offset in F0 address space */
#define SD_IO_FBR_SIZE 0x00700 /* Total size of FBR */
From nobody Thu Feb 2 06:57:18 2023
X-Original-To: dev-commits-src-branches@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 4P6qNG361dz3c4SP;
Thu, 2 Feb 2023 06:57:18 +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 4P6qNG2J1Wz4MDX;
Thu, 2 Feb 2023 06:57:18 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675321038;
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=Q9YEnkGuFhpggh3yx5iWqlWVjXj1s/r19NCZUnZS97Q=;
b=MOsWcxOok/x60o6Lo+I547nsSU79kCC8ccMNVEUF/F+dHQrOj3URW0T47viTSoTk0k5ze0
91kl+Xeziz91NH6SAeUggJeJbVDEKtH840plqPEM2hb5SfXKlWHkYWyZyObXYRoT8eoqAd
Uapv9DBzWEYkFE//IMAD6oA4h+kA1/W+AZqL6BPORAErzh7nd4KDP4Ur34zO/PrFwzyyRg
5LPFGMmgB7BpO2GQz0tlon3E5OrsfOH3FQIUU11T44rKzrvqe9Lz4xrEpF5oYRiUNggepw
kqfUYmpGC1k1PR+begX5L53BXyTw7pBg0ydPu3f7lqsTCU3EKrm9Um3IyfJWoA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675321038;
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=Q9YEnkGuFhpggh3yx5iWqlWVjXj1s/r19NCZUnZS97Q=;
b=I3KsctJcwPI9EKdBBZgmkNwv7BpBDZXMJRxSatBozODSC/SSxZV8+xbNIQFXr7tHcy5Sug
bYY1WjeGvSlAHekKkjimLWQrRxVeXgDMPSM9GoEm9+7taFqup7VRJ06QnbebFRwzZ5sq5k
0ppiKL8xPzbWLCZ+z+NILnPLqsuDv2CN6b2yYHlvVlWl8+ZWdXhSybuFgRSrJW3t7rNIX1
FZ1pVtA/FM7+AqK4bjYPe/3GcCXr9STWH5Hi9AMWJWCMopYhzyuZBCx1jRgSi6C29ohFl9
aL+Q7UpjJTJtRq7a6vOz7nd7yY9TqTWvYvMWjmjTRZuHGbL57FFzWxAdSRgMNg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675321038; a=rsa-sha256; cv=none;
b=um+XUyOqWXi07l2IIbPNapE0qiUYFgEfB+cvgL1OMKvEx5+sBaRAVvsB0w18QScoFQ42xj
WJ2INks92aO06K8GoWfKBO4mlHtHdupW7qfVHy3zzNx6KWgRpvvdmn2kqBDx2jE6dZYbCX
Wau3BSs2DEUh97N102qP91FXv4go5E9kVmg41dYJX01it9IkymI4cDRz+q4puXoHO0YkK5
AKxwoO/7kpCeCAMWPU6GUHiNBBBwdIfD+T4wz6gksxqmf53ecnLvh/XFZ46zN3xeLQki2X
BZunKluUM2/LScGbR0dAfujIj1hRhTWRofKttht0+7aTatQoL85ZEs8l9TxFjw==
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 4P6qNG1NF4zlr3;
Thu, 2 Feb 2023 06:57:18 +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 3126vIxW003766;
Thu, 2 Feb 2023 06:57:18 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3126vIWI003765;
Thu, 2 Feb 2023 06:57:18 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 06:57:18 GMT
Message-Id: <202302020657.3126vIWI003765@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 8974b83aa1a0 - stable/13 - sdio: Do not allow setting a block size if function doesn't support it
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 8974b83aa1a077bc038f59c0909e4698f88a5904
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=8974b83aa1a077bc038f59c0909e4698f88a5904
commit 8974b83aa1a077bc038f59c0909e4698f88a5904
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-05-26 11:15:58 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 06:47:34 +0000
sdio: Do not allow setting a block size if function doesn't support it
(cherry picked from commit 49da0242e798ade8a578036929bff493a2d6ef75)
---
sys/dev/sdio/sdio_subr.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sys/dev/sdio/sdio_subr.c b/sys/dev/sdio/sdio_subr.c
index 0885b16550a6..50b741ff2a27 100644
--- a/sys/dev/sdio/sdio_subr.c
+++ b/sys/dev/sdio/sdio_subr.c
@@ -121,6 +121,9 @@ sdio_set_block_size(struct sdio_func *f, uint16_t bs)
uint32_t addr;
uint16_t v;
+ if (bs > f->max_blksize)
+ return (EOPNOTSUPP);
+
if (!sdio_get_support_multiblk(f->dev))
return (EOPNOTSUPP);
From nobody Thu Feb 2 07:39:23 2023
X-Original-To: dev-commits-src-branches@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 4P6rJq2XXjz3c8xQ;
Thu, 2 Feb 2023 07:39: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 4P6rJq20MQz4Qht;
Thu, 2 Feb 2023 07:39:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323563;
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=+KWKeH/amtEbAMVy5nxUgF8o2Bk+Vt1iaZizNAqZ+00=;
b=jOvGgftIqrlAd8YKiUjqzOyI4nPmi9RbhBTU5miZLDPqwFy/kq9qZqMddt39+WyyZhDnVc
xS+sZ3qwV+fYz12Vo7oPYCTO11Bf5C324N6kxATPwk2XrIZ4sm9dJtH0c1YLSltZBvVBDv
dN04+oajj2a9rCe7DsNnxYuwMJoKKG3tT23i0qqW8DHI2x4ZKRX7FjkdP2brI/2S4AdScr
iIwrzKrOEu2QK5Dn4XGTdp95EYtjvuzLRpKML4pLH828Zunto3b5fg2cr6kYBo5wZc6slP
4k5YpVWJqh3cun43B50AXv4g/Iuqg75uKWKQ3d7+IGfh5JDQK7UKqf+quu1P7A==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323563;
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=+KWKeH/amtEbAMVy5nxUgF8o2Bk+Vt1iaZizNAqZ+00=;
b=xJYLXHET0fOKMW428mTSbRCvgv4T5qkD4H0lqYJanhIve5oLq3lEDdOaUljPa8hAPTDR8L
vOmdz31Rrc6SlQ2jfLezCSIohM+EOrYDCVjsGEVTjhUvm9NgtGLXqSx678crQWaw7T0zwX
rnPhiN5ZdbvPsjdZtoC5oKFzEztJ15uEyPiyPAxkkO5dc+u33AzE7AwN+dFmJuMNODWr38
WGA7bRjh5WsbfWrgAtoGo8kHeS64QKSeA3yqaPwh/2AFL8AARjRp/d4uIoBQSygsbRMiAg
lwSFU/6acghzfD2Kkn+PpVIKqWsw9PugoOkFJWoXWr905qcjYtVed3wJwp3HWQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323563; a=rsa-sha256; cv=none;
b=QZV5Hvo56+dIGAEUiovdnIBjO6+X26qkguybj8Ta50C3RpCcYo/28GZDYs0ZLojY7X4r6a
2EKoZkHwHp8tn5AopNRltuArsAaIxgkWkvVXE3vagSXM4sa64HtsYSvYU25jku/S9ICCwi
PSnS1Ht8LC+0YkIiTZXA5txDK7a87IwO8b2qNyoQ5u+Ou6lXX0dOH9Znj+64CEkos/bTJX
4NjTQYUHu/27WkOthmxbgWh0HrInT9OtnnzwH2r28rAE7JpDaT4rrqXQIh41Pf68u3pjm9
rAvN7dTe8huDfQGcULCEb/griMT5tDDLkzLPkYO9zwniMdGHhsZJPiX5CSeIQg==
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 4P6rJq14fYzmXn;
Thu, 2 Feb 2023 07:39: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 3127dNr2061824;
Thu, 2 Feb 2023 07:39:23 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dNWn061823;
Thu, 2 Feb 2023 07:39:23 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:23 GMT
Message-Id: <202302020739.3127dNWn061823@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: b85e5c7e7302 - stable/13 - cxgbe(4): Fix the sorting order of the regions listed in meminfo.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: b85e5c7e730275bbb89fec4e30272c733e0486ac
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=b85e5c7e730275bbb89fec4e30272c733e0486ac
commit b85e5c7e730275bbb89fec4e30272c733e0486ac
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-04-05 21:13:11 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:09:43 +0000
cxgbe(4): Fix the sorting order of the regions listed in meminfo.
Sponsored by: Chelsio Communications
(cherry picked from commit 9983e5cce6c77c791bd914648b2acc2e54acc515)
---
sys/dev/cxgbe/t4_main.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index f0ef8073919c..309f719d504f 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -9809,16 +9809,23 @@ sysctl_linkdnrc(SYSCTL_HANDLER_ARGS)
}
struct mem_desc {
- unsigned int base;
- unsigned int limit;
- unsigned int idx;
+ u_int base;
+ u_int limit;
+ u_int idx;
};
static int
mem_desc_cmp(const void *a, const void *b)
{
- return ((const struct mem_desc *)a)->base -
- ((const struct mem_desc *)b)->base;
+ const u_int v1 = ((const struct mem_desc *)a)->base;
+ const u_int v2 = ((const struct mem_desc *)b)->base;
+
+ if (v1 < v2)
+ return (-1);
+ else if (v1 > v2)
+ return (1);
+
+ return (0);
}
static void
From nobody Thu Feb 2 07:39:24 2023
X-Original-To: dev-commits-src-branches@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 4P6rJr6Kjdz3c8g8;
Thu, 2 Feb 2023 07:39:24 +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 4P6rJr2WF6z4Qcf;
Thu, 2 Feb 2023 07:39:24 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323564;
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=ehqoTOWqwRl1AjiMJpt4aSaJ2J9GbssYI5sakiNT3Bk=;
b=wzatsQbIW182V5uluXuYwjR6HvCcMqmpBkkjDgaIQMwEJ04QtyHjpn1JfjzNMEwBMXBqVJ
/JvHJ3VmN4grEJBLFOobpskRDOufSs8reYPb8t+swjkXc/wb7wgtK+qgbZfGAJGhZCBeKc
mGe5BIHBdLQvrEdp92cIzpynC1IpnHrZZANave1fgsBpTsibbi0TgjJ0/YphEhUtpIhK4n
ThDkt1/m04yae/TMGGJRCd29PCMIhsdlaLm4DCe6vd07jdFOZGXpIm2B7XvxAWXTVIlLsv
clrK6NSYxPG/ljiv65ztWcY0VkMtDyhm8nl7ibB0h/e50HEnvg3zXBWldrLzVg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323564;
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=ehqoTOWqwRl1AjiMJpt4aSaJ2J9GbssYI5sakiNT3Bk=;
b=NnweNH1aUzMdsDRpeOQM6obf0GThmcsNS2EomCOSXi3FUZteJZ/vims+DUocxLuccwya0o
FHqNXw3TxBv4aWFUPsORnjvvaK0fh1EH5GkDqIWlp3fRNixlpsGWpiwj5ap68fizHdRLxt
2xTIdYZzfYbU3j6uUcA2tkVZ8SLi5fxLyF0W5QLOwZypL+os9OsvzDtZ3tpZRjXOtFF0yD
4Kd1IcjfC9uqqhcx+sruCZDD7q0bKeKCJysh+YIC5Q0WZ5VbByl59kZv3pyrVHEd+bU1LG
n+6poIQk8yh3zZkCER1QG77moA4xpvDASNiexbsN7rJRz8qc9QCVi0Y8d4/8NQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323564; a=rsa-sha256; cv=none;
b=pIjoyfQh8be9Jp2UkgwdStx6+I96YoR/TC1lk0hevCYkGXxHbBfQ/P+5rGMaF9H72N6F2D
WD6tV84/3E6CKf3ZyIWYf9dSlOHd1YCdk5Bfc3635csflhSSksYaxc8SWyrT6+yZo6fSWT
S0ciLy8S0xOa2QuJYfi/xpdCEcDHQhpHsdr7emWLXiub3kI9SNfAa4AZ/M2pk6JGX5Jn9K
PDyBC8arHOnc+J2YTNbDHSgkFAu0gjc+j3ZOeZkZaYyUpQnivOMOEbj3YKrFmvuFEYyjgF
CbvxNuCqFt9WCrpDcJobQ8H55VurPJQjbw65/v1m0kRbR8zdR5UGUJZo/QBWhw==
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 4P6rJr1ZJzzmVH;
Thu, 2 Feb 2023 07:39:24 +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 3127dO71061852;
Thu, 2 Feb 2023 07:39:24 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dOrd061851;
Thu, 2 Feb 2023 07:39:24 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:24 GMT
Message-Id: <202302020739.3127dOrd061851@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: 6d187cf93b04 - stable/13 - cxgbe(4): meminfo should get the TLS region's limits from the hardware.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 6d187cf93b04f819b0cbcc789dd115196db9e4ce
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=6d187cf93b04f819b0cbcc789dd115196db9e4ce
commit 6d187cf93b04f819b0cbcc789dd115196db9e4ce
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-04-05 21:54:11 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:10:41 +0000
cxgbe(4): meminfo should get the TLS region's limits from the hardware.
meminfo is meant for debugging and it should read hardware configuration
directly when possible instead of relying on values queried from the
firmware. Rename the region to "TLSKey region" to match other drivers
while here.
Sponsored by: Chelsio Communications
(cherry picked from commit f88b31885c4fd1f80bed2c3b3f2eb05f98367f31)
---
sys/dev/cxgbe/t4_main.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index 309f719d504f..32348d3c4b8c 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -9861,8 +9861,8 @@ sysctl_meminfo(SYSCTL_HANDLER_ARGS)
"Tx payload:", "Rx payload:", "LE hash:", "iSCSI region:",
"TDDP region:", "TPT region:", "STAG region:", "RQ region:",
"RQUDP region:", "PBL region:", "TXPBL region:",
- "DBVFIFO region:", "ULPRX state:", "ULPTX state:",
- "On-chip queues:", "TLS keys:",
+ "TLSKey region:", "DBVFIFO region:", "ULPRX state:",
+ "ULPTX state:", "On-chip queues:",
};
struct mem_desc avail[4];
struct mem_desc mem[nitems(region) + 3]; /* up to 3 holes */
@@ -9977,6 +9977,8 @@ sysctl_meminfo(SYSCTL_HANDLER_ARGS)
ulp_region(RX_RQUDP);
ulp_region(RX_PBL);
ulp_region(TX_PBL);
+ if (sc->cryptocaps & FW_CAPS_CONFIG_TLSKEYS)
+ ulp_region(RX_TLS_KEY);
#undef ulp_region
md->base = 0;
@@ -10015,13 +10017,6 @@ sysctl_meminfo(SYSCTL_HANDLER_ARGS)
md->idx = nitems(region); /* hide it */
md++;
- md->base = sc->vres.key.start;
- if (sc->vres.key.size)
- md->limit = md->base + sc->vres.key.size - 1;
- else
- md->idx = nitems(region); /* hide it */
- md++;
-
/* add any address-space holes, there can be up to 3 */
for (n = 0; n < i - 1; n++)
if (avail[n].limit < avail[n + 1].base)
@@ -10030,6 +10025,7 @@ sysctl_meminfo(SYSCTL_HANDLER_ARGS)
(md++)->base = avail[n].limit;
n = md - mem;
+ MPASS(n <= nitems(mem));
qsort(mem, n, sizeof(struct mem_desc), mem_desc_cmp);
for (lo = 0; lo < i; lo++)
From nobody Thu Feb 2 07:39:25 2023
X-Original-To: dev-commits-src-branches@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 4P6rJs4MSgz3c8gF;
Thu, 2 Feb 2023 07:39:25 +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 4P6rJs3db7z4QZZ;
Thu, 2 Feb 2023 07:39:25 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323565;
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=wcsxm2lUgoAIxpx+oDP7XeQxyumAR4RgD2g1j7HvhKM=;
b=x158XCWCDlh6KLm4Xe49qA8QyLHc8R8b90SMlSdw8sCQpiBUrM3GyNH/Wf7Cd3Nb11t7+N
QC6Fkr0CTB/UWL3PpP/6ZUP0swOPSwb8jjq9+/JjWslJLDM63Ch7WAv8CZqcc/sKEp/WkD
/hrjz1i6t2kGum5UjJtBxLQenfT33nfC3q1up2jq6H5UkvSZrE8UVPRKOjn9ApIN3y1/u5
pL+hQtRPfFrRXe7YsboleP9WU2DciizJwaodMZMTANNj288xbZhAxJ7wheDKz1Csi3BU36
Vj87vPSajfUd+hU4thZyd1cTc1lE6KsRNKCnIxFMtqjKGPakobDtXf1S864vVw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323565;
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=wcsxm2lUgoAIxpx+oDP7XeQxyumAR4RgD2g1j7HvhKM=;
b=si36Ap7GHgmwBPA8ia7trcwKIOySR0fWd67ZDmPxKS5bBxZCNZzFi4GraDYpajOdQw3/to
sGI+79N/2n9oqpR1LMFVpb943SjJTeWWyFZ4juZR1A03Uswvy0Pm3Vy0cQQkDc/EwJlE0b
O3D98jfhZW9mu/RRPEfy/89BhiEpEyPdiYkSPGpP0hc41yVwRzvPbO0gy25wy06q1g4T+i
dQJUs6VdCg+b54u/c4Jfl9RbnTCTB7md+H2ZqtJ+1GRlziZot0w+KjUAvQXpdyhttVjIGp
k5g4+ckPI2P+HkmLcu8NVc+Xjk7inpqt62LSeGFqNmjgXVK8qkQ1YIGGj55DAw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323565; a=rsa-sha256; cv=none;
b=bPF6/50Hywn7dtO1ABqN2JYNwuJENL7obYN1Sbr9pk/DxZrABT95CQovRQd/1uD9EwlgFv
Cn41OuNFTsWSLYK2V+IXn8seIEcYUvBUnmgu7++bihwA6Ud6GKP5TNqUc0z+Yhxou0zVaF
bC89KlDInlZk3xm7W2q0B/ZAnT7i8kQVrFDDK/ghE68PGAcxv4Rix5kSfjfXC3cE+OjsRI
8jeVS2J34j/7umSMvW53L97G41oqyBQ65Uy3D2S46O3dxfqa6ccWryOsP6Me2Isj9TC/WD
p04axZ5TtdFfThSc8PgBLR2l+GO9xrBTyeNj741izA0xkcPjg4haH+dYLmcedw==
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 4P6rJs2lHkzm4s;
Thu, 2 Feb 2023 07:39:25 +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 3127dPkO061876;
Thu, 2 Feb 2023 07:39:25 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dPYg061875;
Thu, 2 Feb 2023 07:39:25 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:25 GMT
Message-Id: <202302020739.3127dPYg061875@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: 37cb194b416e - stable/13 - cxgbe(4): Display the number of free PM pages and p-structs in meminfo.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 37cb194b416e50ba82a8336cf92bc56623f81246
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=37cb194b416e50ba82a8336cf92bc56623f81246
commit 37cb194b416e50ba82a8336cf92bc56623f81246
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-04-06 00:15:31 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:11:17 +0000
cxgbe(4): Display the number of free PM pages and p-structs in meminfo.
Sponsored by: Chelsio Communications
(cherry picked from commit c5a7885c80260f5eccb616ecbc77d7e919ce2614)
---
sys/dev/cxgbe/t4_main.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index 32348d3c4b8c..fd98cdc76299 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -9851,7 +9851,7 @@ sysctl_meminfo(SYSCTL_HANDLER_ARGS)
struct adapter *sc = arg1;
struct sbuf *sb;
int rc, i, n;
- uint32_t lo, hi, used, alloc;
+ uint32_t lo, hi, used, free, alloc;
static const char *memory[] = {
"EDC0:", "EDC1:", "MC:", "MC0:", "MC1:", "HMA:"
};
@@ -10052,19 +10052,24 @@ sysctl_meminfo(SYSCTL_HANDLER_ARGS)
mem_region_show(sb, "uP Extmem2:", lo, hi);
lo = t4_read_reg(sc, A_TP_PMM_RX_MAX_PAGE);
- sbuf_printf(sb, "\n%u Rx pages of size %uKiB for %u channels\n",
- G_PMRXMAXPAGE(lo),
+ for (i = 0, free = 0; i < 2; i++)
+ free += G_FREERXPAGECOUNT(t4_read_reg(sc, A_TP_FLM_FREE_RX_CNT));
+ sbuf_printf(sb, "\n%u Rx pages (%u free) of size %uKiB for %u channels\n",
+ G_PMRXMAXPAGE(lo), free,
t4_read_reg(sc, A_TP_PMM_RX_PAGE_SIZE) >> 10,
(lo & F_PMRXNUMCHN) ? 2 : 1);
lo = t4_read_reg(sc, A_TP_PMM_TX_MAX_PAGE);
hi = t4_read_reg(sc, A_TP_PMM_TX_PAGE_SIZE);
- sbuf_printf(sb, "%u Tx pages of size %u%ciB for %u channels\n",
- G_PMTXMAXPAGE(lo),
+ for (i = 0, free = 0; i < 4; i++)
+ free += G_FREETXPAGECOUNT(t4_read_reg(sc, A_TP_FLM_FREE_TX_CNT));
+ sbuf_printf(sb, "%u Tx pages (%u free) of size %u%ciB for %u channels\n",
+ G_PMTXMAXPAGE(lo), free,
hi >= (1 << 20) ? (hi >> 20) : (hi >> 10),
hi >= (1 << 20) ? 'M' : 'K', 1 << G_PMTXNUMCHN(lo));
- sbuf_printf(sb, "%u p-structs\n",
- t4_read_reg(sc, A_TP_CMM_MM_MAX_PSTRUCT));
+ sbuf_printf(sb, "%u p-structs (%u free)\n",
+ t4_read_reg(sc, A_TP_CMM_MM_MAX_PSTRUCT),
+ G_FREEPSTRUCTCOUNT(t4_read_reg(sc, A_TP_FLM_FREE_PS_CNT)));
for (i = 0; i < 4; i++) {
if (chip_id(sc) > CHELSIO_T5)
From nobody Thu Feb 2 07:39:26 2023
X-Original-To: dev-commits-src-branches@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 4P6rJt5QSDz3c94J;
Thu, 2 Feb 2023 07:39:26 +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 4P6rJt4fZ6z3Brx;
Thu, 2 Feb 2023 07:39:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323566;
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=MuMTXCgyUARwOidTt3rBUzeJi9ngJmErB1AHOu40c2Q=;
b=TlOPYqpFFpE/xdYoggkffkBS7wKRc+2FlULe86cl5mRgDTJB+flEMvheZNjB/Ry58HJjhN
/HqkE0hP0RX0bERTjr+XLeSMsc9Lx8wcmPdmlpgpfueWaK6c9L1rSeguPIuRjfB3iTlT0M
GqnSe+jiqDU9s3R6uTdXb8DnIKqwyhqwZ5iPTy+dRFkzDWmkWLye4VjNVQx+i3LP5OPhXi
0PO5e6z/coHHEDIJxkk/rohwCK8kNTEjbd1x82TEYf+/K1n9m22ipQKuQR21ut9ezFz1F4
oPFA5Zz+RwXj17nvetFOI81PeAbsBzb7v/x1gTvpHIg6XozaMBwsx48HCW1jlA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323566;
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=MuMTXCgyUARwOidTt3rBUzeJi9ngJmErB1AHOu40c2Q=;
b=ZLlJEMlU75RhtPvLMtUBpbQjTXkJTROIfvwBvdx+P8eGksNDlPcJIpXq3dLb+Zt7nkAp1J
KZGYSyxvR03zC34xd4vDHaUa7pB3Hp9841G4zuwGAuV1iyRIV7/cHYA8ShM6N4lePbpMVE
KifSGrONN8XuVhi1OGIPK/DnUObKMW1mT5mO67ivPoNpzOLIJE4FodW/NwHreCuqlBjLWv
eUINLhYSDINHjpcPCfyhwoDIKp+R4kCMtEjNkAxQbbfVTONOoHwMD1k2ncqiyvOLUwGWKL
gGtCP0Gvmt4h9fmXFsowsqIHU88C9afkY1h6TLMo9psouDDXrE8fz948jH+jcg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323566; a=rsa-sha256; cv=none;
b=t7lFNDCDsc7UWOKeIxNzXiVXrkM+VW4GGe1Kn2Z5DsvovydcbBZGD+tRyjUOjrXbZx+Zcs
v1Yu/J1CLf2wt1VHw3q1J4QwiuWmXBisKZs+aJFkslYyo/2MFV/yiMBSoBKbv0aiX6KMiF
lxwgRxjhFj25VCgOnWtwKDOXnT5gSpAe4/fzoUXmqnF9nPSxiUxRUc4a/Yvpuzp5ZCUrbx
QL2MzthNa37LcFB0OAbvA7gl4lqRtmsqkxRwvU9UoN9vrp1p2v9LUSbQPO96yA0q43vzBz
SVUcOBAqniaU8vVpuVGdo0ELgJncxLlsL8velnJHJtf1rsLa0yMGStRyHhRnQQ==
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 4P6rJt3hx1zmVJ;
Thu, 2 Feb 2023 07:39:26 +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 3127dQYD061907;
Thu, 2 Feb 2023 07:39:26 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dQLx061906;
Thu, 2 Feb 2023 07:39:26 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:26 GMT
Message-Id: <202302020739.3127dQLx061906@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: ff802044d094 - stable/13 - cxgbe/cxgbei: Allow max PDU payload lengths to be changed with a sysctl.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: ff802044d094491dcc65b1e1df352a93b78ca39e
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=ff802044d094491dcc65b1e1df352a93b78ca39e
commit ff802044d094491dcc65b1e1df352a93b78ca39e
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-01-25 22:27:28 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:12:17 +0000
cxgbe/cxgbei: Allow max PDU payload lengths to be changed with a sysctl.
New connections will use the new values. Existing connections are not
affected.
Obtained from: jhb@
Sponsored by: Chelsio Communications
(cherry picked from commit f8058d33337425549e42dcccdd0f55c837bb8775)
---
sys/dev/cxgbe/cxgbei/cxgbei.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/dev/cxgbe/cxgbei/cxgbei.c b/sys/dev/cxgbe/cxgbei/cxgbei.c
index 979feace81dd..ad66247775e1 100644
--- a/sys/dev/cxgbe/cxgbei/cxgbei.c
+++ b/sys/dev/cxgbe/cxgbei/cxgbei.c
@@ -197,10 +197,10 @@ cxgbei_init(struct adapter *sc, struct cxgbei_data *ci)
CTLFLAG_RW, &ci->ddp_threshold, 0, "Rx zero copy threshold");
SYSCTL_ADD_UINT(&ci->ctx, children, OID_AUTO, "max_rx_data_len",
- CTLFLAG_RD, &ci->max_rx_data_len, 0,
+ CTLFLAG_RW, &ci->max_rx_data_len, 0,
"Maximum receive data segment length");
SYSCTL_ADD_UINT(&ci->ctx, children, OID_AUTO, "max_tx_data_len",
- CTLFLAG_RD, &ci->max_tx_data_len, 0,
+ CTLFLAG_RW, &ci->max_tx_data_len, 0,
"Maximum transmit data segment length");
return (0);
From nobody Thu Feb 2 07:39:27 2023
X-Original-To: dev-commits-src-branches@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 4P6rJv6C4Rz3c8xr;
Thu, 2 Feb 2023 07:39:27 +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 4P6rJv5blDz3Bvf;
Thu, 2 Feb 2023 07:39:27 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323567;
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=UEjy1IfXnpaY11dBwYR+aTxY4Mjcdk+U5W5jow3E1XA=;
b=fZUzscmYDMFKXPXUDowbUnyNatVjSXLOO70T6JVACspPLaK8yWz0xhfyZNDtWJzwQH6v1Z
HVIDzT+X/6cBAZYnBhjEKU3Q7TP3NFpDPJ5UUAOf6Cw5KUHA8Q3SwdwDxGAljYsuYuzWNz
3irwgG657pbapeFWiWPRc7PfnYcIJcUqGakAU6qMcnWoOoUCgubZ2fJes4PiyOTsmBH9dk
ENGJCY2gioJyES2zDFVW39t1GdD9ro5eIpBfl10eAstk9JR1yxAqRr4fCOnoRN0LRDTg0o
Oln1ruTrT2nBX50ov4DoMbxdzUX4mZnjJGOPcvLAyO+ss9eQPLGXaFQoplVfWQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323567;
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=UEjy1IfXnpaY11dBwYR+aTxY4Mjcdk+U5W5jow3E1XA=;
b=VOnVF6tQ99vO5L9fpWEnwSdBG9KH+X39Ft629uPAssmfBWrGG6g4fKeRC71wnIsiF+k8/Y
XMXFIlhKWUv6GPQJuTH3Z4kMCTISWbrcU/zQbWEnnOUqfcKq+uo7vBdJGPsgI77InK9QQi
wCROJaKdSznETfXSIZo5f9yHD2PiEaCOuVj+E1dnSjgysq5cVxGSiuDeXp4fvoZSvDPlnW
D50GRJbwtKI1x0kOHWWBlJFH+B6nvc7N1AbH3OkUihYgHDC9XoCX5LyKygUMi0Lmxw1A0b
g9Fg6KYX5PSnup9Xx6J4ayVZgEJNslvphn4jlMb9u2diSPbeOXrp2qly07x3xw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323567; a=rsa-sha256; cv=none;
b=ZHCfdttV3DQ0CZfEDz0nnbK3kJaMpXz6Jwi2n9caFoZbDD0r5Y3hSzkK+DK5qlUlcK7D3I
cBksEWqwvxjHOHUDA+floH31gThBp8ZaV+UbayZ0s6CScapuyih5c8TdKxmm3PjXv3MEq4
9HIQc/TvXnPl8YewvFZoq96QuTfE33x2ZYWqgvF6bvf0Okb278wuJF9a69m5mINnApy7Gi
eASwUFqpszrm3QRpnWov2OygAaoPQ//TPTIPfVH7k57lzlhmuJ/gu8GU90VZyA599UXXd/
3vP+kC8hsp9wGv8LIZlrE1y4ao1S/vVqj5vqRWQeFJMLlc1IskvexsQ9EfxoYw==
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 4P6rJv4gTRzm4t;
Thu, 2 Feb 2023 07:39: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 3127dRVN061931;
Thu, 2 Feb 2023 07:39:27 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dRl0061930;
Thu, 2 Feb 2023 07:39:27 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:27 GMT
Message-Id: <202302020739.3127dRl0061930@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: a7a9dbe2fee9 - stable/13 - cxgbe(4): Fix control flow issues reported by Coverity.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a7a9dbe2fee958090e8f76af42ce664e5a489446
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=a7a9dbe2fee958090e8f76af42ce664e5a489446
commit a7a9dbe2fee958090e8f76af42ce664e5a489446
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-04-14 07:17:36 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:12:41 +0000
cxgbe(4): Fix control flow issues reported by Coverity.
CID 1487932: Control flow issues (NESTING_INDENT_MISMATCH).
The macro on this line expands into multiple statements, only the first
of which is nested within the preceding parent while the rest are not.
9828 ulp_region(RX_TLS_KEY);
Reported by: Coverity (CID 1487932)
Fixes: f88b31885c4 cxgbe(4): meminfo should get the TLS region's limits from the hardware.
Sponsored by: Chelsio Communications
(cherry picked from commit 239170f29210a21a68284dc967e57ed8047fb2ba)
---
sys/dev/cxgbe/t4_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index fd98cdc76299..0ec1dc54bdd4 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -9977,8 +9977,9 @@ sysctl_meminfo(SYSCTL_HANDLER_ARGS)
ulp_region(RX_RQUDP);
ulp_region(RX_PBL);
ulp_region(TX_PBL);
- if (sc->cryptocaps & FW_CAPS_CONFIG_TLSKEYS)
+ if (sc->cryptocaps & FW_CAPS_CONFIG_TLSKEYS) {
ulp_region(RX_TLS_KEY);
+ }
#undef ulp_region
md->base = 0;
From nobody Thu Feb 2 07:39:28 2023
X-Original-To: dev-commits-src-branches@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 4P6rJx0D6sz3c97y;
Thu, 2 Feb 2023 07:39:29 +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 4P6rJw6b5Xz3BwQ;
Thu, 2 Feb 2023 07:39:28 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323568;
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=ijvwGHWNIPIoQZHZd24sdEEaGTL/41HeKqsLeYKqztE=;
b=gLVM2STP5LBheQTl2Htt/OlFaeePrYvzpklnwyT8Eb1CtLcybMjYCehethKyXpgyANtQAx
fcZDD8Q6y3U8JQ5baMMjqT9bhNIOAYuvFZxVbFxu9ETG+gJROwlQ01YbUa1gj0o0s5HS9X
e08/fZ6vMmupcYl/zZTUBKi3bEITULpkslfGtkdLxnRdM3kwAJ1/V9CNghDj7RY53ovAE8
zHKGvNavkYHY8H5VWBwp50SwKJWnMW85NTV0cOf12SoxAbgloBnKzanJYWL5a6ezEa+PpY
7MJORYO32VcCjJUW5sA9xe9zeLYcOJ2j+TNDiYTxTrvmU9iMqCakgRlflqjUNQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323568;
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=ijvwGHWNIPIoQZHZd24sdEEaGTL/41HeKqsLeYKqztE=;
b=YCL2HkxS8+l7OEE1r5/ZHQUEKVp/Q261hGABEtfpdyA1B2zH1RGGFknAw/HH6dewZgRwKe
ng8pZboCAOb09uW/P2EO2YfB3b65b//oyAtQdKe4HS2PbRD2Ztb39BQDIF6AHB1OtDFQRz
VFDw9nm/Z5nlrXI+OxiUZcIMkLrac+18kvSAR9H6PUbs2JOaDP3+7z9Unj1Xwnt9IIPB3D
hZOUTsfncCTGLVEcfn8NJIE6WmigDB4wX50CKFR0KbXWw5VIcf6AgEHpn7JWdBTysLA29Z
T5ciqVMZE0i5kGzTM8AF0xVXluYZd0m5tOr3Wu6j/ApF+LHRjq4I9nAZzK/Dbg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323568; a=rsa-sha256; cv=none;
b=s2rFbonrpLKUEiNqfB+og7NI4RBGBl6skbaPXDvjXI9/NF0sAPDg8wTlZanJWg90cJ4uja
4XNwpAsbpFddUO0d7cKH+mh7QH0rUFKTpk+V3m7ZyxociQ4MzE5m/2MYmoR24JKeLb68jz
t+uy4yh09SC72dDg7CpeNYsugGiAq2HZVuJUurtzaMOS+CMh7W1GVtztiuDUxDNeUJn+Ud
UGUH6zHoJU2wuCS6huFQDvNHeqggm73IAMECTQ2MSbTYMyN74XHG0J6tbAAfvAh/N/booT
uMPYeRiPWXGJ6427J5WZfd4vHkdgJQBwlsHgnAH6MnJzTD/gicHr/j8PON2bTg==
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 4P6rJw5dnCzm4v;
Thu, 2 Feb 2023 07:39:28 +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 3127dSK2061955;
Thu, 2 Feb 2023 07:39:28 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dSbS061954;
Thu, 2 Feb 2023 07:39:28 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:28 GMT
Message-Id: <202302020739.3127dSbS061954@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: 5d45caebfad6 - stable/13 - cxgbe(4): Add support for PPOD_EDRAM feature.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 5d45caebfad60cd323b732d99e52239644a724a0
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=5d45caebfad60cd323b732d99e52239644a724a0
commit 5d45caebfad60cd323b732d99e52239644a724a0
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-04-14 22:43:32 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:13:18 +0000
cxgbe(4): Add support for PPOD_EDRAM feature.
The driver queries the firmware to find out if it supports this feature
and enables it if it does. The firmware moves the iSCSI page pod region
to a lower address so that some of it is located in the faster on-chip
memory instead of external DDR.
Reviewed by: jhb@
Sponsored by: Chelsio Communications
Differential Revision: https://reviews.freebsd.org/D34895
(cherry picked from commit 169e94c41e235191014503de06915b0c1b60db91)
---
sys/dev/cxgbe/t4_main.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index 0ec1dc54bdd4..ebbe1bf1306e 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -5252,6 +5252,17 @@ set_params__pre_init(struct adapter *sc)
"failed to enable high priority filters :%d.\n",
rc);
}
+
+ param = FW_PARAM_DEV(PPOD_EDRAM);
+ rc = -t4_query_params(sc, sc->mbox, sc->pf, 0, 1, ¶m, &val);
+ if (rc == 0 && val == 1) {
+ rc = -t4_set_params(sc, sc->mbox, sc->pf, 0, 1, ¶m,
+ &val);
+ if (rc != 0) {
+ device_printf(sc->dev,
+ "failed to set PPOD_EDRAM: %d.\n", rc);
+ }
+ }
}
/* Enable opaque VIIDs with firmwares that support it. */
From nobody Thu Feb 2 07:39:29 2023
X-Original-To: dev-commits-src-branches@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 4P6rJy4XW1z3c8xy;
Thu, 2 Feb 2023 07:39:30 +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 4P6rJy22Ccz3Bws;
Thu, 2 Feb 2023 07:39:30 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323570;
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=AQRx0JXxEwyrd9oj7J7poLqOO6UiRgNosM9v8meRzyQ=;
b=fAFk4kro/73x1b/2q3EdxqwPFzl+q6F7xDJTyLaKI6C3R5h6YsU8gIZhZ79tEyhR01kpJ/
1UEKa1ZwCjcxksR/KaTsD8+TztEXwKoS/5fmCPq1i5gVf3UnrRjCgcnvA5yzdp421dy16b
FM17dSurQeBJ8pGw/BgbNT1xbF+pTXdj2g9k867R39vemOOqXnvzqv9QR059qbVq+/KgWu
CRnn91tCpEXiJZ+e9qYJAj0PD5sx2DXfcucQk275MHPwUsO4E1NoAXj+Bib6kMnyx5lwtX
PpIDFmUryCKxGl1Gklhqco2d9MlzzCFZo+BgmkTrA5KmwUTj7gklP1BtXOrZTw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323570;
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=AQRx0JXxEwyrd9oj7J7poLqOO6UiRgNosM9v8meRzyQ=;
b=GHg0NAahC4cHAftQKt8VrEUakXKgFkE2QDvwLHIlNgkICz47A+wW+dsH+DhJKpp6+/gqRQ
v2jYMLN4kn4MIExS7Qn6NUJJN9say5BLLT+Kdt9OKgRvvfsyiwn7/CirFFV1ioEcMkJhBL
a+ypCWrKsCAjRWc6L5JnnDbW+LYjes6yEXqU/PCSQHcEpPaLFOAB7X2/cvd96Ynp6Qln99
PiHwYs0tzitoZHSvFtGAk4UCp93XDJv2QcGswbUscHkbh8cqtFfPS7bQLOWe/cgf3MbgL1
6I5jpDSuIOD627/fZHfcXBX0INuOSJlSauLdEvdbam5dNTiDjxUdxNSWDAjqfg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323570; a=rsa-sha256; cv=none;
b=KP6EvnAE3H/5e35136JJ57o408BWSOCwzv8P1fVrxRv+CfmS6BtQovnRFEKrM3a5Cspdtq
tTWBs//wwVLk5BryZq7aO6YGZMVgtX4RulXC1A7+KZqWCooVaaR2zGcjfE71vk8x3ogr9Q
8GKeF01HSFJT/iILiyiE4feIm0mokJEIohnpJqXFA77QCW+IxuPtVzmsqQq85BbzwxCAgM
Fx9Q+qz/LGShbqUOn6Ei3I5aprCRQ87GIAHCABDk2EswlSIRjVLoz+VCPfOO76Y4hnpaLJ
1VhcsyQsiojJKZbT5H4kRLcqqAdzaRlYHxP7E06TS9UmDNAkiR4C1s7CIvoLtw==
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 4P6rJx6ZtszmVK;
Thu, 2 Feb 2023 07:39:29 +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 3127dTfI061979;
Thu, 2 Feb 2023 07:39:29 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dTiH061978;
Thu, 2 Feb 2023 07:39:29 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:29 GMT
Message-Id: <202302020739.3127dTiH061978@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: f9cc817c17b7 - stable/13 - cxgbe/t4_tom: Support for round-robin selection of offload queues.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: f9cc817c17b7663e80d5418362d2da0be2c7a2a1
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=f9cc817c17b7663e80d5418362d2da0be2c7a2a1
commit f9cc817c17b7663e80d5418362d2da0be2c7a2a1
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-04-14 22:49:58 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:13:55 +0000
cxgbe/t4_tom: Support for round-robin selection of offload queues.
A COP (Connection Offload Policy) rule can now specify that the tx
and/or rx queue for a new tid should be selected in a round-robin
manner. There is no change in default behavior.
Reviewed by: jhb@
Sponsored by: Chelsio Communications
Differential Revision: https://reviews.freebsd.org/D34921
(cherry picked from commit db28d4a0cd1c7a8505d6cbb3e8772b794cd55e53)
---
sys/dev/cxgbe/adapter.h | 2 ++
sys/dev/cxgbe/t4_ioctl.h | 5 +++++
sys/dev/cxgbe/tom/t4_tom.c | 22 ++++++++++++++--------
3 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h
index b3bffcc32b52..f59fe4e7c4e4 100644
--- a/sys/dev/cxgbe/adapter.h
+++ b/sys/dev/cxgbe/adapter.h
@@ -255,6 +255,8 @@ struct vi_info {
struct sysctl_oid *ofld_txq_oid;
uint8_t hw_addr[ETHER_ADDR_LEN]; /* factory MAC address, won't change */
+ u_int txq_rr;
+ u_int rxq_rr;
};
struct tx_ch_rl_params {
diff --git a/sys/dev/cxgbe/t4_ioctl.h b/sys/dev/cxgbe/t4_ioctl.h
index f3bb7d8b4aa4..3ef03f7c526c 100644
--- a/sys/dev/cxgbe/t4_ioctl.h
+++ b/sys/dev/cxgbe/t4_ioctl.h
@@ -376,6 +376,11 @@ enum {
OPEN_TYPE_DONTCARE = 'D',
};
+enum {
+ QUEUE_RANDOM = -1,
+ QUEUE_ROUNDROBIN = -2,
+};
+
struct offload_settings {
int8_t offload;
int8_t rx_coalesce;
diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c
index b36b4b934d12..8888265dd32a 100644
--- a/sys/dev/cxgbe/tom/t4_tom.c
+++ b/sys/dev/cxgbe/tom/t4_tom.c
@@ -1217,17 +1217,23 @@ init_conn_params(struct vi_info *vi , struct offload_settings *s,
cp->mtu_idx = find_best_mtu_idx(sc, inc, s);
/* Tx queue for this connection. */
- if (s->txq >= 0 && s->txq < vi->nofldtxq)
- cp->txq_idx = s->txq;
+ if (s->txq == QUEUE_RANDOM)
+ cp->txq_idx = arc4random();
+ else if (s->txq == QUEUE_ROUNDROBIN)
+ cp->txq_idx = atomic_fetchadd_int(&vi->txq_rr, 1);
else
- cp->txq_idx = arc4random() % vi->nofldtxq;
+ cp->txq_idx = s->txq;
+ cp->txq_idx %= vi->nofldtxq;
cp->txq_idx += vi->first_ofld_txq;
/* Rx queue for this connection. */
- if (s->rxq >= 0 && s->rxq < vi->nofldrxq)
- cp->rxq_idx = s->rxq;
+ if (s->rxq == QUEUE_RANDOM)
+ cp->rxq_idx = arc4random();
+ else if (s->rxq == QUEUE_ROUNDROBIN)
+ cp->rxq_idx = atomic_fetchadd_int(&vi->rxq_rr, 1);
else
- cp->rxq_idx = arc4random() % vi->nofldrxq;
+ cp->rxq_idx = s->rxq;
+ cp->rxq_idx %= vi->nofldrxq;
cp->rxq_idx += vi->first_ofld_rxq;
if (SOLISTENING(so)) {
@@ -1587,8 +1593,8 @@ lookup_offload_policy(struct adapter *sc, int open_type, struct mbuf *m,
.ecn = -1,
.ddp = -1,
.tls = -1,
- .txq = -1,
- .rxq = -1,
+ .txq = QUEUE_RANDOM,
+ .rxq = QUEUE_RANDOM,
.mss = -1,
};
static const struct offload_settings disallow_offloading_settings = {
From nobody Thu Feb 2 07:39:30 2023
X-Original-To: dev-commits-src-branches@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 4P6rJz1qt3z3c9Bt;
Thu, 2 Feb 2023 07:39:31 +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 4P6rJz1Mb0z3CCD;
Thu, 2 Feb 2023 07:39:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323571;
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=17aPCr6ooN6m6OTiGA249qvjYKGUY1s42u+bKy0Gpwc=;
b=LWq/+WSjZVmV9K/3nkE6DHSmeFf81rIMetgCLoCHwicgOcsNZp+ewMrNbFOdUPcOVH/JwN
iZMFuNoiAuNGr2Mf0H26wDeGvjGBknq9ERa+eDlfJLG8oXcEUKFZETsVKPzRbpfrv+l4Na
o5CmzjD4xZxr1HqYhSFgurMVDUuaqPNa8IUQW3sihtdC7zuA3dq78A4mCAxzw8MZtF/6/R
zHtaSFgtS5wKo6tjYKJ2G+x+IGklY1//JpUdd9pEsgT7493fwTJ/w7AFy4DsdFLs/2Y21j
+5wr8kwV04jJxuaOTOJreGyATz7IKa+w1+sa6nGhUyY8Uc7uQYZrZVV1CdCRYw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323571;
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=17aPCr6ooN6m6OTiGA249qvjYKGUY1s42u+bKy0Gpwc=;
b=Cd0rb/kWDFBMrb2e0t3W7FPshCcnKIFMEX6iYxKwRwvesnJdRKtlGGtvdFyb3XrWEhzmg7
7c3wWDUIGdssWT8jlDAHnk7wK8SbAmDnzPdXTmzYFMHu2QhIy2f3M7nIGBYZmBYL/PaTya
HyNAjMK5CLJGjb8iAIqhJq+wZQGuN2Duc0BzosWGz5bZWDk0Rvb/yQL97UVhoewpThG36n
QW/a2zn64X/VYW3uzy6wEkgn7lDxdGjzucQODQjUqRoSRS2L/at3cIk2DLRBOF9jJkpgks
4qNecPu9m3KtwXBa7+RVOjUKUF8cCIbwIIcZBi/dOmHxrcahc927MJm4K7LOzQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323571; a=rsa-sha256; cv=none;
b=ZMgtG4+X5VKc66tVAgj9lHop414EBexu0sGde9pqVG18WZNgtEsAho9cdlexqVIvP1Tjtm
e11gA8Ht1/p5jjNC4zMHeN+Zs9vSF5t3wMfbOHVsJ1uXMoIMRm2h2b3Ijvmr+DertBun/M
JlXNOWvXvzk2QGiQuyWQJ032JOY/ToCclCS58pOh4V4FMlxUM3BrWcw0u2bASbhsyC2TLx
s87lF9gjkVAyhNOKDEFLjsttF63D+3dj5RwylKuvPdw2wMrxRllfdILhuRtAvoJLAcwXlU
sk8TP2OJaDIpPkTJRgvZe1mjD5BeZZQnD8pCGtMM39iDBXxGPrCi6lukqof+vA==
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 4P6rJz0JdLzm4w;
Thu, 2 Feb 2023 07:39:31 +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 3127dU7s062003;
Thu, 2 Feb 2023 07:39:30 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dUdw062002;
Thu, 2 Feb 2023 07:39:30 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:30 GMT
Message-Id: <202302020739.3127dUdw062002@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: 1af49ac2e40e - stable/13 - cxgbetool(8): User interface to round-robin queue selection via COP.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 1af49ac2e40e46cca5d015aa48660c9ca37f96fc
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=1af49ac2e40e46cca5d015aa48660c9ca37f96fc
commit 1af49ac2e40e46cca5d015aa48660c9ca37f96fc
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-04-14 22:54:13 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:14:24 +0000
cxgbetool(8): User interface to round-robin queue selection via COP.
Queue "roundrobin" in a COP rule means the driver should select queues
for new tids in a round-robin manner.
Reviewed by: jhb@
Sponsored by: Chelsio Communications
Differential Revision: https://reviews.freebsd.org/D34922
(cherry picked from commit 811a82d53aaf905bebb523600d375a457069f022)
---
usr.sbin/cxgbetool/cxgbetool.8 | 18 +++++++++++-------
usr.sbin/cxgbetool/cxgbetool.c | 15 +++++++++------
2 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/usr.sbin/cxgbetool/cxgbetool.8 b/usr.sbin/cxgbetool/cxgbetool.8
index d1c6f528d04e..96e66632e758 100644
--- a/usr.sbin/cxgbetool/cxgbetool.8
+++ b/usr.sbin/cxgbetool/cxgbetool.8
@@ -31,7 +31,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 23, 2021
+.Dd April 14, 2022
.Dt CXGBETOOL 8
.Os
.Sh NAME
@@ -649,18 +649,22 @@ must be one of
.It Cm class Ar sc
Bind the connection to the specified tx scheduling class.
Valid range is 0 to 14 (for T4) and 0 to 15 (T5 onwards).
-.It Cm rxq Ar qid
+.It Cm rxq Ar qnum
Use the specified offload rx queue.
-.Ar qid
-should be between 0 and nofldrxq for the ifnet.
+.Ar qnum
+should be
+.Cm random Ns , Cm roundrobin Ns ,
+or a number between 0 and nofldrxq for the ifnet.
.It Cm txq Ar qnum
Use the specified offload tx queue.
-.Ar qid
-should be between 0 and nofldtxq for the ifnet.
+.Ar qnum
+should be
+.Cm random Ns , Cm roundrobin Ns ,
+or a number between 0 and nofldtxq for the ifnet.
.It Cm bind Ar qnum
Shorthand for
.Cm rxq Ar qnum Cm txq Ar qnum Ns .
-Use only when nofldrxq is the same as nofldtxq.
+Use when nofldrxq is the same as nofldtxq.
.It Cm mss Ar val
Set the advertised TCP MSS in the SYN for this connection to
.Ar val
diff --git a/usr.sbin/cxgbetool/cxgbetool.c b/usr.sbin/cxgbetool/cxgbetool.c
index 1d239ccf238a..f93c28da8e16 100644
--- a/usr.sbin/cxgbetool/cxgbetool.c
+++ b/usr.sbin/cxgbetool/cxgbetool.c
@@ -3150,14 +3150,17 @@ parse_offload_settings_word(const char *s, char **pnext, const char *ws,
os->sched_class = val;
} else if (!strcmp(s, "bind") || !strcmp(s, "txq") ||
!strcmp(s, "rxq")) {
- val = -1;
- if (strcmp(param, "random")) {
+ if (!strcmp(param, "random")) {
+ val = QUEUE_RANDOM;
+ } else if (!strcmp(param, "roundrobin")) {
+ val = QUEUE_ROUNDROBIN;
+ } else {
p = str_to_number(param, &val, NULL);
if (*p || val < 0 || val > 0xffff) {
warnx("invalid queue specification "
"\"%s\". \"%s\" needs an integer"
- " value, or \"random\".",
- param, s);
+ " value, \"random\", or "
+ "\"roundrobin\".", param, s);
return (EINVAL);
}
}
@@ -3207,8 +3210,8 @@ parse_offload_settings(const char *settings_ro, struct offload_settings *os)
.ecn = -1,
.ddp = -1,
.tls = -1,
- .txq = -1,
- .rxq = -1,
+ .txq = QUEUE_RANDOM,
+ .rxq = QUEUE_RANDOM,
.mss = -1,
};
From nobody Thu Feb 2 07:39:32 2023
X-Original-To: dev-commits-src-branches@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 4P6rK02THdz3c8y5;
Thu, 2 Feb 2023 07:39:32 +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 4P6rK01ljxz3C2r;
Thu, 2 Feb 2023 07:39:32 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323572;
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=3+ir93/FaqX+0R3KiDEpLwKkostYbjktQr4irgjOd8Q=;
b=YEqx4h/PDOCpeaiAWK8oZhBxx54ROE4nvH4uR87FuDR6oPn/bkppElLrbLWXGz8R72b2w4
jCqJXKOhF2EdumvvOq9HbUhufapGDrFUvbutxXr1uuZArtimVIkQW0AU88WLcXFevyBPDN
6mpQwwJSW5rpyFNNw6xsnu7BDvuCcRSD/r0CgofuN87d0cqRaG2LUp0V/3wE08DJIGeVAV
Dz4a3okyk9tHHVhWB3k+ovKnrs1W34RF8OCQkRKn5WUVqt7drY8bwUAHv10eGqNYpLTEJy
WwzuGB5omgb03IJbHMPcr0jQ6odnZsLRe7/ht/7k1LoR5we6Q2G7Xy2kc0xYag==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323572;
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=3+ir93/FaqX+0R3KiDEpLwKkostYbjktQr4irgjOd8Q=;
b=bngPJPj1j1N3AXsSf1PllNH8WQ/W4oQqai8j77k+eGp1o7gQp1Q/C6bIsFD/6/dVmq6zyz
AiHlUTHiiA738jLNGKAdsjLXf/MlGVP+tk/Brfit8MGkp2XqKzEdX54AtA/N+ntSuWfxkS
omw4cnUnRTiH28RZdoAe8RtpGt4dmT/jVafSr3+sIxrKuaFF7hVhAtICxa81c2QtJ7/wS1
aEv/YmzrYHi2h+aJEIqprQng1ZS0dkQurGkP2yBtUzLTvdkBjRkAVcjWs19D053R8Eglp/
TYCnqFQfguWvuE5cqGBtNvEXMh3QLovztvgvcGTt688VkMUZRNdmHaZ65Bj/wQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323572; a=rsa-sha256; cv=none;
b=jKk5N9W2Hrb/zLoZimcdP893rkqK0MSlFmZT9Ye/piJcirG7cpZaUn9T6S9gdKgfGN3bsu
eCRPbV1dS8hydYJtLV4ye+Q0JzG8HpY1Z53JazKBxaimRFta5Tug49bZYcVLTjcvxX0xNt
Aw9XSXAVlmlIsd5KzBicwG+92qA3CRoP0ATgwfYO3H8jwhIaJvK6pTMzIJyB46P6EY/vN2
nWzwt/A9ZaQGweTsethS6I8HuHNIBWdbNVKzapQoF/axFaAhoumzh7HG2gqlCHMLBOFlIr
5JrLFkNb1uKQ4w9MLkeacjYjeyy70oOLgwhYf9w4fkvsP/Ac+ozBVHxM9zZRTw==
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 4P6rK00rt4zmgd;
Thu, 2 Feb 2023 07:39:32 +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 3127dWbg062034;
Thu, 2 Feb 2023 07:39:32 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dWbw062033;
Thu, 2 Feb 2023 07:39:32 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:32 GMT
Message-Id: <202302020739.3127dWbw062033@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: d3be047579fd - stable/13 - cxgbe/iw_cxgbe: c4iw_zero_addr should not use IN_ZERONET.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: d3be047579fddd6ec462b17676c87adfab205502
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=d3be047579fddd6ec462b17676c87adfab205502
commit d3be047579fddd6ec462b17676c87adfab205502
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-05-19 19:25:30 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:14:48 +0000
cxgbe/iw_cxgbe: c4iw_zero_addr should not use IN_ZERONET.
c4iw_zero_addr is supposed to check for all-zero addresses but was using
IN_ZERONET (which does something different) for IPv4 addresses. Fix it
by simply checking for 0 as is done for IPv6 addresses.
Reported by: karels@
Sponsored by: Chelsio Communications
(cherry picked from commit 87c5ff0648a8e88b71a66994e1f9ca127fd4ed83)
---
sys/dev/cxgbe/iw_cxgbe/cm.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sys/dev/cxgbe/iw_cxgbe/cm.c b/sys/dev/cxgbe/iw_cxgbe/cm.c
index 6d29116ff1bb..19ec920f48c7 100644
--- a/sys/dev/cxgbe/iw_cxgbe/cm.c
+++ b/sys/dev/cxgbe/iw_cxgbe/cm.c
@@ -938,8 +938,7 @@ static inline int c4iw_zero_addr(struct sockaddr *addr)
struct in6_addr *ip6;
if (addr->sa_family == AF_INET)
- return IN_ZERONET(
- ntohl(((struct sockaddr_in *)addr)->sin_addr.s_addr));
+ return (((struct sockaddr_in *)addr)->sin_addr.s_addr == 0);
else {
ip6 = &((struct sockaddr_in6 *) addr)->sin6_addr;
return (ip6->s6_addr32[0] | ip6->s6_addr32[1] |
From nobody Thu Feb 2 07:39:33 2023
X-Original-To: dev-commits-src-branches@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 4P6rK16TW5z3c8gj;
Thu, 2 Feb 2023 07:39:33 +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 4P6rK13kV0z3CJv;
Thu, 2 Feb 2023 07:39:33 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323573;
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=cPFo8sOZqXMihTm2SkGGU1qGN6M38A3h1eQ+zWS8aKE=;
b=Rt67Tp2ugMfDFUKP7Ppro901TZTvNzcCwPc6LSUMyPDyIR8Tl/ty3zpQvvM6JnjQfiuadQ
7DR10zwBPz4DlER2Z/iPZ5UJEsNAx3KIJDoO1OkdQ3hXPOs8oeuQX2T/yt0qJIs1GbH1kd
Alt6MsWXX3pBZa1+JwesHo/PD1HTjERiKaP8AxtDRt00p2Tc9vEXasYVRzfyZu1WvJ/xvB
RSr6WVw/eT6fdtVWnsOtMenvFEB9yt+/hRs1Ik9yBY6Wc7JDZN1xZxKg+hlseJ3EAA/xUG
kOq3Cq0Lttt3vzB5JlwtH767T80ilfgeTb77Fj4bUT9Xw3peY2QE3urwruqsgA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323573;
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=cPFo8sOZqXMihTm2SkGGU1qGN6M38A3h1eQ+zWS8aKE=;
b=E1xiY5dg5/iwgD30M0oyqh84bxnJJNSpXyjQp/jmwPp1DjYSlrsDRAmQdzLWmKyAAa9hJb
+frr1Ld0ep08VIHYJ3gfqVCpRiB2sTmHR0VwLacUirvbR/bAuO+K5jcQNPSM79s03ysaUV
LCCuZjfXffmAUhuUzyVHOiJ0rE1p1lIVohaNE0KTICGDbBmuDvpqzkDuji+BpwIiK9TYlq
qykIqCf6LMkwCRtHkUtrS/RAhgEZ+Okh9Fl7QhTtf4i8Nqek8AcjK5aHNvi5VoAYP/1xtV
jzrwrlEBDLuybRUlZbmkM2svw9UzmGtxLVDxdL7m+58o4DirGq8sIr3JXfoaYg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323573; a=rsa-sha256; cv=none;
b=pHQuyeDIEAXmex76Inmv6rGvFPGX8b034YUlGkVqumq1WPgxwlLEYggBFA69zjnqpWswhF
/r8d5J5q6rw9wK5hUg3ksaFWWJFOpbskIWHdQdfeOh+dpJA/Rmv8Be1bd2Fw12s690ToeU
j2lCiUZ5WM5Ok8ya77HdtJkPkdUWYyK6lIVFlZJ2UQPTJmulItoKuHxMmZ6OqW6pX+kkT+
CIC3WuCJiNPC498iUo2Fi5pxrh2mQyYRJk3zvV5R3CyLO+Ja790ldGBhGsfefjkuIjdALt
rmkLkF7TfclLrvSC9CKgdWR7ZzMju4L7hgLpVy/WY4kpsUyVcmnO/kNHz+pQMQ==
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 4P6rK12ZCszmgf;
Thu, 2 Feb 2023 07:39:33 +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 3127dXfw062058;
Thu, 2 Feb 2023 07:39:33 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dX9g062057;
Thu, 2 Feb 2023 07:39:33 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:33 GMT
Message-Id: <202302020739.3127dX9g062057@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: 886a5109c84a - stable/13 - cxgbe(4): Update firmwares to 1.27.0.0.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 886a5109c84a491e704f4b707fab0968da82df4d
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=886a5109c84a491e704f4b707fab0968da82df4d
commit 886a5109c84a491e704f4b707fab0968da82df4d
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-08-14 23:57:39 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:15:22 +0000
cxgbe(4): Update firmwares to 1.27.0.0.
Changes since 1.26.6.0 are listed here. This list comes from the
Release Notes for "Chelsio Unified Wire 3.17.0.0 for Linux" dated
2022-07-29.
Fixes
-----
BASE:
- Enabled all MA parity interrupt bits.
- Use config file value to override number of rx channel. nrxch=1 was not
handled in the firmware.
- Replaced read only registers with new registers EDC_H_BIST_USER_WDATA0,
EDC_H_BIST_USER_WDATA1 and EDC_H_BIST_CMD_LEN to dump the uP memory parity
error status registers.
- 10G simplex module support enabled.
Obtained from: Chelsio Communications
Sponsored by: Chelsio Communications
(cherry picked from commit 2bb28b5f8cb5700945539584e7864773f0dfcd51)
---
sys/conf/files | 6 +++---
.../{t4fw-1.26.6.0.bin => t4fw-1.27.0.0.bin} | Bin 570880 -> 570880 bytes
sys/dev/cxgbe/firmware/t4fw_interface.h | 12 ++++++------
.../{t5fw-1.26.6.0.bin => t5fw-1.27.0.0.bin} | Bin 676352 -> 677376 bytes
.../{t6fw-1.26.6.0.bin => t6fw-1.27.0.0.bin} | Bin 729600 -> 729600 bytes
sys/modules/cxgbe/t4_firmware/Makefile | 2 +-
sys/modules/cxgbe/t5_firmware/Makefile | 2 +-
sys/modules/cxgbe/t6_firmware/Makefile | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/sys/conf/files b/sys/conf/files
index d1d317172c92..aaf9d4223bbe 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1528,7 +1528,7 @@ t4fw.fwo optional cxgbe \
no-implicit-rule \
clean "t4fw.fwo"
t4fw.fw optional cxgbe \
- dependency "$S/dev/cxgbe/firmware/t4fw-1.26.6.0.bin" \
+ dependency "$S/dev/cxgbe/firmware/t4fw-1.27.0.0.bin" \
compile-with "${CP} ${.ALLSRC} ${.TARGET}" \
no-obj no-implicit-rule \
clean "t4fw.fw"
@@ -1562,7 +1562,7 @@ t5fw.fwo optional cxgbe \
no-implicit-rule \
clean "t5fw.fwo"
t5fw.fw optional cxgbe \
- dependency "$S/dev/cxgbe/firmware/t5fw-1.26.6.0.bin" \
+ dependency "$S/dev/cxgbe/firmware/t5fw-1.27.0.0.bin" \
compile-with "${CP} ${.ALLSRC} ${.TARGET}" \
no-obj no-implicit-rule \
clean "t5fw.fw"
@@ -1596,7 +1596,7 @@ t6fw.fwo optional cxgbe \
no-implicit-rule \
clean "t6fw.fwo"
t6fw.fw optional cxgbe \
- dependency "$S/dev/cxgbe/firmware/t6fw-1.26.6.0.bin" \
+ dependency "$S/dev/cxgbe/firmware/t6fw-1.27.0.0.bin" \
compile-with "${CP} ${.ALLSRC} ${.TARGET}" \
no-obj no-implicit-rule \
clean "t6fw.fw"
diff --git a/sys/dev/cxgbe/firmware/t4fw-1.26.6.0.bin b/sys/dev/cxgbe/firmware/t4fw-1.27.0.0.bin
similarity index 79%
rename from sys/dev/cxgbe/firmware/t4fw-1.26.6.0.bin
rename to sys/dev/cxgbe/firmware/t4fw-1.27.0.0.bin
index ea13e7084dde..dcae4d1b8a2b 100644
Binary files a/sys/dev/cxgbe/firmware/t4fw-1.26.6.0.bin and b/sys/dev/cxgbe/firmware/t4fw-1.27.0.0.bin differ
diff --git a/sys/dev/cxgbe/firmware/t4fw_interface.h b/sys/dev/cxgbe/firmware/t4fw_interface.h
index f589052618b7..e8f8096a6595 100644
--- a/sys/dev/cxgbe/firmware/t4fw_interface.h
+++ b/sys/dev/cxgbe/firmware/t4fw_interface.h
@@ -10002,18 +10002,18 @@ enum fw_hdr_chip {
enum {
T4FW_VERSION_MAJOR = 1,
- T4FW_VERSION_MINOR = 26,
- T4FW_VERSION_MICRO = 6,
+ T4FW_VERSION_MINOR = 27,
+ T4FW_VERSION_MICRO = 0,
T4FW_VERSION_BUILD = 0,
T5FW_VERSION_MAJOR = 1,
- T5FW_VERSION_MINOR = 26,
- T5FW_VERSION_MICRO = 6,
+ T5FW_VERSION_MINOR = 27,
+ T5FW_VERSION_MICRO = 0,
T5FW_VERSION_BUILD = 0,
T6FW_VERSION_MAJOR = 1,
- T6FW_VERSION_MINOR = 26,
- T6FW_VERSION_MICRO = 6,
+ T6FW_VERSION_MINOR = 27,
+ T6FW_VERSION_MICRO = 0,
T6FW_VERSION_BUILD = 0,
};
diff --git a/sys/dev/cxgbe/firmware/t5fw-1.26.6.0.bin b/sys/dev/cxgbe/firmware/t5fw-1.27.0.0.bin
similarity index 77%
rename from sys/dev/cxgbe/firmware/t5fw-1.26.6.0.bin
rename to sys/dev/cxgbe/firmware/t5fw-1.27.0.0.bin
index 8963b7247b6e..1158b9567336 100644
Binary files a/sys/dev/cxgbe/firmware/t5fw-1.26.6.0.bin and b/sys/dev/cxgbe/firmware/t5fw-1.27.0.0.bin differ
diff --git a/sys/dev/cxgbe/firmware/t6fw-1.26.6.0.bin b/sys/dev/cxgbe/firmware/t6fw-1.27.0.0.bin
similarity index 71%
rename from sys/dev/cxgbe/firmware/t6fw-1.26.6.0.bin
rename to sys/dev/cxgbe/firmware/t6fw-1.27.0.0.bin
index 41ce839ce105..0652ae751b82 100644
Binary files a/sys/dev/cxgbe/firmware/t6fw-1.26.6.0.bin and b/sys/dev/cxgbe/firmware/t6fw-1.27.0.0.bin differ
diff --git a/sys/modules/cxgbe/t4_firmware/Makefile b/sys/modules/cxgbe/t4_firmware/Makefile
index 179a9133c90a..bd46124af668 100644
--- a/sys/modules/cxgbe/t4_firmware/Makefile
+++ b/sys/modules/cxgbe/t4_firmware/Makefile
@@ -17,7 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0
.endif
.endfor
-T4FW_VER= 1.26.6.0
+T4FW_VER= 1.27.0.0
FIRMWS+= t4fw-${T4FW_VER}.bin:t4fw:${T4FW_VER}
.include <bsd.kmod.mk>
diff --git a/sys/modules/cxgbe/t5_firmware/Makefile b/sys/modules/cxgbe/t5_firmware/Makefile
index efa401c73099..3cc9c0b07f09 100644
--- a/sys/modules/cxgbe/t5_firmware/Makefile
+++ b/sys/modules/cxgbe/t5_firmware/Makefile
@@ -17,7 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0
.endif
.endfor
-T5FW_VER= 1.26.6.0
+T5FW_VER= 1.27.0.0
FIRMWS+= t5fw-${T5FW_VER}.bin:t5fw:${T5FW_VER}
.include <bsd.kmod.mk>
diff --git a/sys/modules/cxgbe/t6_firmware/Makefile b/sys/modules/cxgbe/t6_firmware/Makefile
index 3269432e8ac1..0f89e03fe819 100644
--- a/sys/modules/cxgbe/t6_firmware/Makefile
+++ b/sys/modules/cxgbe/t6_firmware/Makefile
@@ -17,7 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0
.endif
.endfor
-T6FW_VER= 1.26.6.0
+T6FW_VER= 1.27.0.0
FIRMWS+= t6fw-${T6FW_VER}.bin:t6fw:${T6FW_VER}
.include <bsd.kmod.mk>
From nobody Thu Feb 2 07:39:34 2023
X-Original-To: dev-commits-src-branches@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 4P6rK25DRFz3c94Q;
Thu, 2 Feb 2023 07:39:34 +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 4P6rK24gL9z3CMc;
Thu, 2 Feb 2023 07:39:34 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323574;
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=LRvlPsF09VIu0KdUsqZKIV7Vv89BTgAm8pmud+Q6IBQ=;
b=YhqZZDlktwuF/C23ttDip7JlYKmeD6vn8j+w1fIk5wJ4fjb91MgnwFekSRlCwHqIGmK6f0
Jo10UwF1MnuRA2Fz5PG61VDvb27/33ATcOINqBATipUshKXoqyTrxx2vTfryVrCEYmkFfX
5p0JRBnVMO2zwpgqe3RxJdaS/paTIrf6elIuUCjp20esEzGiOxgi4dGU/dKliVckm52L2M
I9V5iEgNXAaiaaXqt+KR4g4FIZGv4hA7tZywhSwit2lBsE2+FdbDCQrYnnRMMMqO+YygLz
KU2ErmsdJ89sGqLZGyY7oUo9m20FD/Pp4fA4A8WlGmE9aB5K0i9SP27Qy0TROA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323574;
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=LRvlPsF09VIu0KdUsqZKIV7Vv89BTgAm8pmud+Q6IBQ=;
b=ZIsY7NhiIeLGo1M6MJRxz3I0ZRtcFDUty4zlDvfl4ZqBFwhTW6s5ho7CU6C+P6ZwjRkVRH
AdAbErWgfvuAfEgn8vJdEZgVhLhwjUsM8u86P+EUoZ1EPPJfIrmlYJg9V22kwayJ9x3YRP
AV1OkVgtDIUtkJHc0oppZslHa46naDzvIBEUAcuzkeXZZQlNNKOZnbLyNZJo3r3upty2B4
wiA0GSd3VNB+95FN35/7NIZb7rg0Y/E8OEylIQsGAN1TGb3nFyqDQ2SYxUxxkKYBQ54mbM
y2raAss6ZQkKOpI+5QFNsQrKXXrr/Ga9vPxgl++sVDCggJywFro4UI+SDYuhDA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323574; a=rsa-sha256; cv=none;
b=Ftsz4k2Ii8weVrq4PEpa1dGgHZirCUIpRy5LUxqXfox0BFN8JkTzLnQMYUSppifHmTxxEr
VVTWiX8wHBErCjBx2OEAIL0Q+jIQTN5jxM1xDigWWh58XLM/cdhfVfHYQSs/dCpkCp4PRN
9XQJAL8g/2TY/f3l1/3d/uUYhsx1UyetjLryHbc3FgM1sZ/KHZdyMghIKo85bUydYEsKm4
V/QSaBfN2uJUfcAZwfQGAxnyNkfo+r5ikF0oWW0y92L6Bfja8ibs3dlwXJGBg/mF3ClwOh
qeTEFIcPE1cOjDvaNYJuf3fuG65UsT/j1TGXN4scDIUzwf4nYaXfK+Adi+q9uw==
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 4P6rK23mNjzlwr;
Thu, 2 Feb 2023 07:39:34 +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 3127dYkO062082;
Thu, 2 Feb 2023 07:39:34 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dYNR062081;
Thu, 2 Feb 2023 07:39:34 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:34 GMT
Message-Id: <202302020739.3127dYNR062081@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: 6c2b290e579a - stable/13 - cxgbe(4): Decode and display some more bits in the PL interrupt handler.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 6c2b290e579a444c833d3bf784d762498a123f93
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=6c2b290e579a444c833d3bf784d762498a123f93
commit 6c2b290e579a444c833d3bf784d762498a123f93
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-08-13 04:11:13 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:16:01 +0000
cxgbe(4): Decode and display some more bits in the PL interrupt handler.
Sponsored by: Chelsio Communications
(cherry picked from commit a7d081a8ce0e1f4c985d2a771859d35561602b5c)
---
sys/dev/cxgbe/common/t4_hw.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/sys/dev/cxgbe/common/t4_hw.c b/sys/dev/cxgbe/common/t4_hw.c
index 0176eb3e2b0d..75797199e1cf 100644
--- a/sys/dev/cxgbe/common/t4_hw.c
+++ b/sys/dev/cxgbe/common/t4_hw.c
@@ -5266,10 +5266,28 @@ static bool mac_intr_handler(struct adapter *adap, int port, bool verbose)
return (fatal);
}
+static bool pl_timeout_status(struct adapter *adap, int arg, bool verbose)
+{
+
+ CH_ALERT(adap, " PL_TIMEOUT_STATUS 0x%08x 0x%08x\n",
+ t4_read_reg(adap, A_PL_TIMEOUT_STATUS0),
+ t4_read_reg(adap, A_PL_TIMEOUT_STATUS1));
+
+ return (false);
+}
+
static bool plpl_intr_handler(struct adapter *adap, int arg, bool verbose)
{
+ static const struct intr_action plpl_intr_actions[] = {
+ { F_TIMEOUT, 0, pl_timeout_status },
+ { 0 },
+ };
static const struct intr_details plpl_intr_details[] = {
+ { F_PL_BUSPERR, "Bus parity error" },
{ F_FATALPERR, "Fatal parity error" },
+ { F_INVALIDACCESS, "Global reserved memory access" },
+ { F_TIMEOUT, "Bus timeout" },
+ { F_PLERR, "Module reserved access" },
{ F_PERRVFID, "VFID_MAP parity error" },
{ 0 }
};
@@ -5280,7 +5298,7 @@ static bool plpl_intr_handler(struct adapter *adap, int arg, bool verbose)
.fatal = F_FATALPERR | F_PERRVFID,
.flags = NONFATAL_IF_DISABLED,
.details = plpl_intr_details,
- .actions = NULL,
+ .actions = plpl_intr_actions,
};
return (t4_handle_intr(adap, &plpl_intr_info, 0, verbose));
From nobody Thu Feb 2 07:39:35 2023
X-Original-To: dev-commits-src-branches@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 4P6rK366z9z3c8yG;
Thu, 2 Feb 2023 07:39:35 +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 4P6rK35c82z3CC9;
Thu, 2 Feb 2023 07:39:35 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323575;
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=EnwwJdPd7YwcpdlW67836mJauQHey+o4XcHz1v4aGIw=;
b=udeKlQazXpeLTQjcXbDjbSd2/Mf40zxmrErXJZgwDo7LlSbqyHNs6AUhk8ayDbUjFtMikc
g+omWBOl56ctz2mZcpxMJUu6ghR7Y6iNDjxzTgCG29SZHWVCURz6Bv5Sou4XPYh0jhTufl
yYlPQzVo7ZYOLIXj/R8KyiUW/pna1ZKTMUW1D1qWMmLE5i/6w0/VnWPZ4Pox7/0hD6NGI3
S65wDs7CB0JERxQNfbZ9ShdF5dVeIsmRkFDr/VH3BKTw2MBB5mOqYA+Se5iHIqI/XNujOm
dAfq3y3aDvYs4MGGvwathnAt9Ll2KMwgBXrnPvX69DQFPFP7eayKORZkeFzkrA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323575;
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=EnwwJdPd7YwcpdlW67836mJauQHey+o4XcHz1v4aGIw=;
b=uoQReedHID4OojtS8Lj9tM+iC/mnKi4WwyF/edKwOANlbpOwOvPnoh3mmKQmYtzxFuYkBF
3pdfTGkxjRAXrTLA5XXQJ4RUj1mcRzbggZOM7A+1dty8Sg6bbkvGlNbXLn99Swu7Ix8dQi
M0camLXjzucQvcpnJAhMbj5AWqLXKQOHEV2EqZHKCv+JOC9+B4u5AQ59upX7Wb4UVvlmKb
AWgrLhjmrAvzpWooeqzorWqB9Y6HXWWD+v+hj/eVEWPEXzoF/9PGM/iGa8heAaJ7NlsBsw
LKWgbulGo4jO3EDvS7nTV/G+iW7VZ+YbB1jwXQpYIyY3+VQlmutfQQYIC4dSzg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323575; a=rsa-sha256; cv=none;
b=rolxPjrUdi4JEjtDbs0jEzzXRiwOvbsMZ0VWA7q8EFRhuh9eCuRrbjo/SJNIwC2Kb8ldxh
CmBLLID15ZkHvAX2Rfdvb29bIY6Zz0hkoLZ54+Th0OC/kUQ6Q/EIv3mDPJN9xVLBVVwMQE
E00VjZGuKMYIP38RdnGWGtDeSQbm74j66/WUWDItJWgs85ybAKHwpRhzSc6PGeFMMxtzoG
X0/pEQf29BCMVEHxX7g3BdcuHmgWMLFG6qenXkkxJ+NeZkkb/XDSOA+THlIrWs7DL54KKE
LuuTsSfIBzJ338GyHRzbGSSNtBnb/hBPjakvZylNavZJKWfGHOmV/Paby2XShw==
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 4P6rK34jV0zm4x;
Thu, 2 Feb 2023 07:39:35 +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 3127dZph062106;
Thu, 2 Feb 2023 07:39:35 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dZap062105;
Thu, 2 Feb 2023 07:39:35 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:35 GMT
Message-Id: <202302020739.3127dZap062105@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: 35c9bbff4342 - stable/13 - cxgbe(4): Add a knob to request that clocks be gated on suspend.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 35c9bbff43423f4d8b0920ef1eb1d79975b9776e
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=35c9bbff43423f4d8b0920ef1eb1d79975b9776e
commit 35c9bbff43423f4d8b0920ef1eb1d79975b9776e
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-08-16 07:48:21 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:16:20 +0000
cxgbe(4): Add a knob to request that clocks be gated on suspend.
Sponsored by: Chelsio Communications
(cherry picked from commit a8dc67388ae11a3bbb0175acb3ef9f6478d0c233)
---
sys/dev/cxgbe/t4_main.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index ebbe1bf1306e..9f4ffba9b3ef 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -631,6 +631,10 @@ static int t4_reset_on_fatal_err = 0;
SYSCTL_INT(_hw_cxgbe, OID_AUTO, reset_on_fatal_err, CTLFLAG_RWTUN,
&t4_reset_on_fatal_err, 0, "reset adapter on fatal errors");
+static int t4_clock_gate_on_suspend = 0;
+SYSCTL_INT(_hw_cxgbe, OID_AUTO, clock_gate_on_suspend, CTLFLAG_RWTUN,
+ &t4_clock_gate_on_suspend, 0, "gate the clock on suspend");
+
static int t4_tx_vm_wr = 0;
SYSCTL_INT(_hw_cxgbe, OID_AUTO, tx_vm_wr, CTLFLAG_RWTUN, &t4_tx_vm_wr, 0,
"Use VM work requests to transmit packets.");
@@ -2074,6 +2078,12 @@ t4_suspend(device_t dev)
sc->reset_thread = NULL;
mtx_unlock(&sc->reg_lock);
+ if (t4_clock_gate_on_suspend) {
+ t4_set_reg_field(sc, A_PMU_PART_CG_PWRMODE, F_MA_PART_CGEN |
+ F_LE_PART_CGEN | F_EDC1_PART_CGEN | F_EDC0_PART_CGEN |
+ F_TP_PART_CGEN | F_PDP_PART_CGEN | F_SGE_PART_CGEN, 0);
+ }
+
CH_ALERT(sc, "suspend completed.\n");
done:
end_synchronized_op(sc, 0);
From nobody Thu Feb 2 07:39:36 2023
X-Original-To: dev-commits-src-branches@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 4P6rK5031Yz3c8vd;
Thu, 2 Feb 2023 07:39: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 4P6rK46fnkz3CLS;
Thu, 2 Feb 2023 07:39:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323576;
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=/AUTF5xZaN6/6+uih3BHnNObn3JFRXkPodFtUlBSnMk=;
b=YPvXaL/Dc4NuefED91JvKkxfK7EG8FEqC3xqyiUr/Cp1HWbH13OIRHEzvZE8c1/ILbZ1Yc
zBX9ZeaRqEv1qt1gud6N4KUfVFA9wHlY2RMP+HtDuTluKNfUooGvFL37sFYcf6fD+R9oMI
vsxlQUF8PTS3OgI9r0dBRBIAGW2dfWmG/htoc0d0tOv9sXNWyX2EcEgvIEI5hLuDhtx1Q9
3aGgCt3K5Ureo0O5D4K2uHNeAH8WUVgl7xG89SA4H6w+7Dgwxvc3uOFITpUfRV1IRUlY+U
VNxcqXxEbIJb+5Yj14spQN3yQoYXbCnbMgwE+JF1+aP++APa6JgHSgihMnYLrA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323576;
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=/AUTF5xZaN6/6+uih3BHnNObn3JFRXkPodFtUlBSnMk=;
b=l9rP+KeNf31G8n2BtO1diVbKxtLuCQI2fAy+UjqyaYFxb+B7/UadiKUfi6n4sMArVzumEx
avIdb05NAqLRloEcTblRT69TSgB9UxpCar2kivF5j95s/9L0dn9ebL+iEfyhgWb5fUaiGr
WEqg1OzMHQV3CT7d9NGu9nGafCIpH8B881hdsKxxQ4sx+0r6R1VtiVtj8Ktxmym+uqiM//
2/KaTn1MiO6Y7nwMmq3wUTonyfkJOMRuUJgCJLOwltDkJC0i0iWiS/MIpopF3HUra8BWnJ
UB/kA3w7dwyaENJvKIn4Ycm8jOpJP4H1BbGmPWV0HSBhVRSXtQfnj0pi62vm3g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323576; a=rsa-sha256; cv=none;
b=Josujf1fzXSj/5yKYC7foXCMDwQuZsUTR5gWPkS8vUAnrWqMpy3ND+HeXO1wWfmiUDV+Lu
4Li9FO0FsQqcBUtmqRagXZ/jqegMeJJj8m265Z2R+W1/Imss6P3tzxLuQcZVAiCxsNagNw
+RDIa0UsO0BjDPZ9733i2TblsQWR54gVoBempJKSFFlJJm4WVubQ96VOsmBiLT/nB9G8re
vGxAR9YBtU7FvXV5wERSwyyUlAYD4DrdeX123bTw66PuJRKsZY4Yk+2XKeLuwzgxF9Lftt
VL/hmL8DufbiSIN7Sz3CijItHXx5C5KbZ0lpdFfS7l2zYD+Qd5TLfoB/jAzo7g==
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 4P6rK45hjqzmJV;
Thu, 2 Feb 2023 07:39:36 +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 3127daGJ062134;
Thu, 2 Feb 2023 07:39:36 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dadl062133;
Thu, 2 Feb 2023 07:39:36 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:36 GMT
Message-Id: <202302020739.3127dadl062133@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: 5d57964698e8 - stable/13 - cxgbetool: remove unnecessary vertical whitespace.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 5d57964698e89fe45e75f2293b03fa96b69b89f0
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=5d57964698e89fe45e75f2293b03fa96b69b89f0
commit 5d57964698e89fe45e75f2293b03fa96b69b89f0
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-08-19 19:46:32 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:16:38 +0000
cxgbetool: remove unnecessary vertical whitespace.
No functional change.
(cherry picked from commit f6cc21e8e14344ca698c19a2931c04867249dd60)
---
usr.sbin/cxgbetool/cxgbetool.c | 36 ------------------------------------
1 file changed, 36 deletions(-)
diff --git a/usr.sbin/cxgbetool/cxgbetool.c b/usr.sbin/cxgbetool/cxgbetool.c
index f93c28da8e16..43707df0b47a 100644
--- a/usr.sbin/cxgbetool/cxgbetool.c
+++ b/usr.sbin/cxgbetool/cxgbetool.c
@@ -544,46 +544,36 @@ do_show_info_header(uint32_t mode)
case T4_FILTER_FCoE:
printf(" FCoE");
break;
-
case T4_FILTER_PORT:
printf(" Port");
break;
-
case T4_FILTER_VNIC:
if (mode & T4_FILTER_IC_VNIC)
printf(" VFvld:PF:VF");
else
printf(" vld:oVLAN");
break;
-
case T4_FILTER_VLAN:
printf(" vld:VLAN");
break;
-
case T4_FILTER_IP_TOS:
printf(" TOS");
break;
-
case T4_FILTER_IP_PROTO:
printf(" Prot");
break;
-
case T4_FILTER_ETH_TYPE:
printf(" EthType");
break;
-
case T4_FILTER_MAC_IDX:
printf(" MACIdx");
break;
-
case T4_FILTER_MPS_HIT_TYPE:
printf(" MPS");
break;
-
case T4_FILTER_IP_FRAGMENT:
printf(" Frag");
break;
-
default:
/* compressed filter field not enabled */
break;
@@ -825,11 +815,9 @@ do_show_one_filter_info(struct t4_filter *t, uint32_t mode)
case T4_FILTER_FCoE:
printf(" %1d/%1d", t->fs.val.fcoe, t->fs.mask.fcoe);
break;
-
case T4_FILTER_PORT:
printf(" %1d/%1d", t->fs.val.iport, t->fs.mask.iport);
break;
-
case T4_FILTER_VNIC:
if (mode & T4_FILTER_IC_VNIC) {
printf(" %1d:%1x:%02x/%1d:%1x:%02x",
@@ -845,40 +833,32 @@ do_show_one_filter_info(struct t4_filter *t, uint32_t mode)
t->fs.mask.ovlan_vld, t->fs.mask.vnic);
}
break;
-
case T4_FILTER_VLAN:
printf(" %1d:%04x/%1d:%04x",
t->fs.val.vlan_vld, t->fs.val.vlan,
t->fs.mask.vlan_vld, t->fs.mask.vlan);
break;
-
case T4_FILTER_IP_TOS:
printf(" %02x/%02x", t->fs.val.tos, t->fs.mask.tos);
break;
-
case T4_FILTER_IP_PROTO:
printf(" %02x/%02x", t->fs.val.proto, t->fs.mask.proto);
break;
-
case T4_FILTER_ETH_TYPE:
printf(" %04x/%04x", t->fs.val.ethtype,
t->fs.mask.ethtype);
break;
-
case T4_FILTER_MAC_IDX:
printf(" %03x/%03x", t->fs.val.macidx,
t->fs.mask.macidx);
break;
-
case T4_FILTER_MPS_HIT_TYPE:
printf(" %1x/%1x", t->fs.val.matchtype,
t->fs.mask.matchtype);
break;
-
case T4_FILTER_IP_FRAGMENT:
printf(" %1d/%1d", t->fs.val.frag, t->fs.mask.frag);
break;
-
default:
/* compressed filter field not enabled */
break;
@@ -1010,43 +990,30 @@ get_filter_mode(int hashfilter)
if (mode & T4_FILTER_IPv4)
printf("ipv4 ");
-
if (mode & T4_FILTER_IPv6)
printf("ipv6 ");
-
if (mode & T4_FILTER_IP_SADDR)
printf("sip ");
-
if (mode & T4_FILTER_IP_DADDR)
printf("dip ");
-
if (mode & T4_FILTER_IP_SPORT)
printf("sport ");
-
if (mode & T4_FILTER_IP_DPORT)
printf("dport ");
-
if (mode & T4_FILTER_IP_FRAGMENT)
printf("frag ");
-
if (mode & T4_FILTER_MPS_HIT_TYPE)
printf("matchtype ");
-
if (mode & T4_FILTER_MAC_IDX)
printf("macidx ");
-
if (mode & T4_FILTER_ETH_TYPE)
printf("ethtype ");
-
if (mode & T4_FILTER_IP_PROTO)
printf("proto ");
-
if (mode & T4_FILTER_IP_TOS)
printf("tos ");
-
if (mode & T4_FILTER_VLAN)
printf("vlan ");
-
if (mode & T4_FILTER_VNIC) {
if (mode & T4_FILTER_IC_VNIC)
printf("vnic_id ");
@@ -1055,13 +1022,10 @@ get_filter_mode(int hashfilter)
else
printf("ovlan ");
}
-
if (mode & T4_FILTER_PORT)
printf("iport ");
-
if (mode & T4_FILTER_FCoE)
printf("fcoe ");
-
printf("\n");
return (0);
From nobody Thu Feb 2 07:39:37 2023
X-Original-To: dev-commits-src-branches@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 4P6rK61sZXz3c8gq;
Thu, 2 Feb 2023 07:39:38 +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 4P6rK60Xmdz3Cbv;
Thu, 2 Feb 2023 07:39:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323578;
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=iPw0xZDDLDrJgr+4Th58TK+8HpKOwbBnWAv2ZyJntDg=;
b=LIN/G7T5Tg5UtTPyhQJxidqnkvTFpPiE9a/1uPGZWwQtLjqtp9FxE0MFh3XygAmCbyhGhq
wqSUgjPbXTkioyWUXmdkjCZXlXLFxj4d7ZfDlXDtuwtZkD1TnUoyVLQX61tJUjeRpb/jxp
78eaSivt5P8tCikf+MA9gDqLWIkxCWihpPxRL7SQR1nmafM4HWtSRMYR8ldsQ/PTBXgrZ4
1hI4SKGR3cgbIqj4xE2vRJPw+4VkmdqdNeY08hA281kB2d+HxupbPXBxteI463+ITgzdXF
W1rVTSiFOvEbDI4TTXnRy4kEj7x/oBqNPuJpOH4GcnFV6hlMAhR+TxTcWlUPmw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323578;
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=iPw0xZDDLDrJgr+4Th58TK+8HpKOwbBnWAv2ZyJntDg=;
b=JmGi/AZ36nqaR/frbkCwH1S4NhXkVg8WN386QZ8pqq+xV20uJn/PZnCbdUIC+PXIRHRPnk
KJvqM9aTy+AvvFhaIrN/7I4ryznD3m00fZl3xcqdv2zOAu4l1XJTPO4LRhKGgZVYy1k7f/
OkLqwcCSSL+y+8g8jRJgUWDn0XGF7MkdLSHLysvx39JbbgHWcWAArnuDzPXvC1+XIHLo32
u1LDFMuQZBAIkL1zSN7QBvsfVOP7RgzXnXUvOZgsxBIdM614ejgUN/BuPe2WI4XtBZrlKN
T0wVeGEaDuolHguYIywoKWvo7wqJuYi1iHB8OKrifhM5W8884oFrNmq6wZ4cug==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323578; a=rsa-sha256; cv=none;
b=q71zHH1eZ5FgwhJxak+GJj6v/EdU4sQce7I3otcC+h7vFxL/2Sm/rkd5yg4frqQKCtAZks
WyNv3mgfIA+znJowYTSTtaC2167yATXzKVl5JoNZsH4oTcPbQOaWFMESzjx3papdeygwYZ
Axy4ug4m+OwEFNiiPoBpUGXlsirCq/VxxNZaqPA7bl7vEoIso6O4bwYakN21VFkCPTXrva
Qjaf4AC37lzodLJWvkpGtNSayNB759PJ1irsDK4vtfzGF8uYEauY7LcliygJV1TDMuQomA
kuXmcd4RmogHGyO7BeM1IouJHA81/go2n2SszI7f0QnqVu7+E1sX1ozDYeyXlg==
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 4P6rK56dylzmJW;
Thu, 2 Feb 2023 07:39: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 3127dboQ062164;
Thu, 2 Feb 2023 07:39:37 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dbqF062163;
Thu, 2 Feb 2023 07:39:37 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:37 GMT
Message-Id: <202302020739.3127dbqF062163@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: af0f5fe24c9b - stable/13 - cxgbe(4): Specify the ingress queue's type when creating it.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: af0f5fe24c9b16341ee9c981d572150b74c41fa9
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=af0f5fe24c9b16341ee9c981d572150b74c41fa9
commit af0f5fe24c9b16341ee9c981d572150b74c41fa9
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-09-08 18:47:38 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:18:45 +0000
cxgbe(4): Specify the ingress queue's type when creating it.
The firmware takes the type into account when setting up the PCIe
channel for the queue.
Sponsored by: Chelsio Communications
(cherry picked from commit c387ff0045d620d60ed8250360d4196a4c962a13)
---
sys/dev/cxgbe/adapter.h | 8 +++++++-
sys/dev/cxgbe/t4_netmap.c | 1 +
sys/dev/cxgbe/t4_sge.c | 16 ++++++++++------
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h
index f59fe4e7c4e4..afb571323419 100644
--- a/sys/dev/cxgbe/adapter.h
+++ b/sys/dev/cxgbe/adapter.h
@@ -377,6 +377,11 @@ struct iq_desc {
CTASSERT(sizeof(struct iq_desc) == IQ_ESIZE);
enum {
+ /* iq type */
+ IQ_OTHER = FW_IQ_IQTYPE_OTHER,
+ IQ_ETH = FW_IQ_IQTYPE_NIC,
+ IQ_OFLD = FW_IQ_IQTYPE_OFLD,
+
/* iq flags */
IQ_SW_ALLOCATED = (1 << 0), /* sw resources allocated */
IQ_HAS_FL = (1 << 1), /* iq associated with a freelist */
@@ -420,7 +425,8 @@ typedef int (*fw_msg_handler_t)(struct adapter *, const __be64 *);
* Ingress Queue: T4 is producer, driver is consumer.
*/
struct sge_iq {
- uint32_t flags;
+ uint16_t flags;
+ uint8_t qtype;
volatile int state;
struct adapter *adapter;
struct iq_desc *desc; /* KVA of descriptor ring */
diff --git a/sys/dev/cxgbe/t4_netmap.c b/sys/dev/cxgbe/t4_netmap.c
index 75953b1b516b..1ac24e75e733 100644
--- a/sys/dev/cxgbe/t4_netmap.c
+++ b/sys/dev/cxgbe/t4_netmap.c
@@ -326,6 +326,7 @@ alloc_nm_rxq_hwq(struct vi_info *vi, struct sge_nm_rxq *nm_rxq, int cong)
}
c.iqns_to_fl0congen |=
htobe32(V_FW_IQ_CMD_FL0HOSTFCMODE(X_HOSTFCMODE_NONE) |
+ V_FW_IQ_CMD_IQTYPE(FW_IQ_IQTYPE_NIC) |
F_FW_IQ_CMD_FL0FETCHRO | F_FW_IQ_CMD_FL0DATARO |
(fl_pad ? F_FW_IQ_CMD_FL0PADEN : 0) |
(black_hole == 2 ? F_FW_IQ_CMD_FL0PACKEN : 0));
diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c
index 1a291af2a24d..e485ca8736a7 100644
--- a/sys/dev/cxgbe/t4_sge.c
+++ b/sys/dev/cxgbe/t4_sge.c
@@ -235,7 +235,7 @@ static struct mbuf *get_fl_payload(struct adapter *, struct sge_fl *, uint32_t);
static int eth_rx(struct adapter *, struct sge_rxq *, const struct iq_desc *,
u_int);
static inline void init_iq(struct sge_iq *, struct adapter *, int, int, int,
- int, int);
+ int, int, int);
static inline void init_fl(struct adapter *, struct sge_fl *, int, int, char *);
static inline void init_eq(struct adapter *, struct sge_eq *, int, int, uint8_t,
struct sge_iq *, char *);
@@ -3387,7 +3387,7 @@ send_txpkts:
static inline void
init_iq(struct sge_iq *iq, struct adapter *sc, int tmr_idx, int pktc_idx,
- int qsize, int intr_idx, int cong)
+ int qsize, int intr_idx, int cong, int qtype)
{
KASSERT(tmr_idx >= 0 && tmr_idx < SGE_NTIMERS,
@@ -3396,10 +3396,13 @@ init_iq(struct sge_iq *iq, struct adapter *sc, int tmr_idx, int pktc_idx,
("%s: bad pktc_idx %d", __func__, pktc_idx));
KASSERT(intr_idx >= -1 && intr_idx < sc->intr_count,
("%s: bad intr_idx %d", __func__, intr_idx));
+ KASSERT(qtype == FW_IQ_IQTYPE_OTHER || qtype == FW_IQ_IQTYPE_NIC ||
+ qtype == FW_IQ_IQTYPE_OFLD, ("%s: bad qtype %d", __func__, qtype));
iq->flags = 0;
iq->state = IQS_DISABLED;
iq->adapter = sc;
+ iq->qtype = qtype;
iq->intr_params = V_QINTR_TIMER_IDX(tmr_idx);
iq->intr_pktc_idx = SGE_NCOUNTERS - 1;
if (pktc_idx >= 0) {
@@ -3615,8 +3618,9 @@ alloc_iq_fl_hwq(struct vi_info *vi, struct sge_iq *iq, struct sge_fl *fl)
V_FW_IQ_CMD_IQESIZE(ilog2(IQ_ESIZE) - 4));
c.iqsize = htobe16(iq->qsize);
c.iqaddr = htobe64(iq->ba);
+ c.iqns_to_fl0congen = htobe32(V_FW_IQ_CMD_IQTYPE(iq->qtype));
if (iq->cong >= 0)
- c.iqns_to_fl0congen = htobe32(F_FW_IQ_CMD_IQFLINTCONGEN);
+ c.iqns_to_fl0congen |= htobe32(F_FW_IQ_CMD_IQFLINTCONGEN);
if (fl) {
bzero(fl->desc, fl->sidx * EQ_ESIZE + sc->params.sge.spg_len);
@@ -3832,7 +3836,7 @@ alloc_fwq(struct adapter *sc)
intr_idx = 0;
else
intr_idx = sc->intr_count > 1 ? 1 : 0;
- init_iq(fwq, sc, 0, 0, FW_IQ_QSIZE, intr_idx, -1);
+ init_iq(fwq, sc, 0, 0, FW_IQ_QSIZE, intr_idx, -1, IQ_OTHER);
rc = alloc_iq_fl(vi, fwq, NULL, &sc->ctx, sc->fwq_oid);
if (rc != 0) {
CH_ERR(sc, "failed to allocate fwq: %d\n", rc);
@@ -3986,7 +3990,7 @@ alloc_rxq(struct vi_info *vi, struct sge_rxq *rxq, int idx, int intr_idx,
"rx queue");
init_iq(&rxq->iq, sc, vi->tmr_idx, vi->pktc_idx, vi->qsize_rxq,
- intr_idx, tnl_cong(vi->pi, cong_drop));
+ intr_idx, tnl_cong(vi->pi, cong_drop), IQ_ETH);
#if defined(INET) || defined(INET6)
if (ifp->if_capenable & IFCAP_LRO)
rxq->iq.flags |= IQ_LRO_ENABLED;
@@ -4109,7 +4113,7 @@ alloc_ofld_rxq(struct vi_info *vi, struct sge_ofld_rxq *ofld_rxq, int idx,
CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "offload rx queue");
init_iq(&ofld_rxq->iq, sc, vi->ofld_tmr_idx, vi->ofld_pktc_idx,
- vi->qsize_rxq, intr_idx, 0);
+ vi->qsize_rxq, intr_idx, 0, IQ_OFLD);
snprintf(name, sizeof(name), "%s ofld_rxq%d-fl",
device_get_nameunit(vi->dev), idx);
init_fl(sc, &ofld_rxq->fl, vi->qsize_rxq / 8, maxp, name);
From nobody Thu Feb 2 07:39:38 2023
X-Original-To: dev-commits-src-branches@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 4P6rK72mJNz3c98H;
Thu, 2 Feb 2023 07:39:39 +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 4P6rK726R2z3CR1;
Thu, 2 Feb 2023 07:39:39 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323579;
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=vB8injebYOeQbUswKj6XFHhdXAZfE4pUXgkC/Lrw+94=;
b=fzUk6lZ1elykflQzR/qmFI0RS+3ylkIxFpU1Gl2w3RfvIJdjwy+736wlZ+u/ii1zP8amIO
OouA5kWnGkflPgi/XVcrm/t/a51QMMlbi4SqymlexEBZJjyk7X2pm/3dnNNm1zSYhV5W+/
CBL/JIQQic7t7Fhc+ZzfBijUcSHHNU2qG89SkUbYE7e0sBzNINM1nsMIuQaiuwY0dmR5TD
pR1oyb0NX5SCYn5Lc3HXX4x9KGH1Le76ZSdaGoxZS2AbmHBv8nXCjoxeYHhvj49evhEIVO
bUP+ejOoSFhfCA1ImlsrdSCEtE0JFVFhHFVxYYYpfqSaiuVLfuVGDFs+qyG8dQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323579;
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=vB8injebYOeQbUswKj6XFHhdXAZfE4pUXgkC/Lrw+94=;
b=dlpv3fnprcyRJNB7lt4UmoY+p3DBCPbR/laEm2uCSlbDVzl3oKaTZHadH6UoTT950skn6j
aG5ZQcCULhAF8Dyfwyp325NbaTHM8HckP4VJW/PGZ5ehkhl7e/lQ8QguRIJ6tya7SQfPdN
wyyEhg2n1abrEzxisQeEEaf4rjRJh3NtS2NjBxhE1CrL91cJBGNYachv/lP+frQYbEj0bh
PdIKTTs06fZcMUfrOxm7E04B1RpS5bXbO1uPUm13N9MPxMmnl0nGMP71gCMScxDJ4ABdrI
Wm2NwHfxhCKWwzU8C+T8TmjT3FDwu4V/OIQmcyfXYAo8O1Ja2CE10lTMOj+wuQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323579; a=rsa-sha256; cv=none;
b=qn/Fo+qmAq0AQPD0Z+QtXCVHuAJBIXzYQDyxYDSnFJz8kuzNEqGYf0XRm9wQrgMabWGxgM
XD9GSo6XoBNlhakAkw4IqMih5wbXdO70JCKPyXmVyLsm0+Am7L3ZLnCTEbptRlfZO42egF
Q/Q4Mi7dgnUttSW5ATcpzaTwaxUZIH1mwrtl2CByW99pI9qz8oJ3qyrjy6m27js2jy8CGv
rNSGGx9iaE9hork6LKS9m7LVECLmuQ447iLvFF0k8E1KOcfsGyrolDakfNBqQF6b+5wiOD
EOpphMPvaViemOkRAUHS46vb6SFVQ7EbkDr9mNhiydCUJ0ckj+GVLwL9cn/Gdg==
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 4P6rK70X02zmVL;
Thu, 2 Feb 2023 07:39:39 +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 3127dcZh062189;
Thu, 2 Feb 2023 07:39:38 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dcvx062188;
Thu, 2 Feb 2023 07:39:38 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:38 GMT
Message-Id: <202302020739.3127dcvx062188@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: 5adfcaeacafa - stable/13 - cxgbe(4): Add another setting to the knob that controls congestion.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 5adfcaeacafa73522cf98403428e7785a7aecc82
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=5adfcaeacafa73522cf98403428e7785a7aecc82
commit 5adfcaeacafa73522cf98403428e7785a7aecc82
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-09-09 22:16:22 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:18:51 +0000
cxgbe(4): Add another setting to the knob that controls congestion.
hw.cxgbe.cong_drop=2 will generate backpressure *and* drop frames for
queues that are congested.
Sponsored by: Chelsio Communications
(cherry picked from commit df275ae5090048fb7a8c082d509fae57e891957a)
---
share/man/man4/cxgbe.4 | 3 +-
sys/dev/cxgbe/adapter.h | 4 +-
sys/dev/cxgbe/t4_netmap.c | 41 ++++++------------
sys/dev/cxgbe/t4_sge.c | 106 +++++++++++++++++++++++++++++-----------------
4 files changed, 84 insertions(+), 70 deletions(-)
diff --git a/share/man/man4/cxgbe.4 b/share/man/man4/cxgbe.4
index 5f959299d2ad..b0f8af93b3b6 100644
--- a/share/man/man4/cxgbe.4
+++ b/share/man/man4/cxgbe.4
@@ -31,7 +31,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 10, 2021
+.Dd September 12, 2022
.Dt CXGBE 4
.Os
.Sh NAME
@@ -277,6 +277,7 @@ Controls the hardware response to congestion.
0 instructs the hardware to backpressure its pipeline on congestion.
This usually results in the port emitting PAUSE frames.
1 instructs the hardware to drop frames destined for congested queues.
+2 instructs the hardware to both backpressure the pipeline and drop frames.
.It Va hw.cxgbe.pause_settings
PAUSE frame settings.
Bit 0 is rx_pause, bit 1 is tx_pause, bit 2 is pause_autoneg.
diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h
index afb571323419..7de1913840a1 100644
--- a/sys/dev/cxgbe/adapter.h
+++ b/sys/dev/cxgbe/adapter.h
@@ -433,7 +433,7 @@ struct sge_iq {
int8_t intr_pktc_idx; /* packet count threshold index */
uint8_t gen; /* generation bit */
uint8_t intr_params; /* interrupt holdoff parameters */
- int8_t cong; /* congestion settings */
+ int8_t cong_drop; /* congestion drop settings for the queue */
uint16_t qsize; /* size (# of entries) of the queue */
uint16_t sidx; /* index of the entry with the status page */
uint16_t cidx; /* consumer index */
@@ -1403,7 +1403,7 @@ struct mbuf *alloc_wr_mbuf(int, int);
int parse_pkt(struct mbuf **, bool);
void *start_wrq_wr(struct sge_wrq *, int, struct wrq_cookie *);
void commit_wrq_wr(struct sge_wrq *, void *, struct wrq_cookie *);
-int tnl_cong(struct port_info *, int);
+int t4_sge_set_conm_context(struct adapter *, int, int, int);
void t4_register_an_handler(an_handler_t);
void t4_register_fw_msg_handler(int, fw_msg_handler_t);
void t4_register_cpl_handler(int, cpl_handler_t);
diff --git a/sys/dev/cxgbe/t4_netmap.c b/sys/dev/cxgbe/t4_netmap.c
index 1ac24e75e733..06c9c98136f5 100644
--- a/sys/dev/cxgbe/t4_netmap.c
+++ b/sys/dev/cxgbe/t4_netmap.c
@@ -276,14 +276,17 @@ free_nm_txq(struct vi_info *vi, struct sge_nm_txq *nm_txq)
}
static int
-alloc_nm_rxq_hwq(struct vi_info *vi, struct sge_nm_rxq *nm_rxq, int cong)
+alloc_nm_rxq_hwq(struct vi_info *vi, struct sge_nm_rxq *nm_rxq)
{
- int rc, cntxt_id, i;
+ int rc, cntxt_id;
__be32 v;
struct adapter *sc = vi->adapter;
+ struct port_info *pi = vi->pi;
struct sge_params *sp = &sc->params.sge;
struct netmap_adapter *na = NA(vi->ifp);
struct fw_iq_cmd c;
+ const int cong_drop = nm_cong_drop;
+ const int cong_map = pi->rx_e_chan_map;
MPASS(na != NULL);
MPASS(nm_rxq->iq_desc != NULL);
@@ -313,15 +316,15 @@ alloc_nm_rxq_hwq(struct vi_info *vi, struct sge_nm_rxq *nm_rxq, int cong)
V_FW_IQ_CMD_TYPE(FW_IQ_TYPE_FL_INT_CAP) |
V_FW_IQ_CMD_VIID(vi->viid) |
V_FW_IQ_CMD_IQANUD(X_UPDATEDELIVERY_INTERRUPT));
- c.iqdroprss_to_iqesize = htobe16(V_FW_IQ_CMD_IQPCIECH(vi->pi->tx_chan) |
+ c.iqdroprss_to_iqesize = htobe16(V_FW_IQ_CMD_IQPCIECH(pi->tx_chan) |
F_FW_IQ_CMD_IQGTSMODE |
V_FW_IQ_CMD_IQINTCNTTHRESH(0) |
V_FW_IQ_CMD_IQESIZE(ilog2(IQ_ESIZE) - 4));
c.iqsize = htobe16(vi->qsize_rxq);
c.iqaddr = htobe64(nm_rxq->iq_ba);
- if (cong >= 0) {
+ if (cong_drop != -1) {
c.iqns_to_fl0congen = htobe32(F_FW_IQ_CMD_IQFLINTCONGEN |
- V_FW_IQ_CMD_FL0CNGCHMAP(cong) | F_FW_IQ_CMD_FL0CONGCIF |
+ V_FW_IQ_CMD_FL0CNGCHMAP(cong_map) | F_FW_IQ_CMD_FL0CONGCIF |
F_FW_IQ_CMD_FL0CONGEN);
}
c.iqns_to_fl0congen |=
@@ -373,29 +376,9 @@ alloc_nm_rxq_hwq(struct vi_info *vi, struct sge_nm_rxq *nm_rxq, int cong)
nm_rxq->fl_db_val = V_QID(nm_rxq->fl_cntxt_id) |
sc->chip_params->sge_fl_db;
- if (chip_id(sc) >= CHELSIO_T5 && cong >= 0) {
- uint32_t param, val;
-
- param = V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_DMAQ) |
- V_FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DMAQ_CONM_CTXT) |
- V_FW_PARAMS_PARAM_YZ(nm_rxq->iq_cntxt_id);
- if (cong == 0)
- val = 1 << 19;
- else {
- val = 2 << 19;
- for (i = 0; i < 4; i++) {
- if (cong & (1 << i))
- val |= 1 << (i << 2);
- }
- }
-
- rc = -t4_set_params(sc, sc->mbox, sc->pf, 0, 1, ¶m, &val);
- if (rc != 0) {
- /* report error but carry on */
- device_printf(sc->dev,
- "failed to set congestion manager context for "
- "ingress queue %d: %d\n", nm_rxq->iq_cntxt_id, rc);
- }
+ if (chip_id(sc) >= CHELSIO_T5 && cong_drop != -1) {
+ t4_sge_set_conm_context(sc, nm_rxq->iq_cntxt_id, cong_drop,
+ cong_map);
}
t4_write_reg(sc, sc->sge_gts_reg,
@@ -749,7 +732,7 @@ cxgbe_netmap_on(struct adapter *sc, struct vi_info *vi, struct ifnet *ifp,
if (!nm_kring_pending_on(kring))
continue;
- alloc_nm_rxq_hwq(vi, nm_rxq, tnl_cong(vi->pi, nm_cong_drop));
+ alloc_nm_rxq_hwq(vi, nm_rxq);
nm_rxq->fl_hwidx = hwidx;
slot = netmap_reset(na, NR_RX, i, 0);
MPASS(slot != NULL); /* XXXNM: error check, not assert */
diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c
index e485ca8736a7..8d83567c2725 100644
--- a/sys/dev/cxgbe/t4_sge.c
+++ b/sys/dev/cxgbe/t4_sge.c
@@ -123,10 +123,11 @@ SYSCTL_INT(_hw_cxgbe, OID_AUTO, spg_len, CTLFLAG_RDTUN, &spg_len, 0,
* -1: no congestion feedback (not recommended).
* 0: backpressure the channel instead of dropping packets right away.
* 1: no backpressure, drop packets for the congested queue immediately.
+ * 2: both backpressure and drop.
*/
static int cong_drop = 0;
SYSCTL_INT(_hw_cxgbe, OID_AUTO, cong_drop, CTLFLAG_RDTUN, &cong_drop, 0,
- "Congestion control for RX queues (0 = backpressure, 1 = drop");
+ "Congestion control for NIC RX queues (0 = backpressure, 1 = drop, 2 = both");
/*
* Deliver multiple frames in the same free list buffer if they fit.
@@ -553,7 +554,7 @@ t4_sge_modload(void)
spg_len = len;
}
- if (cong_drop < -1 || cong_drop > 1) {
+ if (cong_drop < -1 || cong_drop > 2) {
printf("Invalid hw.cxgbe.cong_drop value (%d),"
" using 0 instead.\n", cong_drop);
cong_drop = 0;
@@ -3412,7 +3413,7 @@ init_iq(struct sge_iq *iq, struct adapter *sc, int tmr_idx, int pktc_idx,
iq->qsize = roundup2(qsize, 16); /* See FW_IQ_CMD/iqsize */
iq->sidx = iq->qsize - sc->params.sge.spg_len / IQ_ESIZE;
iq->intr_idx = intr_idx;
- iq->cong = cong;
+ iq->cong_drop = cong;
}
static inline void
@@ -3578,9 +3579,10 @@ free_iq_fl(struct adapter *sc, struct sge_iq *iq, struct sge_fl *fl)
static int
alloc_iq_fl_hwq(struct vi_info *vi, struct sge_iq *iq, struct sge_fl *fl)
{
- int rc, i, cntxt_id;
+ int rc, cntxt_id, cong_map;
struct fw_iq_cmd c;
struct adapter *sc = vi->adapter;
+ struct port_info *pi = vi->pi;
__be32 v = 0;
MPASS (!(iq->flags & IQ_HW_ALLOCATED));
@@ -3612,15 +3614,17 @@ alloc_iq_fl_hwq(struct vi_info *vi, struct sge_iq *iq, struct sge_fl *fl)
V_FW_IQ_CMD_TYPE(FW_IQ_TYPE_FL_INT_CAP) |
V_FW_IQ_CMD_VIID(vi->viid) |
V_FW_IQ_CMD_IQANUD(X_UPDATEDELIVERY_INTERRUPT));
- c.iqdroprss_to_iqesize = htobe16(V_FW_IQ_CMD_IQPCIECH(vi->pi->tx_chan) |
+ c.iqdroprss_to_iqesize = htobe16(V_FW_IQ_CMD_IQPCIECH(pi->tx_chan) |
F_FW_IQ_CMD_IQGTSMODE |
V_FW_IQ_CMD_IQINTCNTTHRESH(iq->intr_pktc_idx) |
V_FW_IQ_CMD_IQESIZE(ilog2(IQ_ESIZE) - 4));
c.iqsize = htobe16(iq->qsize);
c.iqaddr = htobe64(iq->ba);
c.iqns_to_fl0congen = htobe32(V_FW_IQ_CMD_IQTYPE(iq->qtype));
- if (iq->cong >= 0)
+ if (iq->cong_drop != -1) {
+ cong_map = iq->qtype == IQ_ETH ? pi->rx_e_chan_map : 0;
c.iqns_to_fl0congen |= htobe32(F_FW_IQ_CMD_IQFLINTCONGEN);
+ }
if (fl) {
bzero(fl->desc, fl->sidx * EQ_ESIZE + sc->params.sge.spg_len);
@@ -3630,9 +3634,9 @@ alloc_iq_fl_hwq(struct vi_info *vi, struct sge_iq *iq, struct sge_fl *fl)
(fl_pad ? F_FW_IQ_CMD_FL0PADEN : 0) |
(fl->flags & FL_BUF_PACKING ? F_FW_IQ_CMD_FL0PACKEN :
0));
- if (iq->cong >= 0) {
+ if (iq->cong_drop != -1) {
c.iqns_to_fl0congen |=
- htobe32(V_FW_IQ_CMD_FL0CNGCHMAP(iq->cong) |
+ htobe32(V_FW_IQ_CMD_FL0CNGCHMAP(cong_map) |
F_FW_IQ_CMD_FL0CONGCIF |
F_FW_IQ_CMD_FL0CONGEN);
}
@@ -3666,6 +3670,8 @@ alloc_iq_fl_hwq(struct vi_info *vi, struct sge_iq *iq, struct sge_fl *fl)
if (fl) {
u_int qid;
#ifdef INVARIANTS
+ int i;
+
MPASS(!(fl->flags & FL_BUF_RESUME));
for (i = 0; i < fl->sidx * 8; i++)
MPASS(fl->sdesc[i].cl == NULL);
@@ -3705,28 +3711,10 @@ alloc_iq_fl_hwq(struct vi_info *vi, struct sge_iq *iq, struct sge_fl *fl)
FL_UNLOCK(fl);
}
- if (chip_id(sc) >= CHELSIO_T5 && !(sc->flags & IS_VF) && iq->cong >= 0) {
- uint32_t param, val;
-
- param = V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_DMAQ) |
- V_FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DMAQ_CONM_CTXT) |
- V_FW_PARAMS_PARAM_YZ(iq->cntxt_id);
- if (iq->cong == 0)
- val = 1 << 19;
- else {
- val = 2 << 19;
- for (i = 0; i < 4; i++) {
- if (iq->cong & (1 << i))
- val |= 1 << (i << 2);
- }
- }
-
- rc = -t4_set_params(sc, sc->mbox, sc->pf, 0, 1, ¶m, &val);
- if (rc != 0) {
- /* report error but carry on */
- CH_ERR(sc, "failed to set congestion manager context "
- "for ingress queue %d: %d\n", iq->cntxt_id, rc);
- }
+ if (chip_id(sc) >= CHELSIO_T5 && !(sc->flags & IS_VF) &&
+ iq->cong_drop != -1) {
+ t4_sge_set_conm_context(sc, iq->cntxt_id, iq->cong_drop,
+ cong_map);
}
/* Enable IQ interrupts */
@@ -3950,15 +3938,57 @@ free_ctrlq(struct adapter *sc, int idx)
}
int
-tnl_cong(struct port_info *pi, int drop)
+t4_sge_set_conm_context(struct adapter *sc, int cntxt_id, int cong_drop,
+ int cong_map)
{
+ const int cng_ch_bits_log = sc->chip_params->cng_ch_bits_log;
+ uint32_t param, val;
+ uint16_t ch_map;
+ int cong_mode, rc, i;
- if (drop == -1)
- return (-1);
- else if (drop == 1)
- return (0);
- else
- return (pi->rx_e_chan_map);
+ if (chip_id(sc) < CHELSIO_T5)
+ return (ENOTSUP);
+
+ /* Convert the driver knob to the mode understood by the firmware. */
+ switch (cong_drop) {
+ case -1:
+ cong_mode = X_CONMCTXT_CNGTPMODE_DISABLE;
+ break;
+ case 0:
+ cong_mode = X_CONMCTXT_CNGTPMODE_CHANNEL;
+ break;
+ case 1:
+ cong_mode = X_CONMCTXT_CNGTPMODE_QUEUE;
+ break;
+ case 2:
+ cong_mode = X_CONMCTXT_CNGTPMODE_BOTH;
+ break;
+ default:
+ MPASS(0);
+ CH_ERR(sc, "cong_drop = %d is invalid (ingress queue %d).\n",
+ cong_drop, cntxt_id);
+ return (EINVAL);
+ }
+
+ param = V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_DMAQ) |
+ V_FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DMAQ_CONM_CTXT) |
+ V_FW_PARAMS_PARAM_YZ(cntxt_id);
+ val = V_CONMCTXT_CNGTPMODE(cong_mode);
+ if (cong_mode == X_CONMCTXT_CNGTPMODE_CHANNEL ||
+ cong_mode == X_CONMCTXT_CNGTPMODE_BOTH) {
+ for (i = 0, ch_map = 0; i < 4; i++) {
+ if (cong_map & (1 << i))
+ ch_map |= 1 << (i << cng_ch_bits_log);
+ }
+ val |= V_CONMCTXT_CNGCHMAP(ch_map);
+ }
+ rc = -t4_set_params(sc, sc->mbox, sc->pf, 0, 1, ¶m, &val);
+ if (rc != 0) {
+ CH_ERR(sc, "failed to set congestion manager context "
+ "for ingress queue %d: %d\n", cntxt_id, rc);
+ }
+
+ return (rc);
}
/*
@@ -3990,7 +4020,7 @@ alloc_rxq(struct vi_info *vi, struct sge_rxq *rxq, int idx, int intr_idx,
"rx queue");
init_iq(&rxq->iq, sc, vi->tmr_idx, vi->pktc_idx, vi->qsize_rxq,
- intr_idx, tnl_cong(vi->pi, cong_drop), IQ_ETH);
+ intr_idx, cong_drop, IQ_ETH);
#if defined(INET) || defined(INET6)
if (ifp->if_capenable & IFCAP_LRO)
rxq->iq.flags |= IQ_LRO_ENABLED;
From nobody Thu Feb 2 07:39:40 2023
X-Original-To: dev-commits-src-branches@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 4P6rK8385bz3c9C5;
Thu, 2 Feb 2023 07:39:40 +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 4P6rK82Y52z3Ccy;
Thu, 2 Feb 2023 07:39:40 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323580;
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=KRrW0bg/dLh00rbwlltY9sVuofY2xzsDXTfHcl9/VTc=;
b=qrdPhgSBbzQvgpxuqbQOLPXFNE/VKdsFh87WBdsdjnSVJGLVxHCIwnnpgW2dZUXn65Ps1P
l0EICjPx6e2gD20+Y/fogYMr17PycUTeaXE59vJQjoKWloJ0wAs4KdJ1CCOpGl+oEmfLyQ
z16L22obrbSjZnRLy9VrfxFIHKRIPJWlSqh9e9vZbpVifR+3IFU6arU708du2hOpyUlNN0
kqNRr0Pqw0bLDXaZ9gv801njKvf6ZZ1tsrpInG9SNfeUQipiYB/ywHYjE2Xlt2iFyR0Jp5
UZ9DWhwBBijKBFr608bFDkI+JRaBsuamRrW2SgxJ3dSU5++5VKtYGGCGtJXonQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323580;
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=KRrW0bg/dLh00rbwlltY9sVuofY2xzsDXTfHcl9/VTc=;
b=C7VSAlABM+PmLuRVhsUvsUvI7tBamkMqe24AsjOD7jaUnt2kGmVJPBkm/aWUtddafti5Cy
D7PkvHnU/a304AiT1BEJrWIgs3ToXR1979/kJMBo6NctW126eAsgm9RfXx4ofPHPRh5cba
7Svn2EUcS8+2fLuFh27VteqquIlgrErZJAuaxZLyk9GJhB9a+A9tiGCZZ6nR9ezt5DIC6/
93bglyAowajEYa5OfeCCN+6L4JYI3tT9gaz/vp0+umUmkP7yRM1g/hwxdFAi533bRYEqWA
Hb0MovEsQDGSclWU2TTLwOcn6+KRXtgNkthSW+Rxv2imMR1BEIDjLwslJwswWQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323580; a=rsa-sha256; cv=none;
b=iYQ36LVBsM0ajxVpGsopprqQ1XOZcbIbPgiEs35Q9EF3HZmagU5aaqErzXYHH/4DuW/sAM
6VCeHh1qhHT804ZPGCt/SwGRVBboY3XJ8pJjn2fKPDk1z6pPydHpdNop0RU0fHxJ0AqMAm
Nsl2mKfi3hS88Z5MFsQGCimN2i6TDh6AxicO9xwG6XZaRlEAwzkVPQEgbU0MiL6BAO4X49
amR3Rg6xGLBAJmT08aKgkuG1gc9zbxvRES7Z6/DcCkhWqpbKZXdV7IMeFj3diYlghstmQT
gX4RNcu7Ok3A84vbwMmiC9qz4RtIcGmHt+aOAvCqbEn/HFTyurQSUYVVogGNIw==
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 4P6rK81XKlzlws;
Thu, 2 Feb 2023 07:39:40 +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 3127deZg062213;
Thu, 2 Feb 2023 07:39:40 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127delC062212;
Thu, 2 Feb 2023 07:39:40 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:40 GMT
Message-Id: <202302020739.3127delC062212@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: 1b3027b10541 - stable/13 - cxgbe(4): Add knob to control congestion behavior for TOE queues.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 1b3027b1054106c863a34f7f78f4de3063a3b728
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=1b3027b1054106c863a34f7f78f4de3063a3b728
commit 1b3027b1054106c863a34f7f78f4de3063a3b728
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-09-09 22:21:18 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:20:10 +0000
cxgbe(4): Add knob to control congestion behavior for TOE queues.
hw.cxgbe.ofld_cong_drop works just like hw.cxgbe.cong_drop but for TOE
rx queues.
Sponsored by: Chelsio Communications
(cherry picked from commit 998eb37aca6670b1ecbb7b5cad2b5b2d85d744b8)
---
sys/dev/cxgbe/t4_sge.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c
index 8d83567c2725..4a11c6c89573 100644
--- a/sys/dev/cxgbe/t4_sge.c
+++ b/sys/dev/cxgbe/t4_sge.c
@@ -128,6 +128,11 @@ SYSCTL_INT(_hw_cxgbe, OID_AUTO, spg_len, CTLFLAG_RDTUN, &spg_len, 0,
static int cong_drop = 0;
SYSCTL_INT(_hw_cxgbe, OID_AUTO, cong_drop, CTLFLAG_RDTUN, &cong_drop, 0,
"Congestion control for NIC RX queues (0 = backpressure, 1 = drop, 2 = both");
+#ifdef TCP_OFFLOAD
+static int ofld_cong_drop = 0;
+SYSCTL_INT(_hw_cxgbe, OID_AUTO, ofld_cong_drop, CTLFLAG_RDTUN, &ofld_cong_drop, 0,
+ "Congestion control for TOE RX queues (0 = backpressure, 1 = drop, 2 = both");
+#endif
/*
* Deliver multiple frames in the same free list buffer if they fit.
@@ -559,6 +564,13 @@ t4_sge_modload(void)
" using 0 instead.\n", cong_drop);
cong_drop = 0;
}
+#ifdef TCP_OFFLOAD
+ if (ofld_cong_drop < -1 || ofld_cong_drop > 2) {
+ printf("Invalid hw.cxgbe.ofld_cong_drop value (%d),"
+ " using 0 instead.\n", ofld_cong_drop);
+ ofld_cong_drop = 0;
+ }
+#endif
if (tscale != 1 && (tscale < 3 || tscale > 17)) {
printf("Invalid hw.cxgbe.tscale value (%d),"
@@ -1011,6 +1023,10 @@ t4_sge_sysctls(struct adapter *sc, struct sysctl_ctx_list *ctx,
SYSCTL_ADD_INT(ctx, children, OID_AUTO, "cong_drop", CTLFLAG_RD,
NULL, cong_drop, "congestion drop setting");
+#ifdef TCP_OFFLOAD
+ SYSCTL_ADD_INT(ctx, children, OID_AUTO, "ofld_cong_drop", CTLFLAG_RD,
+ NULL, ofld_cong_drop, "congestion drop setting");
+#endif
SYSCTL_ADD_INT(ctx, children, OID_AUTO, "fl_pack", CTLFLAG_RD,
NULL, sp->pack_boundary, "payload pack boundary (bytes)");
@@ -4143,7 +4159,7 @@ alloc_ofld_rxq(struct vi_info *vi, struct sge_ofld_rxq *ofld_rxq, int idx,
CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "offload rx queue");
init_iq(&ofld_rxq->iq, sc, vi->ofld_tmr_idx, vi->ofld_pktc_idx,
- vi->qsize_rxq, intr_idx, 0, IQ_OFLD);
+ vi->qsize_rxq, intr_idx, ofld_cong_drop, IQ_OFLD);
snprintf(name, sizeof(name), "%s ofld_rxq%d-fl",
device_get_nameunit(vi->dev), idx);
init_fl(sc, &ofld_rxq->fl, vi->qsize_rxq / 8, maxp, name);
From nobody Thu Feb 2 07:39:41 2023
X-Original-To: dev-commits-src-branches@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 4P6rK93tLSz3c94m;
Thu, 2 Feb 2023 07:39:41 +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 4P6rK93BLPz3CZy;
Thu, 2 Feb 2023 07:39:41 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323581;
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=GR7wFQ7NQ5lsJz/crjd1M++4WSOFNg8fXr9gja3IxpU=;
b=oncPkrQfCj0E/DqrPVAfwDstafWj8frlqUD6f+Rw2bWaF+HtDgB9Zq+FELfDpJ6LHMQU2f
2QskDjZkZ5Up2pYO0J4Hg0h1OKeSg23hsz1t+iEK+k1hfv3Gra42BVhpsx57rb1rcDn3RT
1ACCfVcGOmW5YJ7NnvlyHJ0PHPL23dTrhMY5EcYwMGSl88Mn9oqNIjiuWb8aRDdce1RLo7
lglOkD6HLWPdBhtyEA8/lkvBg6+cqZtfjUEt2tm4+5tpgY7vpD8phN6ZlLNO2UtdDoqFkY
kQUk8NqD6e0+QS/Axfc6XUqQKfgi0cKkywRmRNFjg727EKWwX0GY+WhHS5LCNg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323581;
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=GR7wFQ7NQ5lsJz/crjd1M++4WSOFNg8fXr9gja3IxpU=;
b=ahEAJpkqYZIoWlRePLnPmnyEIAoKRldIB8Plc9Gmk3TuaueOdreurgRPzGrt0t4HDqXPvW
t8EjCWiA/8eooYtHuju0GD+NNcmiWdm/52cBNJB2OD8q97sZ4BA+uOqMFftc322q2RGvE2
XBn8cT+Y0e/yWAQulKePfY6yHg7uKRc1hvTv4CrhqVR0zj9u8mPueau0AGdrjlZHyIhi74
5Kp1LLUlwjhCKbCi+VuvL2FN4XbpvBB6cMGchIGu0LipY5K05nPT1fsagtePfalXnxWov8
VfdDpAqmLBzuQnbXjljvQ6ZFAYZT/WBKwW3m+J9Es6WTNFA2dXSJU+8+0mRJcQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323581; a=rsa-sha256; cv=none;
b=jan7UhD6ZKFBZzFzJeefKsoDbcPZV3cVLFlXxU3Jwz3Qn5KH3hRUlO8+AALD8iYrnkTxqq
/rpCyhm6joGhB4UqPPbtk+Yyqi06aaG+XqrWeWkqUYNY6M8OEEQjHuPBstofsUpIRktMfy
VMun8StDjF29HovIvvPmeJ3Gb/MvFMiLg/st/KW5aHoZeftGDQnZ/AKPf0KXpsykeOs2f8
oJewK27lDn533qYVjuTRXGEJl+0NzOsz/EPv2rC+KUpifSYQMrOUz9f27DTVfwOW8IC8BF
QoH3iG6mzg3r5SEnFynbnyIH5ichgPXgj/Rzrycl4ytYpBesu91FYmZmaZvtcA==
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 4P6rK92DbkzmXp;
Thu, 2 Feb 2023 07:39:41 +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 3127dfl7062238;
Thu, 2 Feb 2023 07:39:41 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127df13062237;
Thu, 2 Feb 2023 07:39:41 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:41 GMT
Message-Id: <202302020739.3127df13062237@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: beb8eaf79368 - stable/13 - cxgbe/tom: Fix assertions in the code that maintains TCB history.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: beb8eaf7936877fdabbd02ef28d42543860bf96f
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=beb8eaf7936877fdabbd02ef28d42543860bf96f
commit beb8eaf7936877fdabbd02ef28d42543860bf96f
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-09-29 02:56:14 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:20:15 +0000
cxgbe/tom: Fix assertions in the code that maintains TCB history.
The tids used for TOE connections start from tid_base, not 0.
Sponsored by: Chelsio Communications
(cherry picked from commit 8d2c13931b7e4897ca5d73af57f4cf35e440ec54)
---
sys/dev/cxgbe/tom/t4_tom.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c
index 8888265dd32a..25a63b992287 100644
--- a/sys/dev/cxgbe/tom/t4_tom.c
+++ b/sys/dev/cxgbe/tom/t4_tom.c
@@ -478,7 +478,8 @@ send_get_tcb(struct adapter *sc, u_int tid)
struct cpl_get_tcb *cpl;
struct wrq_cookie cookie;
- MPASS(tid < sc->tids.ntids);
+ MPASS(tid >= sc->tids.tid_base);
+ MPASS(tid - sc->tids.tid_base < sc->tids.ntids);
cpl = start_wrq_wr(&sc->sge.ctrlq[0], howmany(sizeof(*cpl), 16),
&cookie);
@@ -531,7 +532,8 @@ add_tid_to_history(struct adapter *sc, u_int tid)
struct tom_data *td = sc->tom_softc;
int rc;
- MPASS(tid < sc->tids.ntids);
+ MPASS(tid >= sc->tids.tid_base);
+ MPASS(tid - sc->tids.tid_base < sc->tids.ntids);
if (td->tcb_history == NULL)
return (ENXIO);
@@ -581,7 +583,8 @@ lookup_tcb_histent(struct adapter *sc, u_int tid, bool addrem)
struct tcb_histent *te;
struct tom_data *td = sc->tom_softc;
- MPASS(tid < sc->tids.ntids);
+ MPASS(tid >= sc->tids.tid_base);
+ MPASS(tid - sc->tids.tid_base < sc->tids.ntids);
if (td->tcb_history == NULL)
return (NULL);
@@ -773,7 +776,8 @@ read_tcb_using_memwin(struct adapter *sc, u_int tid, uint64_t *buf)
uint32_t addr;
u_char *tcb, tmp;
- MPASS(tid < sc->tids.ntids);
+ MPASS(tid >= sc->tids.tid_base);
+ MPASS(tid - sc->tids.tid_base < sc->tids.ntids);
addr = t4_read_reg(sc, A_TP_CMM_TCB_BASE) + tid * TCB_SIZE;
rc = read_via_memwin(sc, 2, addr, (uint32_t *)buf, TCB_SIZE);
From nobody Thu Feb 2 07:39:42 2023
X-Original-To: dev-commits-src-branches@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 4P6rKB51bvz3c8yX;
Thu, 2 Feb 2023 07:39:42 +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 4P6rKB3rMCz3Cr6;
Thu, 2 Feb 2023 07:39:42 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323582;
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=sSIhZf8vA0Gzv/llKUVifPjd04rRxOzd8wl96Lz5kBM=;
b=f/JTdvzfR26cNFN+XCQ+DUmWGYj3X+XccawHFQImosX3dd+oVEHBjSwgcNLrFI7wtTbfel
GZPAuAkADukQ5e2Lw95o/+RK0nLp665QV4uMksB1KJWVIZpQjvq5m91NM4/atlxoZxFRxO
Tnoh9oYV80bVEDVT8RMRDb6vCIRKmCHyOE4v6DCzxlJPrPtIprx5sE3BBsknxqy64Bliq7
2RzjM5HTtbOk7nkE3yAvY223mGEkWBDq/Qp+AeyP0ejf7++bnk/cu9ZAcRxS0cm1iBNv2U
Mje3SAHaqBU3gtp3LBa89WIH1eOrSazocY/atYBlp1ro+IYJeOdA7STfWPalsQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323582;
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=sSIhZf8vA0Gzv/llKUVifPjd04rRxOzd8wl96Lz5kBM=;
b=n+csz0cKq4x4B3bnpoUcmIZKw40/Acx3jvkIlAc0Ro7f9D7EdxhUDVlR5s1PeZwRITPnKk
N7ikNGN8sVU+hr27o6Rrwlq8am6MMxYTbHAT6pl7yAYQQlXNsw7vYO++v+6+poOEaNk3Yk
N3kKLHxERf57KOMCllLRAezPEYG8i1H8L5u3j5A+Y6/d0X/clAJoqAdkvEdzP/ikh4TA1w
CAS+94LmeFQsdqqDO+RVjNVHpIRMh1eEjmtfTiN9eunqqnxR9SPnahowPCQvJjZnuOQxsE
dLsGQ1qWzv7MVuZKcGYbvkmLJhETWYkJWkb/CcvTzR0OzmBmvubnNhkhhtaL6Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323582; a=rsa-sha256; cv=none;
b=sCDMz7e2FSuunx+Q64IFcsiHbNy6C4dQO1juGmKXCwn0BptV/g5e7t2tVEG/EiY2HLUoda
5W8Nvw1UYGhsjyyaR9kt/cWDJSaHYxfbpaxUobDu/InBv/ld/ENtbUbDDDdOgHGvTNqubn
BNOQNc/IQziubACf9Dskxxae6sK84xFJL6yitYtZdq8rKqyiO4ErSvRpqLOFa6aAAKBULK
mnw4bZrUPiJVivrAadRyQW2n6tLBMZ+SgiA468vNFw9u/AsCa6lQhRJSZgrvlK+CfVKKAe
tQj8u47ZaaEqoesmjoCYb3YOQl6fpuAdFlhsRzNG4aiyv3QaCCUqW2D/rIIi1w==
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 4P6rKB2xRTzmDp;
Thu, 2 Feb 2023 07:39:42 +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 3127dgq2062262;
Thu, 2 Feb 2023 07:39:42 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dgUf062261;
Thu, 2 Feb 2023 07:39:42 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:42 GMT
Message-Id: <202302020739.3127dgUf062261@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: 0d15ab14a4f4 - stable/13 - cxgbe/cxgbei: Do not validate the hardware iSCSI tag mask.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 0d15ab14a4f48044eb91b356ae7c863228790702
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=0d15ab14a4f48044eb91b356ae7c863228790702
commit 0d15ab14a4f48044eb91b356ae7c863228790702
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-10-05 18:05:12 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:20:15 +0000
cxgbe/cxgbei: Do not validate the hardware iSCSI tag mask.
This was added in 7cba15b16eb2 in 2016 and firmwares at that time were
already setting up the iSCSI tag mask properly. Since then it has also
become possible to split the iSCSI region between multiple PCIE PFs but
the driver's calculation takes only its own PF's allocation into account
and that means this code is incorrect and not just a harmless no-op.
Sponsored by: Chelsio Communications
(cherry picked from commit 661faa1f77c0fa9d28d60d71087820aaaaee8b1b)
---
sys/dev/cxgbe/cxgbei/cxgbei.c | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/sys/dev/cxgbe/cxgbei/cxgbei.c b/sys/dev/cxgbe/cxgbei/cxgbei.c
index ad66247775e1..b6dc5d5c3577 100644
--- a/sys/dev/cxgbe/cxgbei/cxgbei.c
+++ b/sys/dev/cxgbe/cxgbei/cxgbei.c
@@ -167,21 +167,6 @@ cxgbei_init(struct adapter *sc, struct cxgbei_data *ci)
return (rc);
}
- r = t4_read_reg(sc, A_ULP_RX_ISCSI_TAGMASK);
- r &= V_ISCSITAGMASK(M_ISCSITAGMASK);
- if (r != pr->pr_tag_mask) {
- /*
- * Recent firmwares are supposed to set up the iSCSI tagmask
- * but we'll do it ourselves it the computed value doesn't match
- * what's in the register.
- */
- device_printf(sc->dev,
- "tagmask 0x%08x does not match computed mask 0x%08x.\n", r,
- pr->pr_tag_mask);
- t4_set_reg_field(sc, A_ULP_RX_ISCSI_TAGMASK,
- V_ISCSITAGMASK(M_ISCSITAGMASK), pr->pr_tag_mask);
- }
-
read_pdu_limits(sc, &ci->max_tx_data_len, &ci->max_rx_data_len, pr);
sysctl_ctx_init(&ci->ctx);
From nobody Thu Feb 2 07:39:43 2023
X-Original-To: dev-commits-src-branches@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 4P6rKC5BHVz3c8yh;
Thu, 2 Feb 2023 07:39:43 +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 4P6rKC4kJPz3Ch7;
Thu, 2 Feb 2023 07:39:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323583;
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=JzcdD7JjGAVtRXjmUqzR3LsfKhWgWiB5QMEimYbYNTQ=;
b=kQco+DE1XrkGvZBtZVvxfpMfzdNclOqJyMu/4uru/BxH2fWf3pBRpVAIVjVPf5JN+QbOjv
FG8YhLiULRJJXUYQA/2r/hq3V/hfCMNIvjvu/j9JXUj6ROZJ06VcbDl8gkRXoUY6EaWSYW
EQeA9gG+scpShIOkPqAfr5VU0uHJmGUyG2jmNz6yt4Uaxc0bDu183qyjg6jnEZ65hKYtt3
mRhNnXX8Vkt+XxKIVtbGzteFEc4KSsVf6EQmaeOAutbftEp+KDfLndllFNYvR9DOAoZNSx
sc8B+ZzVMs5IuUBd5s3sGjLwJlXUJHq4z/JqvClGeEC4c3Bo9wohIzOP20q2Kw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323583;
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=JzcdD7JjGAVtRXjmUqzR3LsfKhWgWiB5QMEimYbYNTQ=;
b=tRblBcsTmOz5MxmGHBdUgdpn9wsF2pBXPmIzMZLwVArGxF7wvpnzMsJT5cNPXS72S4Risr
gyoK77btmvJ26b3VIFUH35IPRbj0VPqo0v/ZEiLY691XvJNXneBfcgD6CIdAGnGlMQaLA7
yf0kGVD90clgwpxa47Rn+cr9DkxegIjo6lJRtr8itNQr6RZ5bEekj0F9VATOFj6YCqfOnL
W/LqQj4Tw7s4QzvcjuyMJV0qPfg0MOvV18eTnQLRifP0NUH6YaF1rJ/kzcGKbflBn8aeWx
EwB0k4ZsugxgrwE0vqUHdVBCzYquasqv6lo+rYZBoJRoBBzP52xF/x6mgmPJoA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323583; a=rsa-sha256; cv=none;
b=OkRAq28sEYXx13up5weGRC629b14nJOS5+sl/71Uof3F9IuL9RMAdOgKbzqaRqv59k6Yme
SB7mXYTkB0coOaaz+5cNQ38ayP/1PHO6D+yPoDwzyfcoY6LjFbVGEEgw3DdM8ZPt2zDWko
CxfRF1+0Q824IOBSQKI5GmjhrG7FNGH+SZl15CCJfFZHo77DiNVwhQXvvz1QbtXq+GYRnK
+9CyquJ40JdyMGyJ3HXF3xLxQjMlN3gr8UAhJ1pMRxtF2/g5m5yAE0IoUKpbbBat5Jgltm
bEGQxlQQcuvhvwilIxcTHNhXzQtjFKYwEFXmuh1ftfBBkGLOdn6eV6BuOMsH/Q==
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 4P6rKC3fGGzm4y;
Thu, 2 Feb 2023 07:39:43 +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 3127dhkv062292;
Thu, 2 Feb 2023 07:39:43 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dhA9062291;
Thu, 2 Feb 2023 07:39:43 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:43 GMT
Message-Id: <202302020739.3127dhA9062291@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: 0d7de5477378 - stable/13 - pcireg.h: Add values for ACS PCIe Extended capability.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 0d7de547737899aaa956706551e2d89238de67d6
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=0d7de547737899aaa956706551e2d89238de67d6
commit 0d7de547737899aaa956706551e2d89238de67d6
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-11-04 19:22:11 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:21:35 +0000
pcireg.h: Add values for ACS PCIe Extended capability.
These values come from section 7.7.11 ("ACS Extended Capability") of the
PCI Express Base Specification Revision 6.0, dated 16 Dec 2021.
Sponsored by: Chelsio Communications
Reviewed by: kib@
Differential Revision: https://reviews.freebsd.org/D37270
(cherry picked from commit b2700160cc4f5ff7d64926ea55a214b5ac970cf5)
---
sys/dev/pci/pcireg.h | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h
index d580ef88b60c..31cfc1503a57 100644
--- a/sys/dev/pci/pcireg.h
+++ b/sys/dev/pci/pcireg.h
@@ -1098,3 +1098,28 @@
#define PCIM_OSC_CTL_PCIE_PME 0x04 /* PCIe Native Power Mgt Events */
#define PCIM_OSC_CTL_PCIE_AER 0x08 /* PCIe Advanced Error Reporting */
#define PCIM_OSC_CTL_PCIE_CAP_STRUCT 0x10 /* Various Capability Structures */
+
+/* Access Control Services (ACS) definitions */
+#define PCIR_ACS_CAP 0x4
+#define PCIM_ACS_SOURCE_VALIDATION 0x0001
+#define PCIM_ACS_TRANSLATION_BLOCKING 0x0002
+#define PCIM_ACS_P2P_REQ_REDIRECT 0x0004
+#define PCIM_ACS_P2P_CMP_REDIRECT 0x0008
+#define PCIM_ACS_P2P_UPSTREAM_FORWARDING 0x0010
+#define PCIM_ACS_P2P_EGRESS_CTL 0x0020
+#define PCIM_ACS_P2P_DIRECT_TRANSLATED 0x0040
+#define PCIM_ACS_ENHANCED_CAP 0x0080
+#define PCIM_ACS_EGRESS_CTL_VECTOR_SIZE 0xff00
+#define PCIR_ACS_CTL 0x6
+#define PCIM_ACS_SOURCE_VALIDATION_ENABLE 0x0001
+#define PCIM_ACS_TRANSLATION_BLOCKING_ENABLE 0x0002
+#define PCIM_ACS_P2P_REQ_REDIRECT_ENABLE 0x0004
+#define PCIM_ACS_P2P_CMP_REDIRECT_ENABLE 0x0008
+#define PCIM_ACS_P2P_UPSTREAM_FORWARDING_ENABLE 0x0010
+#define PCIM_ACS_P2P_EGRESS_CTL_ENABLE 0x0020
+#define PCIM_ACS_P2P_DIRECT_TRANSLATED_ENABLE 0x0040
+#define PCIM_ACS_IO_REQ_BLOCKING_ENABLE 0x0080
+#define PCIM_ACS_DSP_MEM_TGT_ACC_CTL 0x0300
+#define PCIM_ACS_USP_MEM_TGT_ACC_CTL 0x0c00
+#define PCIM_ACS_UNCLAIMED_REQ_REDIRECT_CTL 0x1000
+#define PCIR_ACS_EGRESS_CONTROL_VECTOR 0x8
From nobody Thu Feb 2 07:39:44 2023
X-Original-To: dev-commits-src-branches@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 4P6rKD6NnSz3c9CC;
Thu, 2 Feb 2023 07:39:44 +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 4P6rKD5jbRz3CsD;
Thu, 2 Feb 2023 07:39:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675323584;
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=JJ+0XB1tkt36wnor8KpLOJuxm13y/0hRy0moeBuGwqs=;
b=Ad+MyctUcCH/qinkTrD/hcSafQkyNRKOAcBQ1km8osTn80wW0JuutkPwbQoATEZ3dzzwm/
8N/c2Remle1mA7+IOWY8V0tFzJ6UFLOg1rAfva0ikxHlxEhXrI3Mq3fRWYYJnYgsePxerT
O/Ff3SzFVMkZY49RIb74WCkzggY2uBKbPAIg9vMS7wr9tkOrPCe/FLW0v0COHLi1GOEcIs
yNopv4U213wwZMytJJtJBp3utwS46EHcUve1rlV6rQtpz4wWxgGunp5i+ftF4TCW7yCGjn
fMO302pCO5u21qUwUlxYr+glSAzYg0QyJCPdBhUOck64VnBt8uDj5kd+DsMzSQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675323584;
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=JJ+0XB1tkt36wnor8KpLOJuxm13y/0hRy0moeBuGwqs=;
b=ed/tQLhWOpXGC8ABxsTQSgbkvybmSUj1u0+Jj18NldfvzmsowVtTMm7LvzLjukUVkRd9A5
lcT4R+PtKnAVzHFfQLQUghfyjEnGXydfox7cUEEZxMfFOECqa8VrtSBMhxgLH3SbUMcaC9
6vSZPhS/sn1uVNi+0w8HI53691X7spAwBZXRuctJ05K3kN12K8vz90lpdE9tnigqkjlkxs
q78jarxbIzirDiltlg3ZHmAs334xQZ5V04q+UeRMzBZmKGKYI/MBgiQSQihCH7ZSXxTNxA
012ntPDtjMEf/eOpKPNruKPvAuAZubjoDjIAxNIdBTHhF4wn+ZGXx3P7K5qOVQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323584; a=rsa-sha256; cv=none;
b=lYK+fACElb2MUxRiXDR4yZXecq0F3a5CWYoxGqAVB9eEg+BKa3S5ps1ZrCQ/9LJodAqj40
r1pOY6gc4TbKbbrOM09DNSE9MtNMIszs5lqLj/5ghObWYotkiaGtZFHoa30xZ3vwNctmcl
UR0VkoSP1/DuNlGiLd/m6v2KATkd7AlB+vS6yicWQs51UJfJ5hG3mQYXMDWpGZJCdGt1Zr
HqFecDAbicR7fgGAPar+U2qWZIRw8Du/V5naBHEK6zUzPYXiJ+ihkr0mPNamhH/LISp18x
joDNC79hmdCWBijlspf2oCmXCmYEZWy+e+7OGvTt6u05fe2/JExqND7M2i6mPw==
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 4P6rKD4ptkzlwt;
Thu, 2 Feb 2023 07:39:44 +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 3127diYY062321;
Thu, 2 Feb 2023 07:39:44 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127diG3062320;
Thu, 2 Feb 2023 07:39:44 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 07:39:44 GMT
Message-Id: <202302020739.3127diG3062320@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: dde4103a465b - stable/13 - pciconf(8): Decode ACS extended capability.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: np
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: dde4103a465bd8021eafabc159942c60a9473625
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=dde4103a465bd8021eafabc159942c60a9473625
commit dde4103a465bd8021eafabc159942c60a9473625
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2022-11-04 19:30:09 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2023-02-02 07:21:59 +0000
pciconf(8): Decode ACS extended capability.
Sponsored by: Chelsio Communications
Reviewed by: kib@
Differential Revision: https://reviews.freebsd.org/D37271
(cherry picked from commit 118cfb829f355a4545f079f12bab5ea8e41fe214)
---
usr.sbin/pciconf/cap.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
diff --git a/usr.sbin/pciconf/cap.c b/usr.sbin/pciconf/cap.c
index eae53acbd250..3d28fe9bc331 100644
--- a/usr.sbin/pciconf/cap.c
+++ b/usr.sbin/pciconf/cap.c
@@ -1016,6 +1016,64 @@ ecap_sriov(int fd, struct pci_conf *p, uint16_t ptr, uint8_t ver)
print_bar(fd, p, "iov bar ", ptr + PCIR_SRIOV_BAR(i));
}
+static const char *
+check_avail_and_state(u_int cap, u_int capbit, u_int ctl, u_int ctlbit)
+{
+
+ if (cap & capbit)
+ return (ctl & ctlbit ? "enabled" : "disabled");
+ else
+ return "unavailable";
+}
+
+static void
+ecap_acs(int fd, struct pci_conf *p, uint16_t ptr, uint8_t ver)
+{
+ uint16_t acs_cap, acs_ctl;
+ static const char *const acc[] = { "access enabled", "blocking enabled",
+ "redirect enabled", "reserved" };
+
+ printf("ACS %d ", ver);
+ if (ver != 1) {
+ printf("\n");
+ return;
+ }
+
+#define CHECK_AVAIL_STATE(bit) \
+ check_avail_and_state(acs_cap, bit, acs_ctl, bit##_ENABLE)
+
+ acs_cap = read_config(fd, &p->pc_sel, ptr + PCIR_ACS_CAP, 2);
+ acs_ctl = read_config(fd, &p->pc_sel, ptr + PCIR_ACS_CTL, 2);
+ printf("Source Validation %s, Translation Blocking %s\n",
+ CHECK_AVAIL_STATE(PCIM_ACS_SOURCE_VALIDATION),
+ CHECK_AVAIL_STATE(PCIM_ACS_TRANSLATION_BLOCKING));
+
+ printf(" ");
+ printf("P2P Req Redirect %s, P2P Cmpl Redirect %s\n",
+ CHECK_AVAIL_STATE(PCIM_ACS_P2P_REQ_REDIRECT),
+ CHECK_AVAIL_STATE(PCIM_ACS_P2P_CMP_REDIRECT));
+ printf(" ");
+ printf("P2P Upstream Forwarding %s, P2P Egress Control %s\n",
+ CHECK_AVAIL_STATE(PCIM_ACS_P2P_UPSTREAM_FORWARDING),
+ CHECK_AVAIL_STATE(PCIM_ACS_P2P_EGRESS_CTL));
+ printf(" ");
+ printf("P2P Direct Translated %s, Enhanced Capability %s\n",
+ CHECK_AVAIL_STATE(PCIM_ACS_P2P_DIRECT_TRANSLATED),
+ acs_ctl & PCIM_ACS_ENHANCED_CAP ? "available" : "unavailable");
+#undef CHECK_AVAIL_STATE
+
+ if (acs_cap & PCIM_ACS_ENHANCED_CAP) {
+ printf(" ");
+ printf("I/O Req Blocking %s, Unclaimed Req Redirect Control %s\n",
+ check_enabled(acs_ctl & PCIM_ACS_IO_REQ_BLOCKING_ENABLE),
+ check_enabled(acs_ctl & PCIM_ACS_UNCLAIMED_REQ_REDIRECT_CTL));
+ printf(" ");
+ printf("DSP BAR %s, USP BAR %s\n",
+ acc[(acs_cap & PCIM_ACS_DSP_MEM_TGT_ACC_CTL) >> 8],
+ acc[(acs_cap & PCIM_ACS_USP_MEM_TGT_ACC_CTL) >> 10]);
+ }
+}
+
static struct {
uint16_t id;
const char *name;
@@ -1099,6 +1157,9 @@ list_ecaps(int fd, struct pci_conf *p)
case PCIZ_SRIOV:
ecap_sriov(fd, p, ptr, PCI_EXTCAP_VER(ecap));
break;
+ case PCIZ_ACS:
+ ecap_acs(fd, p, ptr, PCI_EXTCAP_VER(ecap));
+ break;
default:
name = "unknown";
for (i = 0; ecap_names[i].name != NULL; i++)
From nobody Thu Feb 2 09:02:16 2023
X-Original-To: dev-commits-src-branches@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 4P6t8T0Mvzz3cNxR;
Thu, 2 Feb 2023 09:02:17 +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 4P6t8S72Mcz3hFY;
Thu, 2 Feb 2023 09:02:16 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675328537;
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=VF1aH0Mm4PVf0I/lLB1UPSbPCBy48l7VP6BGP5LyYC4=;
b=S2QVPm+S6z5ftGa3/1i1AmRdVofqdSPYYaAzLdOA5NlYSjMEGGvmHCgYwM+Sw3Jm6Bgo2h
6H6E8RYfkiHcNaIHdzxCeYaImt8cOMpTZ82QPfbZjLJkpspILFixfg7954cCW7MaYutEJ2
c8dHhS0Qrq/svr9G/jQA5wLAFzvT5Kfpnl3vcYUvr3qxE4J/OgYEGgOpxCWuSZ8YcWJLeS
Ri6oRiSflmuS6v/gsuVAdP8ATimYOGkYpLq+I9q2oKoKTGfbMEF5x6hq/nt2HAfM/T1ASz
tDkX5kXdFukKFBsvYG3zPcW7d0j/zUAIwaa2wIkEPmIaCB/T0fJ1NiRxWKllNw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675328537;
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=VF1aH0Mm4PVf0I/lLB1UPSbPCBy48l7VP6BGP5LyYC4=;
b=Xav62OJFH5hIRzFwh9qmIHezAgyXXoWxMI2jTZBatasy6WLXRWSaO5c0d+DSAnU/JZjDaH
uPG/Cu5nbYSVaNWhMCoKW4NbP/A/rR15lKDpzydPHbmZb797bkrN23rzAnUguGhJ8B1w+L
8+pBsYK8Z/xTS2QVb0mHncyoIz0qEOGd0QCpl/3AaUKPECNMYDB9WPQ0VLf8t4TSzSgToK
QDXl5FK3FLTKJYi/E00CSIs8SpzrKu3Y1m9pScgNAKdK2xIoefw2x9YlVwr0s7SxKPaPBS
1kqWyIWk3VBm+YnmIbScgMgztBk9TfR7DxvoQXbLP/3MobT7mn61Ta4WcjO3xw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675328537; a=rsa-sha256; cv=none;
b=VmazFq9j9y7YUR6nmCf+3mNE+yU+YS1cIrt94AuDgwza1W65lK1sB6vYrcjlw/V6kZK1mO
1soyqvAxEKUIpPU1EEJ2kcsGDT2JllH/KMl0UqJtnI1++s+XOHCEVAgmiAdGvBnaQuP1Qh
81N9mmJoBwVh9yeS9XNgpoSaNhuKZ+3CiYhpNKd4aDo1h4DQHtOTO5LYpkOa05uAPE1ih3
AC5FK8vWPhzww5AozP2R0zVoN9YA0it5EyBzn7nu+yEiHrHgIffbLXlSDZyduTnMBUDSf6
iL/pGlSZNRclmeUxBkFVHyT2wb4Y+FUVO1DGEPU54oZlS96yyZL/yEoBovcKbA==
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 4P6t8S652Zzp5j;
Thu, 2 Feb 2023 09:02:16 +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 31292GlK091231;
Thu, 2 Feb 2023 09:02:16 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31292GIY091230;
Thu, 2 Feb 2023 09:02:16 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:02:16 GMT
Message-Id: <202302020902.31292GIY091230@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gordon Bergling <gbe@FreeBSD.org>
Subject: git: 3d28f00904dc - stable/13 - umcs(4): Fix a typo in a kernel message
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gbe
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 3d28f00904dcaf6ba06fc7b6de5a60db6101dc83
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by gbe (doc committer):
URL: https://cgit.FreeBSD.org/src/commit/?id=3d28f00904dcaf6ba06fc7b6de5a60db6101dc83
commit 3d28f00904dcaf6ba06fc7b6de5a60db6101dc83
Author: Gordon Bergling <gbe@FreeBSD.org>
AuthorDate: 2023-01-28 14:45:52 +0000
Commit: Gordon Bergling <gbe@FreeBSD.org>
CommitDate: 2023-02-02 09:02:01 +0000
umcs(4): Fix a typo in a kernel message
- s/confguration/configuration/
- s/nornal/normal/
Obtained from: NetBSD
(cherry picked from commit ee27834d740df50b7e5834a2075b94ae3c15d81a)
---
sys/dev/usb/serial/umcs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/dev/usb/serial/umcs.c b/sys/dev/usb/serial/umcs.c
index e3c8f1a764fb..06480509c576 100644
--- a/sys/dev/usb/serial/umcs.c
+++ b/sys/dev/usb/serial/umcs.c
@@ -35,7 +35,7 @@
* http://www.moschip.com. The datasheets don't contain full
* programming information for the chip.
*
- * It is nornal to have only two enabled ports in devices, based on
+ * It is normal to have only two enabled ports in devices, based on
* quad-port mos7840.
*
*/
@@ -347,7 +347,7 @@ umcs7840_attach(device_t dev)
}
device_printf(dev, "Chip mcs%04x, found %d active ports\n", uaa->info.idProduct, sc->sc_numports);
if (!umcs7840_get_reg_sync(sc, MCS7840_DEV_REG_MODE, &data)) {
- device_printf(dev, "On-die confguration: RST: active %s, HRD: %s, PLL: %s, POR: %s, Ports: %s, EEPROM write %s, IrDA is %savailable\n",
+ device_printf(dev, "On-die configuration: RST: active %s, HRD: %s, PLL: %s, POR: %s, Ports: %s, EEPROM write %s, IrDA is %savailable\n",
(data & MCS7840_DEV_MODE_RESET) ? "low" : "high",
(data & MCS7840_DEV_MODE_SER_PRSNT) ? "yes" : "no",
(data & MCS7840_DEV_MODE_PLLBYPASS) ? "bypassed" : "avail",
From nobody Thu Feb 2 09:02:39 2023
X-Original-To: dev-commits-src-branches@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 4P6t8w17Wsz3cNsp;
Thu, 2 Feb 2023 09:02:40 +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 4P6t8w0MhRz3hr6;
Thu, 2 Feb 2023 09:02:40 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675328560;
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=wpDYv2wSMJEUwZSDE813j1GD6G0klXueMhIy/qqX0rg=;
b=FhfAY5vyl06Cd5BvosUokhansLwhOX6C9h2EKpUf6+GgiYSFoWccWi7V1CDLu+nhKWBPI6
WJ9QsX1rttE1hKjv4dfAF9D4nDjsXcGbumJxrGr1+xKGbOMYBj/Q5npoLsPM9SNl+bTlQI
B+wX8kZs3e5MlbObbnv9OOSsZE70gKRtr6p39hKwCmuLxJC+x2xPna9pOSDP7vR5ojbsM1
QiKfQ9apSMpR45BwGbDzIQo9QtNz7nUcDSxxzo+d/G6qQnqO4YQUdCXMr7R0OHa77U1x3f
RvxQDnj8/bo/M+mzShVdtvKk9MCyiEe/2zvTdNPWiansq/bw6LowNPPZrrmwvg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675328560;
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=wpDYv2wSMJEUwZSDE813j1GD6G0klXueMhIy/qqX0rg=;
b=SQjdpq59r2aujQHzolBjAOdI13B8FP5yxu/QRbuiceogjWJwm0i+mAwuR2+bAN4Rsx6XkQ
o2YsGjkRSMSJLnUWsAij4ibcZGCJ4GjuliumNGocBU7JB0JtfixCbGg3mf49mCeoPC6RVJ
zD3I4meLaB4pYUw5tR40sQLvKdl8HcBsYiQz6QM5Qcj69vlkA9ELU0CP6V4igYaIYUz8bk
Zq29qSC4D8AABKWyXLThOT+uo6K2fQEV4DNwtzlKgPlVvR0+CmxU5T/7vt92FvIgr8N0Ur
7xrOW2KJ7Mm40Bo+Q1Zhi0OHJDM/UzL9/zDa7OeoHJnhKivEphVEOlrIoxLkIQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675328560; a=rsa-sha256; cv=none;
b=ebv2aOT+FW12sWlUMuXssj0h9RjaUaLBJXxteI2AZNTAbmh1uYZOI58vKxWEI7lH0FqNe/
r+2MIPVoRQjAw9eskgL+b7Gkh26h0wjKOILawloP9G2drTkC8zCISKgxpSK1QGm4uoLCrT
3WecoLtYsFa+P9DUOw+07z/+AMEa42+uT68f9UMQJ9A2GA/t5PuEzfqzkL80wOaTJUDjAD
R9+LCtFGvIPtfNaBG26Qzn3D2IdPwZqMZflP8UG4SOvTxuumoZnfscasTXV9v7L0Or/gdz
VAJWZvPLTYAQAJ8LRyyo3GwxhimIVReN7/hsH2H7V1CIKdmyay/lGEHAHZDGVQ==
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 4P6t8v6Xy0zp5k;
Thu, 2 Feb 2023 09:02:39 +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 31292dbT091390;
Thu, 2 Feb 2023 09:02:39 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31292dwN091389;
Thu, 2 Feb 2023 09:02:39 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:02:39 GMT
Message-Id: <202302020902.31292dwN091389@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gordon Bergling <gbe@FreeBSD.org>
Subject: git: 35f4cc4354c5 - stable/12 - umcs(4): Fix a typo in a kernel message
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gbe
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 35f4cc4354c56ae34bf382061db6df0c1b332e1b
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by gbe (doc committer):
URL: https://cgit.FreeBSD.org/src/commit/?id=35f4cc4354c56ae34bf382061db6df0c1b332e1b
commit 35f4cc4354c56ae34bf382061db6df0c1b332e1b
Author: Gordon Bergling <gbe@FreeBSD.org>
AuthorDate: 2023-01-28 14:45:52 +0000
Commit: Gordon Bergling <gbe@FreeBSD.org>
CommitDate: 2023-02-02 09:02:28 +0000
umcs(4): Fix a typo in a kernel message
- s/confguration/configuration/
- s/nornal/normal/
Obtained from: NetBSD
(cherry picked from commit ee27834d740df50b7e5834a2075b94ae3c15d81a)
---
sys/dev/usb/serial/umcs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/dev/usb/serial/umcs.c b/sys/dev/usb/serial/umcs.c
index bcff8190344d..5b1add0f55fe 100644
--- a/sys/dev/usb/serial/umcs.c
+++ b/sys/dev/usb/serial/umcs.c
@@ -35,7 +35,7 @@
* http://www.moschip.com. The datasheets don't contain full
* programming information for the chip.
*
- * It is nornal to have only two enabled ports in devices, based on
+ * It is normal to have only two enabled ports in devices, based on
* quad-port mos7840.
*
*/
@@ -347,7 +347,7 @@ umcs7840_attach(device_t dev)
}
device_printf(dev, "Chip mcs%04x, found %d active ports\n", uaa->info.idProduct, sc->sc_numports);
if (!umcs7840_get_reg_sync(sc, MCS7840_DEV_REG_MODE, &data)) {
- device_printf(dev, "On-die confguration: RST: active %s, HRD: %s, PLL: %s, POR: %s, Ports: %s, EEPROM write %s, IrDA is %savailable\n",
+ device_printf(dev, "On-die configuration: RST: active %s, HRD: %s, PLL: %s, POR: %s, Ports: %s, EEPROM write %s, IrDA is %savailable\n",
(data & MCS7840_DEV_MODE_RESET) ? "low" : "high",
(data & MCS7840_DEV_MODE_SER_PRSNT) ? "yes" : "no",
(data & MCS7840_DEV_MODE_PLLBYPASS) ? "bypassed" : "avail",
From nobody Thu Feb 2 09:33:02 2023
X-Original-To: dev-commits-src-branches@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 4P6tqy3jlLz3cS9F;
Thu, 2 Feb 2023 09:33:02 +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 4P6tqy3C59z3ltF;
Thu, 2 Feb 2023 09:33:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675330382;
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=0KoNtfvUnOat5QULlJKEXUMZx/JNsuQXJaGQyiPFmvo=;
b=Zr7LuZIhlKicW8Z2oUJ/dMSS7jYpx3xJM+B1KWASThcfXCMMvPgQjd6oXIJiuLIH89tbog
6epe0XJWonsIFHrg+M2MgpJ1me8q3+jgZsewDb3R/1gIHT0d0Trg9PIt/pyFB6l1FTRf6t
2UcHAaD5fiIbQQ2Mvp+Gl1aioc1tNIH0gBvUkGSEzTutGkQtlW9ZTGet93y6+YRxJkWbpG
NrNECRjRWW0DrWNHGlDhG7wgPyc2q+NMqlKhKas2/qfulga5Kx9nMHrC8BaagEHpwoQEXP
e+hZBUPU+9NlAhkivX3JwQa8pIP5l2X960KKGGHb3Axnv0Y18aK8OnlhSyaBig==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675330382;
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=0KoNtfvUnOat5QULlJKEXUMZx/JNsuQXJaGQyiPFmvo=;
b=J7NvA886RHbmhcZSFEte5t6MTejVPWZ+bwCTxVlBM2dugSTXF1Kx5vh4v91AOmzA3Vh3p/
kHAccc8u+8LIGZSSK1b4lVwT6msc3FlGdoIl8DDtpboBFnkAoHaQBP/Osmn4/sA7z4Xeh9
TBaaPi3Jqcn0tLN/ouJCecxCDzgYhMogMWXnQiYI6A/fhGMGPcnthwUFtjR6K4O+OtPA69
X70MB6kwawOc80sD4fzNdUCbHwwZ2H6Fz4AkN6JyOH8d+c2v8TDoRqjAiNdik6eEFNfqWW
JCBqizNjQ22uoyMf2l/Gc9X82DmRkyWh8LEP9Eq7VxJqEP/J97W0rnWmumF3jg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675330382; a=rsa-sha256; cv=none;
b=VbsanUPZVcPi4Jf+YhaGlgwqvfl52hjNQ0ZNN8hKkYaRatHXkE/IuUvq3KVPxTG+dnbIEa
mkfAjgN+CwuisSHo8lv+aNyJ/yGa+3OhoENFNm1tdGLWl4obKRfjKf2A5OlzTjri9stfNH
THQepWPdt/fObarAXr0kzisBFK1LBEKxdwE7nY5Dkuehv14NyKJRqrs0giqbWWwPTQZBV7
Obto93dhtRTvC9CIed5I4tViTNd0r3Hp9/2ZusMSvl2A1ysPZpHZEgGW+JZ7gOpWaBIBtn
me4UacpNJZbj8E+5apnRSTsztKdiMjAHnXqBboR58R0/XRmhwIHwg0QQ8AUBVw==
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 4P6tqy2GvszqFn;
Thu, 2 Feb 2023 09:33:02 +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 3129X2aT033645;
Thu, 2 Feb 2023 09:33:02 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3129X2Kk033644;
Thu, 2 Feb 2023 09:33:02 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:33:02 GMT
Message-Id: <202302020933.3129X2Kk033644@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: a04e97cc2591 - stable/13 - pkgbase: mtree: Correctly tag /var/run entries
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a04e97cc2591ce77394e35539e2f1d8ac686f725
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=a04e97cc2591ce77394e35539e2f1d8ac686f725
commit a04e97cc2591ce77394e35539e2f1d8ac686f725
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-07-22 09:14:40 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:32:54 +0000
pkgbase: mtree: Correctly tag /var/run entries
(cherry picked from commit d2888f5ccf7dc61a31ceb981d488f648795aa878)
---
etc/mtree/BSD.var.dist | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index e1978f341408..77e5d5264af8 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -76,13 +76,13 @@
preserve
..
run
- bhyve
+ bhyve tags=package=bhyve
..
- dhclient
+ dhclient tags=package=dhclient
..
- ppp gname=network mode=0770
+ ppp gname=network mode=0770 tags=package=ppp
..
- wpa_supplicant
+ wpa_supplicant tags=package=wpa
..
..
rwho gname=daemon mode=0775
From nobody Thu Feb 2 09:33:03 2023
X-Original-To: dev-commits-src-branches@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 4P6tqz5X0Kz3cSCM;
Thu, 2 Feb 2023 09:33:03 +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 4P6tqz4pZHz3mD5;
Thu, 2 Feb 2023 09:33:03 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675330383;
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=Nrv7aOSxF+j9zN2F64TedpIlP68nPYtsNfPFej4HA4A=;
b=aXPRzua6Kp2Mf/FElsvJmwudB4Q/QP0sXU7gIsAZAyloMSuoNCzD7NntM81EH0VmevJsaJ
ZlLKQQdMT9YXkPNo5VJKxjANV4Y6PrFyfDViNsNRh6z7USLpeFj0QSaZ5mJYuMwBSZY34P
mq7jSfiHNWV8CwTX3ss1zomX40BZ+kTstCz4Lr6NNhn9nNHAlEAdxbYKP7WjOqdszNeTk3
3lJti+IEz81O3PxOlxehL3OiV7DDLxP2mwKgJFzQT+OYJKurlTqjW0/03E/ESmfEdtMynA
0t8vGPtcPAbzVGxte4k/wb0kE18Dx5V1qYYQoiMB0by0qMmyOfNzmBiBirHpYw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675330383;
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=Nrv7aOSxF+j9zN2F64TedpIlP68nPYtsNfPFej4HA4A=;
b=aczVdMBO6m2rsd9K8EoA+7X8GjZByP/YMDS2DjPMWWe9LVBujCHZoz9zGmh5t3M9tgIrb4
vwUxzzm8J0GXh8G9X6bJSStbbCkmeRmJ0LAnTcsYMjMuB+e/p1ED9jtmRZIWcnXI23KHkZ
W901NLXD8CrbhwJzjBThmahPQ93gGTbFNILu4BxvC5kwf6XG5ZQTAZKcyizpr0s00Pao5P
CPjBu/ID0yDQzpy2onKyE5ilFJ2GZuRk753J9Yb3QNsXWCMiFlzniBSBbY6q5QBmTKrTNT
qC3n6jgxfCjKbsOqbhw6f8n9GItxvPX32cz3PzugsClyR1JzwXnWFvZYQPi0Gg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675330383; a=rsa-sha256; cv=none;
b=Oo65/6fA5DAN7mcnBSCT+kW8Fmrhm7cqA1npfmQt5b5WEAzGaAxEJ2zSSRbhnhdKX8xMs9
TydrlG6XM/i0hWf0Z+gRARv6a6Fz88tAE2j11AwjxI4fNCR/qMASY4yI5wQY4lTD5oOhXv
GRcH84PxrYULMGow7an0UcxswjeEoQGdBZ7ju9U+yPSWFxmfwd1X3z5VNa490MjUL7cDjW
2ea20Mx4Q+eKVh5yPnb/GpZwmG2G+Lh++Rf7qzFsOO5oB0onNiWEzjrO7AmT4fc90oQOdX
gXV999z5rwvhMV9BtNA6/1pv8kBsmAJJCy2fDTX+UWfOrdWygQT7s8Gn5Izr+g==
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 4P6tqz3j0Gzq1Z;
Thu, 2 Feb 2023 09:33:03 +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 3129X3S0033681;
Thu, 2 Feb 2023 09:33:03 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3129X3M5033680;
Thu, 2 Feb 2023 09:33:03 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:33:03 GMT
Message-Id: <202302020933.3129X3M5033680@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 218d04c702e8 - stable/13 - pkgbase: mtree: Correctly tag /var/db entries
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 218d04c702e85e34f33ee472e0817ce15be9baee
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=218d04c702e85e34f33ee472e0817ce15be9baee
commit 218d04c702e85e34f33ee472e0817ce15be9baee
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-07-22 09:21:44 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:32:54 +0000
pkgbase: mtree: Correctly tag /var/db entries
(cherry picked from commit 1a104a3bf3d23bfe8a1d899f3b668dec7d2f0a27)
---
etc/mtree/BSD.var.dist | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 77e5d5264af8..24961accf7fb 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -42,9 +42,9 @@
..
freebsd-update mode=0700
..
- hyperv mode=0700
+ hyperv mode=0700 tags=package=hyperv-tools
..
- ipf mode=0700
+ ipf mode=0700 tags=package=ipf
..
mtree
..
@@ -56,7 +56,7 @@
..
portsnap
..
- zfsd
+ zfsd tags=package=zfs
cases
..
..
From nobody Thu Feb 2 09:33:04 2023
X-Original-To: dev-commits-src-branches@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 4P6tr06McCz3cSH4;
Thu, 2 Feb 2023 09:33:04 +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 4P6tr05Sj3z3mGh;
Thu, 2 Feb 2023 09:33:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675330384;
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=4iN1s2BkZ7RoCOHeVpnHkNp39ffZO+AGnTUrpAFsO9M=;
b=pQGePNnuErbwz+7cvSFxv0ocCrOKktDlsEzPioQUKv6ic/Rzq3LlFFQGgjqqtft2nIdfoY
DkGEsfMWYDPlj8s/UbfXnBSPriwD4P9ukhLo5IlMsv+EJWJ24QKjgQsBF8Z2NnFYY26PTp
d/KYCV7SvyIPL4+3DuAwVjxkmdxZW4CwvKmOkHrbYcn14kwQ/bOMyE+YH8PdPh+DZiT1zF
bZIZsK74gyF4PA7krUIeR5WPo8/3IvGBrsdgKvLP2WdwfEw6VicNYeruXI2QVQpYT1XS1S
KKq0Py1kSSm4NJ6fz9DP0/CiQ3wq/2mNGAxWF5/fW23TFrdJlljo8UJ2DeP2OA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675330384;
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=4iN1s2BkZ7RoCOHeVpnHkNp39ffZO+AGnTUrpAFsO9M=;
b=yDVPZLOEbdF3/jJw2dWT0GsU28BtDWR16pLnfNp+g7LihT62taD8BWhBWSr7X4GK4IPYTC
D4/paM+Nyd9D1wxmMF1tOX3A5hU6TilCZ1Xpit5ZButi5OrD/ixlgIRR9FD3hBjGqoF7tv
k/qY/8ev0It7hULTMI2m64dHN2agbRZCs2ntNv2y4UUlhM8m9TWfl/t/SC4YIrx8Hg68aQ
oB2HUNkWun6apCeBEiHzZTfrRAZkjVX8RLPdJqrjkei82LX8K53EaXl/LlKRdlPjrrfJUw
WOQ3MG42b7NzhEFW093d92kvzGh1Xdot9GivjYSZ/z8+lVbm6liiJQgApDYeAw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675330384; a=rsa-sha256; cv=none;
b=Nz/m/nslr1WhYaaspwXVApPHIQPQaxgePTY2XjDkFkIQG8WIu5w3uCADgFW7RxfrAkeraN
RFZA99b5Kl8kLA+ew0UL4XBspdmtyRMxucCKdvddraaqhCFbdUqqqFuRX1M5zWqjaa5mzZ
4uWveduoOecjirVRAaO6Jhhjx9/wasggcHIaiva10SgeZ94IU7PQlD4XB8pI5PxNo7Ow+G
+4fxFaRPZdEFxiEBZgYME299pC8rRJ+Hu/kuG+Y9UQWdyvDyBmdmmpYlmCJ7qLxRujzG5z
AguWzP2J80DlKvezVSawCgShGhUecoI4gX7HbfOZ3RtE+t4YIuGDQpAeIAp20w==
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 4P6tr04QqrzqP3;
Thu, 2 Feb 2023 09:33:04 +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 3129X4P9033705;
Thu, 2 Feb 2023 09:33:04 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3129X4LK033704;
Thu, 2 Feb 2023 09:33:04 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:33:04 GMT
Message-Id: <202302020933.3129X4LK033704@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 9c3b0203a10e - stable/13 - pkgbase: Put mount_nfs in the FreeBSD-nfs package
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 9c3b0203a10e72fd2f6c7065cef5175f2d2dbe3c
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=9c3b0203a10e72fd2f6c7065cef5175f2d2dbe3c
commit 9c3b0203a10e72fd2f6c7065cef5175f2d2dbe3c
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-07-22 11:23:14 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:32:54 +0000
pkgbase: Put mount_nfs in the FreeBSD-nfs package
(cherry picked from commit 4efb514b70ba9acdc27026daf3c8c93917ed4fe9)
---
sbin/mount_nfs/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile
index a896edef898f..527ea42575a5 100644
--- a/sbin/mount_nfs/Makefile
+++ b/sbin/mount_nfs/Makefile
@@ -2,7 +2,7 @@
#
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=nfs
PROG= mount_nfs
SRCS= mount_nfs.c getmntopts.c mounttab.c
MAN= mount_nfs.8
From nobody Thu Feb 2 09:33:05 2023
X-Original-To: dev-commits-src-branches@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 4P6tr21YBWz3cSRw;
Thu, 2 Feb 2023 09:33:06 +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 4P6tr166sdz3mHM;
Thu, 2 Feb 2023 09:33:05 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675330385;
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=6SwqYxcSlwSeOq/6x5jo6jrMl4xFlwWFTAXWGxZIpWA=;
b=Fa5wRjYuSE0V60qLqbg+rqrz2ipyYi+gZDtHd+a1uhDcjzKB2CGvBNvW9t68QN9iyWw88K
BA2TD1rsP3vWCNheAZzQdM9PwSKEZLYucFP103ozj8AQ5qOoRuDjSJYV4l0eMGt/b5SHA1
Ub/VHFmaZ0iXt0rOLoUFbgljnscykwT+hjvFdMrQNHPDy58Y1+fTKOa4yM24+rl6Qa+Tgn
baB6dmpTOn1lWtzwPO0REkc+ZSy/XR9BNSqEHs9jRFYpffHIdxL2xvcacBTNyLzsK6Mn7D
Ikv79xfbn5iHMRF3rVrADbjVewKxGva1/vFdz88c2gTP1MRfY5lDfWbZkRmyCg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675330385;
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=6SwqYxcSlwSeOq/6x5jo6jrMl4xFlwWFTAXWGxZIpWA=;
b=BKS9MRyYsZrnrQxDm3JP5VSXzmoaZhgnqwFUX+kXvVKt+dHvAGPKMBdLM6x4OIz7r+5W1Y
Usj2dAUhRCj73raRydGsmYproCgkpyLAkQ6Cc3mVJCgN+OMZYUkNCMC37/m3TDHfcQ+4fC
q3hD+f7/BMw3Wh9iZOFjz5l6tamePRbDZ1GWf9goFxgLsV+tPdJ2TmoXNSfnpmKHQuM+gN
uCkdgxwNx02wHrZ3MHt/56fxJa6Wc1X1j/kKYgAaQf6gkQWC6IKYbgkcODFHpd1PErE/jC
VSsa5dfStlu8ZamZ/5gy1gMOvxvSyAUM4JQ+//YfAS/V+2IphHYT+0VfCfXwPg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675330385; a=rsa-sha256; cv=none;
b=o+RUE96aCu2yg/xI4TobLdvDToM72sbMOWGVJHzvSavIfSuuHOtug05sEjBKRzzpgh03mY
rFRQRiEkI6O39KhxJnLP3NVrlS2/7WROr+6P6fR3skEac+Q5Acvm+tZPX9P1rMKFEoUORk
XgrZb8LiNDsWWHKS2j71xQRbGBrVh01gmnYJ+Tu0ex2w4A80yr34xk3BrcwqAKAPjG7W1i
heLFRVffBTYFh3H8R14CdDlRbyGGh/LOqFQ5Wj2c0uuXcL67tKZ/VAOydfALA3g0C4eiFy
GQUwG8W/16kfMkDpvWasfpczxFChOOYrrj6tzvOFcDjx81LzVthfIvmAnQITIw==
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 4P6tr15DMQzqP4;
Thu, 2 Feb 2023 09:33:05 +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 3129X5t1033729;
Thu, 2 Feb 2023 09:33:05 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3129X5sH033728;
Thu, 2 Feb 2023 09:33:05 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:33:05 GMT
Message-Id: <202302020933.3129X5sH033728@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 73f65c7acdfe - stable/13 - lib: Gate libfigpar under MK_DIALOG
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 73f65c7acdfe7d5780c9a9e3320caf85885d6300
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=73f65c7acdfe7d5780c9a9e3320caf85885d6300
commit 73f65c7acdfe7d5780c9a9e3320caf85885d6300
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-07-21 14:52:24 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:32:54 +0000
lib: Gate libfigpar under MK_DIALOG
libfigpar is only used by dpv and dpv isn't built if WITHOUT_DIALOG
is set.
(cherry picked from commit 15d781b5323315afaed06fb2f2499f9164e1ef86)
---
lib/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/Makefile b/lib/Makefile
index eedcbef50386..091bbc2a4ca8 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -56,7 +56,6 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \
libexecinfo \
libexpat \
libfetch \
- libfigpar \
libgcc_eh \
libgcc_s \
libgeom \
@@ -167,7 +166,7 @@ SUBDIR+= clang
SUBDIR.${MK_CUSE}+= libcuse
SUBDIR.${MK_CXX}+= libdevdctl
SUBDIR.${MK_TOOLCHAIN}+=libpe
-SUBDIR.${MK_DIALOG}+= libdpv
+SUBDIR.${MK_DIALOG}+= libdpv libfigpar
SUBDIR.${MK_FILE}+= libmagic
SUBDIR.${MK_GPIO}+= libgpio
SUBDIR.${MK_GSSAPI}+= libgssapi librpcsec_gss
From nobody Thu Feb 2 09:33:06 2023
X-Original-To: dev-commits-src-branches@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 4P6tr317Xzz3cS9t;
Thu, 2 Feb 2023 09:33:07 +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 4P6tr30Xkrz3md7;
Thu, 2 Feb 2023 09:33:07 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675330387;
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=68liu1IQBgPDOx23MzAApULPE98L7du87ssjyG4ouvw=;
b=gXeSC7hIpS9BSgzfMWu+OdPYHBX+qmguL93oXKSHKgp7bA7h5AbojvC9pZaFdAAM0unhg2
6bp+oUNdsQYNe0aOj1gxSWfyMT38hB4Sn/Z7ibvcupQgdqVMhN4PVasZN51+EheWQS76J2
PUsZwys0CjeyWpZZklsCo0z/vyel4FzzuCLXUCUHODylU3qp/GDnBLQCv8WMw3RVSMncEX
DgY5LmrcluwJRosj99Gd6ICav49CdT9F8CBq0UChJ+IpG2OFoTPqFN3xMmoXayA6YPm6EB
BL83p79gK5SuWQvB+ryiMvzfCHspzXILzeItt4OXqahhQ1ldfOyAnvESQ4JO7w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675330387;
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=68liu1IQBgPDOx23MzAApULPE98L7du87ssjyG4ouvw=;
b=e8OtHnnIsp8Vg+Th+HNnXwIXeOgw/y9VIkCMkkOtKImZ9VWrtSNqT2vkGvweOt9lEA6C/P
NP8feuXyBRQT6RSP9E7XFfj+j41Y6gJuA4Ty+z+L9GXqTw+nQqCp7j9gQOijOUZz9tB3Ik
ar3JehZaQhG3OoSLZmcOFPJudR1Bdt8cHN7Ysd66KsOW1dVnW012lVCeAbiCRNUMqMD31o
Yz9xoi1tLcsv115toID42+6lgMEb6D4ul3CCq2OHF3vGJqM0SId/R8bWZnq1jtuQLpKCB7
GFh/h6EzWaUe/GAfj1foQeOm5G/ipwrIj6gID8dD68Fa+EpuxXjfgXdoPIt0Hg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675330387; a=rsa-sha256; cv=none;
b=n2MWuL/8HDV66dgrNkFUsmLcCAj1o4zEK1jI+2t9fE89L3MyJUQOoAVlKSpkj8um0ArJ5o
ay1mC8z3JwmQF8QLUS0EKV5qv/Cg/dqLHnSqog4klM0SO25HoVVAV2eHV3BVexIE7yx3K3
aOUzhbtbqRutk0VqdmI3FI+qPxrYbU0gy1VSX625lcj+JCXM/XZym2O7DV8gtmSJ0KYshJ
rWIVyDRP9zY/g4dJ87meQvZBYx3T0XFgWl1qNdCnrgexiJyi2J2rhJXR1K3jh3BZfNWE8K
U08Kyt1VDiOF05BLY1pN/drlqlJVEAfgVqIXrWyzeDgjCqI4zOKpSWktNufOUQ==
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 4P6tr26QNhzqP5;
Thu, 2 Feb 2023 09:33:06 +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 3129X6sR033759;
Thu, 2 Feb 2023 09:33:06 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3129X6lj033758;
Thu, 2 Feb 2023 09:33:06 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:33:06 GMT
Message-Id: <202302020933.3129X6lj033758@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 33fea630f25c - stable/13 - pkgbase: Put accounting utilities in the acct package
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 33fea630f25cad8f868dba9a77924ec317021b0f
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=33fea630f25cad8f868dba9a77924ec317021b0f
commit 33fea630f25cad8f868dba9a77924ec317021b0f
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-07-21 15:09:34 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:32:54 +0000
pkgbase: Put accounting utilities in the acct package
(cherry picked from commit 0c6b2a91795167203f442a84aac2570397226e56)
---
usr.bin/last/Makefile | 1 +
usr.bin/users/Makefile | 1 +
usr.bin/who/Makefile | 1 +
usr.sbin/ac/Makefile | 1 +
usr.sbin/lastlogin/Makefile | 1 +
usr.sbin/utx/Makefile | 2 +-
6 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/usr.bin/last/Makefile b/usr.bin/last/Makefile
index 3edb032fd6c0..61a3be7ca7ac 100644
--- a/usr.bin/last/Makefile
+++ b/usr.bin/last/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= last
+PACKAGE= acct
LIBADD= xo
NO_WFORMAT=
diff --git a/usr.bin/users/Makefile b/usr.bin/users/Makefile
index ba990f890717..c1eef9c7b487 100644
--- a/usr.bin/users/Makefile
+++ b/usr.bin/users/Makefile
@@ -3,6 +3,7 @@
WARNS?= 3
PROG_CXX= users
+PACKAGE= acct
CXXFLAGS+= -fno-rtti
.include <bsd.prog.mk>
diff --git a/usr.bin/who/Makefile b/usr.bin/who/Makefile
index 0478d73071a3..7065ebbd6f15 100644
--- a/usr.bin/who/Makefile
+++ b/usr.bin/who/Makefile
@@ -2,5 +2,6 @@
# $FreeBSD$
PROG= who
+PACKAGE= acct
.include <bsd.prog.mk>
diff --git a/usr.sbin/ac/Makefile b/usr.sbin/ac/Makefile
index 0fac2fbdbab9..daade986de91 100644
--- a/usr.sbin/ac/Makefile
+++ b/usr.sbin/ac/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= ac
+PACKAGE= acct
MAN= ac.8
# If "CONSOLE_TTY" is not defined, this program is compatible with the
diff --git a/usr.sbin/lastlogin/Makefile b/usr.sbin/lastlogin/Makefile
index 7fe146ffd492..14a4cc03b5d7 100644
--- a/usr.sbin/lastlogin/Makefile
+++ b/usr.sbin/lastlogin/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PROG= lastlogin
+PACKAGE= acct
MAN= lastlogin.8
LIBADD= xo
diff --git a/usr.sbin/utx/Makefile b/usr.sbin/utx/Makefile
index 8177d3fe7832..c7710b2a6fcb 100644
--- a/usr.sbin/utx/Makefile
+++ b/usr.sbin/utx/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE= runtime
+PACKAGE= acct
PROG= utx
MAN= utx.8
From nobody Thu Feb 2 09:33:07 2023
X-Original-To: dev-commits-src-branches@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 4P6tr41C1Nz3cRy6;
Thu, 2 Feb 2023 09:33:08 +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 4P6tr40XB6z3mKt;
Thu, 2 Feb 2023 09:33:08 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675330388;
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=VxsoGiRV8ZtS0XFbWXtXtz0wJ+uwtjrkVZ8XZPFUqOs=;
b=pZGr2F/KI8GGCasWfW/L7+eG5vhC6P8I1wj6zeXYNiL2PVixTAzAG8/sVB2YEb0oksULiy
j/adlGWuR+6KpaoGZ6wZKpla16fkNirysda5JvYbi+gJ1HFqHY/gvYm/ER3RdsUwvAlTTB
052MQe+1C1+fbjhPBpy81iXHcxh41mJddZKHKzBQSmpzmjL3ldEbGHfvqv9+2MPzp/WXgD
LfLTN8LdnTYG4+RZe79ScipRcjonOi5z/AejBEcXidapH2gW7mVNmKgcHjBkuP3okX4YC7
7VdRncOWZizQXVvQMaj5DtT4wo3K24BhBirblDeMw4OjDPQIjoCzSJvcGOo4yA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675330388;
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=VxsoGiRV8ZtS0XFbWXtXtz0wJ+uwtjrkVZ8XZPFUqOs=;
b=tW+TtR2JrI8MGK2irbazCGNQhXvLgIJS8en96HplPcwiD9n8IlfSrZj53NvVfyze6rLZpF
p82/vdFsE5eg6EzKpkVPmizerLxecQTz253+bN3GeAWQ5eIjZ8xgQam1XwdhsQ3kmUnP2h
kRP/RB6HMy7TXyEVkfWtalvBIibskEc583uMCN7tUxxKFNloVzQsftSzNXVcOQEhSo2WRJ
3uY8+w7t+7Fo2fFpnwTrl/YJGQhm1u01dCJ8tAsMFPsIL1UX+9xaHDdNW3PoZGqNBo+gQv
6qaVqO+MsGkJW1tyNVEo2smS2U37OL6Ty5UHA4PKFJLDf2msTlM5quf6PG8x4w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675330388; a=rsa-sha256; cv=none;
b=IlyiGUu/pkaOge3zno2mmByShrK0YikFnAuCSxmB9nkvowhkeeKzR/c2pTZBPwYws2fYcd
nGHz++yJ6xbdI1dy12rj98e7N6Qu8efpPrSUyQLfBXVOb7PjSSeqkMlI636cy5j3AEntF7
oSNUpbZaePbFgHgabKLNllfqedg/LGaOzcqCOjNm2g7ZzlZXsuA5R5SUSN+k/g56rSeIU2
EQVQhuafZcxQ7QUxl2t6mB74wZ2TNl1DQgRtzXEekOfPhfccbhzEXuUU+ubyv64eX77v+X
7vLWYHGTsDKWVpjeICkUDQmbDjUiWvwW1Xnw5RRlEJVyIqVI2VUOrhFTkirOlg==
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 4P6tr36jk5zphL;
Thu, 2 Feb 2023 09:33:07 +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 3129X7Gs033785;
Thu, 2 Feb 2023 09:33:07 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3129X7LH033784;
Thu, 2 Feb 2023 09:33:07 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:33:07 GMT
Message-Id: <202302020933.3129X7LH033784@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: b80ee728d2c4 - stable/13 - pkgbase: Put nvmecontrol in its own package
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: b80ee728d2c4bf9bb49e5d3d41854f41552e9cf7
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=b80ee728d2c4bf9bb49e5d3d41854f41552e9cf7
commit b80ee728d2c4bf9bb49e5d3d41854f41552e9cf7
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-07-22 07:58:11 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:32:54 +0000
pkgbase: Put nvmecontrol in its own package
It doesn't really make sense to have it in runtime and let's not
bloat utilities more.
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D36221
(cherry picked from commit 5f9db65d8af0b8419ba71749f15ee06d636fb9c4)
---
release/packages/Makefile.package | 2 ++
sbin/nvmecontrol/Makefile | 2 +-
sbin/nvmecontrol/modules/Makefile.inc | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index 511adf4a65ce..f5c9a916bff6 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -87,6 +87,8 @@ newsyslog_COMMENT= Newsyslog Utility
newsyslog_DESC= Newsyslog Utility
nfs_COMMENT= NFS Utilities
nfs_DESC= NFS Utilities
+nvme-tools_COMMENT= NVME Utilities
+nvme-tools_DESC= NVME Utilities
openssl_COMMENT= OpenSSL Library and Utility
openssl_DESC= OpenSSL Library and Utility
pkg-bootstrap_COMMENT= pkg bootstrap Utility
diff --git a/sbin/nvmecontrol/Makefile b/sbin/nvmecontrol/Makefile
index b5ceb350ed0d..ac71e1aeaa42 100644
--- a/sbin/nvmecontrol/Makefile
+++ b/sbin/nvmecontrol/Makefile
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-PACKAGE=runtime
+PACKAGE=nvme-tools
PROG= nvmecontrol
SRCS= comnd.c nvmecontrol.c
SRCS+= devlist.c firmware.c format.c identify.c logpage.c ns.c nsid.c
diff --git a/sbin/nvmecontrol/modules/Makefile.inc b/sbin/nvmecontrol/modules/Makefile.inc
index bdc25f711a67..57b6b074202a 100644
--- a/sbin/nvmecontrol/modules/Makefile.inc
+++ b/sbin/nvmecontrol/modules/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=nvme-tools
NVMECONTROLDIR= ${SRCTOP}/sbin/nvmecontrol
MK_INSTALLLIB= no
From nobody Thu Feb 2 09:33:09 2023
X-Original-To: dev-commits-src-branches@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 4P6tr52Xhbz3cSCv;
Thu, 2 Feb 2023 09:33:09 +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 4P6tr51kv4z3mSt;
Thu, 2 Feb 2023 09:33:09 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675330389;
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=Ir3pf7qitED3M4NSAkaMXFF8qT5aTqI/+Z5XkhSuAa0=;
b=vBfZ6AobZilEdd84j4aEUamsvwcvr+Dz89T2YYlLqg0WeAKrEuu6JyC3v33GCkwS4VLJ5i
3zg74F5wodFWaJkQ7yzCknInJwaP/YFx63Vjakilaq+oAEj/AImPZc4uY/vjzfbboICXAP
0/JUeNojMtLGa9gWqcpxgjh13o7ZNy5RQEcckQvzjBFSTd4fhgzb8ME9yQff5JKrVlWES8
COz5q0d3NwLg3oTlNiQ77QaIBn4lbFiCtzoe8e0850I/a6DLwCg+nOKZfdwwBbui7jO0qo
2/5SmVVAjd5fbq1IlUygFpxhlyq9yPCqowzIhB9dIiai5CU9bM7i92oRLk7nzA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675330389;
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=Ir3pf7qitED3M4NSAkaMXFF8qT5aTqI/+Z5XkhSuAa0=;
b=VuCPYtkBcXkln3HUKtcIVGVZFBd+ypqO821F9h20y/X4lqPSB06t/3g6xhT3Ms2ZtmHRb9
YXp5WW2XuzrRJgB8D+sx754imUuukl2g8guzr28cFgIJ4XNy2LlDK8bVHU0qufMBITa+20
MfoEDR7cRLlIS6AM7979Ggf25kAbWnHt2AZDs6QScZnesvM1H9TEYuoxdaRrrLUk3nd7m2
0eyI3YKpXaF5wHjYPsQW82MJs4zXSZ1xBmX5hR1GE7wZl9kqLlIM6eUc3xuVz8GZIHqSIw
V1J5El+oit8aDthcJcr02pA8z/yhYwMK7PmheC7B5uKpnbPLBEZC6gKO6ad2Vw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675330389; a=rsa-sha256; cv=none;
b=kNWFjH2fsO8eKl2GXOAC/JX91FYlj+hfakt/RMZYFX7i9fwZ2xG3TLq94j0UWf0GDEMdsr
4Pin4QqLMli6BpsimrTQ72pndclA5RecJHdBKtjD99xj0R/ZvkGN90wNoPy4ACkoKX738F
vUCEjWu3WVSeC3OHeePAVbC9rg39NRLlMXwtkDdpSbx52i9CRzXAwZUMQ0DhZ3xaIGEhH0
lVxAUbcImmnIabVh2KN5aYgvpBzEXs4bJGepyuSotGZv+h6eCSBMkgLa3eKX0DhURyp86r
KhoiFaRW8CZPgpVrFR6q3uwO/I0LVuIlq2zJr0QZwWFvYLAs8kJEM2O06xh6rg==
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 4P6tr50l3Yzq1b;
Thu, 2 Feb 2023 09:33:09 +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 3129X9qR033811;
Thu, 2 Feb 2023 09:33:09 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3129X9hC033810;
Thu, 2 Feb 2023 09:33:09 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:33:09 GMT
Message-Id: <202302020933.3129X9hC033810@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: bbc6162c50c6 - stable/13 - pkgbase: Put dhclient in its own package
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: bbc6162c50c653b9f04fe38de693a32754dc3a82
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=bbc6162c50c653b9f04fe38de693a32754dc3a82
commit bbc6162c50c653b9f04fe38de693a32754dc3a82
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-07-22 08:00:03 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:32:55 +0000
pkgbase: Put dhclient in its own package
It doesn't really make sense to have it in runtime and let's not
bloat utilities more.
Reviewed by: emaste, imp
Differential Revision: https://reviews.freebsd.org/D36222
(cherry picked from commit ab4bd66752fb8aca307a7a4b4523a1c44a21fc45)
---
release/packages/Makefile.package | 2 ++
sbin/dhclient/Makefile | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index f5c9a916bff6..e5cf3d51cca8 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -32,6 +32,8 @@ clibs_COMMENT= Core C Libraries
clibs_DESC= Core C Libraries
cxgbe-tools_COMMENT= Chelsio cxbge Utilities
cxgbe-tools_DESC= Chelsio cxbge Utilities
+dhclient_COMMENT= DHCP Client
+dhclient_DESC= DHCP Client
dma_COMMENT= DMA Mail Agent Utilities
dma_DESC= DMA Mail Agent Utilities
docs_COMMENT= Documentation
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index cdf93b8b8145..ec1f71300abd 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -34,7 +34,7 @@
.include <src.opts.mk>
CONFS= dhclient.conf
-PACKAGE=runtime
+PACKAGE=dhclient
SRCS= dhclient.c clparse.c alloc.c dispatch.c hash.c bpf.c options.c \
tree.c conflex.c errwarn.c inet.c packet.c convert.c tables.c \
parse.c privsep.c
From nobody Thu Feb 2 09:33:10 2023
X-Original-To: dev-commits-src-branches@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 4P6tr65DvKz3cS7t;
Thu, 2 Feb 2023 09:33:10 +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 4P6tr62mgQz3mkx;
Thu, 2 Feb 2023 09:33:10 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675330390;
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=QCov1LeyHdcxA+X9ULHGCucvFC3fJ/api5pNs2uIuxs=;
b=YpAkx7RIh5vsZThzDAXvA9HUz23OO6JXhJhbGcaMhrjxfbs72em8v4/diheS8pgqn4cxSM
90tEsjMWZcD07wEl2aWtbiVu+ewVDwBen6HfIemHJ6+b+3yUvdK9RbaLFEY8BdksPgZFCt
l06WDHnxmYJTSZUjE4AbjLQD93F6Q1hIJlZzjyP7cKfYmCKhJWQNGgn/RD4f/B7YNOt29u
nyryj4dIf4C5PlRX4fqc3tsFE6Yu0T0aRxrF+yKO1i2YQeQAuL3OmjGVhzIfqaYWffAfna
crdtqrZbKOrSSlgLSEShCK41jD/EKDvU6+dYd1nZ2s5O618L+liOCQWmctPgDw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675330390;
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=QCov1LeyHdcxA+X9ULHGCucvFC3fJ/api5pNs2uIuxs=;
b=FnEhwhu4ZPn5UCoqmOoAyHTaGpA2sv22BfYIFKwVgoddT2V9cbEvtn0MaK8eCxyqmI3CJD
O+LLWL7EctkPgMv5faK7aDuqnq/8/7C+ofUWXmNSjcQMYxRtPceLKWBLSVOMfSpRCP3Wks
vmGs+KX3WAI4Pj9APwzx25VZJKiZqD84dYx0LuYROFG0c18xQ/UYYqpCmJMU1T9UpQNV3g
ct3SnsBQWC8rt6ZpbrO7M8j+y6sbNX2v+oyzPkNr2qzv8H2CM5TOAKKpAguUbQQvkfYqvQ
U2SWkOWhNE5P8NYWv665YZ0Npgg+fjIKAVnPcJEXfugzfgS44FEL/qXF5XxCkg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675330390; a=rsa-sha256; cv=none;
b=LfLtLuNC+HeiDWVUPfe5st+JdxnmL6sZYKW9e0Xcj3sL/1WCazH38mi9HRqYIHFZeDw0za
gMo1HoomxTgwobO5/LIwRBh6LMQAtcKxvdd6n06lPO1E4mGeFExFOMSQ9r73Z3w3ptt/JN
CdTgsasCvkbzG2YbchCa8J/uIHp5zDZwCSZcAvrEg+HZWFUlA1P3AzxNh3iIZLNJ32IRbI
Mz0VEflxuvpFR2g3pFOhcV8zFC5TrEdIzs9sLg49T0TOkDDyMYrdI0ztVEL6+91vJlw/Zs
N5NH/5rl72ShYGkyXRiaVw+BQssVU0Punyw2C7TpacX4biwYuIN+BbiWZExJqQ==
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 4P6tr61jXBzqP6;
Thu, 2 Feb 2023 09:33:10 +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 3129XARu033838;
Thu, 2 Feb 2023 09:33:10 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3129XARn033837;
Thu, 2 Feb 2023 09:33:10 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:33:10 GMT
Message-Id: <202302020933.3129XARn033837@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 0c4f6e1ec0d5 - stable/13 - pkgbase: Put resolvconf in its own package
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 0c4f6e1ec0d54c5fbb5dc1a37e0ac52e50ff981a
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=0c4f6e1ec0d54c5fbb5dc1a37e0ac52e50ff981a
commit 0c4f6e1ec0d54c5fbb5dc1a37e0ac52e50ff981a
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-07-22 08:01:59 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:32:55 +0000
pkgbase: Put resolvconf in its own package
It doesn't really make sense to have it in runtime and let's not
bloat utilities more.
Differential Revision: https://reviews.freebsd.org/D36223
(cherry picked from commit 6987b552ddad55a0392622f6598e4dd6f983d287)
---
release/packages/Makefile.package | 2 ++
sbin/resolvconf/Makefile | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index e5cf3d51cca8..026025b225d1 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -105,6 +105,8 @@ rdma_COMMENT= RDMA Utilities
rdma_DESC= RDMA Utilities
rescue_COMMENT= Rescue Utilities
rescue_DESC= Rescue Utilities
+resolvconf_COMMENT= Resolvconf Utility and scripts
+resolvconf_DESC= Resolvconf Utility and scripts
runtime_COMMENT= FreeBSD Base System
runtime_DESC= FreeBSD Base System
runtime-debug_DESCR= Debugging Symbols
diff --git a/sbin/resolvconf/Makefile b/sbin/resolvconf/Makefile
index 6d7586090da0..abfb486a41c1 100644
--- a/sbin/resolvconf/Makefile
+++ b/sbin/resolvconf/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=resolvconf
DIST= ${SRCTOP}/contrib/openresolv
.PATH: ${DIST}
From nobody Thu Feb 2 09:33:11 2023
X-Original-To: dev-commits-src-branches@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 4P6tr74vsLz3cSHM;
Thu, 2 Feb 2023 09:33:11 +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 4P6tr745VXz3mn0;
Thu, 2 Feb 2023 09:33:11 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675330391;
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=u0BRM78m4DiFmT1IfiQJdFnrhJ7iAA16gYDXN7QN68U=;
b=cpYrjlIlDIDAO7FZp56FqtPDv+M5UdTcdyjhyS0qWDs2mjUf6syOGHkkn1W9aNSc9kv2cI
oafhKE3YZhwM//xbqyUXwauTmFgsoQ5Yd05n6x65OX7XqI/w1GcegGm+BkdfvoIwIMLGfV
08dawWJdFbSlEbFF95RL3/vPCAD9sc3D7GC2HrQcesEA0OHR/9CThMu8/Xq+MNZVEe4Igj
wjhNjW61cfT68NBVR8QptceJTo8UJOqE8Rqrk0yyPOJ3VEuOmev5WQCP2gaERj5p29bB/G
EAaVSruifUYU96+h1Fc7PIDiYQLOawnFB8d1ygwbZP+9TqMD6pEQoEMNQgEMug==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675330391;
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=u0BRM78m4DiFmT1IfiQJdFnrhJ7iAA16gYDXN7QN68U=;
b=WYOVGaLQk0PQs86O3VBJRYY0uyPlOhd0g74weY2TJrqdTJqaJLKWWJOnW+GC/6RLqSgakl
74ZarnmAO6oN3pM/KF0ztF1USkjtLPBQc8bo9hvAtBBSitujEo/XYkrbGyE96wxXQrAmtY
b02jqaDkVYEQtB6s2IDoOnsjCkFpV1ohcvW47vIXCUy/zd1pHSbFtvU32yGRD57RjqTsAh
Ob2KDiBYMRmm8cordXyXG0FtIdNjq7BeFTiu4rE0oya77ub/FjCzB95Yi18MwDy4pfKpJt
drNTHHBto2rbMqKh8NuDjr8YkXb4lKPwrwTWgfzElzaUaFXfnRq2f0/3RGxXwg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675330391; a=rsa-sha256; cv=none;
b=xyhDBYCS8souEUfG7jmqLaGRIYoJTGsVgmZeS/A8h8gBMwXCoUU0d59HG12//h3XjF+rxK
lJwTARIfViAQS9aARfZdDa7ejzfPkZUO5vBJyzBkLNMn/4Lk/ITWEliAvr3o4Ipj8Y3ZBO
0ekcnIo6wKr6sR/FMIZfiRiKBi4dOKCY14vNrw4Aaz5I+sh75Gd71yVeREUvTvFJOdjzZi
0J8Ou35JGQXI2knRSD2pOffJ0LynRsQbIcZksgCB1Bty/r05glmj9OV9PGkyLdMljNtgCr
VtUOczY0vsz3KhKyE3bCmQAWNqOLXE6GQ8w9vUzb98bqR5oc01qpLm18N52X/g==
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 4P6tr72fvqzpy8;
Thu, 2 Feb 2023 09:33:11 +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 3129XBt3033872;
Thu, 2 Feb 2023 09:33:11 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3129XBhI033871;
Thu, 2 Feb 2023 09:33:11 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:33:11 GMT
Message-Id: <202302020933.3129XBhI033871@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: e93d2af4beab - stable/13 - pkgbase: Put geom utilities in their own package
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: e93d2af4beabc690752474658ba163d23ac7350a
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=e93d2af4beabc690752474658ba163d23ac7350a
commit e93d2af4beabc690752474658ba163d23ac7350a
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-07-22 08:19:07 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:32:55 +0000
pkgbase: Put geom utilities in their own package
For most users it's not needed to boot and they are also
available in the FreeBSD-rescue package in case an update
break and FreeBSD-geom package isn't updated correctly.
Differential Revision: https://reviews.freebsd.org/D36224
(cherry picked from commit 0bf688786f7d5508b43b50c62f50f022e33b1352)
---
lib/geom/cache/Makefile | 2 +-
lib/geom/concat/Makefile | 2 +-
lib/geom/eli/Makefile | 2 +-
lib/geom/journal/Makefile | 2 +-
lib/geom/label/Makefile | 2 +-
lib/geom/mirror/Makefile | 2 +-
lib/geom/mountver/Makefile | 2 +-
lib/geom/multipath/Makefile | 2 +-
lib/geom/nop/Makefile | 2 +-
lib/geom/part/Makefile | 2 +-
lib/geom/raid/Makefile | 2 +-
lib/geom/raid3/Makefile | 2 +-
lib/geom/shsec/Makefile | 2 +-
lib/geom/stripe/Makefile | 2 +-
lib/geom/virstor/Makefile | 2 +-
release/packages/Makefile.package | 2 ++
sbin/gbde/Makefile | 2 +-
sbin/geom/Makefile | 2 +-
sbin/gvinum/Makefile | 2 +-
19 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/lib/geom/cache/Makefile b/lib/geom/cache/Makefile
index e1ba031c9ffe..2aee7212dfda 100644
--- a/lib/geom/cache/Makefile
+++ b/lib/geom/cache/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=geom
.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= cache
diff --git a/lib/geom/concat/Makefile b/lib/geom/concat/Makefile
index 3c370520a624..9d5cfb8b3893 100644
--- a/lib/geom/concat/Makefile
+++ b/lib/geom/concat/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=geom
.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= concat
diff --git a/lib/geom/eli/Makefile b/lib/geom/eli/Makefile
index e36eece7a6e2..49f34908f917 100644
--- a/lib/geom/eli/Makefile
+++ b/lib/geom/eli/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=geom
.PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/eli ${SRCTOP}/sys/crypto/sha2
GEOM_CLASS= eli
diff --git a/lib/geom/journal/Makefile b/lib/geom/journal/Makefile
index 3be15a13a81e..e789793a68b8 100644
--- a/lib/geom/journal/Makefile
+++ b/lib/geom/journal/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=geom
.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= journal
diff --git a/lib/geom/label/Makefile b/lib/geom/label/Makefile
index 767924b78b61..9f2b9c5e24f8 100644
--- a/lib/geom/label/Makefile
+++ b/lib/geom/label/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=geom
.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= label
diff --git a/lib/geom/mirror/Makefile b/lib/geom/mirror/Makefile
index 553e44787d8b..0fd7a7bcd13b 100644
--- a/lib/geom/mirror/Makefile
+++ b/lib/geom/mirror/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=geom
.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= mirror
diff --git a/lib/geom/mountver/Makefile b/lib/geom/mountver/Makefile
index 36c1e01e112a..7924df1a074d 100644
--- a/lib/geom/mountver/Makefile
+++ b/lib/geom/mountver/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=geom
.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= mountver
diff --git a/lib/geom/multipath/Makefile b/lib/geom/multipath/Makefile
index 5a753e42d76d..4364e382ba75 100644
--- a/lib/geom/multipath/Makefile
+++ b/lib/geom/multipath/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=geom
.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= multipath
diff --git a/lib/geom/nop/Makefile b/lib/geom/nop/Makefile
index 9d8b69117466..51a535a3b9e1 100644
--- a/lib/geom/nop/Makefile
+++ b/lib/geom/nop/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=geom
.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= nop
diff --git a/lib/geom/part/Makefile b/lib/geom/part/Makefile
index e9631caf4d84..077bc6c64b1d 100644
--- a/lib/geom/part/Makefile
+++ b/lib/geom/part/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=geom
.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= part
diff --git a/lib/geom/raid/Makefile b/lib/geom/raid/Makefile
index 75d2ac7e25b7..2e3d4083492a 100644
--- a/lib/geom/raid/Makefile
+++ b/lib/geom/raid/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=geom
.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= raid
diff --git a/lib/geom/raid3/Makefile b/lib/geom/raid3/Makefile
index 2fdf4e8f8167..29aeb9d595b5 100644
--- a/lib/geom/raid3/Makefile
+++ b/lib/geom/raid3/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=geom
.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= raid3
diff --git a/lib/geom/shsec/Makefile b/lib/geom/shsec/Makefile
index f86df6c9af42..e6acbf24577c 100644
--- a/lib/geom/shsec/Makefile
+++ b/lib/geom/shsec/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=geom
.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= shsec
diff --git a/lib/geom/stripe/Makefile b/lib/geom/stripe/Makefile
index bbea1901749e..9fc24db55d65 100644
--- a/lib/geom/stripe/Makefile
+++ b/lib/geom/stripe/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=geom
.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= stripe
diff --git a/lib/geom/virstor/Makefile b/lib/geom/virstor/Makefile
index dfbe0aeddc47..24b4e508af18 100644
--- a/lib/geom/virstor/Makefile
+++ b/lib/geom/virstor/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=geom
.PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/virstor
GEOM_CLASS= virstor
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index 026025b225d1..fda5c90f8c6f 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -54,6 +54,8 @@ ftpd_COMMENT= FTP Daemon
ftpd_DESC= FTP Daemon
gdb_COMMENT= GDB Utilities
gdb_DESC= GDB Utilities
+geom_COMMENT= GEOM Utilitites
+geom_DESC= GEOM Utilitites
ggate_COMMENT= GEOM Gate Utilities
ggate_DESC= GEOM Gate Utilities
groff_COMMENT= Groff Utilities
diff --git a/sbin/gbde/Makefile b/sbin/gbde/Makefile
index dcc034fd7564..867a7f8e9b55 100644
--- a/sbin/gbde/Makefile
+++ b/sbin/gbde/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=geom
PROG= gbde
SRCS= gbde.c template.c
SRCS+= rijndael-alg-fst.c
diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile
index 0c6e6e2b95c8..4424c757371f 100644
--- a/sbin/geom/Makefile
+++ b/sbin/geom/Makefile
@@ -4,7 +4,7 @@
.PATH: ${.CURDIR}/core ${.CURDIR}/misc
-PACKAGE=runtime
+PACKAGE=geom
PROG= geom
SRCS= geom.c subr.c
MAN= geom.8
diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile
index 18550053228a..88d6b7242580 100644
--- a/sbin/gvinum/Makefile
+++ b/sbin/gvinum/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=geom
PROG= gvinum
SRCS= gvinum.c gvinum.h geom_vinum_share.c
MAN= gvinum.8
From nobody Thu Feb 2 09:33:12 2023
X-Original-To: dev-commits-src-branches@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 4P6tr8593rz3cRyD;
Thu, 2 Feb 2023 09:33: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 4P6tr84Mhrz3mt0;
Thu, 2 Feb 2023 09:33:12 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675330392;
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=13p7wN8RTmWsRefpiNnJu2MhIuyVkDjjORapMfPxWFw=;
b=A+gADhTx9XdetaGcPjdyy4dsX+rbOWHoJrUQeIAl5yOK3ZVrk6htxU63Encu85sIfiQkYd
X5yVGTZfq/GML1o4JbJfeP+hT6paoAn+RbBVazt/N07enSi6iwM5JyZsv0yQcdQZRXq6N+
7KRs63SnFI4m+KiyJaFbtDz+FXaSb7UB4Ov0+PFh2GmxO+cMoOpF8iaG+BwPdPAngN0GEa
19z+fYMkmsDx+YZJnGjf8REL7LqJ2pqIKHX/EP9zTsjSo4sQ5j+FIdhYJ4XpOReZW2ZWGd
7nBeJqdiftsTDlCc0tjjbKzCN8lr/v2ZIYhCCJMshqdWJ4tvMJT5N7Z2xKllaQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675330392;
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=13p7wN8RTmWsRefpiNnJu2MhIuyVkDjjORapMfPxWFw=;
b=oP62iWCDxNcPbekzzf0xw/rOPi18W5gaLQpKsZq46Q/Xj4S0YMYR3b3oZZoCcv1Gn/z35e
sK0JOF1lz0+tYzaVVqsLJ1ffANrW+j5l5c8Dq8Ayx3L+plHxx4RYviq8rkazqdznefK3fR
NybB+d4A+/G3jlrKcPgnjdBUVg3qqP7Yru8Af+zgbmIbdnBwke3TqKtZTZyDcYektAHFYM
PgU8FRUgwPRpxnNIMNI2GOBFCHEbmfHGmP6kUUOFa4U+yDL0gfnf4I0Qw/CuLFbDYNaxFr
EQkJwptFUx4ErIGs2Jpd6ziWRXPP+gUgz+OnfXKpAM9z8uxSXmAyR/9MUbqfGg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675330392; a=rsa-sha256; cv=none;
b=PeJ1hJZY3lbelJEO9p2RcylIoEv1yUBFWiz6vbLqOsUymM3O+07juWUhuRwBUmZH1dsuah
17Ov0nzgEEgBg9RpLNjandghugz2Bim7GZQ+yDtwcOe8zMOcxby+Dt0aQVETekxcyp9+wz
eOkU/DHYHH0OqKKF1V9UkWXE5NBg+wK5vSqYwdLQBgLoly53H5OJeKOYiaEs4vrg/QddAc
v+nZYjbGGucOGPeiXJk1Ds2YlM9j0z8zYPSUXQxIPflJ5KAR/H7hhkPmzT3tsTMQQe96nU
kvpmn9p6UTpIqFePnMw03kk3kv/3qF+tLg2wlIAuDsTgmJuqDMlmAyE3/D5elA==
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 4P6tr83RLWzqP7;
Thu, 2 Feb 2023 09:33:12 +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 3129XC9w033899;
Thu, 2 Feb 2023 09:33:12 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3129XCEb033898;
Thu, 2 Feb 2023 09:33:12 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:33:12 GMT
Message-Id: <202302020933.3129XCEb033898@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 40b8a8f25302 - stable/13 - pkgbase: Put zfs utilities and lib in their own package
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 40b8a8f2530224ccebfd35b1875bc75f0ff72d79
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=40b8a8f2530224ccebfd35b1875bc75f0ff72d79
commit 40b8a8f2530224ccebfd35b1875bc75f0ff72d79
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-07-22 08:43:39 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:32:55 +0000
pkgbase: Put zfs utilities and lib in their own package
It is useful to have zfs utilities and lib in a separate package as
it allow users to create image that can support ZFS (i.e. not with
WITHOUT_ZFS in src.conf set) without bloating the default image with
all zfs tools (for example for jails).
Differential Revision: https://reviews.freebsd.org/D36225
(cherry picked from commit a71ea7bea0d2a8ba86373377c3c1443acbeab5d2)
---
cddl/lib/libavl/Makefile | 2 +-
cddl/lib/libicp/Makefile | 2 +-
cddl/lib/libnvpair/Makefile | 2 +-
cddl/lib/libspl/Makefile | 2 +-
cddl/lib/libtpool/Makefile | 2 +-
cddl/lib/libumem/Makefile | 2 +-
cddl/lib/libuutil/Makefile | 2 +-
cddl/lib/libzfs/Makefile | 2 +-
cddl/lib/libzfs_core/Makefile | 2 +-
cddl/lib/libzfsbootenv/Makefile | 2 +-
cddl/lib/libzpool/Makefile | 1 +
cddl/lib/libzutil/Makefile | 2 +-
cddl/lib/pam_zfs_key/Makefile | 2 +-
cddl/sbin/zfs/Makefile | 2 +-
cddl/sbin/zpool/Makefile | 2 +-
cddl/share/zfs/compatibility.d/Makefile | 2 ++
cddl/usr.bin/zinject/Makefile | 1 +
cddl/usr.bin/zstream/Makefile | 1 +
cddl/usr.bin/ztest/Makefile | 1 +
cddl/usr.sbin/zdb/Makefile | 1 +
cddl/usr.sbin/zfsd/Makefile | 1 +
cddl/usr.sbin/zhack/Makefile | 1 +
lib/libbe/Makefile | 2 +-
release/packages/Makefile.package | 2 ++
sbin/bectl/Makefile | 2 +-
25 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile
index b5e3b458f982..6a39e342bafc 100644
--- a/cddl/lib/libavl/Makefile
+++ b/cddl/lib/libavl/Makefile
@@ -2,7 +2,7 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl
-PACKAGE= runtime
+PACKAGE= zfs
LIB= avl
LIBADD= spl
SRCS= avl.c
diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile
index 9195b7182d54..6c0d73561818 100644
--- a/cddl/lib/libicp/Makefile
+++ b/cddl/lib/libicp/Makefile
@@ -2,7 +2,7 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
-PACKAGE= utilities
+PACKAGE= zfs
LIB= icp
LIBADD=
diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile
index aaf76ed3fb28..b3a550688293 100644
--- a/cddl/lib/libnvpair/Makefile
+++ b/cddl/lib/libnvpair/Makefile
@@ -6,7 +6,7 @@
LIB= nvpair
LIBADD= spl
-PACKAGE= runtime
+PACKAGE= zfs
# user
SRCS= libnvpair.c \
libnvpair_json.c \
diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile
index e8d6368fce81..82f1aa037d42 100644
--- a/cddl/lib/libspl/Makefile
+++ b/cddl/lib/libspl/Makefile
@@ -8,7 +8,7 @@
LIB= spl
LIBADD=
-PACKAGE= runtime
+PACKAGE= zfs
SRCS = \
assert.c \
diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile
index 637385bc842e..d6a1d9fcfb7c 100644
--- a/cddl/lib/libtpool/Makefile
+++ b/cddl/lib/libtpool/Makefile
@@ -6,7 +6,7 @@
LIB= tpool
LIBADD= spl
-PACKAGE= runtime
+PACKAGE= zfs
INCS= thread_pool_impl.h
SRCS= thread_pool.c
diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile
index ca8f5e665920..4e4ef2e69461 100644
--- a/cddl/lib/libumem/Makefile
+++ b/cddl/lib/libumem/Makefile
@@ -2,7 +2,7 @@
.PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem
-PACKAGE= runtime
+PACKAGE= zfs
LIB= umem
SRCS= umem.c
WARNS?= 3
diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile
index 76567b50c610..d1267caa9fd3 100644
--- a/cddl/lib/libuutil/Makefile
+++ b/cddl/lib/libuutil/Makefile
@@ -2,7 +2,7 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil
-PACKAGE= runtime
+PACKAGE= zfs
LIB= uutil
SRCS=\
uu_alloc.c \
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index b159955c0212..babded59199d 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -10,7 +10,7 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib
-PACKAGE= runtime
+PACKAGE= zfs
LIB= zfs
LIBADD= \
avl \
diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile
index 6350990064f7..2f95a34b49f7 100644
--- a/cddl/lib/libzfs_core/Makefile
+++ b/cddl/lib/libzfs_core/Makefile
@@ -6,7 +6,7 @@
LIB= zfs_core
LIBADD= nvpair spl zutil
-PACKAGE= runtime
+PACKAGE= zfs
INCS= libzfs_core.h
SRCS= libzfs_core.c
diff --git a/cddl/lib/libzfsbootenv/Makefile b/cddl/lib/libzfsbootenv/Makefile
index f84718a10de7..4e2f35848e04 100644
--- a/cddl/lib/libzfsbootenv/Makefile
+++ b/cddl/lib/libzfsbootenv/Makefile
@@ -3,7 +3,7 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfsbootenv
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
-PACKAGE= runtime
+PACKAGE= zfs
LIB= zfsbootenv
SHLIB_MAJOR= 1
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index 0e5d24bd0ec5..7991e1964995 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -30,6 +30,7 @@ ATOMIC_SRCS= opensolaris_atomic.c
PICFLAG= -fPIC
.endif
+PACKAGE= zfs
LIB= zpool
USER_C = \
diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile
index b2677eb3f8ae..19aa9e35fbbf 100644
--- a/cddl/lib/libzutil/Makefile
+++ b/cddl/lib/libzutil/Makefile
@@ -6,7 +6,7 @@
LIB= zutil
LIBADD= avl geom m tpool
-PACKAGE= runtime
+PACKAGE= zfs
INCS = zutil_import.h
diff --git a/cddl/lib/pam_zfs_key/Makefile b/cddl/lib/pam_zfs_key/Makefile
index cf43802090dd..c35a8a6bd615 100644
--- a/cddl/lib/pam_zfs_key/Makefile
+++ b/cddl/lib/pam_zfs_key/Makefile
@@ -1,7 +1,7 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/contrib/pam_zfs_key
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
-PACKAGE= utilities
+PACKAGE= zfs
LIB= pam_zfs_key
SHLIBDIR?= /usr/lib
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
index 6a6ef62e4fce..0babca17e98a 100644
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -7,7 +7,7 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
.PATH: ${ZFSTOP}/man/man8
.PATH: ${ZFSTOP}/module/os/freebsd/spl
-PACKAGE= runtime
+PACKAGE= zfs
PROG= zfs
MAN= \
zfs.8 \
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
index 4c2a8b94de19..7020439a4366 100644
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
@@ -10,7 +10,7 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
.PATH: ${ZFSTOP}/cmd/zpool/os/freebsd
-PACKAGE= runtime
+PACKAGE= zfs
PROG= zpool
MAN= \
spl.4 \
diff --git a/cddl/share/zfs/compatibility.d/Makefile b/cddl/share/zfs/compatibility.d/Makefile
index 255f4a3542b3..da180b10e733 100644
--- a/cddl/share/zfs/compatibility.d/Makefile
+++ b/cddl/share/zfs/compatibility.d/Makefile
@@ -4,6 +4,8 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
.PATH: ${ZFSTOP}/cmd/zpool/compatibility.d
+PACKAGE= zfs
+
FILES= \
compat-2018 \
compat-2019 \
diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
index fcc472c24214..1e25b38d4eea 100644
--- a/cddl/usr.bin/zinject/Makefile
+++ b/cddl/usr.bin/zinject/Makefile
@@ -5,6 +5,7 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
.PATH: ${ZFSTOP}/cmd/zinject
.PATH: ${ZFSTOP}/man/man8
+PACKAGE= zfs
PROG= zinject
INCS= zinject.h
SRCS= zinject.c translate.c
diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile
index cfcff71a813f..d8891a23b83f 100644
--- a/cddl/usr.bin/zstream/Makefile
+++ b/cddl/usr.bin/zstream/Makefile
@@ -5,6 +5,7 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
.PATH: ${ZFSTOP}/cmd/zstream
.PATH: ${ZFSTOP}/man/man8
+PACKAGE= zfs
PROG= zstream
MAN= zstream.8
MLINKS= zstream.8 zstreamdump.8
diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
index 0945bb962c63..2031fedc97e5 100644
--- a/cddl/usr.bin/ztest/Makefile
+++ b/cddl/usr.bin/ztest/Makefile
@@ -7,6 +7,7 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
.PATH: ${ZFSTOP}/cmd/ztest
.PATH: ${ZFSTOP}/man/man1
+PACKAGE= zfs
PROG= ztest
MAN= ztest.1
diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
index efd8c746128f..3be2dea0bb95 100644
--- a/cddl/usr.sbin/zdb/Makefile
+++ b/cddl/usr.sbin/zdb/Makefile
@@ -5,6 +5,7 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
.PATH: ${ZFSTOP}/cmd/zdb
.PATH: ${ZFSTOP}/man/man8
+PACKAGE= zfs
PROG= zdb
MAN= zdb.8
INCS= zdb.h
diff --git a/cddl/usr.sbin/zfsd/Makefile b/cddl/usr.sbin/zfsd/Makefile
index 88eb9220a8cc..e263a47cb422 100644
--- a/cddl/usr.sbin/zfsd/Makefile
+++ b/cddl/usr.sbin/zfsd/Makefile
@@ -4,6 +4,7 @@
.include "Makefile.common"
+PACKAGE= zfs
PROG_CXX= zfsd
MAN= zfsd.8
diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile
index 24800c693cf3..56725d54ad5c 100644
--- a/cddl/usr.sbin/zhack/Makefile
+++ b/cddl/usr.sbin/zhack/Makefile
@@ -2,6 +2,7 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/cmd/zhack
+PACKAGE= zfs
PROG= zhack
MAN=
diff --git a/lib/libbe/Makefile b/lib/libbe/Makefile
index d1fab41578bf..4092c7475552 100644
--- a/lib/libbe/Makefile
+++ b/lib/libbe/Makefile
@@ -4,7 +4,7 @@ SHLIBDIR?= /lib
.include <src.opts.mk>
-PACKAGE= runtime
+PACKAGE= zfs
LIB= be
SHLIB_MAJOR= 1
SHLIB_MINOR= 0
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index fda5c90f8c6f..af4a1ed3f49f 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -146,3 +146,5 @@ wpa_COMMENT= 802.11 Supplicant
wpa_DESC= 802.11 Supplicant
yp_COMMENT= Yellow Pages programs
yp_DESC= Yellow Pages programs
+zfs_COMMENT= ZFS Libraries and Utilities
+zfs_DESC= ZFS Libraries and Utilities
diff --git a/sbin/bectl/Makefile b/sbin/bectl/Makefile
index 46d43306b9ca..fe2e6087e243 100644
--- a/sbin/bectl/Makefile
+++ b/sbin/bectl/Makefile
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-PACKAGE=runtime
+PACKAGE=zfs
PROG= bectl
MAN= bectl.8
From nobody Thu Feb 2 09:33:13 2023
X-Original-To: dev-commits-src-branches@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 4P6trB1qr0z3cSBJ;
Thu, 2 Feb 2023 09:33:14 +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 4P6tr95LkBz3mmB;
Thu, 2 Feb 2023 09:33:13 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675330393;
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=a6BObZBYMLx+U6p7LMDnrKvI+cYgSYFw0WwycbXTYi8=;
b=Uzz48XLX2znnqNELjv5cJVJCGm/9Goo6abn/lPaGkW4TVXJIiMMj0A8AdliNvW3SQc0oYj
XVs5H7LOGEi+kWDG7+xCrdLUNoPWgO4IG4UxJ7OD03KjqTKVIOrCmUdV1XfVqyKWuXinUo
/WrVjjlGw6UFppx+SCWKiKsFoYq+L3t1HqmdFUl/IY9dUMsZum70OCzH1sgO4lKsNG+xNd
NlzAVNg8FDrtNOc6GJuePuepIQWh4TKWBp6lptXgauHAMW7IJqDu2wm4pRapLdT68fST2P
cI1NDwVEg8L/Vflc52KJxlOgnwEqjPaBrRDORydJlX9KujvHu+d/MY7+0emusQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675330393;
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=a6BObZBYMLx+U6p7LMDnrKvI+cYgSYFw0WwycbXTYi8=;
b=eJOwNnIbNX9hpIQtqAibpk3s0TiKQvS78XmxtUd3olmITqhAxDdrcQQCLiT98+gWBuvbIV
zDUMrmanAh8f2ruio8RBCckq/jwSO/IHgZjzAluRpKgeYNyKVsbxd/F/cM6RBqJkCe3zVZ
gHL/J56mikPRYA6xOT5D7vacISBIGOHL46Atg3z+WksyV7wm4h4426HYeNYYiDqn1oANUr
6jrJeq2MErd3Y/+sKpW5W57EDjzHGxCQijgxttnVd2jfLbsjbQA4Vq+5ss+8jNut8aEJr9
Yi7Y1ntULy4Z3yOpJN6rkJH1wLBm2dBK/bKGJ89yd8GdOAP+VW6t8LxsGVpfBw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675330393; a=rsa-sha256; cv=none;
b=ThU1ShgAWPf1jnshAs4RTk9XGrEund55Uag5DgvAFp2nZajwWH1wewTQ+MEeFv4QOZ1du2
YR+Uj0jUg+43do0mG0NHy77tf8sIwW1wTH9ij1R6zCl3hUlpJqEgGaTOUkJJ+9D3mEDJjz
5rTtTFvro570apeZrHAoMgbhaRI8Dlmh9yfa45LNQAepU7/lN7w9yJup3nroyN9B7kBQfS
OBr9lEHxJaQwaSmHmbEfw+URpYPYDMjLsJ9jHDBrQQt7lPjv0TTTPJkcGvxGTUzVCIqj4N
+wSzHTdIVuTs1Rb9hA7OBstD40QHXOsE+yKi4LihpySkBT4g723tpn+VxC8M1A==
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 4P6tr94P84zq3v;
Thu, 2 Feb 2023 09:33:13 +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 3129XDWl033936;
Thu, 2 Feb 2023 09:33:13 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3129XDLl033935;
Thu, 2 Feb 2023 09:33:13 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:33:13 GMT
Message-Id: <202302020933.3129XDLl033935@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: af38da83afe3 - stable/13 - pkgbase: Put libwrap in FreeBSD-tcpd package
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: af38da83afe3c57a33cd8872e94074852954b332
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=af38da83afe3c57a33cd8872e94074852954b332
commit af38da83afe3c57a33cd8872e94074852954b332
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-07-22 09:06:05 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:32:55 +0000
pkgbase: Put libwrap in FreeBSD-tcpd package
It belongs there with the tcp wrapper utilities
Differential Revision: https://reviews.freebsd.org/D36226
(cherry picked from commit a099694ecdbdc50445487c5b1ebebdc13c2f0b43)
---
lib/libwrap/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 71559b17e6ad..a396be5a0899 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -4,7 +4,7 @@
.include <src.opts.mk>
-PACKAGE= runtime
+PACKAGE= tcpd
CONFS= hosts.allow
LIB= wrap
From nobody Thu Feb 2 09:33:14 2023
X-Original-To: dev-commits-src-branches@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 4P6trC1YWgz3cSX2;
Thu, 2 Feb 2023 09:33:15 +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 4P6trB6HV2z3n0B;
Thu, 2 Feb 2023 09:33:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675330394;
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=gt2uH3BDAAeLTeVuHFbGELXXSZEXzCZy/+L86hkHgag=;
b=F/N3LxNJCpg0t85pnpYRbHCBYe9N0nG1V/n0sQASXyxONOqddd079FctLWBIPXEfzppEfb
FF7AXyUik8/KH8HE/3kh8XRM5Fi0ggL27V6IsCQ5T0HicKN5RxOwawpIMH351LjnSkLNLX
Swc0T3H11xOw9wKiEcPK7vTQWrgdk661TZFK0zZQsBHzeeiRnEshZ2mIq0FaqtJbmWo7mC
qI1/tLMlwZ8RQl3YKjTsMzgo2AyY87JRa2/YT6Emc/PKPPO1dejFsGw4+nngW4WM1Cj8GH
1lXC2RQth+LDDs+E3AmawBZffSRH0Nrp6b8VyXpQ4tuJMS2QiA8JUXYAKAHdyQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675330394;
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=gt2uH3BDAAeLTeVuHFbGELXXSZEXzCZy/+L86hkHgag=;
b=ClN/d+/ls4f/S9LZn4xKHRMQ1/KZ033iak5CyvgSHgaPoCO8nuwRHbB6geGlEtSoSiZCFR
Rh9zV7n1Hbore/NNlwD9cGs6u0EFTfmoyEDtRdSD19A6yoLmbo9rWhfZJfEa9d/sAryQPI
FvSgbtTsYwOec6O/t/MRVsMArbJRfCsZ43wLUrzAtk7SjzDoEsQKPQcG7b5jR5Lwmc10HL
0uIKxL27SQeIxMsCcH9dJl6+DwYpG/S5RMVhsNvDmdiqkpuiv/GPFJWGJtN4oKMhWOA9Ll
ELyumy+zvu3I/mlnmTg7J6zttd1B5Kt7T1uH10EcK4dt0j15p+Gnf6P8okcHPg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675330394; a=rsa-sha256; cv=none;
b=oRy76OrvTF2QDfvhQygDaZ5MI7SYaJxqTJSRhMGorf5YCkzExwEY6aLdLKE4vj8pOHgaR6
vKJbT8v0Rym5qk1+8M56iopFrsEXwcP4pO0RxJYh4ZAu4RBCk8OthVEa4byBRx4qsmS+wE
XjbcD3WaYDgQA9kS3dZJTQ58pWNxCfvakxlSAo8OcXkVEOsYFNmWtWAUTYEL6TRawBy3E6
FQ6+mWZf1zsO/z0cffoOuVogZ+zxYbISM/+kuORxr9kWvqHzVaNpACn5i11Hp6uWA0lKFK
TnCBFz/mRqZlFm+kBn6dOrm+T+mTrC+C4QbvmibiKbG39iK38clR9B/MZOoOLg==
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 4P6trB5NbTzqFp;
Thu, 2 Feb 2023 09:33:14 +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 3129XEd6033962;
Thu, 2 Feb 2023 09:33:14 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3129XEfT033961;
Thu, 2 Feb 2023 09:33:14 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:33:14 GMT
Message-Id: <202302020933.3129XEfT033961@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 01db7f820e8e - stable/13 - pkgbase: Put ufs related tools and lib in their own package
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 01db7f820e8ee3e901b81ecd4551d4b37b62026f
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=01db7f820e8ee3e901b81ecd4551d4b37b62026f
commit 01db7f820e8ee3e901b81ecd4551d4b37b62026f
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-07-22 11:22:29 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:32:55 +0000
pkgbase: Put ufs related tools and lib in their own package
It's not really useful in a jail or in a mdroot or even if a users
wants to do a full zfs machine.
Reviewed by: mckusick
Differential Revision: https://reviews.freebsd.org/D36227
(cherry picked from commit a7ffc948497e04354fa512915f7e383ee04ae269)
---
lib/libufs/Makefile | 2 +-
release/packages/Makefile.package | 2 ++
sbin/clri/Makefile | 2 +-
sbin/dump/Makefile | 2 +-
sbin/dumpfs/Makefile | 2 +-
sbin/ffsinfo/Makefile | 2 +-
sbin/fsck_ffs/Makefile | 2 +-
sbin/fsdb/Makefile | 2 +-
sbin/fsirand/Makefile | 2 +-
sbin/growfs/Makefile | 2 +-
sbin/mksnap_ffs/Makefile | 2 +-
sbin/newfs/Makefile | 1 +
sbin/restore/Makefile | 2 +-
sbin/tunefs/Makefile | 2 +-
usr.sbin/snapinfo/Makefile | 1 +
15 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile
index a767546f457f..755722880484 100644
--- a/lib/libufs/Makefile
+++ b/lib/libufs/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE= runtime
+PACKAGE= ufs
LIB= ufs
SHLIBDIR?= /lib
SHLIB_MAJOR= 7
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index af4a1ed3f49f..b924026aa64d 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -134,6 +134,8 @@ telnet_COMMENT= Telnet and telnetd
telnet_DESC= Telnet and telnetd
tests_COMMENT= Test Suite
tests_DESC= Test Suite
+ufs_COMMENT= UFS Libraries and Utilities
+ufs_DESC= UFS Libraries and Utilities
unbound_COMMENT= Unbound DNS Resolver
unbound_DESC= Unbound DNS Resolver
utilities_COMMENT= Non-vital programs and libraries
diff --git a/sbin/clri/Makefile b/sbin/clri/Makefile
index 5f8777f30391..77a7933f8cdd 100644
--- a/sbin/clri/Makefile
+++ b/sbin/clri/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=ufs
PROG= clri
MAN= clri.8
LIBADD= ufs
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index f611d6b1ab47..0977a969609b 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -13,7 +13,7 @@
# DEBUG use local directory to find ddate and dumpdates
# TDEBUG trace out the process forking
-PACKAGE=runtime
+PACKAGE=ufs
PROG= dump
CONFS= /dev/null
CONFSGRP= operator
diff --git a/sbin/dumpfs/Makefile b/sbin/dumpfs/Makefile
index 03e1aae03b87..c90644dd0186 100644
--- a/sbin/dumpfs/Makefile
+++ b/sbin/dumpfs/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=ufs
PROG= dumpfs
WARNS?= 2
LIBADD= ufs
diff --git a/sbin/ffsinfo/Makefile b/sbin/ffsinfo/Makefile
index 19aa71ab89c4..37837d182a91 100644
--- a/sbin/ffsinfo/Makefile
+++ b/sbin/ffsinfo/Makefile
@@ -7,7 +7,7 @@
GROWFS= ${.CURDIR:H}/growfs
.PATH: ${GROWFS}
-PACKAGE=runtime
+PACKAGE=ufs
PROG= ffsinfo
SRCS= ffsinfo.c debug.c
MAN= ffsinfo.8
diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile
index ba8a39a87e1f..351ec432095d 100644
--- a/sbin/fsck_ffs/Makefile
+++ b/sbin/fsck_ffs/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
# @(#)Makefile 8.2 (Berkeley) 4/27/95
-PACKAGE=runtime
+PACKAGE=ufs
PROG= fsck_ffs
LINKS+= ${BINDIR}/fsck_ffs ${BINDIR}/fsck_ufs
LINKS+= ${BINDIR}/fsck_ffs ${BINDIR}/fsck_4.2bsd
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index a2e280420479..37be6845fa78 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -2,7 +2,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=ufs
PROG= fsdb
MAN= fsdb.8
SRCS= fsdb.c fsdbutil.c \
diff --git a/sbin/fsirand/Makefile b/sbin/fsirand/Makefile
index 1fc54ff44687..7c9475b95251 100644
--- a/sbin/fsirand/Makefile
+++ b/sbin/fsirand/Makefile
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1 1997/01/26 02:23:20 millert Exp $
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=ufs
PROG= fsirand
MAN= fsirand.8
LIBADD= ufs
diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile
index 8aeb9d77509e..9c0704193446 100644
--- a/sbin/growfs/Makefile
+++ b/sbin/growfs/Makefile
@@ -8,7 +8,7 @@
.PATH: ${.CURDIR:H}/mount
-PACKAGE=runtime
+PACKAGE=ufs
PROG= growfs
SRCS= growfs.c getmntopts.c
MAN= growfs.8
diff --git a/sbin/mksnap_ffs/Makefile b/sbin/mksnap_ffs/Makefile
index a79ae2f73417..53690a39805f 100644
--- a/sbin/mksnap_ffs/Makefile
+++ b/sbin/mksnap_ffs/Makefile
@@ -2,7 +2,7 @@
.PATH: ${.CURDIR:H}/mount
-PACKAGE=runtime
+PACKAGE=ufs
PROG= mksnap_ffs
SRCS= mksnap_ffs.c getmntopts.c
MAN= mksnap_ffs.8
diff --git a/sbin/newfs/Makefile b/sbin/newfs/Makefile
index 9e3ea13b6e5c..2723c42e575c 100644
--- a/sbin/newfs/Makefile
+++ b/sbin/newfs/Makefile
@@ -3,6 +3,7 @@
.PATH: ${SRCTOP}/sys/geom
+PACKAGE= ufs
PROG= newfs
LIBADD= ufs util
SRCS= newfs.c mkfs.c geom_bsd_enc.c
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index d6c1e6202693..38134903ee46 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR:H}/dump
-PACKAGE=runtime
+PACKAGE=ufs
PROG= restore
LINKS= ${BINDIR}/restore ${BINDIR}/rrestore
MAN= restore.8
diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile
index 9d0754edca89..cdb2f313c5f7 100644
--- a/sbin/tunefs/Makefile
+++ b/sbin/tunefs/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=ufs
PROG= tunefs
SRCS= tunefs.c getmntopts.c
LIBADD= ufs
diff --git a/usr.sbin/snapinfo/Makefile b/usr.sbin/snapinfo/Makefile
index 76013744e988..3aded69e2fb7 100644
--- a/usr.sbin/snapinfo/Makefile
+++ b/usr.sbin/snapinfo/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
#
+PACKAGE= ufs
PROG= snapinfo
MAN= snapinfo.8
From nobody Thu Feb 2 09:33:15 2023
X-Original-To: dev-commits-src-branches@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 4P6trD1d85z3cRyT;
Thu, 2 Feb 2023 09:33:16 +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 4P6trD0jGCz3n32;
Thu, 2 Feb 2023 09:33:16 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675330396;
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=Mia+E1OmkDKoNXO5c3BAcyesXkCyn8A+sftLeIviWkg=;
b=mQK/AyjoeWY3fgd8Kb/skm4s5Lod+/0214vcHAtHdhRjn01bmbVtxSd/TDfxrecSc5ckfC
KvtTJnIWc1NjjEQIJ5Zc7aw8elekHWiQbMKBMHMvg1EufSyjjaIx+2qzsDmnjjyJIHS8th
PvKK2jAUXxjEUKrpnxSzHFoC+lXRgqQKVWQ/eJBFsjl2L56F+258ORQK2plul755DaTS/A
95xIPyCK3xBXaDXKgzvrqUlvtRksoSGIPZsUR6L7IuDPJXY4Kf3eJHwyK0gqYPTNPezDUf
a3EGnPaHqdyu81sX43jO3t+9pNmQiJ4dkBsV2AryRRF70GRCUoruUj/NuCWoXw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675330396;
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=Mia+E1OmkDKoNXO5c3BAcyesXkCyn8A+sftLeIviWkg=;
b=t9yBkK3WMR4krK4Un7Y/138ugpXn+Y/gx/xSxADpKL+Y8dhzthZhlTTg8L06hW9wj2NSID
dyjxRsLNdmCvVY07h+vcZp6dOD7m4mRTJeJq9mt/S7sMefbVHVP2mxfbRp03M5K2TtbHQX
wPq89YqqMpKrY5kUY86mSVENdTdfDE3TYkZzfe9By67GAQiSimmfmfSFjsvxwEJSkzJK9L
T/zdbITzHIa3Eo1j48WsdG7a5bDFKDCJcEyNDsvzMW9h/O7AqO1mfNNYHcXaZg6QFT4h6d
tJKRhRDN1d3Ck8M/GLeGWHfIXhUh0SXs7UZFjarLXZmZxCUo1RbqNHk/ydKuSA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675330396; a=rsa-sha256; cv=none;
b=a9B9hTtlOp1gdsm5xyLIrdpAXiiO1p+YAn+UcY31+yMHd3rDKgDOpQzW6vHqk3wO2FsJ9w
j+yKkNX17woar7jeNxZw9PNtfkKew7CevYQ+d+JmdsO6ocyL8SYLC9JPmbh75GZAt8lh2f
wjLzaTmVqKMpMDXrRnM5crP6n9VOzH+DjL0ceWXQL3jfKFItKYO7IYbuJGEuQehrhgwAJ3
R638ckO/cxJXRgCnIn7VXWwszYqBIgQ9kNiW23ze0L9Q0rK9rgZx9UyptpjhQBb86EnHiY
xAyk8i41JUacZfFveyr6b/dQuCu8I3KDDDnQaprgV4MAmygsF1IqmzPfReRvZw==
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 4P6trC6SfYzqCR;
Thu, 2 Feb 2023 09:33:15 +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 3129XFMu033986;
Thu, 2 Feb 2023 09:33:15 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3129XFWn033985;
Thu, 2 Feb 2023 09:33:15 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:33:15 GMT
Message-Id: <202302020933.3129XFWn033985@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: de6eaf5c35ad - stable/13 - pkgbase: Put devd in its own package
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: de6eaf5c35ad6440a4cdfd9ff8ffa3bc142042e8
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=de6eaf5c35ad6440a4cdfd9ff8ffa3bc142042e8
commit de6eaf5c35ad6440a4cdfd9ff8ffa3bc142042e8
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-07-22 12:46:30 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:32:56 +0000
pkgbase: Put devd in its own package
It's not that useful in a jail or in a mdroot.
Differential Revision: https://reviews.freebsd.org/D36228
(cherry picked from commit ea0850e4be1a027ba00a53f630bddd8cebebce1d)
---
release/packages/Makefile.package | 2 ++
sbin/devd/Makefile | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index b924026aa64d..564eed4c1218 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -32,6 +32,8 @@ clibs_COMMENT= Core C Libraries
clibs_DESC= Core C Libraries
cxgbe-tools_COMMENT= Chelsio cxbge Utilities
cxgbe-tools_DESC= Chelsio cxbge Utilities
+devd_COMMENT= Devd Utility and scripts
+devd_DESC= Devd Utility and scripts
dhclient_COMMENT= DHCP Client
dhclient_DESC= DHCP Client
dma_COMMENT= DMA Mail Agent Utilities
diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index 0bda9e1ecf95..5caccbe6eb61 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -3,7 +3,7 @@
.include <src.opts.mk>
WARNS?= 3
-PACKAGE=runtime
+PACKAGE=devd
CONFGROUPS= CONFS DEVD
CONFS= devd.conf
DEVD= devmatch.conf
From nobody Thu Feb 2 09:33:16 2023
X-Original-To: dev-commits-src-branches@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 4P6trF1hbyz3cSZW;
Thu, 2 Feb 2023 09:33:17 +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 4P6trF154Sz3nDH;
Thu, 2 Feb 2023 09:33:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675330397;
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=VDpZFU2uHaoRFAymf8zuQwWL413IA9DzaHAwBHJoD6g=;
b=MH0jpzFV3t/VxJn5QbFYAEgB4lOq9IHBZPZKoPhqR3sHmno4d/KlgL96V4IBehMm01g+q0
b10VCdy2/z2VnCAUocB+DlaTLYMJk3ojAWOZMQNOKARuplW6j1SiNWKsKckXulIThemzL4
NBuOYlBdOrB/sX2ovaHJlotPghCJHsNJk1tb4Q/m3rJHZfRJSy7DELj5H31V7OOeEgIpur
ZgsjCCE6EJWenjBlOnYmYK/L5ZvzX5z2D0p5MsAUvkOXl6Hr+YD4GsufxIvrQ4QukaEXOG
KEJ7TbiE1fpxQwlySYvAm8i5YGAGo6Zv3oqzmb7uYvMFhonqFwARADAlLwZ51Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675330397;
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=VDpZFU2uHaoRFAymf8zuQwWL413IA9DzaHAwBHJoD6g=;
b=XBcME2z9Pg5XJV0Is3K58S1HKvyhn2iOaXUDUPOHfUKP1bcLEq1+466Tot3OQ5zGijchbJ
1F4v5cYLlJtgmSEqIqEW4mojrgIMBwHgs+do4crz6Hmr5ONjmY7QtE6j0dLuXgN37CbRSW
iLo0D74MsZErqdECGz7GmffblaMFac5M90VEdG9khQa5klla8o2fFFSQAcsd7mzskGx+nN
E2FHlZKcQO0VcYDx+CVLa4vonFR40Fa9zsctbfN9lBSlIodw+8PaAwLIHutqKbzw08/Hkt
YWFAlRcwyKfgFSKomwSMtrOgE8nvcXLU92JOVoEaJB/JzYEkNvBn73FUxGU5/g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675330397; a=rsa-sha256; cv=none;
b=wcH8sQl4yhkTl0wFS6hKaXXT5I+fG4njiOPMnUlLOVrmPfuc0gZ01YwJM0TA3Rw1cDlBmQ
4vwjT5VTDdiTy+8K3On5oSU8nVEiiI3GS5ojbrtftlqd5RBPGG+A0/Eyx8QisA9HyxHqej
+uLoGk4aMG5l6oVZMeyrebqWX2/vnGqdnlcgd03mXy7glHDKcmvdtacaaC5hVdy7In4YwU
59eDHDzZprW+DSFYeoT+8d0rS8HXMuSB3Wb3GUYJe8uLJiFQql15dtP6V+ifsDIgL2ybZb
E4zEkmUji83QLTkMDuuo61YyGV5i4JCCiiiPeQGamNSoZMuLieLhy71/jjvbxA==
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 4P6trF076jzqRg;
Thu, 2 Feb 2023 09:33:17 +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 3129XGVP034010;
Thu, 2 Feb 2023 09:33:16 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3129XGl6034009;
Thu, 2 Feb 2023 09:33:16 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:33:16 GMT
Message-Id: <202302020933.3129XGl6034009@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: ee4bb682f17f - stable/13 - pkgbase: Put devmatch in its own package
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: ee4bb682f17fe7fb6340118ffb6182b2554a77ca
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=ee4bb682f17fe7fb6340118ffb6182b2554a77ca
commit ee4bb682f17fe7fb6340118ffb6182b2554a77ca
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-07-22 20:30:11 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:32:56 +0000
pkgbase: Put devmatch in its own package
devmatch is useful on standalone machine but not on jails.
Put devinfo(8) and libdevinfo there too.
Differential Revision: https://reviews.freebsd.org/D36229
(cherry picked from commit e7a5a60ed57d1eeb638f4824479b2ab3663eb8a1)
---
lib/libdevinfo/Makefile | 1 +
release/packages/Makefile.package | 2 ++
sbin/devmatch/Makefile | 1 +
usr.sbin/devinfo/Makefile | 1 +
4 files changed, 5 insertions(+)
diff --git a/lib/libdevinfo/Makefile b/lib/libdevinfo/Makefile
index 7995660fb7fd..7edfaecb53b2 100644
--- a/lib/libdevinfo/Makefile
+++ b/lib/libdevinfo/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE= devmatch
LIB= devinfo
SRCS= devinfo.c
INCS= devinfo.h
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index 564eed4c1218..eec564207721 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -34,6 +34,8 @@ cxgbe-tools_COMMENT= Chelsio cxbge Utilities
cxgbe-tools_DESC= Chelsio cxbge Utilities
devd_COMMENT= Devd Utility and scripts
devd_DESC= Devd Utility and scripts
+devmatch_COMMENT= Devmatch Utility
+devmatch_DESC= Devmatch Utility
dhclient_COMMENT= DHCP Client
dhclient_DESC= DHCP Client
dma_COMMENT= DMA Mail Agent Utilities
diff --git a/sbin/devmatch/Makefile b/sbin/devmatch/Makefile
index 6622bdb284d1..7c8b0446ab5f 100644
--- a/sbin/devmatch/Makefile
+++ b/sbin/devmatch/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE= devmatch
PROG= devmatch
MAN= devmatch.8
diff --git a/usr.sbin/devinfo/Makefile b/usr.sbin/devinfo/Makefile
index 681c8197f5de..a740fd6a9b17 100644
--- a/usr.sbin/devinfo/Makefile
+++ b/usr.sbin/devinfo/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE= devmatch
PROG= devinfo
MAN= devinfo.8
From nobody Thu Feb 2 09:33:18 2023
X-Original-To: dev-commits-src-branches@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 4P6trH0DWSz3cSDD;
Thu, 2 Feb 2023 09:33:19 +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 4P6trG2lJcz3n1Y;
Thu, 2 Feb 2023 09:33:18 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675330398;
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=xWHNplnjUmkHr7RoZoQ2daquZFf4Nv0TAplrSJmyhT4=;
b=tvsCH5ppupkSBYbOpq8OuRl4LqefiWvcA9pg7+HvkdzRjW2w273EeEjwzWME1cfaY0zEh6
nYu0c+yRrd5cppjT+oYbKgGEkvTqHpG1luKktWefb7CxHVUQARpVEFlVrrn1qp1fv/iOrh
TiQpSNjQPXZ4+BMlVehLjYn4Q+lvLiNA43RUQClCQvxPsv2TwYcJdwru/+47B31SxNay7Z
eJ6ux1Lx5qIkBxfTHR+AVEok0Jxhw6PnNY7xrqh6wEOHG3iiu0lL8HPLUjOIeHaLvqzgb6
RgD583oeSgaiGGKfAHqNsThOd/di4u9w9efdIwyi67o9zV09+DAxKCR3kSfosA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675330398;
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=xWHNplnjUmkHr7RoZoQ2daquZFf4Nv0TAplrSJmyhT4=;
b=SkEkaTAR53CnEylieJ9yvZMsySafUNOlT7jvIhWEUhyD7ZInuevZii0KdYURcE0GEcYwoB
Qh0HGZkHyqPbYCtujC+ilL6CJv6219rMZ0SxtvPPEGIXEWIibaJcnJK11BCLjE815HiHBC
ku+zOjjZBzCan0Y1R5Bj7PZ+V6EaQU5aG28nnWCyevgD98xz+Fkg7umI8yNrIlaeEvzYpl
3sTJOCXpqoTNeOaauLqzD/HNaZzlJ7Gs6Tcbc+LjW/dA/5VDXnLzgjoQLym3x6fhLBEAQP
1EXuqiQuJRpavM+bj7w+DHSLHjqugKZtXqEvLpRJeW+GonLe5qRLKG3ikALnpw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675330398; a=rsa-sha256; cv=none;
b=B6YsiDfaPaBSremLGqCYZyrSe88d/fZlg0cJzJKdRe6FoW7rlmRQOZnW07mdEy4oNsBWGh
wonzj8Drke1zSKcoWID0cEYATg0p7sq6xmK2DfHnO3yb3ZrwbGFPXz68dm64U9nco+cSb7
3/LHADjnmqPmedK/Pk42KQEH0jWUcRY0qaw91kb6ed3LXYf7fG2E9G0dA3/2HX/PGWzbs6
ZjUushw+uNmUXJvIQChRDYCPm8oUI3ei5Eh+2fB87mVvlTz2Qg85fxMG8XjQJE8ROIeEyY
NbdLc4UUQaUaVYdIez8kvO+IKy7tc7V3n9Z4uvyU/8uwQHOfcSACbwRFqCnWNA==
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 4P6trG10D1zq3w;
Thu, 2 Feb 2023 09:33:18 +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 3129XIkh034036;
Thu, 2 Feb 2023 09:33:18 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3129XIYX034035;
Thu, 2 Feb 2023 09:33:18 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:33:18 GMT
Message-Id: <202302020933.3129XIYX034035@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: b99749e1e522 - stable/13 - pkgbase: Create a FreeBSD-games package
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: b99749e1e522edfc7c16bdd2e80e60999505a08a
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=b99749e1e522edfc7c16bdd2e80e60999505a08a
commit b99749e1e522edfc7c16bdd2e80e60999505a08a
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-08-08 17:56:50 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:32:56 +0000
pkgbase: Create a FreeBSD-games package
And put :
- pom
- caesar
- grdc
Differential Revision: https://reviews.freebsd.org/D36230
(cherry picked from commit feec04b3554483ab8e6998200117949ed9ffed61)
---
release/packages/Makefile.package | 2 ++
usr.bin/caesar/Makefile | 2 ++
usr.bin/grdc/Makefile | 2 ++
usr.bin/pom/Makefile | 2 ++
4 files changed, 8 insertions(+)
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index eec564207721..9e340c3a9674 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -56,6 +56,8 @@ ftp_COMMENT= FTP Utilities
ftp_DESC= FTP Utilities
ftpd_COMMENT= FTP Daemon
ftpd_DESC= FTP Daemon
+games_COMMENT= Games
+games_DESC= Games
gdb_COMMENT= GDB Utilities
gdb_DESC= GDB Utilities
geom_COMMENT= GEOM Utilitites
diff --git a/usr.bin/caesar/Makefile b/usr.bin/caesar/Makefile
index 2ad96b7c22e3..5409d962e3ed 100644
--- a/usr.bin/caesar/Makefile
+++ b/usr.bin/caesar/Makefile
@@ -1,6 +1,8 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
+PACKAGE= games
+
PROG= caesar
LIBADD= m
SCRIPTS=rot13.sh
diff --git a/usr.bin/grdc/Makefile b/usr.bin/grdc/Makefile
index d12277df8466..e1a4fde9fb7e 100644
--- a/usr.bin/grdc/Makefile
+++ b/usr.bin/grdc/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= games
+
PROG= grdc
MAN= grdc.6
LIBADD= ncursesw
diff --git a/usr.bin/pom/Makefile b/usr.bin/pom/Makefile
index b7d4b000b2d2..7ba93ccf2663 100644
--- a/usr.bin/pom/Makefile
+++ b/usr.bin/pom/Makefile
@@ -1,6 +1,8 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
+PACKAGE= games
+
PROG= pom
MAN= pom.6
LIBADD= m
From nobody Thu Feb 2 09:33:19 2023
X-Original-To: dev-commits-src-branches@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 4P6trH4rCrz3cS2C;
Thu, 2 Feb 2023 09:33:19 +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 4P6trH3Gddz3nC2;
Thu, 2 Feb 2023 09:33:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675330399;
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=STcvyMjalTfMZTZ4h3OcnLpZcnOiv6tHCcOB/i/FdCk=;
b=lyVdFPc8f2HuIfLDbHCpAQp7cVONbKl8srtM6eqgQb7C8lcddyOfASsWYPN+pC14BXO+wG
ZME0KmKd/IXIACWUbEONMzBeiZAdauOZI41CwHNuabhQ6/AohbaUwsjfDl3hfqrHIrXgd1
cTd9+gxMHkQJNg0J0O2P64JUQcLL4pu5ezuqLYDmIP671lznHAYaWwLunTP5A1N47zmAWp
YCBw0JjnyWHkKcWxRHehos9yGxmBLA8U+99LyAEdTd5xHdzuB9KazaKTObDWoxqgAVs+ln
kE7d2nKvYerxfJCFuPS90u69xFKzsFWUzZ4O9pdTeipA6pTY+LRAz2eJC/dMFQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675330399;
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=STcvyMjalTfMZTZ4h3OcnLpZcnOiv6tHCcOB/i/FdCk=;
b=LH39BQ5YoNjy047qtlez6b+NarlysOK/GoB/Fpmn0dgY2du21D93H9BuhAP5W9l0zC3g5h
mfa/34+WRGlqQcJz6D4HqyiGbRo8TmOlceAa7GeGA9Pb7/JuSZXnVxysxzmnbiObG5SCsD
SMkDM1A1p/gE05hjyo3uqW7JE4MFVM97ARk6M3Y+Pdew8cpT5OdxtNPCoofaV0P3duCZm5
dEErhR3EUP7JEp4YbVKOQiydHbradCpG3GnYN7EMkue/8fNQw2VQjD9jaXNjMvv3/bI85G
UJuSUFLL3VuUkcb8S3/vwHeSenieWYHX5ljXWsBLzpWzNurrkMqpdEN+djLwcQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675330399; a=rsa-sha256; cv=none;
b=npp3gR29qarEoUXc3wdBicoX9j0pJwMPAa4iVoC4ONT95XqkZcJW32OA9RdErvAjnF4c/l
FEuT5b2Rdhab6iLxbjni72799yff0uHjPvaxkHriX79WmYSrP1qSxFjKm/gjFiUMTxvdnT
2fYASqtH8O6gmDRbK6GkpbSV+G9AKSLWHj3BeymVxBPwyY0YFiPXikQdz3AwEjv0K71FVY
Pvf2exRj33VA3qCZc/gNEWlyN7hKc6axXFfEFncFQrn7vYp/ofnkovTlo48u/ZXvJ6by3o
jC5hIX2wCgmVE7eS39w+hF2Vip8ZwUzs06GgGr/6N7efYdN/bJ2WxvL4sHfW8w==
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 4P6trH246hzqFq;
Thu, 2 Feb 2023 09:33:19 +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 3129XJ3j034066;
Thu, 2 Feb 2023 09:33:19 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3129XJKp034065;
Thu, 2 Feb 2023 09:33:19 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 09:33:19 GMT
Message-Id: <202302020933.3129XJKp034065@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 20cfc902d911 - stable/13 - pkgbase: Put less in FreeBSD-runtime
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 20cfc902d911add0dff31c8b22c20dbc8bf275c3
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=20cfc902d911add0dff31c8b22c20dbc8bf275c3
commit 20cfc902d911add0dff31c8b22c20dbc8bf275c3
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-08-16 19:25:38 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:32:56 +0000
pkgbase: Put less in FreeBSD-runtime
Useful to have a pager in it.
Differential Revision: https://reviews.freebsd.org/D36231
(cherry picked from commit 069ebe6fbae56a70058d24db4d6e310f1f916733)
---
usr.bin/less/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/usr.bin/less/Makefile b/usr.bin/less/Makefile
index 08c5249598f9..012554401d20 100644
--- a/usr.bin/less/Makefile
+++ b/usr.bin/less/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE= runtime
PROG= less
SRCS= main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c cvt.c \
decode.c edit.c filename.c forwback.c help.c ifile.c input.c \
From nobody Thu Feb 2 10:06:53 2023
X-Original-To: dev-commits-src-branches@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 4P6vb137yTz3cmgC;
Thu, 2 Feb 2023 10:06:53 +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 4P6vb12gHcz3x4T;
Thu, 2 Feb 2023 10:06:53 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675332413;
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=MmGjb9iYEkX+5REHd8v/F80UBKTGtxDsr/SJqDExMP8=;
b=Q7eAACadBtw2uHlVoVJEggc1NOS9+u6W9zOwbTsp8Ubawfpx9r7VzxVzgy4iTfWJCcEyQb
gwXzG4t74UBAtyIUw7K+G1Q6Zg7teThie7baxtM8fQ+Fy+wH4q1/vv4WqJJrzqtFUtSqg1
X1xbVjGbDe/n8sZ+NSEqhGtjTqL8GfiMbU6B+z92qrOT8PO5vp0QGnrX7ThjirXu4FclyF
G1yXLgFlZyLgVE6BYm5iSJFz8T/Mlfnn18n6yY7nZ2HoMrYmcHhHR8NWx0ACM92xteQTNg
KqKIXI13+nGsVmmAZikjx+iruxMromuIezI1sLWj+PX9fDukbBOCC+hbQBck/Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675332413;
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=MmGjb9iYEkX+5REHd8v/F80UBKTGtxDsr/SJqDExMP8=;
b=A4qw/QxGTEf1CTmZjoWCpPDBsJBgeaO9w+SN4se4V4eLFWp4Ga1vnUyNalp6fgTCCz9etD
CiGwWpk56JTStQWRVCUNiqbb0uRjQXGVg1se/azXLxaCMh4a7cm7MKVvtfUAnlxQOqUa3E
4iRPbDpfK/36/Fi5duUzuvkSnLrEec8rVyqc1n+/w/68+J+bwsrs9ISo75hEHMvkZjqMET
fwUXIukEQYMStebSttNK+fDBVCRmi9woAqe9AbNxLoABM+wSlJUq81a7HXMJ4L5OvdASri
WCJxFgDGeXzHhe8y331oZ0+O8nqi9CqqTJHGFARJ13gQYs6etqxG98idST+WaQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675332413; a=rsa-sha256; cv=none;
b=wY/G87CBZ+bPibkfXeB8Cf/cHwsjRbK/e1JWVbHXPXYZFUbhwohJsB1sVzMVvD+T1qD3JU
7V16epFEB9HgV3b4Vl4IOGVCHRCP1xja660HwuzgTixAvny2TW4GOeEp4oU9+lEBPq6Phd
IhD5+IOPA1cJ23AjACOeotccGBQMNnIeGjsGjdUbSP9PwX18P7gHohxpKOc8pX9XUCPAOJ
C9O1uccJKHMrZVIKbHcOcnISrJjVIg6BGeuZjyCWkyyLVCbSCPOcGZyOl0WIkvC/G0wxNd
PcATAI+jwEyApl/bHAIDCNWF++enkS/fgw4OSLd+QDa9EN3deLaadWdRzA+8yQ==
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 4P6vb11jdrzqr4;
Thu, 2 Feb 2023 10:06:53 +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 312A6r6x077733;
Thu, 2 Feb 2023 10:06:53 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312A6rGg077732;
Thu, 2 Feb 2023 10:06:53 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 10:06:53 GMT
Message-Id: <202302021006.312A6rGg077732@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: a53b1150e4ec - stable/13 - pkgbase: Stop adding FreeBSD-runtime as a dep for every package
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a53b1150e4ec7aecc7970598dce0033ff26cafa1
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=a53b1150e4ec7aecc7970598dce0033ff26cafa1
commit a53b1150e4ec7aecc7970598dce0033ff26cafa1
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-12-08 10:55:39 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:34:47 +0000
pkgbase: Stop adding FreeBSD-runtime as a dep for every package
shlib_required/provided is enough for the dependencies and this also
causes problems for packages like rescue which shouldn't depend on runtime
at all.
PR: 268063
Sponsored by: Beckhoff Automation GmbH & Co. KG
(cherry picked from commit 6933abc3e4bd316c1a10862d7dfc0688765fb723)
---
release/packages/generate-ucl.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index de1a21391950..48a8b24c5118 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -96,7 +96,6 @@ main() {
pkgdeps="${outname}"
;;
${origname})
- pkgdeps="runtime"
;;
*)
uclfile="${outname##*}${origname}"
From nobody Thu Feb 2 10:06:54 2023
X-Original-To: dev-commits-src-branches@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 4P6vb24FZ4z3cmrV;
Thu, 2 Feb 2023 10:06:54 +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 4P6vb23XKnz3xCH;
Thu, 2 Feb 2023 10:06:54 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675332414;
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=Hj3aYtLcrD5DXCNHVxSZzxvg/mcMw3MIgAS3pj0F1EM=;
b=GqJyoOQy3gAgFCDqQnOpNxeAQ27jSsKA41XgLsSybS/MqKPUtawU+S9yaQRrmV46cUcLsR
dtkrrFJP/Q0r1bXeaEuTHCx0P81e6UjkQebWvGYOqQD4UDmPFgA78V1KsOf+WrP5fnAam3
Cq9KweIJWriD7gRdXjtJRecWSh1cWBlBJeahN0G+yb88+7p5PP9ur/KXJVEzdxzf7Xn2bB
jvPLWbQCFq5HkPelcCp0Ii7KFLfyGBmS8+5OsUXIG12/h0Jhf0ZAw2CtC6GwJL13CMbB6U
wzQ37QDhYO7pzlXXoyQA7651hkhdOFsXGdqaYEPPsp1l84Ep4X1t3KkF1nZvQg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675332414;
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=Hj3aYtLcrD5DXCNHVxSZzxvg/mcMw3MIgAS3pj0F1EM=;
b=HmcHOud3at7rWOlSyUm+oqajjE5FeduKxJufNEUEhaXPOFjfGijAeobGTbvDL0ykPtiQ42
lp4NBdCmbSZrRPLTVHEhAaLdQ8NlWsaxNAHl95AcU/8Cp1RogJM3mRw8KlYtQweVpcYEgC
/aRIq6JjMvebIt/6Qzt3zCpZZnwJs4/a2fbwBO8HKnnoPErFJCFS73aslIG8uuhc4WT7BN
XsvKw7SOXmhbdszAKrTjZwSgmZSk1ICT6ev6ylLO8hMJ3yTvSagF/hkvzivh5iKexoiTpK
FJ98NAvJ4/5efQm65RmaqBT8fUObs1Dsc2mAMSA3qxPm37RC8f3KGZGaW1/HhA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675332414; a=rsa-sha256; cv=none;
b=qC72n1+haH/VWH7VqrYoR7cjgtd6LROdKka5hKLawxKiaT6s/28Ghh0HLYtZYi/LSV6Ykw
cAJT4suJ/7q2G+osOEPia5LprTErkN2ni0xvUzEWo9nUOrfsThrVGpWj61YDiqvKXi3IGr
bXx/p3mBrZt671KyHb3YOYnzWOqa8XD6p5xYgaaRlvxUSyimd1WmJvYlTTnzmLZHq7zp1b
1RiXtLnhiWeg+BBWxholIiLDU64E5jUowyHYUAj0dcntp28hx1s1jLS/c95JYQbyPypDc+
3w0VAfxmwHrX3KjJlDmqdJmzk1QlT8AnCASjW6ZPH29SkwJeoy1KTZc11adTsA==
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 4P6vb22bqtzqsv;
Thu, 2 Feb 2023 10:06:54 +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 312A6s5R077760;
Thu, 2 Feb 2023 10:06:54 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312A6siT077759;
Thu, 2 Feb 2023 10:06:54 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 10:06:54 GMT
Message-Id: <202302021006.312A6siT077759@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 4cffb585c29a - stable/13 - pkgbase: Do not record dependency on non-existent libcompat package
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 4cffb585c29a676daa3ada1a0a52ed1c5a8c41d1
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=4cffb585c29a676daa3ada1a0a52ed1c5a8c41d1
commit 4cffb585c29a676daa3ada1a0a52ed1c5a8c41d1
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-01-05 22:27:22 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:34:48 +0000
pkgbase: Do not record dependency on non-existent libcompat package
libcompat only provides a .a which is put in the -dev package.
Add a special record for it so we do not require a dependency on the
non-existent package FreeBSD-libcompat.
Sponsored by: Beckhoff Automation GmbH & Co. KG
(cherry picked from commit 5391bcf0f7e4f9021b56d050cbd798940858d9c0)
---
release/packages/generate-ucl.sh | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index 48a8b24c5118..2909d111d681 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -56,6 +56,18 @@ main() {
outname=${outname%%-lib32_dev}
_descr="32-bit Libraries, Development Files"
;;
+ libcompat-dev)
+ outname=${outname%%-dev}
+ _descr="Development Files"
+ ;;
+ libcompat-man)
+ outname=${outname%%-dev}
+ _descr="Development Files"
+ ;;
+ libcompat-lib32_dev)
+ outname=${outname%%-lib32_dev}
+ _descr="32-bit Libraries, Development Files"
+ ;;
utilities)
uclfile="${uclfile}"
From nobody Thu Feb 2 10:06:55 2023
X-Original-To: dev-commits-src-branches@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 4P6vb34kgMz3cmyn;
Thu, 2 Feb 2023 10:06:55 +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 4P6vb34GlLz3x80;
Thu, 2 Feb 2023 10:06:55 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675332415;
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=EgqfOAFGaqqbCipbWpkd0l8LLuNzvJXMk8dr3A4/XmI=;
b=WUud8j7fWGlhiFdeRRMuLGMBeCvRLC0vgzLGu/fbkcd/Z0ibP4CQcMhT6ro7QEkSc3YoJi
c3TlzJSZZygPe72TpIfDm2bGAUYatmg3tLRAX8iYMaDxDv9K9k12tPZudmEC8BS9u0gW2n
HlXMM/vyOyPcDeEEDtP8gbBqxudRj2sm2i4cjEdRPnPLRI0EQ12h1mY/+0aJQNepfw7KpR
ayi6AysdUzANoFclzGOUrw123VcOWpI08l4YuCrDFudPpHplP1uKKdm//5SR8cj875fl4N
b3X51Hkw7PJ77JnYvutI/Jc6/oTrycDx0l+2BH6+TBM+qIt+mTxSj/77vO+Yug==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675332415;
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=EgqfOAFGaqqbCipbWpkd0l8LLuNzvJXMk8dr3A4/XmI=;
b=Wf9tig5+JbRvA6yOFC94Sh6f0W/KxW2QBk/PUiJEcOo4JAOFchku2BvZQxOl1/lWj1ium2
AxhEH6H3NxPBzS9tQvViLP6OZ/SJwi6WJBy8kscKD9l961Kqq5Ki8MLODS2C5tXoySeZwM
3xcdypfxnQTd9qpIhqTGosfQHDtC+LDmS+j3fVGT+GsF+kIceznTFLWW3BIUHwmCQTV+WA
y6JSY6p5ocwkIOanVsf/xsMtqlD+c3jwNHrhlwEPPp+pAKOCygFx/ra7BaYC0sjuABNgsy
LSzT7BHuqKFnDEIxi3yi2Nv54j55OHk5NvuLbBf4ayhozcSVtDCgD+PI3nvh4Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675332415; a=rsa-sha256; cv=none;
b=OwUdeWK8Z6U0rx/QeKFb4ff5f9x7tzVyB9LDVO8S4x+FY7Y8vcobwExMspOeeEoVcNpPjG
wNOVhjzcqB3JHjnuhA24iHcXNkUCs/Evb3aX+w+ETqA7p3EYS/UfWsjNjxiV2dA+yb7hJC
amyMrQVEBFCMQGrjnKA6EeqaNOjHui88ccBMf95GhdNPTHi5uL4Vv/N5ILiQU74RlRfhAZ
ycsuhvsUWCANA8kNn7yZVXaTQbmBadfIlflpYziO+cotYiQ1XeoFS1oKJyOLtXLqHWCDqr
JqLFg0tuRpcLOB06j2b+a+WNGf5xaCyWmtUy07jpUXgkLncsivY74kHpYwgNOQ==
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 4P6vb33K1qzqWw;
Thu, 2 Feb 2023 10:06:55 +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 312A6tW6077785;
Thu, 2 Feb 2023 10:06:55 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312A6tIE077784;
Thu, 2 Feb 2023 10:06:55 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 10:06:55 GMT
Message-Id: <202302021006.312A6tIE077784@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 8de6763fedbd - stable/13 - pkgbase: Do record dependency on non-existent libelftc package
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 8de6763fedbd7c8911a1bfef7168f2055502e24c
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=8de6763fedbd7c8911a1bfef7168f2055502e24c
commit 8de6763fedbd7c8911a1bfef7168f2055502e24c
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-01-05 22:38:14 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:34:48 +0000
pkgbase: Do record dependency on non-existent libelftc package
libelftc is an internal lib so it's never installed.
When building with WITH_MANSPLITPKG=yes the libelftc-man package
will have a dependecy on a non-existent libelftc package.
Sponsored by: Beckhoff Automation GmbH & Co. KG
(cherry picked from commit 65fa2fd23b9de1dd81a0a5fafc1d69757792edac)
---
release/packages/generate-ucl.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index 2909d111d681..4b2992b9c827 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -68,6 +68,10 @@ main() {
outname=${outname%%-lib32_dev}
_descr="32-bit Libraries, Development Files"
;;
+ libelftc-man)
+ outname=${outname%%-dev}
+ _descr="Development Files"
+ ;;
utilities)
uclfile="${uclfile}"
From nobody Thu Feb 2 10:06:56 2023
X-Original-To: dev-commits-src-branches@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 4P6vb50M8Cz3cmm0;
Thu, 2 Feb 2023 10:06:57 +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 4P6vb450lMz3xB7;
Thu, 2 Feb 2023 10:06:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675332416;
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=MvwMavBl/BU5JTb7WrqCXWI52wLSJW+BpW850VutPJs=;
b=T20oOiDeI1d4UW5K+Jng85LT0KBKN4WcsHNA8b7JemGrfpNK+UCxxfIKe/TYAMNA8omsv7
vtFlynirSXDMnrggl8gQ+/1S1xTpC4Aljg5xQdZXcjgPQwBJLrDgesOCqN/Z1MDtIJeUMg
EIo516QiWEetMBvBrsmow+4SsTMHGSuY/ZWXpdMAPp662b+Ir3hq/Ulmq015Sihwj8OnY5
ZEl6UTo5u8qU9jnUVOaCyI0UH0Q3+H6KaUpCqPFh4AFvPkl6CNbjtcdWOAomvr+xEKUDnw
F122SUtSydjlcdZAlN3nF0fkmsSFYJ93vVdW0JwY0xURS5+/kBDYVizB0w+/og==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675332416;
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=MvwMavBl/BU5JTb7WrqCXWI52wLSJW+BpW850VutPJs=;
b=W3OMExyd6DATmsCxadMsUxQ14G7gNKlC+xtDEaxGvAwVG6PSLg0TmNZ5kw+lMEYEA5IRHX
xxGEPJNFfdnRUAWeuni+tcnLVhyW/RzrDs0Hw/F84XKeV4Ah6fE91jk0hRrsrFzQNqk3hE
STpg1xTVObhSIVuaOGxVZkI2SKispDVtTt1E2tYacjfI1UhvHA3W6ljZ17JwagZW2OS9Sv
XmEJIdPxCnhMWyhdH9EgcHI7Up+1Qb+1UR6nIEmfS8pkTvccYWz6z0scpQ8dluZTkVLnc4
ilBa3IZgJGossNPAgtF2SjiA0cHpqqQKGijxf1pgei9cB4/wvEHxID9rJmu+oQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675332416; a=rsa-sha256; cv=none;
b=roloH+CWUS77ctQWwns3qQqmc0/LhpXlp1msf680wQt4Zv6dmReN1zkfxDFZiciLqyNMda
3CPXy/I4pRXtb5rPC48LoyUQv9Oq66EpV/kY3dWMg2yT8mnvf/wkaafAYQTrcth+kgBA1N
YM4HkQbu5dWApWvWtebMotmo1KEOwPGY4JtB+bt+R3xhX93aTt9nQm/xVTWmkKhvpyrCwb
HHGmEsDWYfv/ktUtXG2hQ8uMmX7wA/wcT5hO5LP97RJNFv+Fgnnx/4jU/DqSO2bvv1xDXQ
XwjG5MtHTi50q1LiOrv7xICBERxhtMKgIzlxz756i8h74G7oujTiaXGTGJ5tvg==
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 4P6vb446xWzqWx;
Thu, 2 Feb 2023 10:06:56 +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 312A6uJv077815;
Thu, 2 Feb 2023 10:06:56 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312A6uVP077814;
Thu, 2 Feb 2023 10:06:56 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 10:06:56 GMT
Message-Id: <202302021006.312A6uVP077814@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: ef120bffbfdc - stable/13 - pkgbase: share rules for packages without pkgdeps
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: ef120bffbfdc682d9beb9d22d45d6a0553c3f0ed
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=ef120bffbfdc682d9beb9d22d45d6a0553c3f0ed
commit ef120bffbfdc682d9beb9d22d45d6a0553c3f0ed
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-01-06 14:44:54 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:35:07 +0000
pkgbase: share rules for packages without pkgdeps
Have liby and libcompat share *-dev and *-lib32_dev rules, and share
*-man rule for libcompat and libelftc. Also correct name substitution
and description for man rules.
Reviewed by: manu
Fixes: 5391bcf0f7e4 ("pkgbase: Do not record dependency on...")
Fixes: 65fa2fd23b9d ("pkgbase: Do record dependency on non-...")
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D37964
(cherry picked from commit 0eccd618a36aed1fb33d2f712e6624fdf111406d)
---
release/packages/generate-ucl.sh | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index 4b2992b9c827..2b1f71e95c11 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -48,31 +48,18 @@ main() {
# -dev packages that have no corresponding non-dev package
# as a dependency.
- liby-dev)
+ libcompat-dev|liby-dev)
outname=${outname%%-dev}
_descr="Development Files"
;;
- liby-lib32_dev)
+ libcompat-lib32_dev|liby-lib32_dev)
outname=${outname%%-lib32_dev}
_descr="32-bit Libraries, Development Files"
;;
- libcompat-dev)
- outname=${outname%%-dev}
- _descr="Development Files"
- ;;
- libcompat-man)
- outname=${outname%%-dev}
- _descr="Development Files"
- ;;
- libcompat-lib32_dev)
- outname=${outname%%-lib32_dev}
- _descr="32-bit Libraries, Development Files"
- ;;
- libelftc-man)
- outname=${outname%%-dev}
- _descr="Development Files"
+ libcompat-man|libelftc-man)
+ outname=${outname%%-man}
+ _descr="Manual Pages"
;;
-
utilities)
uclfile="${uclfile}"
;;
From nobody Thu Feb 2 10:53:48 2023
X-Original-To: dev-commits-src-branches@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 4P6wd83FLlz3ct0v;
Thu, 2 Feb 2023 10:53:48 +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 4P6wd82bQkz44hq;
Thu, 2 Feb 2023 10:53:48 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675335228;
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=xMjLMA8+BCLUut1b2WEL1dkab32Nn51+ICffkySO92I=;
b=lB0/uqViNx/FNMO60YQIUOrxv4jk0LnxWEQn1d0RDUO3gN3k10pxkszz3r4kEHPFb6o9az
/GI/BF/mcwaLO+CMYIs+BL7ObbaM6hxSwbLGDH9fcR9kWlkwe5UQlwAVLQN+1bxP60Otf/
onMupxKB2mcYcesT2JTmzInqUlNL9RDq6N3kVB1AIJBEtQEkamoq6QyqN8e60Y5SnQej+T
kKvbCSikflmGjIfE/f8rGPqMk1/jhrPuaIUk9AWvY7zWulRNeLn0nFh77rzN3T73JrVrg/
sutKU/JI/rWOighvNwpYE0GJFkw+4SnRRqY6efeFtP7ik1GnMM7A0FPXK9LO/Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675335228;
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=xMjLMA8+BCLUut1b2WEL1dkab32Nn51+ICffkySO92I=;
b=LDp2XQDiqBVU1A+iiKO6lcuNRRTKDt2kUHT/s2vddLGSwW1DS2oEsnzxTdZ4S7eJnElIcl
lBWkUyWKZjzUHtBvoEQ67KCbSHHGNP4yyDLPIPfqnaZNcYwQnzj+gP4hL2I2fF1ave4gyP
ylrI18kLdpeG5UFcxKB+cjHOHfAbeJmbnLF+vkb4Z0YH+HKs+MbMceMO5nbbTtYkuDcuA3
1bmqfdNqllbuTfoMr5VIsuJNZ1xuhO2kHosb7lEAVtVSDt6JYbHi5a2/6D7FFh6u8aPOgM
0fhVDK8NfPRk80IlsP8P+SnWpP4UaKZq5Owy87XeedwPfDRX6+Wl1lXQsaMftQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675335228; a=rsa-sha256; cv=none;
b=SKebc8OHjfMOaqVAPl2G9LgBG6VZc2U4rs+OhJf2nn4Ug19RIIuPuVqNM5b/cgGF62Pu7i
46mZrEgK05UI10jpdhfEBISLQ/BfnI66tFybv5tvtTNQ0C0JW1Sf3Ta5A+c2UAPlYQF/ya
9vnR9xOlAPN1YCTYxRq8sCMTh3/yEe10xCtkdtVXcpJefgG87BIz7Mis+l1y9tqqOrv202
WuLZTs4Gp48bvdrTZ9SEeMjcZnRUp8t8GToz9DzbGhjmgZPOIJ7ioYrLGCiWwZVu9FQoOF
nZ12r8Oe8KNWTN6UCQz5DQJbFPYH4o5ayFNYTkp6MKGN2SZtP5aEOeoxVzaJIA==
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 4P6wd81fLGzs0p;
Thu, 2 Feb 2023 10:53:48 +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 312ArmF4047268;
Thu, 2 Feb 2023 10:53:48 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312ArmHx047267;
Thu, 2 Feb 2023 10:53:48 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 10:53:48 GMT
Message-Id: <202302021053.312ArmHx047267@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 68ee29c97da6 - stable/13 - rc.d: Put devd script in FreeBSD-devd package
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 68ee29c97da649e3a45c81d948967b42019836f7
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=68ee29c97da649e3a45c81d948967b42019836f7
commit 68ee29c97da649e3a45c81d948967b42019836f7
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-10-28 07:31:17 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 10:35:34 +0000
rc.d: Put devd script in FreeBSD-devd package
Differential Revision: https://reviews.freebsd.org/D37186
(cherry picked from commit f0435696920bd18d46a31c69105d8cbaa7d479e5)
---
libexec/rc/rc.d/Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index 0c1106338378..834aaeb5d9ae 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -24,7 +24,6 @@ CONFS= DAEMON \
ctld \
ddb \
defaultroute \
- devd \
devfs \
devmatch \
dhclient \
@@ -118,6 +117,10 @@ CONFS= DAEMON \
var_run \
watchdogd
+CONFGROUPS+= DEVD
+DEVD= devd
+DEVDPACKAGE= devd
+
.if ${MK_NIS} != "no"
CONFS+= ypbind \
ypldap \
From nobody Thu Feb 2 10:53:49 2023
X-Original-To: dev-commits-src-branches@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 4P6wd94VSQz3csxn;
Thu, 2 Feb 2023 10:53:49 +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 4P6wd93kH9z44Wy;
Thu, 2 Feb 2023 10:53:49 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675335229;
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=SWvJ9pig1VOdWWPmOkiw9gj6trT39yI1iyyex7aBeJ8=;
b=QK915c63JO1BjapK8NPW7eazAyXsjdJcLxjQPacFvzit21aB7bzZPfQd+Ci2dKkaT32AAD
g59M70XkADcS/0PPp07qBpQ5HAYpC26mHIQXjUZM9D98phSVSX0U15TTitqJXpxkH+27Jf
4QSxOBRR5sCjL4smkeTbYY+510hEMO8Ra2DWl9L784Z6vKt7LYu7y9Y/oxlC6x3kK20/Ai
981WDCFJYf5Cxc9MDKvj8n6yvFQuwsLKHnhRF7WJezBik5TsQLYClB109LSrGHFfcuAlCw
G1mD4z39FGHwYvwudJgIofKqWx0pyP5AfREBkya8S/amy1ETOqvHtUJ5CHgWAg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675335229;
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=SWvJ9pig1VOdWWPmOkiw9gj6trT39yI1iyyex7aBeJ8=;
b=Yh3uOZeB/yxBF4wMQxo+hhdnUF5/3KfLxCMUK+eSIzAAlmbhbJw79DPYIxpgMPNbj6QnHk
Y48rgta6Nb6yX3JpU6l4GNu5qXM5A8ReP6TcTV8wgy3bFyD5Tw5q4+8K8Ir1fL5akBKx/u
LEkU1Xna7tXSlVnRypAHjZNCTDLoXmenwSzBRSlMRENdNKHPB7vjdd1rG8V2gl/NxrHZEW
lDZZmwPKZr/3cYSziElHBSt2PVrFV1kkfJTSRJApiv5Zzimdch5sJzxAVbr19ulvTOE5n7
wrL7W/FQ5B03y6t1fhOE/ntgqsfCiU4xGyDNQpx1VHhFsnG08je72V/xDjQ8NQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675335229; a=rsa-sha256; cv=none;
b=yT5X8J59R7iLj4eTfPw/LmCINHNsx5yYxm82OGPVuMH+iAzK6bRvHUcLvzAlbTqM0mn/oz
AV9W0xootbrkAcDjpUCpyenZr4C2BWj6jmpiFXbr5OoQm1mqNW9fPcFKM5YqP/jfQVd4y4
WaaiZ7z+g1DrB2LEwwCTCVpzeU5gX6HXhFC8ZWmUzwqYW7f98CMwK/ylAz5r5uDUEb12UI
ZnhiBfP5RMnhgQRbZpfDWy/EsftF73uA/uOyApXX21/IpbxY2luh5brpo6CiwyLrnrAj69
HZI1TuBLenV6YaDdhYQPm6gJUn3tMeJABGlSEpNaQk2fLEvbF3ojfJqoYATong==
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 4P6wd92ql7zrjH;
Thu, 2 Feb 2023 10:53:49 +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 312Arn7l047292;
Thu, 2 Feb 2023 10:53:49 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312ArnAR047291;
Thu, 2 Feb 2023 10:53:49 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 10:53:49 GMT
Message-Id: <202302021053.312ArnAR047291@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 9cfd02f5ce40 - stable/13 - rc.d: Put devmatch script in FreeBSD-devmatch
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 9cfd02f5ce40cb60fd3fd5985379f16ec63228f8
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=9cfd02f5ce40cb60fd3fd5985379f16ec63228f8
commit 9cfd02f5ce40cb60fd3fd5985379f16ec63228f8
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-10-28 07:31:59 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 10:35:48 +0000
rc.d: Put devmatch script in FreeBSD-devmatch
Differential Revision: https://reviews.freebsd.org/D37192
(cherry picked from commit d8799160c2db46ea0caa3752838808c3126e2a6c)
---
libexec/rc/rc.d/Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index 834aaeb5d9ae..8fdbc1422452 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -25,7 +25,6 @@ CONFS= DAEMON \
ddb \
defaultroute \
devfs \
- devmatch \
dhclient \
dmesg \
dumpon \
@@ -121,6 +120,10 @@ CONFGROUPS+= DEVD
DEVD= devd
DEVDPACKAGE= devd
+CONFGROUPS+= DEVMATCH
+DEVMATCH= devmatch
+DEVMATCHPACKAGE= devmatch
+
.if ${MK_NIS} != "no"
CONFS+= ypbind \
ypldap \
From nobody Thu Feb 2 10:53:50 2023
X-Original-To: dev-commits-src-branches@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 4P6wdB4zXTz3ct7y;
Thu, 2 Feb 2023 10:53:50 +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 4P6wdB4SZcz44tv;
Thu, 2 Feb 2023 10:53:50 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675335230;
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=K+ISEBgEWO+Er6FNRCHuJRDYR+SHAK4ot3Ec9Djhi9s=;
b=ZoohC3+5wPygO/vD4YkDM7oexeZWwseAYXp1tRrzdLmx7da1CVsyFQz8z/VOx6pKlhP1xt
hdxayZtZgmHZwqf5mIfIVq6ebUcjsk6qxsRwbB6VFTMnRH/CXay/RvJAIHX3S4MGBQzWso
bjpTua21qwVabL12RqJH4MF3J6Sl1XLWW1Kyznht3YceQW1ikn0Ij4QBd3Q5zTUSduuEC0
6iA3PIODoVEDEh4qtD1yh00b2kny06SszLAJWwghgOO30pXAg89P7oIVJ6WzV4SGZDSxPL
4EHsjS0M0D2+VyxiSsI4idkUcextdSSs0nPzYOa/3+bzuyqSzgRKEH+RKB4nJQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675335230;
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=K+ISEBgEWO+Er6FNRCHuJRDYR+SHAK4ot3Ec9Djhi9s=;
b=RXqSX0zjYg1db+4iU2SmoWD2r5nQxX5J8a7VDfYlkhWYgEK2sVis0ro7ETP5hrhiHA1zJD
mctnPdPRrHrpd8nTRAjorFxT8Lst8UjcVN6tRM22RGqup5A88q5AcUxvTEPAVPantb/TrB
3Kbka9HxhYwiw561Hl3mTyOBWG+lZSyNATN4JrqkLCC9ADvaPz/+mh/JHf6d+41WIxFCFO
iZPgt5Gm3lE7lWqPECDiimLpISCwo9vqHOZ4tjoEeqjUzOk2ZaIaqTnk6mVBSEnoDklny9
6y/iluKChzEvqddtkYwpCRz5ewAQggKkpq0NUzGdair/LcZsE4oUcdJg6WcR+w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675335230; a=rsa-sha256; cv=none;
b=XPYlJNZJTyPIrtI64oe1Dhf1kVwLFHX4bUnhhZG0/FYhSQKoMFAoHz8//AcMg9zFLPgIZR
3xk6Ixm9q8kAHcDTviiuCoI0pxD8GOKe+JmN4IVBZ/L9iZ7zjYGLNLTLu1AZiEmC2JdjCJ
1Ninvg9PHZq3Pinup0hBARssgUY7Yd8fhNkHVMH4JRBv5dAyMgm660juPunX43s1dQcbK1
yX7bOrqW0BgsVu9n+QKraizzYbw+AD4015B+PKkLMl3esRRN4S92dttd5qgcKpfDBI/kGL
8qQW13g0tthHMAItFhpO7NUGScBRD3hdEbJN2OpMBZH9FirC47W5ulCmh2ECPg==
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 4P6wdB3Zd4zs8V;
Thu, 2 Feb 2023 10:53:50 +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 312AroFP047316;
Thu, 2 Feb 2023 10:53:50 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312Aroch047315;
Thu, 2 Feb 2023 10:53:50 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 10:53:50 GMT
Message-Id: <202302021053.312Aroch047315@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 0b6df226db1f - stable/13 - rc.d: Put dhclient script in FreeBSD-dhclient
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 0b6df226db1f2f68e6d31680b3e209c383ec5479
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=0b6df226db1f2f68e6d31680b3e209c383ec5479
commit 0b6df226db1f2f68e6d31680b3e209c383ec5479
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-10-28 07:32:27 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 10:35:59 +0000
rc.d: Put dhclient script in FreeBSD-dhclient
Differential Revision: https://reviews.freebsd.org/D37187
(cherry picked from commit 81b18bea0935c33fc6aafb084ca72fd427d8364a)
---
libexec/rc/rc.d/Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index 8fdbc1422452..a6ed5b715734 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -25,7 +25,6 @@ CONFS= DAEMON \
ddb \
defaultroute \
devfs \
- dhclient \
dmesg \
dumpon \
fsck \
@@ -124,6 +123,10 @@ CONFGROUPS+= DEVMATCH
DEVMATCH= devmatch
DEVMATCHPACKAGE= devmatch
+CONFGROUPS+= DHCLIENT
+DHCLIENT= dhclient
+DHCLIENTPACKAGE= dhclient
+
.if ${MK_NIS} != "no"
CONFS+= ypbind \
ypldap \
From nobody Thu Feb 2 10:53:51 2023
X-Original-To: dev-commits-src-branches@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 4P6wdC5q6Hz3ct10;
Thu, 2 Feb 2023 10:53:51 +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 4P6wdC5Lqcz450T;
Thu, 2 Feb 2023 10:53:51 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675335231;
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=fzJUnlE2sAcnjiCBteyhl9R431JhhsxxkDLqMt3fmhY=;
b=fw7ZVQrjgI2EiyiWZI9ECMH/EMethWZm1VNb1aEXqOFhGMj6UdnKO6uI+SEjYxdQpQJ2po
vC5F2YVbuL/98Z+jvt06QEi366ZIB+EuW3CY1PHeH6zId3TzcolWtipZq4KZflIGZVEXQA
w0/mv2LFJb5BDyTBoVhZh1Ts8p9COu6J5t8InJGgwG5iMLhzPs2j3K30v9krRq094/SW5r
bj5D7Q6JjJRUtOaUecw9DdDbRGoYRNlXQM3Jn/JLjCSr+4wvi4iyIXPdaWEBtSdVHKrBEC
fjL/9lhSJZHVUxdWharkQJKUEML27SfO3AWtzDu7hCcyBqsawoSQxjyCDIABIg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675335231;
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=fzJUnlE2sAcnjiCBteyhl9R431JhhsxxkDLqMt3fmhY=;
b=AS9Cjr4K27AFtZhgojR1L2MUmC9H0o6W4ywvmhVV/VJryDC0LcmkZ/OWR5w7qnq+PgPvqG
8F2oRq4rel595a1AAsFMEJ6iBFt2SmK7ze5q81yDRzwDeaHvv/hrk0KJTKMhmSvZapz3mL
qK2H4PFr0AdqiZ6ziJ41eDdIOQbI6GsYXDxOdiXHF4dOwDVb6J3c1ob2V5B5xomXlkCBUI
h0slHivJ7IE3QKswZZWPPe1FLry4JpW/eorikcdYV/Z+8K23rt9Q7WIvw7Lg+qyHgMJ2SO
xXh7AQM24kx0BLr441hiwhU3JjDEEwlB9TPOYh9lW4+vMJnQTvQ1CFp0O3zO6w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675335231; a=rsa-sha256; cv=none;
b=eZcnMZpiHAQ3WPxkIh2ryOPfsegH8j5p0sOR5ZayCofVOCwbg1q6wBFUWoa67b2JiSC46j
mE4Att8aLT9gRuk6JO+sDAOleyPszaYqbvzt29kSoJZFskgLTgDog0D5wRno6HXyisKIna
jANyPuh6yowEA2PXYsxXkBfKM4G6p24/3Api3K528tRXNJ2PvPpC0bIJsf1oL4DjbovVNl
LltuM6SpIcw0zDP8QB9YPsmwFy2BwcEGESZg00hu1DvF+MasU7IGj2tlZTGfRTfB39XGCT
Em+8189dF0PnwyXOcBsZ2wnfC22HGvthbOrHrVN21kx9NiQ3HDp+xlGJM3QICQ==
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 4P6wdC4QdWzs8W;
Thu, 2 Feb 2023 10:53:51 +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 312ArpeD047347;
Thu, 2 Feb 2023 10:53:51 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312ArpBX047346;
Thu, 2 Feb 2023 10:53:51 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 10:53:51 GMT
Message-Id: <202302021053.312ArpBX047346@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 037902038e68 - stable/13 - rc.d: Put resolv script in FreeBSD-resolvconf
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 037902038e683877be09b043f49e31be32b47cc3
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=037902038e683877be09b043f49e31be32b47cc3
commit 037902038e683877be09b043f49e31be32b47cc3
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-10-28 07:33:38 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 10:41:11 +0000
rc.d: Put resolv script in FreeBSD-resolvconf
Differential Revision: https://reviews.freebsd.org/D37190
(cherry picked from commit a6a21bbedc744bae9ce7b20948b53a6d4033adcf)
---
libexec/rc/rc.d/Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index a6ed5b715734..188eae2e2f5b 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -86,7 +86,6 @@ CONFS= DAEMON \
random \
rarpd \
rctl \
- resolv \
root \
route6d \
routing \
@@ -127,6 +126,10 @@ CONFGROUPS+= DHCLIENT
DHCLIENT= dhclient
DHCLIENTPACKAGE= dhclient
+CONFGROUPS+= RESOLVCONF
+RESOLVCONF= resolv
+RESOLVCONFPACKAGE= resolvconf
+
.if ${MK_NIS} != "no"
CONFS+= ypbind \
ypldap \
From nobody Thu Feb 2 11:14:33 2023
X-Original-To: dev-commits-src-branches@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 4P6x5531zKz3cwNd;
Thu, 2 Feb 2023 11:14:33 +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 4P6x552QLCz46mq;
Thu, 2 Feb 2023 11:14:33 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675336473;
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=MyLJDkX3n+kcCmoPNyhT/TJCR4//LEVd+DPCn1bA1Kg=;
b=KmApRTbidB3uds2tmjGYWSoew/bNnzoOebwD/AgnEH0gYKyZstfYwU8w0OBvwVynbjLCxa
bV3DOjUK7rGQv8SjigA3CVt/+DTMcJOWNvQGj/VBJH/3kWY+MlCcGVuwQ6m6iSWNU2Br8Z
ByZjHFuLgo00R1RfxhcTV3OZFEREhBTr/CfIhYlMITP2rMre3z7sc6+m0EldI23KeM+s5l
m6aWqapnkgZcYICuDNkyNrEUd7OXfRI3MwXEloLO1A2dYgKJWC6GXwqwPGBFqDm0gkCcY5
mgOPWpFHGz7TzjBV665yh6Xfam9iD8qZ1YmTnr9obq8O356pOjld0OczY1CC+A==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675336473;
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=MyLJDkX3n+kcCmoPNyhT/TJCR4//LEVd+DPCn1bA1Kg=;
b=ydmM+zZdWxc2DmMKmlKnkxPEjGJEBgo5Bk9RzVTUKuthyY841NDoQ5nuEbGsYYsEezumAd
/QJi38t9kolRL/Hx7vW8uuD6Rsf1wLjL6vu1G4EZyYlumBqli9Tm2hpLsru9d1OweT5uO5
2qN1EfIeQu/PrSSXy7TI7Pxynn8HTtyZ0zLp0MfImCi1nihXV9ySpIdkTm/fzopSLjTDQm
I04Vdk8Cru4KIbeNMiNKfJvm5FlnJUxoZQvh9Ki9v/MDdDdHLLRp/QYGHBqd64WAzPvo5/
ku8UMaSdqbX5R8VZQVLg1T6A9JVBq/fc+7ElnONa8i14SUdximPBzO+GRU9SWw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675336473; a=rsa-sha256; cv=none;
b=A+0ZC+2tqUtdUI5Zwb6ZUhkY6FkCjvadvSLd6U45QC+PqA5IMkW+bvvxDnscwTl8/RYupK
AjbYYaMCxwbhP4fgpeJYjU7W6SdoTwe10s7Yilm+9yLg7584JVnpPqlIQNpaGE7zLq2Ktz
o8mN9kTdZlDYzPd19WDpTsVBIVwoI2Z82xK1/Ku+jeBciCF2iQC/LhF/hFBsBeS8X2wgt7
kNKAyoLaA3xKiDEolXIhHAQxGlsu+jQfrvEoK9RCbhHrSY/UNo4PMLJik/ZJEJqYAcl1ZV
VwXV6EbivQENnP+dpQ5EmiL/wLVTP3kcot72uSSc931f3tJ0mEUCip98xXmaBw==
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 4P6x551S8qzsfD;
Thu, 2 Feb 2023 11:14:33 +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 312BEXv7076634;
Thu, 2 Feb 2023 11:14:33 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312BEXoN076633;
Thu, 2 Feb 2023 11:14:33 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 11:14:33 GMT
Message-Id: <202302021114.312BEXoN076633@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 59a9cd98631c - stable/13 - linuxkpi: Fix return value of dma_map_sgtable
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 59a9cd98631c026a4666e604752e99b04207d63c
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=59a9cd98631c026a4666e604752e99b04207d63c
commit 59a9cd98631c026a4666e604752e99b04207d63c
Author: Austin Shafer <ashafer@badland.io>
AuthorDate: 2022-12-06 15:25:53 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 11:10:36 +0000
linuxkpi: Fix return value of dma_map_sgtable
dma_map_sgtable internally uses the dma_map_sg_attrs helper. The problem is
that dma_map_sg_attrs returns the number of entries mapped, whereas
dma_map_sgtable returns nonzero on failure. This leads to dma_map_sgtable
returning non-zero-but-positive values which tricks other areas of the stack
into thinking nents is a valid pointer.
This checks if nents is valid and returns zero if so, updating the nents field
in sgt. This fixes PRIME render offload with nvidia-drm.
Fixes: 9202c95f47c2 ("linuxkpi: Add dma_{un,}map_sgtable")
(cherry picked from commit 4085bde9fa2ea7ebe861a2e4a07312aac00a26fc)
---
sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
index ef3570ef7639..25e4acf9e45d 100644
--- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
+++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
@@ -358,7 +358,14 @@ dma_map_sgtable(struct device *dev, struct sg_table *sgt,
unsigned long attrs)
{
- return (dma_map_sg_attrs(dev, sgt->sgl, sgt->nents, dir, attrs));
+ int nents = dma_map_sg_attrs(dev, sgt->sgl, sgt->nents, dir, attrs);
+
+ if (nents < 0) {
+ return nents;
+ } else {
+ sgt->nents = nents;
+ return 0;
+ }
}
static inline void
From nobody Thu Feb 2 11:14:34 2023
X-Original-To: dev-commits-src-branches@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 4P6x566tlxz3cwbg;
Thu, 2 Feb 2023 11:14:34 +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 4P6x563xFWz46bb;
Thu, 2 Feb 2023 11:14:34 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675336474;
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=jsiZTIruH/3jJItxR9G2BGCZB3Y9kd0HEF8yg7iMuIc=;
b=bE2d3KaH+kdhueuP3CQB8Ce0Irw+x6PMyNThv3YcJhVu+VJU6vcWI5ptk1o6+B7ItW4Yyi
pjx2IfiQFKl38zBNf4V5rPVlktsof7TbdL3CxL62EunAp+p99yhnz2tCC+IsJEI/gEaa8p
m87vna6SESvD3WwBtLyk/4E1Zap27RmbCpaXQBvgcy3UtM9WyWgXC6ggCdfcuEVodRxh2O
+SikrnAKJ+GzNlcqiApjU7C+siIG8/RrZWk8LJWahTTaAEq0yHpl+N1iDB3xhw+BeSh1gk
XOAq5YcEgwqijKs+2kNjKyap4Y+IePools5F00vEsApjiCVaScVCT+6EXJ0tkA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675336474;
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=jsiZTIruH/3jJItxR9G2BGCZB3Y9kd0HEF8yg7iMuIc=;
b=eY8KjKvL1OK7MsjTl8MLmL9WaW9V/rFgkRXTW2LTeDG50pKdDwC0d58I3cj0VCD3Hqwb/N
tjEeD/3Wd+DS9U6dM1879tAX17j9I7M5D8bi7AwmnIXtk1X4i1j5wE+74aqKhQPLDcKDth
lz6GfEOtR9fPszYi76nN3ibI008sg5pnU7kFwmSQ+j2VPdcSi8fxsAPinGvueUsSHGHDVv
qjDihR6sTD27wOkpDRjebItnG9OQFy3jKZkw8x+WFSVuOqS2c27MVLw88RYKMIzIF6J5d1
QRbI8+axX1wSRsPiMVVOzb2YMNLNHlOUfPcFgZOnq2ZXqDrVwwH+b4RC462pSg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675336474; a=rsa-sha256; cv=none;
b=LB2kj98lso1L63ncvTonSm1zSyU7+UzcJDC2e7jEegdIoPYsIUplGvv9+GxjcnSM0Ef0mx
qXuNKsvs7BCX37uPYh6rJs8tuxMrtMNkl0j7ALPEbbvlSA1l9NM8JaZWwSFKosPK5ZuTlB
lXvP1AuicwBIcjRq0y3DqqXcKratdpSqb4nOJ2re6f9sSu5DqMtAhHKl/Uzvjh9DmzVWI2
r4pWPXjaE7QbadgbdmAvAZapoqFoDptG3ZgegQUyv4Xp/EYUzeUeu0Rr6OmBErfM1X/H53
sfjqN0U65lx6ClcFC1RTRYec5Bv1hwQhLbt3lsYR9xv70ElAFVPe83v16DwtjQ==
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 4P6x5629wFzsNf;
Thu, 2 Feb 2023 11:14:34 +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 312BEYf7076658;
Thu, 2 Feb 2023 11:14:34 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312BEYFx076657;
Thu, 2 Feb 2023 11:14:34 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 11:14:34 GMT
Message-Id: <202302021114.312BEYFx076657@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: f9a312f61ca2 - stable/13 - linuxkpi: Fix style for dma_map_sgtable
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: f9a312f61ca2d3349d5d0e89e9306bb817d60548
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=f9a312f61ca2d3349d5d0e89e9306bb817d60548
commit f9a312f61ca2d3349d5d0e89e9306bb817d60548
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-12-06 15:52:16 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 11:10:36 +0000
linuxkpi: Fix style for dma_map_sgtable
Reported by: bz
Sponsored by: Beckhoff Automation GmbH & Co. KG
(cherry picked from commit 72621b543e984a2074e1945adc26b49ac04af7e8)
---
sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
index 25e4acf9e45d..afcaa69998b8 100644
--- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
+++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
@@ -357,15 +357,13 @@ dma_map_sgtable(struct device *dev, struct sg_table *sgt,
enum dma_data_direction dir,
unsigned long attrs)
{
+ int nents;
- int nents = dma_map_sg_attrs(dev, sgt->sgl, sgt->nents, dir, attrs);
-
- if (nents < 0) {
- return nents;
- } else {
- sgt->nents = nents;
- return 0;
- }
+ nents = dma_map_sg_attrs(dev, sgt->sgl, sgt->nents, dir, attrs);
+ if (nents < 0)
+ return (nents);
+ sgt->nents = nents;
+ return (0);
}
static inline void
From nobody Thu Feb 2 11:14:35 2023
X-Original-To: dev-commits-src-branches@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 4P6x574x5Sz3cwfW;
Thu, 2 Feb 2023 11:14:35 +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 4P6x574M2fz46nf;
Thu, 2 Feb 2023 11:14:35 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675336475;
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=wTyPO6reHsZikVmZC0UqmpcJi1JyRxW5VDuR4i11NT4=;
b=S2gBWxPDwHwHOsIoP/evkljhXfJ6dW3YIVjGCmgvE3N968+c+w43DIWSYFqN+ZXIRwQcGt
yNMVjxc6GHZREu757/EQZBqCRQ0NchKvGM6WV4sr2o+tMWJe5rDIqn+qT9eO0h3z4VF3Yu
PSEX23sJ2bvBOcMv7m78pV0+txmpVmXPzyojaHCUPZiRgL/IAoB9TWyQizhesNN881aX2I
kWOEz79+escTr7aUKGkAGmMg+fjQnH7+6wJtFwopLO46uZXc+qQ0LlDhcIx9uRxoWA2WsO
Spphj4QxThjkeSnb2sUlz67nfYTh9Om07BHVh7owmwKwrgCWlPGRbEG5PHftsg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675336475;
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=wTyPO6reHsZikVmZC0UqmpcJi1JyRxW5VDuR4i11NT4=;
b=kDeL4TYKcGuVW8XbS180hPx/WcO1XEyrpkN+Gvlo0u+ZGovhNSy2CmWmp/BYLoBuJdqnzS
4GziJGDo0rqaYkXuJob3glKzsGR4x07+jJJ6JJqWzXq0MSgLDgG/aj28v691ylJHzB7BK8
biQ5lflpTbVEcVYcAMLuDfLcbbt75+0QEZstROjLxgq338hbNrIhrxD/2nIrQrIa9rceJt
7kDiCs9VDgxHSuX6hF6FA2h9MYbvGl+G3gNGDN8nPXwBuNED03DddezdNF8BBswXU3AJQq
kX8iOj6aDhaV8PTyjHXoX7BmlVrAaZwTJJj4s5TcmXJF9KFtAe4w4OboBQDkew==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675336475; a=rsa-sha256; cv=none;
b=yP0MXitFnAbhkACsJGwWS6WW/pSPXPwXJo2KQbOijDnTRmO2nB3II8S6ktY00Ip4HFdq9h
pdvssjTRn8DG7AhKLOPseTMVsz16V42YVQs7O8zE02dLSQDu7nSg8Cs/6PlS4RjLW+pRJn
8mC/xwT/PlI7rdJSRtLFQI35jNWk7EafF/Ld1gGBWNdpmwnUy3NlMzG2RkuP34xvFbWg1J
9Cr0VzLnbw6Z0FPcclLZTiGnfPQba0YG0z87bEssoqGbBRfFXjO6aXX6nm3QORzVv7V0n7
dMHfONyFuwycl+/YIOgEzwu6tRmHiVEYqNujiOk2oxJFrFm/wqbBJykIXa3nUA==
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 4P6x573KMXzsLB;
Thu, 2 Feb 2023 11:14:35 +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 312BEZbm076682;
Thu, 2 Feb 2023 11:14:35 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312BEZVe076681;
Thu, 2 Feb 2023 11:14:35 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 11:14:35 GMT
Message-Id: <202302021114.312BEZVe076681@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 19956b44dcfd - stable/13 - linuxkpi: seq_read: Fix off by one error
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 19956b44dcfd6aadc096cd167e975f02a3804964
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=19956b44dcfd6aadc096cd167e975f02a3804964
commit 19956b44dcfd6aadc096cd167e975f02a3804964
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-12-21 11:42:24 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 11:10:37 +0000
linuxkpi: seq_read: Fix off by one error
strscpy needs the buffer length not the string length (so including
the '\0').
Reviewed by: bz
Fixes: f697b9432d9c ("linuxkpi: drm-kmod debugfs support")
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D37771
(cherry picked from commit ccd8c4488afb15c2b866b58d5aa9dd994f300f95)
---
sys/compat/linuxkpi/common/src/linux_seq_file.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/compat/linuxkpi/common/src/linux_seq_file.c b/sys/compat/linuxkpi/common/src/linux_seq_file.c
index c358e4ae7dc1..d4d8ef059ac4 100644
--- a/sys/compat/linuxkpi/common/src/linux_seq_file.c
+++ b/sys/compat/linuxkpi/common/src/linux_seq_file.c
@@ -67,7 +67,7 @@ seq_read(struct linux_file *f, char *ubuf, size_t size, off_t *ppos)
return (-EINVAL);
size = min(rc - *ppos, size);
- rc = strscpy(ubuf, sbuf_data(sbuf) + *ppos, size);
+ rc = strscpy(ubuf, sbuf_data(sbuf) + *ppos, size + 1);
/* add 1 for null terminator */
if (rc > 0)
From nobody Thu Feb 2 11:20:21 2023
X-Original-To: dev-commits-src-branches@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 4P6xCn30jxz3cx6N;
Thu, 2 Feb 2023 11:20:21 +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 4P6xCn2Splz47nR;
Thu, 2 Feb 2023 11:20:21 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675336821;
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=FPp/YuhrrAMWSZLcJfDSt8Jh9TReNF1elFjxmTP7stM=;
b=ucjM1vucEB/vLdyPHUrTjgVS9z078X2kblMXDpSPmeLwOcdEwTJdiAWwogk9bAol/0mGVt
WEFQvFE6iDawAZt4YgB8YJzFCJitJwIIedRwJHS6ZMoE+FPAjxmhblWsjc1BiH71/1tCt9
dRRl2YLgqD2tDaVlcVSroSGYemAWDaRL4cfhbxXj3X1rNI4BDy+UsewSN/FKzEHNkxRuTZ
YKCuBcbHhpOc/bq3gmONolpSQ//BMBi5IHb4PNvjS7+QWthTTpwrsSxee5BusU/ESz2qno
mBUsk7E4+vwl7umsLfg/CwZZsRB60pr9qoMnEPLjN6DouShpMgFcYPcFs+C8mQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675336821;
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=FPp/YuhrrAMWSZLcJfDSt8Jh9TReNF1elFjxmTP7stM=;
b=gwLq5mHpvTkpP5CehqBeebTiwo927eiLEERv5Y+biXB+hYVo+SHF24O4k/uw9wZWMQoTNh
m/fZhdex9EnLn8SiwGsbIS3fsidhNkM6FIkTaMWiQ0Rvf66jMngN8qgb7bmwInFsQcgAVg
V1E47Z53c3Z8L0Tb/FVuKoge2Is9AuAMaUnuAcdOtPO7qn7neYETQfyXFMWDhZh6Yx/Y1x
GAU//6E3GsBJAgWeTAsvNjPcG75f6IhhXgLpxgKJp3j1Z563YHHqrMpcbaYYb/xe2cepBA
1zGnWk7esqN3X/0oyb6J6iDx1PkqNyPs6tLxVIQlVnbAyFS+d1X/jq6YUKT+Sw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675336821; a=rsa-sha256; cv=none;
b=Bbs1wfOUpiJpHgv0Jd5f7d4pNTZeWaEt1WLxe21SCDmjZixpzHNGnghe1tWs4TGiTWZblm
kdBS7ymLa82qKxAJulAPKOpNlPfOm4rzg0ogfxjSS8iaFgJMKbiFcm5kQYtdfMbwz51JKo
/GTahkWzDC/O9Yc5mLOVAfEVwzkes6QunjxRBwlYzYBRorQ6TcV2W+H7mxWXKKk8mqjDcn
B6lbQX3pXqOvG488X+6upFkO048G8NoPHhS5NMhaBx5LGIRMB9bIaw4O3CtlwEDzWSFnXo
GRCyJ8ZYBBSbOdUAaZMJSHXZvB+WeoSdFCvtwPuxujiKfpo5EmNNYsfJvL7Csg==
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 4P6xCn1WYbzsR1;
Thu, 2 Feb 2023 11:20:21 +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 312BKLc2085834;
Thu, 2 Feb 2023 11:20:21 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312BKLHB085833;
Thu, 2 Feb 2023 11:20:21 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 11:20:21 GMT
Message-Id: <202302021120.312BKLHB085833@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: a412da4f9e7e - stable/13 - Add support for RockChip RK356X to DWC3 driver. For RK356x platform, we can set bit 26 of DWC3_GUCTL1 register for usb 2.0 device.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a412da4f9e7e48067ab1cdc5986bf13497129085
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=a412da4f9e7e48067ab1cdc5986bf13497129085
commit a412da4f9e7e48067ab1cdc5986bf13497129085
Author: Søren Schmidt <sos@FreeBSD.org>
AuthorDate: 2022-08-16 12:24:44 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 11:17:19 +0000
Add support for RockChip RK356X to DWC3 driver.
For RK356x platform, we can set bit 26 of DWC3_GUCTL1 register
for usb 2.0 device.
Reviewed by: manu
Differential Revision: https://reviews.freebsd.org/D36211
(cherry picked from commit 1331c0f44b6a3b6dec1fbd638103fa15bffac5d8)
---
sys/arm64/rockchip/rk_dwc3.c | 6 +-----
sys/dev/usb/controller/dwc3.c | 9 ++++++++-
sys/dev/usb/controller/dwc3.h | 1 +
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/sys/arm64/rockchip/rk_dwc3.c b/sys/arm64/rockchip/rk_dwc3.c
index d63ba67907f8..72292e9f8902 100644
--- a/sys/arm64/rockchip/rk_dwc3.c
+++ b/sys/arm64/rockchip/rk_dwc3.c
@@ -141,11 +141,7 @@ rk_dwc3_attach(device_t dev)
clk_get_name(sc->clk_bus));
return (ENXIO);
}
- if (sc->type == RK3399) {
- if (clk_get_by_ofw_name(dev, 0, "grf_clk", &sc->clk_grf) != 0) {
- device_printf(dev, "Cannot get grf_clk clock\n");
- return (ENXIO);
- }
+ if (clk_get_by_ofw_name(dev, 0, "grf_clk", &sc->clk_grf) == 0) {
err = clk_enable(sc->clk_grf);
if (err != 0) {
device_printf(dev, "Could not enable clock %s\n",
diff --git a/sys/dev/usb/controller/dwc3.c b/sys/dev/usb/controller/dwc3.c
index 19237ef4c11d..2e8f868bc47b 100644
--- a/sys/dev/usb/controller/dwc3.c
+++ b/sys/dev/usb/controller/dwc3.c
@@ -366,6 +366,7 @@ snps_dwc3_common_attach(device_t dev, bool is_fdt)
#ifdef FDT
phandle_t node;
phy_t usb2_phy, usb3_phy;
+ uint32_t reg;
#endif
int error, rid;
@@ -403,7 +404,13 @@ snps_dwc3_common_attach(device_t dev, bool is_fdt)
error = phy_get_by_ofw_name(dev, node, "usb3-phy", &usb3_phy);
if (error == 0 && usb3_phy != NULL)
phy_enable(usb3_phy);
-
+ else {
+ reg = DWC3_READ(sc, DWC3_GUCTL1);
+ if (bootverbose)
+ device_printf(dev, "Forcing USB2 clock only\n");
+ reg |= DWC3_GUCTL1_DEV_FORCE_20_CLK_FOR_30_CLK;
+ DWC3_WRITE(sc, DWC3_GUCTL1, reg);
+ }
snps_dwc3_configure_phy(sc, node);
skip_phys:
#endif
diff --git a/sys/dev/usb/controller/dwc3.h b/sys/dev/usb/controller/dwc3.h
index 83951d327c8c..21a87a1917ee 100644
--- a/sys/dev/usb/controller/dwc3.h
+++ b/sys/dev/usb/controller/dwc3.h
@@ -49,6 +49,7 @@
#define DWC3_GUCTL1 0xc11c
#define DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS (1 << 28)
+#define DWC3_GUCTL1_DEV_FORCE_20_CLK_FOR_30_CLK (1 << 26)
#define DWC3_GSNPSID 0xc120
#define DWC3_GGPIO 0xc124
From nobody Thu Feb 2 11:20:22 2023
X-Original-To: dev-commits-src-branches@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 4P6xCp3pr2z3cxBW;
Thu, 2 Feb 2023 11:20:22 +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 4P6xCp34v2z47g2;
Thu, 2 Feb 2023 11:20:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675336822;
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=TPea1XmXfbid38r/d33INHg0rr3WH6h3n4D3qEPFnVU=;
b=ew1IAWqgZt/YNf8LCstUKtlR8aoAfBChAWWRbRtQ2MowP6NQtXZIaKDrjSLuPGmBVExQGj
QyjW2z+q0KN0S9kQTOU97ivD1QkU8FdppGoQliT3uzrs+TBNK5GnunNrtAxKjmvgG76+NT
NnFNObtNUxc3qjW4CXaGPIGytN1lrQTSNjBVrJKp7ihu9JlYlWQr9yHihr3GeUVsNAfgxi
J88rZC0tkUHkvDRSdfO8s1W7BsO7uVNRb5E714svUsi4SDWstyOdazXedID00kkqDFRPGq
QXUg5Tt5yZCp6pb4lxx4eYq4GV+vr+aC9dT+E05azl80O7CyWFhlrpcyUtZDEA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675336822;
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=TPea1XmXfbid38r/d33INHg0rr3WH6h3n4D3qEPFnVU=;
b=UgRUY490WSVyCUuZ8O1H/IrxAv9wOVM7pjOW1W7dPFfgfAs8UbhBbrXbgNIjfz5Siex6q2
IZGGTt1Td8U16bPKpehwmYP/kBq81wZIsyjDwgvCcwleWi0MP/aWyxzDRcK7fS9iuUA3hA
kkXqEQdDK/p79lMOfoRMn0EBm4qbbWCarjLZU2ym0KLK/lO8+8rdnvjNZv0bPsmK8jLdRO
fowsRifW5MEW4+VnMVjRDarWA4O66DsszhlrV+YyttmPCvI2bjL09bb12Sgocl4pIW+3Tv
B/cxvJelrixeDme3PULGh4KuXPL+msq+34VxmCWDC0tx0hejiqMjfyTpp+fmwQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675336822; a=rsa-sha256; cv=none;
b=qr5PPZQfb1fQENRAGxRCecw5JUQJv6kVl0jThO/Z/nG0+X6ZRF2jxpyX6pQaoOMfk8Et4t
gHz/uHQZoqWR4OkRr38GTCkHDzRAa9VmtAXkzC8umabMTp+uMOrbfFoOfaV5AFjoYOp3pi
N6fSaL9rChM7jMWXXtilJhA0mCeWOu2e+cU+uz2mWQdJR1hQxPJ5JNdTPgQLTVnj97zeoA
wa/xS+4xi1v12vggg9Zzcc2PLSlmaKdErKhEfoLnw0B0umKrEcsiacvFYgYMZInWWrKRi/
WmXMKsuqAOKlOHpqZb+WaHosADI2TY01+LUtVIRPeRk9feTlWgyNrtyGkyepGg==
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 4P6xCp28lWzsLF;
Thu, 2 Feb 2023 11:20:22 +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 312BKMp5085858;
Thu, 2 Feb 2023 11:20:22 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312BKMsR085857;
Thu, 2 Feb 2023 11:20:22 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 11:20:22 GMT
Message-Id: <202302021120.312BKMsR085857@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 2908718700b5 - stable/13 - dwc3: Handle optional clocks
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 2908718700b5890dc733c2bd7a741048b0656f31
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=2908718700b5890dc733c2bd7a741048b0656f31
commit 2908718700b5890dc733c2bd7a741048b0656f31
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-11-15 08:58:30 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 11:17:26 +0000
dwc3: Handle optional clocks
Usually dwc3 needs a glue node that contain the SoC specific clocks/resets.
For some reason the RK3328 DTS doesn't have this glue node and the clocks
are specified in the dwc3 node directly.
The bindings says that it is allowed but doesn't specified some strict names
for them.
Add a specific case for RK3328 based on the compatible string.
Reviewed by: andrew
Differential Revision: https://reviews.freebsd.org/D37392
Sponsored by: Beckhoff Automation GmbH & Co. KG
(cherry picked from commit 0a5f342aa5a0ddd5d173bdfc856c6a81d1c12c6c)
---
sys/dev/usb/controller/dwc3.c | 40 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/sys/dev/usb/controller/dwc3.c b/sys/dev/usb/controller/dwc3.c
index 2e8f868bc47b..eaea4d57a764 100644
--- a/sys/dev/usb/controller/dwc3.c
+++ b/sys/dev/usb/controller/dwc3.c
@@ -86,6 +86,11 @@ struct snps_dwc3_softc {
bus_space_tag_t bst;
bus_space_handle_t bsh;
uint32_t snpsid;
+#ifdef FDT
+ clk_t clk_ref;
+ clk_t clk_suspend;
+ clk_t clk_bus;
+#endif
};
#define DWC3_WRITE(_sc, _off, _val) \
@@ -394,9 +399,32 @@ snps_dwc3_common_attach(device_t dev, bool is_fdt)
if (!is_fdt)
goto skip_phys;
- /* Get the phys */
node = ofw_bus_get_node(dev);
+ /* Get the clocks if any */
+ if (ofw_bus_is_compatible(dev, "rockchip,rk3328-dwc3") == 1) {
+ if (clk_get_by_ofw_name(dev, node, "ref_clk", &sc->clk_ref) != 0)
+ device_printf(dev, "Cannot get ref_clk\n");
+ if (clk_get_by_ofw_name(dev, node, "suspend_clk", &sc->clk_suspend) != 0)
+ device_printf(dev, "Cannot get suspend_clk\n");
+ if (clk_get_by_ofw_name(dev, node, "bus_clk", &sc->clk_bus) != 0)
+ device_printf(dev, "Cannot get bus_clk\n");
+ }
+
+ if (sc->clk_ref != NULL) {
+ if (clk_enable(sc->clk_ref) != 0)
+ device_printf(dev, "Cannot enable ref_clk\n");
+ }
+ if (sc->clk_suspend != NULL) {
+ if (clk_enable(sc->clk_suspend) != 0)
+ device_printf(dev, "Cannot enable suspend_clk\n");
+ }
+ if (sc->clk_bus != NULL) {
+ if (clk_enable(sc->clk_bus) != 0)
+ device_printf(dev, "Cannot enable bus_clk\n");
+ }
+
+ /* Get the phys */
usb2_phy = usb3_phy = NULL;
error = phy_get_by_ofw_name(dev, node, "usb2-phy", &usb2_phy);
if (error == 0 && usb2_phy != NULL)
@@ -427,6 +455,16 @@ skip_phys:
snsp_dwc3_dump_regs(sc, "Post XHCI init");
#endif
+#ifdef FDT
+ if (error) {
+ if (sc->clk_ref != NULL)
+ clk_disable(sc->clk_ref);
+ if (sc->clk_suspend != NULL)
+ clk_disable(sc->clk_suspend);
+ if (sc->clk_bus != NULL)
+ clk_disable(sc->clk_bus);
+ }
+#endif
return (error);
}
From nobody Thu Feb 2 11:20:23 2023
X-Original-To: dev-commits-src-branches@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 4P6xCq6vgzz3cx2S;
Thu, 2 Feb 2023 11:20: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 4P6xCq3WPxz47m8;
Thu, 2 Feb 2023 11:20:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675336823;
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=fkLTEhjEiyn9ue81mn2zTueXbkEV+XqUIc8ilJRmMQ0=;
b=TjjDElgL1Fsg19PCzCh/od9QxIb2ZcQPVs8kq7zoMxFaXw3CfNyNy8EOm72UeCfBq+TsdG
qcMBaOBjDoUWoRyUIqTB9YpsoE2AyhAWccEzOZcKDJA+pHSqgYAUU0IdamCfbc+i8jEADq
c4CV5mkYrCB+NaP3ZKxIBQhe0K/sN21/bIdsFqCPOqqzRVTa7zPAkxi2uG/1BGpf3Xf8DQ
9g4n2RiolQBVeNPIVKKCGLT00WvCjPBsecpRWnuJFavV4OVExygwx2/fDnn4DdqSyqsYLu
8tMWrFZ7Fs4ivTRa+Ly6wRhFW6YrD6SMEJY7MqfuFFtkYHa8dBELlZW0548T8Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675336823;
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=fkLTEhjEiyn9ue81mn2zTueXbkEV+XqUIc8ilJRmMQ0=;
b=Y1vK4jwLz/K6fqk3zPl82nkKK6rMVdvlGIdkVZWwww4eXcgdE8x2dd+RMqDbdXyTe0NVFm
qpuVdaKt2vJqEaDw/Xb7ANlmZvs8VjEujD0+f6VKdObgchUa+KfGXRi7P3/gMaKu510AF9
q7501smPSGyBAtOLx9YHWFl7dnXr3z2nj0n06K1XVA3Hg1BhjyLW2Llz3uahPon00/9HFc
lbZ6R5WnKyX+KPvQZElhHKm8KYuP7xKHlCNcx5H3g2ZYkJxIebCgTrHKogc3P2XqBkHA2f
rAdMtUH0F6iJpZKfcUjjUUdcFJl9+KwsfG4xWEPhGsfkI5upxBPn2TIqpBLZiQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675336823; a=rsa-sha256; cv=none;
b=SGmfgqj0NyfKbGvTUPADltrNBIC8L7GrTXd9SJWVFmpdJY2IcJIMi9OrQuYI9imipA9a8F
9jHPR7lYRNipD2i4OaQrwMmqLx1UxTBRbabA/FK0l/w1ULrz+pc2rWNrhGfJ70sltegCgo
+Z8Y/hv9VkVLEvrvEPNGH5z8MwW89x9Xb5pB4+o0PrS/LzbHi1wnBUo0pwRGA77prm6aQC
vlS2LP/zq6GBDk09PSLgrl1aPLMBPftmmn95qYHyH+YyA3+Imyv88EWFoXFMV2sHhfGeIH
Xl/RVMNWC+SBmJkd1Fi1Rwz/gFbjn6UP65evJzWNBdSzXp78mvhXMtQ64Gzp2A==
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 4P6xCq2d9YzsLG;
Thu, 2 Feb 2023 11:20: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 312BKNuS085883;
Thu, 2 Feb 2023 11:20:23 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312BKNnK085882;
Thu, 2 Feb 2023 11:20:23 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 11:20:23 GMT
Message-Id: <202302021120.312BKNnK085882@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 2b42f2138fe4 - stable/13 - usb/dwc3: Read the full IDs/version
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 2b42f2138fe42212235ac972464c9d989b614d55
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=2b42f2138fe42212235ac972464c9d989b614d55
commit 2b42f2138fe42212235ac972464c9d989b614d55
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-11-15 10:22:23 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 11:17:26 +0000
usb/dwc3: Read the full IDs/version
We need to enable some quirks based on the version so read it.
Reviewed by: andrew
Differential Revision: https://reviews.freebsd.org/D37393
Sponsored by: Beckhoff Automation GmbH & Co. KG
(cherry picked from commit 0e87f58bd7e566d2b7d50cf0ab636e745af591fc)
---
sys/dev/usb/controller/dwc3.c | 30 ++++++++++++++++++++++++++++--
sys/dev/usb/controller/dwc3.h | 12 ++++++++++++
2 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/sys/dev/usb/controller/dwc3.c b/sys/dev/usb/controller/dwc3.c
index eaea4d57a764..40405927685e 100644
--- a/sys/dev/usb/controller/dwc3.c
+++ b/sys/dev/usb/controller/dwc3.c
@@ -86,6 +86,9 @@ struct snps_dwc3_softc {
bus_space_tag_t bst;
bus_space_handle_t bsh;
uint32_t snpsid;
+ uint32_t snpsversion;
+ uint32_t snpsrevision;
+ uint32_t snpsversion_type;
#ifdef FDT
clk_t clk_ref;
clk_t clk_suspend;
@@ -389,8 +392,31 @@ snps_dwc3_common_attach(device_t dev, bool is_fdt)
sc->bsh = rman_get_bushandle(sc->mem_res);
sc->snpsid = DWC3_READ(sc, DWC3_GSNPSID);
- if (bootverbose)
- device_printf(sc->dev, "snps id: %#012x\n", sc->snpsid);
+ sc->snpsversion = DWC3_VERSION(sc->snpsid);
+ sc->snpsrevision = DWC3_REVISION(sc->snpsid);
+ if (sc->snpsversion == DWC3_1_IP_ID ||
+ sc->snpsversion == DWC3_2_IP_ID) {
+ sc->snpsrevision = DWC3_READ(sc, DWC3_1_VER_NUMBER);
+ sc->snpsversion_type = DWC3_READ(sc, DWC3_1_VER_TYPE);
+ }
+ if (bootverbose) {
+ switch (sc->snpsversion) {
+ case DWC3_IP_ID:
+ device_printf(sc->dev, "SNPS Version: DWC3 (%x %x)\n",
+ sc->snpsversion, sc->snpsrevision);
+ break;
+ case DWC3_1_IP_ID:
+ device_printf(sc->dev, "SNPS Version: DWC3.1 (%x %x %x)\n",
+ sc->snpsversion, sc->snpsrevision,
+ sc->snpsversion_type);
+ break;
+ case DWC3_2_IP_ID:
+ device_printf(sc->dev, "SNPS Version: DWC3.2 (%x %x %x)\n",
+ sc->snpsversion, sc->snpsrevision,
+ sc->snpsversion_type);
+ break;
+ }
+ }
#ifdef DWC3_DEBUG
snps_dwc3_dump_ctrlparams(sc);
#endif
diff --git a/sys/dev/usb/controller/dwc3.h b/sys/dev/usb/controller/dwc3.h
index 21a87a1917ee..c69672072209 100644
--- a/sys/dev/usb/controller/dwc3.h
+++ b/sys/dev/usb/controller/dwc3.h
@@ -31,6 +31,15 @@
#ifndef _DWC3_H_
#define _DWC3_H_
+#define DWC3_IP_ID 0x5533
+#define DWC3_1_IP_ID 0x3331
+#define DWC3_2_IP_ID 0x3332
+
+#define DWC3_VERSION_MASK 0xFFFF0000
+#define DWC3_REVISION_MASK 0xFFFF
+#define DWC3_VERSION(x) (((x) & DWC3_VERSION_MASK) >> 16)
+#define DWC3_REVISION(x) ((x) & DWC3_REVISION_MASK)
+
#define DWC3_GSBUSCFG0 0xc100
#define DWC3_GSBUSCFG1 0xc104
#define DWC3_GTXTHRCFG 0xc108
@@ -80,6 +89,9 @@
#define DWC3_GPRTBIMAP_HSLO 0xc180
#define DWC3_GPRTBIMAP_FSLO 0xc188
+#define DWC3_1_VER_NUMBER 0xc1a0
+#define DWC3_1_VER_TYPE 0xc1a4
+
#define DWC3_GUSB2PHYCFG0 0xc200
#define DWC3_GUSB2PHYCFG0_PHYSOFTRST (1 << 31)
#define DWC3_GUSB2PHYCFG0_U2_FREECLK_EXISTS (1 << 30)
From nobody Thu Feb 2 11:20:24 2023
X-Original-To: dev-commits-src-branches@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 4P6xCr51vnz3cwsX;
Thu, 2 Feb 2023 11:20:24 +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 4P6xCr4Td9z47rs;
Thu, 2 Feb 2023 11:20:24 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675336824;
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=HVONg+6QJp0s0Lv5wEhMdfVrf90V9wMR5Najv4uH2e8=;
b=WYhL3SOQVPG7jRAeVr/7ZT9eX6TcLBUD3F6Gslvn8medGSdFrrm+/Y3H9jobQfuYquauvy
EQ/pD/dHB2DQBcoxfCHnHX7DAaqkssifnvNlGAeA1PVjc3yUHLkIfyoTq1+Z8yqhaRj0Ft
PBx9gbTazwtSVo87lJJzLPh+ZlHpj3wb+dHV4d/BSnvdIjTIRohzuDG/EHa2n4h8mh3Afi
lHU2NikRckYqW4namduwRdg+0C4oLRxQMKruN6hJWfmAhFF4FhQ00tJWnnM6pmgOyvqZKg
X2dz/XOF0scjz3mcHEGLeN94od6iks25a27ukeKRmg0wRAiEHi8Z0UKvbmDdtw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675336824;
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=HVONg+6QJp0s0Lv5wEhMdfVrf90V9wMR5Najv4uH2e8=;
b=YH3iDje1XF/xlaAZR8ULTefyJ0sSnjibO69+ru1Hj0d31HLOd650yUzfj9k7vs/IRoA/Ce
Q8LrmDwHQaIAxHOVlP86hd7A296gnCP+ohlvMC2YJEF3Z3DRGu8vzvCWN9j2E5GovdAl+F
x66zw/u1qfNn/hz0AWQME1sC+dhaPxK7+YtPDAxKQiNOQHvtbLqyKfCU11jp3OAMmMnhxl
IegdnC49zh6NTnVTR5ZdYZo2JpT6gxNnFnkEvvY05eIJwl0bBbxYVGvwC/yWfrYoyFsXY8
ei7VqaK1vmAgscvfsE80Y2TzBOL5bls5l6q9PAmX2f6vnyFZ2lOokrK3NPnpaQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675336824; a=rsa-sha256; cv=none;
b=oVpioTmMGAjeKhySTRmXRGytdPgHdzyHDP7/f0fsfEFGY5zpJUG7oqJ6T4KH+fItS5//KA
8K1ureIFZTBVlPAi22FG3IlU2nfuNEltJ71BQ+Kn6CkEp5uLcHMhW+074W8qHbN4AsihJe
MACeLcVhliqnuTrOJ5dcpMyTOUz1VBBR8dgl3xbPrcLBDW8FJ5XlbYErOEzY8cpzq1IMHe
2L5wD9S+PSlzWJ3be2n8M7YegKkGGpAz2sB3aW+X3G3QsK5YorA6ymRJr3tbGbc1JXmVwG
I7cu3oaIZHgfhUU+UkNtdXsdDmLNcpcqJ/yzNcH0YWmPWOZtrJ9CmYfbYv4Qew==
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 4P6xCr3bGvzsSc;
Thu, 2 Feb 2023 11:20:24 +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 312BKO30085915;
Thu, 2 Feb 2023 11:20:24 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312BKO98085914;
Thu, 2 Feb 2023 11:20:24 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 11:20:24 GMT
Message-Id: <202302021120.312BKO98085914@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 181feb34605c - stable/13 - usb/dwc3: Use more () for macros variables
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 181feb34605c3b711fda0e463ef48ead9eec059d
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=181feb34605c3b711fda0e463ef48ead9eec059d
commit 181feb34605c3b711fda0e463ef48ead9eec059d
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-11-16 10:57:56 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 11:19:08 +0000
usb/dwc3: Use more () for macros variables
Suggested by: andrew
Sponsored by: Beckhoff Automation GmbH & Co. KG
(cherry picked from commit 0860c27fe8cf144cb10f8916a0b8fe5ad57a3d9e)
---
sys/dev/usb/controller/dwc3.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/sys/dev/usb/controller/dwc3.h b/sys/dev/usb/controller/dwc3.h
index c69672072209..72420890d28c 100644
--- a/sys/dev/usb/controller/dwc3.h
+++ b/sys/dev/usb/controller/dwc3.h
@@ -99,7 +99,7 @@
#define DWC3_GUSB2PHYCFG0_USBTRDTIM_8BITS 9
#define DWC3_GUSB2PHYCFG0_USBTRDTIM_16BITS 5
#define DWC3_GUSB2PHYCFG0_ENBLSLPM (1 << 8)
-#define DWC3_GUSB2PHYCFG0_PHYSEL(x) ((x >> 7) & 0x1) /* 0 = USB2.0, 1 = USB1.1 */
+#define DWC3_GUSB2PHYCFG0_PHYSEL(x) (((x) >> 7) & 0x1) /* 0 = USB2.0, 1 = USB1.1 */
#define DWC3_GUSB2PHYCFG0_SUSPENDUSB20 (1 << 6)
#define DWC3_GUSB2PHYCFG0_ULPI_UTMI_SEL (1 << 4)
#define DWC3_GUSB2PHYCFG0_PHYIF (1 << 3)
@@ -110,6 +110,11 @@
#define DWC3_GUSB3PIPECTL0_DELAYP1TRANS (1 << 18)
#define DWC3_GUSB3PIPECTL0_SUSPENDUSB3 (1 << 17)
+#define DWC3_HWPARAMS3_SSPHY(x) ((x) & 0x3)
+#define DWC3_HWPARAMS3_SSPHY_DISABLE 0
+#define DWC3_HWPARAMS3_SSPHY_GEN1 1
+#define DWC3_HWPARAMS3_SSPHY_GEN2 2
+
#define DWC3_GTXFIFOSIZ(x) (0xc300 + 0x4 * (x))
#define DWC3_GRXFIFOSIZ(x) (0xc380 + 0x4 * (x))
#define DWC3_GEVNTADRLO0 0xc400
From nobody Thu Feb 2 11:22:34 2023
X-Original-To: dev-commits-src-branches@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 4P6xGM1v0Gz3cxSl;
Thu, 2 Feb 2023 11:22:35 +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 4P6xGM1RzKz49yc;
Thu, 2 Feb 2023 11:22:35 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675336955;
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=v5GPFGgetBYnP/c7CTzcwE7x1EKgQvuDlhST8/4rr7U=;
b=qlUhPcKdXlYWmxNpxgdZdIbUNJAuk1axbz2Lc6dC3rNKXanNjFnwNYpb0TJHHy+S3A7tgs
GumX4YyJ3mYnKfrSjcK2KJi89RzNSfh8rPj0TcQ4xQD2UeI+5j9BUi/fNf8SQH/4dlJmGb
xHEzr2pF/rg1VG046Tx/sHHIBFCnVgmioJn0cLDMoiVtEumXygFdW3rzJSuDNF3AzSGrAN
wynvJywzC21V//F1OV49wDeMSw9HMrtihaI9hXx41JtV2xA2U6xR+q4auPfWkgfMMwmKrD
llv69xkKqR81y3aeSEpz/68PMNBdYVRL4vNNz00vV3t2MJBiCcxbR5g4uXOU6Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675336955;
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=v5GPFGgetBYnP/c7CTzcwE7x1EKgQvuDlhST8/4rr7U=;
b=yK2iHBnKLt41XchQkSTS+w3gjrvdG64QXzbIDapO8z/2nPuwj3lskRWOkfxIhxE016iXRj
gibA3wefivtyow2OL+6YPNWuLyK/8nI5iqplpS5OCouLgQHtV+3ZAoVSRFxcPmvFDfBZUS
eiTgo6KR+VWNemm5gyLjSgMjx5rItZUC/qaYsCyrlXSN5MXlZNSL8noNAYNQTn6jcoH2UO
dmSeuwOFYDW4LpTvN/YSuOqMwo+zEqHxgor4rnxiMggi5HSE7jziUD1qldS4ViFu0HxlEA
YU8IBzizs94kfgcKctSt1sj6RCdInuaipKSU/126PIdZykcLAEPuXnkWyO5w5Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675336955; a=rsa-sha256; cv=none;
b=nJDWewqezWoyhUva41garDw2kbGiICBpcUWUI+h1IA4tTwaUzN3cIrN8rUww/BQG9MY8hh
1IZZOjyN+/k3vYkPdbFwEl8OlnQ4SNRjBaUg+8gFfJEDPrNMapoPPgMgetQAEPMokpX8sy
euTKrYWitC6qFW9Cl96hOHaKZEwMyh6GvNhKZh4d8MgbBQP7eihr3kZR4RUh7vDvQRdbp3
zHpPT9PG7RZfRnqXd66JHCfhCAR4vFm5MuBJ6XIzXf4iTf/1hN/I5JVYIdjudvufJ4F+NX
IZs6Q0RlJUcw25QT2YDHjtBN5IhyfCD8+KjvkZNpJIHS9+aw/M6ANYoi6qy6lg==
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 4P6xGM0W4Czsdr;
Thu, 2 Feb 2023 11:22:35 +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 312BMYRr090669;
Thu, 2 Feb 2023 11:22:34 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312BMYlm090668;
Thu, 2 Feb 2023 11:22:34 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 11:22:34 GMT
Message-Id: <202302021122.312BMYlm090668@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 4a90c1df208e - stable/13 - linuxkpi: Move cpu_relax out of ifdef for x86
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 4a90c1df208ed24bbeade42717c21faad0b13724
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=4a90c1df208ed24bbeade42717c21faad0b13724
commit 4a90c1df208ed24bbeade42717c21faad0b13724
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-11-10 11:50:51 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 11:20:58 +0000
linuxkpi: Move cpu_relax out of ifdef for x86
It's needed by drm-kmod and this allow building on arm64 and powerpc.
Reported by: jhibbits
Sponsored by: Beckhoff Automation GmbH & Co. KG
(cherry picked from commit ee247fc1e93e6d37cf509a640a7d273616056f5d)
---
sys/compat/linuxkpi/common/include/asm/processor.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/compat/linuxkpi/common/include/asm/processor.h b/sys/compat/linuxkpi/common/include/asm/processor.h
index ee2f48b50b44..86d4ab9de98f 100644
--- a/sys/compat/linuxkpi/common/include/asm/processor.h
+++ b/sys/compat/linuxkpi/common/include/asm/processor.h
@@ -39,9 +39,9 @@ struct cpuinfo_x86 {
uint16_t x86_max_cores;
};
-#define cpu_relax() cpu_spinwait()
-
extern struct cpuinfo_x86 boot_cpu_data;
#endif
+#define cpu_relax() cpu_spinwait()
+
#endif /* _LINUXKPI_ASM_PROCESSOR_H_ */
From nobody Thu Feb 2 11:25:55 2023
X-Original-To: dev-commits-src-branches@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 4P6xLD1tGpz3cxbd;
Thu, 2 Feb 2023 11:25:56 +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 4P6xLD0H8bz4C9V;
Thu, 2 Feb 2023 11:25:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675337156;
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=bjc5kI1PD/WOuBqoUfPmgInYRMWEfQSYroawez/O104=;
b=I/GXcAFBDBIhNpN6S3y8Ta5r+MaDU7lZkCK9Hj5mfd/otF3USdv/KmFXvWM52m2VVaQFyZ
o8q2iA2iIwJ3+OmVrKnoY8SwBawsGHztWjYG501SEjdbmVLWDPDCLu5rFqAoLyT6fQg9Vm
4VxITVEUug3rKyCtZE9Vc0ovAWQMuVKpF75z/DX7gxXh1X3QN2xEcyx9NWbEPytzlTyVDU
JoAc4ZmAxlzZne/Adqge2w46rboP2mu4crC5YBiBsv11HIXvidEGdL+zi0n37FiVT78U0h
vPR3A2Qc9F74icBG6lfDaK9VM7R7p4hDbNnCWSaTd3b9I2sADwsM3NQSru6B6Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675337156;
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=bjc5kI1PD/WOuBqoUfPmgInYRMWEfQSYroawez/O104=;
b=Ktdlt/N70aiWzOegOnLiQmMfshwVWeSR82FB8x4jZve254bbN3lpbUODAWKQGFdF7AWFuM
j65MkK3zEdBiuYkaeMpP1ORPQIR6zeG+WlulyeXfkCiGoC8W8uD3vbQ7RVFpspNCvRBV8f
T/+dZo1n6a4dD4j7DREhP9ea2Pwpx9UQ4YmbSomxg3TIidnkvP7lW7LTOxiU2Uh6V98jgm
UAIoQDDr57x5AJw6ooeyYsjbVr24nygHuB8GOSAihGS4KmkgXp9tW3aIFLUZG5mFtTT9CJ
DNLfrwIvCerPMEI1nwB8JP7G6oI5UW3KyXYF8n+M2OUht84sMYlyn6z7iWeH+g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675337156; a=rsa-sha256; cv=none;
b=x7e3rRqXrG1AKN/LAX9T0Vsoqieq2KpSHbQC49gNiKYA/AcYWQqydppesscHZtaetyjLIH
tz+6EDzSwbeOtgSwukfRPqZt1O8EhWdEu3qmnQdjkayMgNDrY+PH9YGjJUeAEPLd+Lk2MV
/blVRhcLq+fFgqvjjGfqQRfULkUSBQv29TR9TCAKkDRgztWEVFO4WbdrpCk1mCB3IrO4ta
fMoZCYNIa60NcFRbeY0OAc68f6V4DqM8Y4CpiZM5XvMGMqN0mgPFqEDXwiInMTHItLZ+dC
VT/Cy7ybl2q+RK2x07Yvr7f7HnHVNBUYNAtiLD27X08p5+/Z5qigxtN7ytHy1Q==
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 4P6xLC6TWqzsdt;
Thu, 2 Feb 2023 11:25:55 +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 312BPtZZ091174;
Thu, 2 Feb 2023 11:25:55 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312BPtT0091173;
Thu, 2 Feb 2023 11:25:55 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 11:25:55 GMT
Message-Id: <202302021125.312BPtT0091173@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: e83f76ac2188 - stable/13 - usb/dwc3: Only force USB2 based on the PHY register and IP version
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: e83f76ac2188ae7aaf9913d352c23940b9e385d7
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=e83f76ac2188ae7aaf9913d352c23940b9e385d7
commit e83f76ac2188ae7aaf9913d352c23940b9e385d7
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-11-15 12:54:49 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 11:25:47 +0000
usb/dwc3: Only force USB2 based on the PHY register and IP version
We shouldn't force USB2 only based on if we have an external PHY.
The internal PHY register tell us what link speed we can acheive
and we need to force USB2 only if it cannot do USB3.
This is only available after revision 0x290A of the dwc3 IP.
Reviewed by: andrew
Differential Revision: https://reviews.freebsd.org/D37394
Fixed: 1331c0f44b6a ("Add support for RockChip RK356X to DWC3 driver.")
Sponsored by: Beckhoff Automation GmbH & Co. KG
(cherry picked from commit d47f5f2886f082281ae6f97dd5fe9440ad31e6d5)
---
sys/dev/usb/controller/dwc3.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/sys/dev/usb/controller/dwc3.c b/sys/dev/usb/controller/dwc3.c
index 40405927685e..d5e3b3f50a9d 100644
--- a/sys/dev/usb/controller/dwc3.c
+++ b/sys/dev/usb/controller/dwc3.c
@@ -458,12 +458,19 @@ snps_dwc3_common_attach(device_t dev, bool is_fdt)
error = phy_get_by_ofw_name(dev, node, "usb3-phy", &usb3_phy);
if (error == 0 && usb3_phy != NULL)
phy_enable(usb3_phy);
- else {
- reg = DWC3_READ(sc, DWC3_GUCTL1);
- if (bootverbose)
- device_printf(dev, "Forcing USB2 clock only\n");
- reg |= DWC3_GUCTL1_DEV_FORCE_20_CLK_FOR_30_CLK;
- DWC3_WRITE(sc, DWC3_GUCTL1, reg);
+ if (sc->snpsversion == DWC3_IP_ID) {
+ if (sc->snpsrevision >= 0x290A) {
+ uint32_t hwparams3;
+
+ hwparams3 = DWC3_READ(sc, DWC3_GHWPARAMS3);
+ if (DWC3_HWPARAMS3_SSPHY(hwparams3) == DWC3_HWPARAMS3_SSPHY_DISABLE) {
+ reg = DWC3_READ(sc, DWC3_GUCTL1);
+ if (bootverbose)
+ device_printf(dev, "Forcing USB2 clock only\n");
+ reg |= DWC3_GUCTL1_DEV_FORCE_20_CLK_FOR_30_CLK;
+ DWC3_WRITE(sc, DWC3_GUCTL1, reg);
+ }
+ }
}
snps_dwc3_configure_phy(sc, node);
skip_phys:
From nobody Thu Feb 2 11:29:49 2023
X-Original-To: dev-commits-src-branches@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 4P6xQk098pz3cxpw;
Thu, 2 Feb 2023 11:29:50 +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 4P6xQj6gjnz4Ckw;
Thu, 2 Feb 2023 11:29:49 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675337389;
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=Z3U9ee7wIWwfQ22YJOtBTzgcfrdYXBZ+7SvFNxKyUKU=;
b=i6A+X9BvNeKprSKK5IgrgHqD7fhpGHzHpZBwqYspoY83an2gxiuWMBbQQeQZH05hUTx1y8
dIHelXkF5551EJFY5Qxf1qp8x7fr2kuhCiyeyzR7VB7zzurDURBb2vMt61zm+vR2T6HbsY
WK98/71fvqCQC3mSgX5KAtb2/wlzoAwJmnvai3m8wOtN6Ti6Oy46oiB/I/gTBkbM2K0pw3
5Z2qnPH10lwU3okvUocK/K0Z1Y0R5/u9uD6NSKwYw5nwteATVC64TcxmRXSaowgKJ4UrQJ
GdOFr036KWTpTBQ4e2BjnPQANKIzwcs0WAx4DXfYt7P9hwWHYePPIkGdr72CPg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675337389;
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=Z3U9ee7wIWwfQ22YJOtBTzgcfrdYXBZ+7SvFNxKyUKU=;
b=kkBFKADwDnRz3ubFUBg5PTdATakjd5gkb+aKNutsGOEuf6pPw1bhADg+Vzr97JnfPrQsTa
Z6GT6cub8dVBgVv+Qvmyr6GxEmmQGa4btbOHZhTyEVRrlp+zaZveqBAdXKSfUgpItzRa/Y
PiOAuzSzkOsiX5f+lBhOmQrRJozrVz0JYpyDan37tw0kKJu9JF4Ui+7tuYIoqWsuhm+jRS
DqFmlZo1T+UnhMkeW9sql5K8W4NqhLQsfS5Sj+6p0SxsZzc4VWKhEazfZNO7Xvxj38WYcc
Qh8aJmWKn/mA/xhK9YS/jeDfWg//fh9LG3/izzApv/HUwIhj/j57luElF0X1Ww==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675337389; a=rsa-sha256; cv=none;
b=sOCCd122MERO4Hlj25I1wYkxxgWAC2igkCVM8IGl1g1F5Uj6ztQLaY2aPx10wneNUd8chV
qLSu+MFfL6X26KbB24SaKkIKRj3nEmzh3lTTQIPSDpXQWmtI7/efrEzYBqxRzO5n1icNa7
NJHwV8G/8HCNmGruhXnRKLzqliAdUTNqdLw5u78V3Bm/yHAEJyo+fbYf6ch73kz5M92jrh
FNhknxZxnuXiz8j+u4KTpV4iH+iVpkLwqLz0lYMy9pzoiG6DKeVBDkBcK92tegQ2iY6OIt
yt9c8DsM2yJTLGwdEDk2+dmsqr0kq3aKYMWzZxmvSWtI8GwZuM6uvcrgrvEXSw==
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 4P6xQj5dNSzsbJ;
Thu, 2 Feb 2023 11:29:49 +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 312BTnnV091773;
Thu, 2 Feb 2023 11:29:49 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312BTnJo091772;
Thu, 2 Feb 2023 11:29:49 GMT
(envelope-from git)
Date: Thu, 2 Feb 2023 11:29:49 GMT
Message-Id: <202302021129.312BTnJo091772@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 01a14c88d9fb - stable/13 - fb: Add a default getinfo method
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 01a14c88d9fb5bb209b869512d31cdf512fbb433
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=01a14c88d9fb5bb209b869512d31cdf512fbb433
commit 01a14c88d9fb5bb209b869512d31cdf512fbb433
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-06-21 13:52:49 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 11:28:47 +0000
fb: Add a default getinfo method
fb_getinfo is badly designed as it returns either the
info if the driver have the method or ENXIO via the kobj stuff
if the driver doesn't have it.
Add a default method that returns NULL as the code already checks this
and it avoid changing the interface.
None of the drm drivers supported have this method and it sometimes
fails and panic when loading them (for now only usb-c docks seems to be
affected).
MFC after: 3 days
Sponsored by: Beckhoff Automation GmbH & Co. KG
(cherry picked from commit 3cbf6518d6eea08e0fbe6d7c609debac5ab31992)
---
sys/dev/fb/fb_if.m | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sys/dev/fb/fb_if.m b/sys/dev/fb/fb_if.m
index 53e4563bb6f5..938cececa409 100644
--- a/sys/dev/fb/fb_if.m
+++ b/sys/dev/fb/fb_if.m
@@ -3,6 +3,14 @@
INTERFACE fb;
+CODE {
+ static struct fb_info *
+ fb_default_getinfo(device_t dev)
+ {
+ return (NULL);
+ }
+};
+
METHOD struct fb_info * getinfo {
device_t dev;
-};
+} DEFAULT fb_default_getinfo;
From nobody Fri Feb 3 00:06:43 2023
X-Original-To: dev-commits-src-branches@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 4P7GD36fKMz3kkxH;
Fri, 3 Feb 2023 00:06:43 +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 4P7GD35qzkz3n1l;
Fri, 3 Feb 2023 00:06:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675382803;
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=o9hiUsq76l1mkA8OAy5+Rstg12wKGvyV/hccIjFtr20=;
b=KNU2MVQGX7hmtS1stTmA20cra8plYqbModC2y4H/fBSLGZV8voNV3Bq9oH3BGLxHKckeHV
SRW7xSQwggWiFvnZubm8gaUQvoN8KHlcrAS1pdHwwduo4JVWXV7EZcCd0hUmqoWZmInQE7
vrAnnZK6VSUo/HZh5NnSLgqAb5QVAI66GK3fhhJLlhne9egZIP3H1yIZ3+E3n3yiyUj/Wh
08ayhtUJggAc/SWZUUo6l/88qQfTDVuFYeSQUhX5gr1m+yPQjM0zh4+8zzMwH7h8rWp3Y+
P+RW1t346DwqoIbPnwyM3G4rNaX9bQQFLLqI8jFbN1lN0H6pm/hIhupUG8O99g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675382803;
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=o9hiUsq76l1mkA8OAy5+Rstg12wKGvyV/hccIjFtr20=;
b=QP/ZHfmeH7pPY0NIGqJ39oJTr+UnPXZIIAxrwPT/5LDoYd9AaSc5+johJopEBzFO/PDGVw
/4tNSzTcDCYentxx2IFKrncRC1ql7fc3xDJ5kZPqU51W2fQ1Kubs/UVlFToWXUCqxAbtrM
nUsSC1k3jBaKxTK4PEtaB4vcLnV3LS2zTMflsGzYYVGB9XcFMbKxYPwv8kMhw4FnpsSEa1
scvQhDbH0pJdli88LhTScR8L/911zEgwUvS3KoCSloTsfbp+eoXZ4jo/tBA5SDZ4xqe+Js
NhACicbrQq0cdtPYgepKFei4FFNmSJvIyFK2If29cnY8VKuZ4sbWg57aige7Lw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675382803; a=rsa-sha256; cv=none;
b=RSv/uP+0fLKE0yLSslUG56t6SoUDsogdRtn/jinM+BTyzRcdON6wImkvCw+aJ2GzmUGn5G
yLB8WHFZtDeHkvvvA8X1+fO6LL7dIlg3OXAaVrh87vmxhyqWO6jF8UBS3Aw/BONK2nbyJI
zkjczS7wOQIygU3mqttkNHLHOBP9VY4D7kc4tHGZ8bDGDkgaNGWXCV3LcIC/u1300gR012
wd0O2jG5Wd4FESPTMOA06MSqxPFMzsgAcFlWsuVm3uaPXpII6RBvtLiulw1+PPP0OolRwU
C8Md8sXqGgQ+cFTnYJuVO2pS3x/PlmXYcoCSh/dHlnuKerD9FZQ/pB/XEuxfkQ==
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 4P7GD34SdRzFKh;
Fri, 3 Feb 2023 00:06:43 +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 31306hIJ077464;
Fri, 3 Feb 2023 00:06:43 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31306hrg077463;
Fri, 3 Feb 2023 00:06:43 GMT
(envelope-from git)
Date: Fri, 3 Feb 2023 00:06:43 GMT
Message-Id: <202302030006.31306hrg077463@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: John Baldwin <jhb@FreeBSD.org>
Subject: git: c6522961cf5e - stable/13 - cxgbe tom: Force unsigned modulus for queue indices.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jhb
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: c6522961cf5ef7ecc5f4da49620f68f6e2125a0c
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=c6522961cf5ef7ecc5f4da49620f68f6e2125a0c
commit c6522961cf5ef7ecc5f4da49620f68f6e2125a0c
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-05-04 22:59:44 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-02-02 23:28:59 +0000
cxgbe tom: Force unsigned modulus for queue indices.
The final transmit and receive queue indices need to be positive
values. However, since txq_idx and rxq_idx are signed (to permit
using -1 to as a marker for uninitialized values), using %= with
another integer type (vi->nofld[tr]xq) yielded a sign-extended modulus
value. This resulted in negative queue indices and a buffer underrun
when arc4random() returned a value with the sign bit set. Use a
temporary unsigned variable to hold the "raw" queue index to force
unsigned modulus.
This worked previously because the modulus was previously applied
directly to the return value of arc4random() which is unsigned before
the result was assigned to txq_idx and rxq_idx.
Discussed with: np
Fixes: db28d4a0cd1c cxgbe/t4_tom: Support for round-robin selection of offload queues.
Sponsored by: Chelsio Communications
(cherry picked from commit b483b6b256b2957f857db9092ef3c420a5143972)
---
sys/dev/cxgbe/tom/t4_tom.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c
index 25a63b992287..0fbcde5e0b57 100644
--- a/sys/dev/cxgbe/tom/t4_tom.c
+++ b/sys/dev/cxgbe/tom/t4_tom.c
@@ -1138,6 +1138,7 @@ init_conn_params(struct vi_info *vi , struct offload_settings *s,
struct inpcb *inp = sotoinpcb(so);
struct tcpcb *tp = intotcpcb(inp);
u_long wnd;
+ u_int q_idx;
MPASS(s->offload != 0);
@@ -1222,23 +1223,21 @@ init_conn_params(struct vi_info *vi , struct offload_settings *s,
/* Tx queue for this connection. */
if (s->txq == QUEUE_RANDOM)
- cp->txq_idx = arc4random();
+ q_idx = arc4random();
else if (s->txq == QUEUE_ROUNDROBIN)
- cp->txq_idx = atomic_fetchadd_int(&vi->txq_rr, 1);
+ q_idx = atomic_fetchadd_int(&vi->txq_rr, 1);
else
- cp->txq_idx = s->txq;
- cp->txq_idx %= vi->nofldtxq;
- cp->txq_idx += vi->first_ofld_txq;
+ q_idx = s->txq;
+ cp->txq_idx = vi->first_ofld_txq + q_idx % vi->nofldtxq;
/* Rx queue for this connection. */
if (s->rxq == QUEUE_RANDOM)
- cp->rxq_idx = arc4random();
+ q_idx = arc4random();
else if (s->rxq == QUEUE_ROUNDROBIN)
- cp->rxq_idx = atomic_fetchadd_int(&vi->rxq_rr, 1);
+ q_idx = atomic_fetchadd_int(&vi->rxq_rr, 1);
else
- cp->rxq_idx = s->rxq;
- cp->rxq_idx %= vi->nofldrxq;
- cp->rxq_idx += vi->first_ofld_rxq;
+ q_idx = s->rxq;
+ cp->rxq_idx = vi->first_ofld_rxq + q_idx % vi->nofldrxq;
if (SOLISTENING(so)) {
/* Passive open */
From nobody Fri Feb 3 00:27:00 2023
X-Original-To: dev-commits-src-branches@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 4P7GgS4t0Tz3klYg;
Fri, 3 Feb 2023 00:27:00 +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 4P7GgS46ldz3pvF;
Fri, 3 Feb 2023 00:27:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675384020;
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=DEJj+TOq0D6p+t+pJmNKHHVDMoiK337PDmHa03XEIUo=;
b=LMnlrNSi0kymvd7dA8CF1L1of1NU5HOmuetX2meHhRBCYls8JxE2nzfe5PyDe11yb5rXST
ftbZGfQV56aGNyeR2gOCM0I0sEy4cwsyNoHtmirJwnHdzSVwA+BsLpGkroQ01R51XMiPKW
4zjpsDueeiyGmnqUuAe1QHHXojpjFaV2q5vG7xXAGrQBl/uuA8gM0C6Y+7jfaZubLmX1sU
HXX0mOU8zssXrDxOAMXg9LVVzgcgGe59p05TxHqh6mj6k+vNoLHb0PUH70HH+gPeTlpnOq
t3s9VPaAlXUhUFSv2blebTvPAhfZSJ1Tc5MJ8Tbzw+QVfuP+O4J7pUhFxGK4ZA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675384020;
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=DEJj+TOq0D6p+t+pJmNKHHVDMoiK337PDmHa03XEIUo=;
b=S8IVvNCNAUSPngtXBr3StBuJuSLYwNH0TqQAThWYeeMGNsZnpfmvTUMlXn0q5uKQfMt9a9
8wkdR8S3mbk6GivsBvFwwXWStZZQYzXIOS/VvOITVu3uyAHQ30vJ/2h1G/AxouC+wJZuH+
CR/i7GUPsnRZKcNfvtfivICFeS0QAZI2PAvJXy9gNOd5yrL2e2/vs9xl/adMIcKPTirBSd
XAV3/4mjIkRA95LfgmAZQiOBN04NbntwzIqz3ORVXljzpQ+xLheGNEhUC1cejEaQfG49au
H5F94LuOp53Da7Gg5WJ8R3/s0vw4u0/uGxznrmiRTr4vfIz5QyztIn2WKyrzOA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675384020; a=rsa-sha256; cv=none;
b=YiUV8G/IfcADjg2QuocaylfrrgSLIXLnNw+v37t6XMCzsSjVGRYzK34uJg9T4hm3zvFf2e
FQnbTDd+9ssutF+/IGiR8TkpzbyuNfdrd6D1ypsyUBWrv9k8zVORCjpwOWpY1hMyen51jk
BJ3nYnwRq4e94jSwBnMH1/v9kEKMQEYX/tzpd/OSr5Oi77zRWjAjaMeDWJTxCZD1D1O5a+
R4li+6CldW781jt9DiEuJBGCRX2eYsChjDGWlzpfUcl3JtNri2croXh5jbmJsZbk4zGdUG
7aHhSk5g7KrHsl5TnF+hPs5kwpWCFE96rHVLVdk9i1QKi/yiURKd8lIpsvdYrw==
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 4P7GgS34CNzF9K;
Fri, 3 Feb 2023 00:27:00 +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 3130R0vi006171;
Fri, 3 Feb 2023 00:27:00 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3130R0b5006170;
Fri, 3 Feb 2023 00:27:00 GMT
(envelope-from git)
Date: Fri, 3 Feb 2023 00:27:00 GMT
Message-Id: <202302030027.3130R0b5006170@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 2dd91c41677d - stable/13 - x86: add more definitions for XCR0 bits
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@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/stable/13
X-Git-Reftype: branch
X-Git-Commit: 2dd91c41677d57ef3728d76c6d68177d01416314
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=2dd91c41677d57ef3728d76c6d68177d01416314
commit 2dd91c41677d57ef3728d76c6d68177d01416314
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-01-27 10:43:56 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-02-03 00:26:12 +0000
x86: add more definitions for XCR0 bits
(cherry picked from commit 11989314dc4a62c82193b6727d33625f2269e511)
---
sys/x86/include/specialreg.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h
index 395338b4a4b4..1b109b48818b 100644
--- a/sys/x86/include/specialreg.h
+++ b/sys/x86/include/specialreg.h
@@ -108,6 +108,9 @@
#define XFEATURE_ENABLED_OPMASK 0x00000020
#define XFEATURE_ENABLED_ZMM_HI256 0x00000040
#define XFEATURE_ENABLED_HI16_ZMM 0x00000080
+#define XFEATURE_ENABLED_PKRU 0x00000200
+#define XFEATURE_ENABLED_TILECONFIG 0x00020000
+#define XFEATURE_ENABLED_TILEDATA 0x00040000
#define XFEATURE_AVX \
(XFEATURE_ENABLED_X87 | XFEATURE_ENABLED_SSE | XFEATURE_ENABLED_AVX)
From nobody Fri Feb 3 00:27:01 2023
X-Original-To: dev-commits-src-branches@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 4P7GgT5kqQz3klt3;
Fri, 3 Feb 2023 00:27:01 +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 4P7GgT4qMXz3pmV;
Fri, 3 Feb 2023 00:27:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675384021;
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=mCscEXXdm8Yh6Aa6dBlBQR5L/MLCrsNZOTDgW2ssuDs=;
b=e4RVULOiXjcaB+5e1MBeQEXzPJJZptIedS3t/sCw7W/Ebwkk7wtJu4av/VSbVNxHbyPjRy
l7thLHbTGtRaGuGoxL3bh6QoiBXz5Bn8q/6FIg/kw/koNkRlK0uN/8Kw34PQmT4JY8ph5H
LXxNeVJFUiSbuBUMEb+edKf2PEdgbGrdGXYIwDEefQCet0H1kCGqs3tH1AKiSpTuik8OPd
Tby5mfis3EB06XyPQFcvX3afxCvrwHJAXW1OxXSzt3/jUogi9qLkNRjf3nABJwK4Rk2+1D
yY0o3d/ge7ugS4U/RilsgW7I8dHY+vdcB+EKx8w5oqFgKvZJ2jllSf220QnAwg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675384021;
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=mCscEXXdm8Yh6Aa6dBlBQR5L/MLCrsNZOTDgW2ssuDs=;
b=ThsSmfmb3coVGa4TnOrYeqGpJQveJ5EauyjDV77nZ44yehUevf6Qf7+saLBLka26el3jTV
LNAtt1TcBt/Pa11uYzIT7+aUiBSgQ3LLry11Py/qNZVWu+C9HmWpFWyrEX+tIDfC1vYBVS
biCfj2ONkTMWlIVC2VqlDjeyjHLIJ9jOB+ro5EJUXodvE5F3VRoOQwRt06wbxY7T2TCGh2
NBoKwxpqb/U7cGySO5pF2OGDt+nA8Y9fqviKNpnHFZ1BZBrxhXKu82qw7zveWgSRjvx+RG
MBONxtgSMqGE5nMnbQe0a5COwUnDSIGKW4kVuD+UPeWGLZO2DDxofzYsvM37GA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675384021; a=rsa-sha256; cv=none;
b=XDcZ7c5sBywMvH8f2UInkg7vEYxj7XXk9dJt3EW39TQu9gqBbb9O3hjx9QPA5Dh6o4wWzw
h1Y092CR8KeBA3fglI7ewg98fTjkgmJQTjhVLsIdusl8KS7RIN6JglFPVfpbftExov73kM
a8z0n64jz/kd/yKXZUSCpGvAwdSJXQu0/DaR9sYXGxoUPNQ77I3eFvQeZ/GQVoCMXcEe8p
clkwYLJDlrSlo9FG7UGiGTtzocWkuar6ROhxHdsTP8UCY7EosWwhLCqnYbyFmjVjHe+Ntp
EBQFqqifi5jqGbNRnsJv23F8WNvTGRcrT7EQTmE0l4Bn2ekBjvsbFssRLTRZ8Q==
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 4P7GgT3xJXzFXc;
Fri, 3 Feb 2023 00:27:01 +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 3130R1ka006195;
Fri, 3 Feb 2023 00:27:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3130R1rx006194;
Fri, 3 Feb 2023 00:27:01 GMT
(envelope-from git)
Date: Fri, 3 Feb 2023 00:27:01 GMT
Message-Id: <202302030027.3130R1rx006194@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 9b16d1435123 - stable/13 - amd64: do not enable PKRU if user disabled saving PKRU register in xsave mask
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@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/stable/13
X-Git-Reftype: branch
X-Git-Commit: 9b16d143512368ac33988c6ae54e7939db2ed036
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=9b16d143512368ac33988c6ae54e7939db2ed036
commit 9b16d143512368ac33988c6ae54e7939db2ed036
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-01-27 10:45:02 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-02-03 00:26:12 +0000
amd64: do not enable PKRU if user disabled saving PKRU register in xsave mask
(cherry picked from commit 153643a5bc8ac3b1d47fc8e4de18d8c8a59817da)
---
sys/amd64/amd64/fpu.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index 8be69a347d63..f51c042bf8de 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -394,6 +394,7 @@ void
fpuinit(void)
{
register_t saveintr;
+ uint64_t cr4;
u_int mxcsr;
u_short control;
@@ -401,7 +402,22 @@ fpuinit(void)
fpuinit_bsp1();
if (use_xsave) {
- load_cr4(rcr4() | CR4_XSAVE);
+ cr4 = rcr4();
+
+ /*
+ * Revert enablement of PKRU if user disabled its
+ * saving on context switches by clearing the bit in
+ * the xsave mask. Also redundantly clear the bit in
+ * cpu_stdext_feature2 to prevent pmap from ever
+ * trying to set the page table bits.
+ */
+ if ((cpu_stdext_feature2 & CPUID_STDEXT2_PKU) != 0 &&
+ (xsave_mask & XFEATURE_ENABLED_PKRU) == 0) {
+ cr4 &= ~CR4_PKE;
+ cpu_stdext_feature2 &= ~CPUID_STDEXT2_PKU;
+ }
+
+ load_cr4(cr4 | CR4_XSAVE);
load_xcr(XCR0, xsave_mask);
}
From nobody Fri Feb 3 00:27:02 2023
X-Original-To: dev-commits-src-branches@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 4P7GgV6WtNz3klnt;
Fri, 3 Feb 2023 00:27:02 +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 4P7GgV5qvZz3pw9;
Fri, 3 Feb 2023 00:27:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675384022;
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=PlTEdYni49UeFqYTZCbBFqDALQdcVi4n5lqrIk0dDOo=;
b=B03YTJMIeEMp/zKz0g9zphiORlwpPW5ZNQ9liB6uGiUb60fMR44fAvicNXiomejw/1b5wE
jiNCQJYiIEJ/X9423R7cVc4JcIauxXOaqj7EmN8hzGexohx/DxNCi+NZPPZhfFU6d3Lk1N
TOmUocJMM67Di+eDfckPx15fczHeicthtQWNWU7+5Y6lUQLCh/VAIUvtzRj/VoZfb+SUjQ
etKz+jZ/s5w1l+g3bVws6LiX9inallCzxS0odi5imqURvrBoadD3VgKY480gl1NbRgg9PD
cO2hKCthFzFynQ5wuydRN2VM0g1luy5upJdYYyrZkIW+qjKxZbMsE3TrNlzMLw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675384022;
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=PlTEdYni49UeFqYTZCbBFqDALQdcVi4n5lqrIk0dDOo=;
b=irg2kTubMnGHAZYwMVths2cMZzSNNjA8/kcm7HIYXr23RsTUt+l32j/6sVYbe2XZ5+kDt6
ersdTsjObpwMGikWHmjA4c5fAtRMtWvHHmgxPZM2fPg1rA+rcM3nFOUH+ouILSUlAAb78L
J59GAf7/lNKm1+znaw5+G4YmuDlOjQJIUIBAeS6AKVyh0X/vYpiflqw9RE8pQlFP/8EI2z
lPVd+t+q0pr0veFdGsusap4PHvxepN2G5hT4RYu08Nd8SEhizOR9mnBi8pvkG6XdReN/CR
Ld+6/dVVAzQcnC4E7zxQYL4q+Bfz+UWBuOBFwbd85fYm5gC+r4WpbJXjnKSQWA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675384022; a=rsa-sha256; cv=none;
b=DseKwuntDtIwNO0rjHbHGZK2WOYblA08lqNWsqCmw/pkSSyuv7Mb4NcAtN15tjcBeqD3Yr
ubq5pUgKCAqBjAW3gbkeG2G/SqQWHaXyZauQeB8VoG0APOUd7d/PTrjiknPPtQBN8uTuGt
sg3jcx2yfNs684hqOFTTK9SQfUR4vt66yEQmAxKjHCWR8oy4jjsdp0QuN44jeO8Wab3Plq
h5k92ulCLaWLdkyiKmycEz7K7MR49BLrGVRlYs4BUX4CkVwkTHPIz+9HIGggwTDnmEOR6i
deYq33i7IE4Rt53FHe68cTAk3fAabPoOsa5by29gDGn5AsaxQhHbmu6STY3gsA==
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 4P7GgV4sPRzFW3;
Fri, 3 Feb 2023 00:27:02 +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 3130R2Qr006220;
Fri, 3 Feb 2023 00:27:02 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3130R2AX006219;
Fri, 3 Feb 2023 00:27:02 GMT
(envelope-from git)
Date: Fri, 3 Feb 2023 00:27:02 GMT
Message-Id: <202302030027.3130R2AX006219@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: dfd1dea884d7 - stable/13 - devname(3): apply S_ISBLK() to type, not dev_t
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@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/stable/13
X-Git-Reftype: branch
X-Git-Commit: dfd1dea884d771f763f1a40efe8b018ffcc04897
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=dfd1dea884d771f763f1a40efe8b018ffcc04897
commit dfd1dea884d771f763f1a40efe8b018ffcc04897
Author: Alexander Naumochkin <alexander.naumochkin@gmail.com>
AuthorDate: 2023-01-28 13:22:50 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-02-03 00:26:12 +0000
devname(3): apply S_ISBLK() to type, not dev_t
PR: 269190
(cherry picked from commit 0311fe403d35f6241fa94104c4b92c9d73214cbc)
---
lib/libc/gen/devname.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/libc/gen/devname.c b/lib/libc/gen/devname.c
index e519b505f1f8..55e6279a25ce 100644
--- a/lib/libc/gen/devname.c
+++ b/lib/libc/gen/devname.c
@@ -48,7 +48,7 @@ devname_r(dev_t dev, mode_t type, char *buf, int len)
int i;
size_t j;
- if (dev == NODEV || !(S_ISCHR(type) || S_ISBLK(dev))) {
+ if (dev == NODEV || !(S_ISCHR(type) || S_ISBLK(type))) {
strlcpy(buf, "#NODEV", len);
return (buf);
}
From nobody Fri Feb 3 00:27:03 2023
X-Original-To: dev-commits-src-branches@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 4P7GgX3jsdz3klT1;
Fri, 3 Feb 2023 00:27:04 +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 4P7GgX0HjTz3q63;
Fri, 3 Feb 2023 00:27:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675384024;
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=aqvGnquXIRJZSYP2L8AotRgSiN52odapEP/Vu1JcvpA=;
b=viJRzIGS3qV1Gd22xMpO3lJgAyx70BduCzvNErh546R+4Rt0j/NzxT8hAHPfAy3vTSFhNs
SIIltVm+JHjDiYF55FSKsgir9Gwbp/m6ysKAwCoaFbQXWELvTkbZHwA/fPT2R7O1rS07y1
cW/VVbVNrTFcb/oKAwvBNgBWwLm7tMXBzIIvvV3HYzZK//pCwjkw2EgkZntOI9JL+8mdzU
g6Yku/dpW8Rxzm9M0RP6XmYtHdb5QiM1HvEd2LL9vzW2POjK3F7Di6fvPG3bSZd5qF1PFw
egRDLTGH56orWgXeT17l0bd+dGhtK99ESP7m8B9LRapNemXowVzFQg9Z1NWyrA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675384024;
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=aqvGnquXIRJZSYP2L8AotRgSiN52odapEP/Vu1JcvpA=;
b=dQzY22jNf7F9gy90qQk3yDpfD+e1NITWeANpzLzkTYLu3nwN5epWywQ1AMetYapk4ZSqfi
QVtUxSM/LyMKhbIqLZz+F4X3Ptg5WEcCGCU864PZD/h02RGkplE9Bdjr9PMJgmhGAIXEkX
eWB9tNXc6EOEczefuUyToHucSRxIlN2CSETgPpwhbfx5+CmSZWQi0w3tJ9VEXwy0//5Fv9
PbQ6YoIwXaAjQIyiTfIFMJSAnCPky0sGRg/WF4NxTPbYTOsRZKGEVDNyw+yB8gdUXAdUl3
Ey+eW46lSAb1q4m76HQWaX7KeBOMqkCcc4Dhec2mNKH5EmgrWqa8yqrFALJlvQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675384024; a=rsa-sha256; cv=none;
b=Ikkm6OWKvzAD6QUtwlvxE8I1Poy3z8aNOxVaXkHs8RDB9Pq2mY6Qo/ujrTazFJchGfeyVW
t5xmwGWRGaF/OAkod5ZXlPDmpnMHo590X3lHfpvuSloFNnTvFyr+CU/9VhWBKneiyS7VAv
XBih8Y/sOdtAEG8VUOujULi3yQhGa0BljEgy30hWTkXviSv/6riJalVwyrYKXW0UFZvb47
3LAwE+pdQcT4Mq/908kI/7Y4yGns+VdrIQaIvmNhTlcaHkIx78VZYV/LuKdYKhC6kcqZRL
fXsA2o5lPqpjxkgB6eTK3lO3NO5N6Nvg+ZdwEiteFFnSYoA8e9shymkamCriQQ==
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 4P7GgW5pnZzFgb;
Fri, 3 Feb 2023 00:27:03 +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 3130R301006244;
Fri, 3 Feb 2023 00:27:03 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3130R3Hn006243;
Fri, 3 Feb 2023 00:27:03 GMT
(envelope-from git)
Date: Fri, 3 Feb 2023 00:27:03 GMT
Message-Id: <202302030027.3130R3Hn006243@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 75aa61400cba - stable/13 - stat(1): Do not pass S_IFBLK to devname unconditionally
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@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/stable/13
X-Git-Reftype: branch
X-Git-Commit: 75aa61400cba6a67ff0ad392d8a5cc2d3855bd3b
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=75aa61400cba6a67ff0ad392d8a5cc2d3855bd3b
commit 75aa61400cba6a67ff0ad392d8a5cc2d3855bd3b
Author: Alexander Naumochkin <alexander.naumochkin@gmail.com>
AuthorDate: 2023-01-28 13:31:39 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-02-03 00:26:12 +0000
stat(1): Do not pass S_IFBLK to devname unconditionally
PR: 269190
(cherry picked from commit 050e4bca94e907c046e9ed63f90b5dd0e49fb405)
---
usr.bin/stat/stat.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c
index 8229e742da87..0033ff2258a6 100644
--- a/usr.bin/stat/stat.c
+++ b/usr.bin/stat/stat.c
@@ -640,14 +640,9 @@ format1(const struct stat *st,
small = (sizeof(st->st_dev) == 4);
data = (what == SHOW_st_dev) ? st->st_dev : st->st_rdev;
#if HAVE_DEVNAME
- sdata = (what == SHOW_st_dev) ?
- devname(st->st_dev, S_IFBLK) :
- devname(st->st_rdev,
- S_ISCHR(st->st_mode) ? S_IFCHR :
- S_ISBLK(st->st_mode) ? S_IFBLK :
- 0U);
- if (sdata == NULL)
- sdata = "???";
+ sdata = devname(what == SHOW_st_dev ? st->st_dev :
+ st->st_rdev, S_ISCHR(st->st_mode) ? S_IFCHR :
+ (S_ISBLK(st->st_mode) ? S_IFBLK : 0));
#endif /* HAVE_DEVNAME */
if (hilo == HIGH_PIECE) {
data = major(data);
From nobody Fri Feb 3 07:19:09 2023
X-Original-To: dev-commits-src-branches@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 4P7Rq21pgnz2lFXc;
Fri, 3 Feb 2023 07:19:10 +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 4P7Rq21LRpz4QSZ;
Fri, 3 Feb 2023 07:19:10 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675408750;
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=TPIGe7VFIJJivN+wkUiJyfOcPFffbR8s6J29s5SdOUw=;
b=N8qrSis8DyP3LkYT0lYpr7yprfL0k8IMJwlXQrl1cIOaUld5Nt5YvHKPBEKLz0+pl/T7MB
PN0qsLlvjGohR8iwJmUikSp2FHjcerKzEhr1BsGKswBfEVPhLi8uLJiz+MowjTryTNL8VP
geyi199RGQHHWKQiiGFn80ADJFu0Xqyc90M3JsIFTI5hMjGpdFYcwhOhU6uBstPjdzpOFx
LXdx4MCIjbyYkwyj1VMn7IvUe3cwV1hBXmJrO0IoSRbn3QjAiHI4D8vCoOILoD1aYrbmmh
45Q8nRJz9u/k87ysvv4GOn0EOcZDsmLJHdzYLycTdNuVRb31G29G642GXan92w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675408750;
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=TPIGe7VFIJJivN+wkUiJyfOcPFffbR8s6J29s5SdOUw=;
b=Op9Qev/XhAK24NUquEq1dVIb44zYVhT0uhSp5TXeh+B2/DCmgnLgpiWv1DZbQUS2fV4F0r
9swzCfTtmzGNPMpZs80I9SdNPyvreglLZSbM9NrA0lwFusCAm57jozigWrmh+9ZauoA/It
bKBM2vL7sfZs/ogF74fri+97p9fmUsY3qeAnaZTATgyQLQAhySS90ycxbKvaZpgVd0e4J8
6Q9K3FPtdl54cmO9dronCBFJ0klkIEnKtHsmN7KYGi/Kbz1mCd31ALM4byRKRfaw2vkmTe
odt9jaqagqELqYmYysmDxKGvDVt4ggtpnCNCBQJjZz9cch6JKrwY3QVPc9yGJg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675408750; a=rsa-sha256; cv=none;
b=cS7CCA9cE3D3Ai8MDbHcZV9HkG/6f9IHM3kIE4Tkpw6WSUGnYTeRgJAS6d6v8uR4em4BVD
Yot4Nq+kIPKBgVRF2qvRJ4r9iNnMBc77LN9J4d9MNTGV7CGsMGnr4UulPpSK8Npo4IYMmp
j+dsQnBYW+Mj1kn6VpEd8MMEqhaEVfjcOLMMdiC2B1m+XSgaRQE6jBnmoQiQlAg78x3gx7
NUbaIZ/Y+WHF6lppPwYONCwUM2wxV7QgaITbisNa4fhcGkv0GTjHliqlB3m9DBNeKH4+0g
b8wTGAw3kp6NEfLcYVQD9u2Tsc2N2Fyi3okQ43koQ8kElxObG+0dje3fItzRmA==
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 4P7Rq20C6tzR6v;
Fri, 3 Feb 2023 07:19:10 +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 3137J9vb089180;
Fri, 3 Feb 2023 07:19:09 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3137J9dN089179;
Fri, 3 Feb 2023 07:19:09 GMT
(envelope-from git)
Date: Fri, 3 Feb 2023 07:19:09 GMT
Message-Id: <202302030719.3137J9dN089179@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Xin LI <delphij@FreeBSD.org>
Subject: git: b38e81cff896 - stable/13 - Disable sandboxing when building with WITHOUT_CAPSICUM.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: delphij
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: b38e81cff896eed0e38f611bd2c93229808a8ef9
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by delphij:
URL: https://cgit.FreeBSD.org/src/commit/?id=b38e81cff896eed0e38f611bd2c93229808a8ef9
commit b38e81cff896eed0e38f611bd2c93229808a8ef9
Author: Xin LI <delphij@FreeBSD.org>
AuthorDate: 2023-01-28 18:53:47 +0000
Commit: Xin LI <delphij@FreeBSD.org>
CommitDate: 2023-02-03 07:18:55 +0000
Disable sandboxing when building with WITHOUT_CAPSICUM.
PR: bin/269185
(cherry picked from commit 8f02c0d15669949bb3b5086800aaf11a65e4c871)
---
lib/liblzma/config.h | 4 ++++
usr.bin/xz/Makefile | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/lib/liblzma/config.h b/lib/liblzma/config.h
index d88e3e105dad..ed6515f56f6e 100644
--- a/lib/liblzma/config.h
+++ b/lib/liblzma/config.h
@@ -24,8 +24,10 @@
/* Define to 1 if you have the <byteswap.h> header file. */
/* #undef HAVE_BYTESWAP_H */
+#ifndef WITHOUT_CAPSICUM
/* Define to 1 if Capsicum is available. */
#define HAVE_CAPSICUM 1
+#endif
/* Define to 1 if the system has the type `CC_SHA256_CTX'. */
/* #undef HAVE_CC_SHA256_CTX */
@@ -283,8 +285,10 @@
/* Define to 1 if you have the <sys/byteorder.h> header file. */
/* #undef HAVE_SYS_BYTEORDER_H */
+#ifndef WITHOUT_CAPSICUM
/* Define to 1 if you have the <sys/capsicum.h> header file. */
#define HAVE_SYS_CAPSICUM_H 1
+#endif
/* Define to 1 if you have the <sys/endian.h> header file. */
/* #undef HAVE_SYS_ENDIAN_H */
diff --git a/usr.bin/xz/Makefile b/usr.bin/xz/Makefile
index f7687116c8fd..e3cbafb0ebc3 100644
--- a/usr.bin/xz/Makefile
+++ b/usr.bin/xz/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+.include <src.opts.mk>
PROG= xz
@@ -43,6 +43,10 @@ CFLAGS+= -DHAVE_CONFIG_H \
-I${LZMALIBDIR} \
-I${XZDIR}/common
+.if ${MK_CAPSICUM} == "no"
+CFLAGS+= -DWITHOUT_CAPSICUM
+.endif
+
LIBADD= lzma
.include <bsd.prog.mk>
From nobody Fri Feb 3 14:31:13 2023
X-Original-To: dev-commits-src-branches@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 4P7dPY4s61z2pBd0;
Fri, 3 Feb 2023 14:31:13 +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 4P7dPY4L8Gz4LQZ;
Fri, 3 Feb 2023 14:31:13 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675434673;
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=B2n4RLC0893jCUA4C9QnPNWzeIO6axsLiX1vnilt1W0=;
b=KA5Bk/pU/x/Px8Iu28erX69chiEwoj1bRPJZUQyIr16MmODKK2bm0i2XRJU7tSni3/rViJ
p9l0ucO3kQ/c4e8mBbzDagrqAvZTJqIVPCWP/OFHBApibXcK5OUYrI5lkgQKBOVrCcCT9F
zihnLAuyGEOFnCCZGqdMkIFDl4zsXVvgbBvhYBT2TZqfGLZJw61+GkuvkJiAbiKaY0JtXp
hijHeBU7rGlkjJnZBakCUEjbSUFA/CKnK29dVu8BkGpHzaVE+wc+sY07DLc4WCNxPL1aOA
cZnTXwpXPQn259knmAbLL1nMgWxqJZNYctFHjMWQ7yooSgZ69AW14igyOkZckg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675434673;
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=B2n4RLC0893jCUA4C9QnPNWzeIO6axsLiX1vnilt1W0=;
b=pYhVqZHyCMYHxaGHpyV0u4bxOwE6H0j3dLFoyVMjbtYiU+A0UEdMC1HcCoKF4NIG13kZlS
Z0aDS/zMTC7CaPzUiRc/uVhuRZ14VUOV/SL8LHabGV5BY0JVIFMpcdRfhymu4wMnFJyJUO
KICB7UdTIu4CbQZP23jSTSzN3F21EKf21b5TsdwU7EVtqgwJXOb5tgyPyPY5FhTiPI/UeP
KtqzAyJgF1sod9g6DWifUAMXHoVTTmuJgqLo92KuwLH0dQO5InOSZWW4s8+SvogZIw9RN7
vEEZEqiKkWyIF5tTHZaFdX87ea1JAGXUqEmJeZnlVkmiYd5y7rNUNv26n6ViyA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675434673; a=rsa-sha256; cv=none;
b=WeOcg1pALMlPDq7TCJYDl1oRMITlNU8gF/Z1gGwf4B6MqBjZ8ziFabf4zsnfR3U9nRACNw
s/i3iM6wbeBnSXitwE8y0ENrOblbpq1269l3Va9qdTOl5Q4gKlofSM0+xAZ5sNhCfHPCpY
o/asDExFAf/9QlNfNAmgSlC4gQskSlyxDtRm81NIWh2rlCOhJbdyD+Dp2HkynEFNvW6C6y
33TLbGrS2sgV9erDughI415PJtIsvvDmQ7phmtbGlc+7LoP7g0gOVJ39ek2872jQTd+AQI
05ljNflwKwi1j4LNYlVn3dssp7NDzw0OrCYSjjeTL8gW0hCDuQBbiulNq1cs6w==
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 4P7dPY3P2czdJg;
Fri, 3 Feb 2023 14:31:13 +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 313EVDHJ012403;
Fri, 3 Feb 2023 14:31:13 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 313EVD1u012402;
Fri, 3 Feb 2023 14:31:13 GMT
(envelope-from git)
Date: Fri, 3 Feb 2023 14:31:13 GMT
Message-Id: <202302031431.313EVD1u012402@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: d468f2a46cf0 - stable/13 - release.7: Correct a variable name
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: d468f2a46cf04fc5ee7f6b54a9bca7be1fb5d4f1
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=d468f2a46cf04fc5ee7f6b54a9bca7be1fb5d4f1
commit d468f2a46cf04fc5ee7f6b54a9bca7be1fb5d4f1
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-01-27 19:00:23 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-02-03 14:31:01 +0000
release.7: Correct a variable name
MFC after: 1 week
(cherry picked from commit 96bc40f4dfae4bb40b2512436f58cd2183e42886)
---
share/man/man7/release.7 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/share/man/man7/release.7 b/share/man/man7/release.7
index 0dbbe67f0258..7b2e7a58b6b3 100644
--- a/share/man/man7/release.7
+++ b/share/man/man7/release.7
@@ -534,7 +534,7 @@ Displays the list of valid
values.
.It Cm list-vmtargets
Displays the list of valid
-.Va VMFORMAT
+.Va VMFORMATS
and
.Va CLOUDWARE
values.
From nobody Fri Feb 3 15:58:02 2023
X-Original-To: dev-commits-src-branches@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 4P7gKk4Yfmz3kShD;
Fri, 3 Feb 2023 15:58:02 +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 4P7gKk424Wz3kRF;
Fri, 3 Feb 2023 15:58:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675439882;
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=Vw3L1w+oQlbY16zRVtjsShKv8sOK0KBjpsKJFCriEsk=;
b=sw/4Wk+I04CaozH4AXHlEAqLG3gAeeaxn5sWjtjebaTcIpysONmp8TUXJ8IRn8Dk2pwal3
nDZik5a8+7Amk2q78skuTaYzbuTrIJ+0jvWsNcVCjKQ5WyHSyarTZjWaF53w7vh/9lCrRg
aZxymbRbn9OfuSRsVXvvr+dQFrOBX1ygXdendILEoxbivG0MtMK8HWAs8mfnM+oE4qFcx5
0SBzQrU6UrJxSqgXT+mn9448FFPfaXSkFpwTamxcLvqF4ddcSGARbPN9EIt91buXZuQLeX
5NLlyH+aaeVCJlKiXGkkAa2SJ/Qz7NGqyMxbKPJ0MF4Btb+FABxoaw83gfZhpg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675439882;
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=Vw3L1w+oQlbY16zRVtjsShKv8sOK0KBjpsKJFCriEsk=;
b=QCpwQBi5ehNKHveROziYmaD3AvKmErIHblBtVe5x8sf17ExMcE3Bxx+tjbB11/kUfMBNhL
tS0LN3aXpv1f+6qSjioOyDFpyl2xRk895/5zG37X+KgSTbx6gXB8CTZOkbi2M369TdkRGw
nHrfiXwOTBwo8d2n9k7I6Swk/9IlycS1EG+OZP2BSecJrsNEisCWx6/H9Rkn5p2HPYitlc
rBPIO9xkaK93tCRl0ywYw/ORlsZZI0l87SC7WC1C0ogT93TE55sXOTj8eynJO+9HSjIROu
OXeSiwUzqAAfBGIZCp93ShLdZEZlm5E9I03m/D6FKHO8ryxpIySeIuidO3axyQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675439882; a=rsa-sha256; cv=none;
b=JZ3rejChkYFDSqQPm8/gPiqLKJ2lg2sXbpepBuIuXF3m7ETAPnRceWBYmtlzhnjc+DwC73
FkopKPTpzVyU7OWZAa9RtIPxg2ZctngUAJO2eMERs7jh/5TfhAZmNM9TBBaPElWIuwqhaf
GGiXfaoJ3BMY8HpnRyQ99xnxeA4d0PI3s61Et17/6C76Y5XZtFh5b5hYyOc+Mev+sGF7VC
niseT3okJBiHfuWwsWjXigitG5WPTcPxd0BGe2CopGKZP03jc61QP1PilVp8fMkSqwoOK2
xnrAczFZtEiroyuOLsMDDrlQFQ4oFTitUzdO559qQIYTy5nQIWrFk198M9iZUA==
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 4P7gKk2rWMzgVc;
Fri, 3 Feb 2023 15:58:02 +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 313Fw26s028796;
Fri, 3 Feb 2023 15:58:02 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 313Fw2W2028795;
Fri, 3 Feb 2023 15:58:02 GMT
(envelope-from git)
Date: Fri, 3 Feb 2023 15:58:02 GMT
Message-Id: <202302031558.313Fw2W2028795@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 66b882078973 - stable/13 - sbin/devfs: Correct usage
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@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/13
X-Git-Reftype: branch
X-Git-Commit: 66b882078973d6e2fce77f976e6c073d0786b3ca
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=66b882078973d6e2fce77f976e6c073d0786b3ca
commit 66b882078973d6e2fce77f976e6c073d0786b3ca
Author: Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2022-04-30 17:54:43 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2023-02-03 15:47:41 +0000
sbin/devfs: Correct usage
The -s applies to rule keyword only and it follows the rule keyword.
PR: 263289
Submitted by: Yuichiro NAITO <naito.yuichiro@gmail.com>
Reviewed by: ngie
Fixes: c3e412c08333 sbin/devfs: clarify usage
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D34934
(cherry picked from commit f9f42a709b2b3f8c8d3de517f301d4ccb33e7b16)
---
sbin/devfs/devfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sbin/devfs/devfs.c b/sbin/devfs/devfs.c
index 7be94c4737de..b5a6bf4015a2 100644
--- a/sbin/devfs/devfs.c
+++ b/sbin/devfs/devfs.c
@@ -228,7 +228,7 @@ usage(void)
{
fprintf(stderr, "usage: %s\n%s\n",
- "\tdevfs [-m mount-point] [-s ruleset] rule ...",
+ "\tdevfs [-m mount-point] rule [-s ruleset] ...",
"\tdevfs [-m mount-point] ruleset ...");
exit(1);
}
From nobody Fri Feb 3 16:01:01 2023
X-Original-To: dev-commits-src-branches@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 4P7gP92rdpz3kSrH;
Fri, 3 Feb 2023 16:01:01 +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 4P7gP92H5Mz3lMf;
Fri, 3 Feb 2023 16:01:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675440061;
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=qgAxXnk9f83gXqORB4fIxwSPs4oO7o4w1MQj1ZT0EEI=;
b=ieVrDeGwQODVn87EaPAQaCXHP4a6VS2IyEjDWBT7IfQYl061m0mc2n61g/mMJ1EOpOminU
D0B4NxLNzv3UaMa+6Nb+kXR/MP5gY0GPZlck3zPN2lkEjxXV9hPCjoblMguyNGP+6a9jYA
LwRQbvo2qJB5LKKjTU0E4pi/4TyPkGWXjiNCRK4dKQPNsiFWT9L+506eURRpRPrE1e5zyF
LBpse89nEAlHA5KusgD8khlAIIk7hJPwY+g7yALBldGkWdNj/kiY8MdgpcmdLf+TstEOZ4
umk+XX3UVT5PjvBMPvj0Z+O0cO44ygW1lxKPNyeK4h48L9nhSECQSb0rzz70/Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675440061;
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=qgAxXnk9f83gXqORB4fIxwSPs4oO7o4w1MQj1ZT0EEI=;
b=Xc6VxUCNBgd+oAncAqDdr4/7uFlbKNvoAiai2L60ruPeVYL3oaRm4CZGwXlaTm0c7PHBnp
UCoDDG+ET1B1oh69aeCt56kTZ6lEmHxfrMISZdsGPBmBCOPIUb1+vwdYTcyCs+CJQ0j8XA
L2UMw7Qypua6LT4Cnacpd/5cKFu1KzZH5QLJXShRCypgso1k121Y+Ps/rryYYmpUa0ockE
yRvO6UwuA9z9jHP84rrNOrPt0uE0x46A/t0bAyFtVfWlpCi0uSQxbEA7aIEoJJKx9ebg0U
ln2xEwxsw3r4066SNpASE5xSW7YqeebW2e112IfK17TISdhhFPGKL9LvGqZUzQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675440061; a=rsa-sha256; cv=none;
b=tL2A4GPt2OtcyodVVMVbBH1fXEdaRpMRztn8Ux6xNYLWK2Ta+kN0iBxFdRbqeTKPriQmfB
HTsM+HlpXTdVbDKl6/0qDAugRfSqe2Z5Y/+p4ojZ9snH5Q3fqsFXSLHIRE84D2H13HGjaX
8Py/79s1gGp7lf+fBM6op/GYQ6t7clpxHvswbbWiYobmHm9zl4wvr/u11cvXNZ1Pm3XlAB
5016Eck9QL1qkI7LOYubPSkHsSv0Lo6dZY74giZ+7hi6DUPYiwXYYC6NimHu1vJcQ4zFid
oICe6XpMBzI/+K63XGmUkXJ8FpYEltNAU0QGyLcTyp7/jv/mkxfrFFyE3CWwgg==
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 4P7gP91LHBzgPk;
Fri, 3 Feb 2023 16:01:01 +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 313G111S038515;
Fri, 3 Feb 2023 16:01:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 313G11qR038514;
Fri, 3 Feb 2023 16:01:01 GMT
(envelope-from git)
Date: Fri, 3 Feb 2023 16:01:01 GMT
Message-Id: <202302031601.313G11qR038514@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: ac3223a57e11 - stable/12 - sbin/devfs: Correct usage
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@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: ac3223a57e119e9e4b6ac055b30b840045acfda1
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=ac3223a57e119e9e4b6ac055b30b840045acfda1
commit ac3223a57e119e9e4b6ac055b30b840045acfda1
Author: Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2022-04-30 17:54:43 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2023-02-03 15:59:18 +0000
sbin/devfs: Correct usage
The -s applies to rule keyword only and it follows the rule keyword.
PR: 263289
Submitted by: Yuichiro NAITO <naito.yuichiro@gmail.com>
Reviewed by: ngie
Fixes: c3e412c08333 sbin/devfs: clarify usage
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D34934
(cherry picked from commit f9f42a709b2b3f8c8d3de517f301d4ccb33e7b16)
(cherry picked from commit 66b882078973d6e2fce77f976e6c073d0786b3ca)
---
sbin/devfs/devfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sbin/devfs/devfs.c b/sbin/devfs/devfs.c
index 7be94c4737de..b5a6bf4015a2 100644
--- a/sbin/devfs/devfs.c
+++ b/sbin/devfs/devfs.c
@@ -228,7 +228,7 @@ usage(void)
{
fprintf(stderr, "usage: %s\n%s\n",
- "\tdevfs [-m mount-point] [-s ruleset] rule ...",
+ "\tdevfs [-m mount-point] rule [-s ruleset] ...",
"\tdevfs [-m mount-point] ruleset ...");
exit(1);
}
From nobody Sat Feb 4 00:26:48 2023
X-Original-To: dev-commits-src-branches@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 4P7tcn1RLbz3kvlM;
Sat, 4 Feb 2023 00:26:49 +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 4P7tcn0z35z3s1S;
Sat, 4 Feb 2023 00:26:49 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675470409;
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=ZiGUkp9bf7T5CRKbGaBXd+ApHfvO9koI3UBK1mO+llg=;
b=hLi1YTYOzVy1hA5qAjmH0rpocZF/MldYZ1e+6GxPEzOiYoTVEXiTLDvHEbQQ1gHB3//z0w
lxf7YhaPPYxk+yhbmPmWjJGvnWBMSwmUlSdHRsnjTF93vRy6PRL9pta/1r148tIKqOSDWt
ncfmUmlRiKWPR1ir9beTXg9QD1h0/ZGNlkBDERci4PCC3RR6L3Mu1JgZIVPIrgUsloMajs
Oqh/aDbLwkmOZYqltM7oqz+/fe2dRwGJfn7qDd0lNXd2tfuTlAw3RoPW8DGvZN+KO8P2nG
9Sw6n65GRlgH7zLihahWifNk66B3q2c74JmVvWkmjqC6laRn0fKRSg1QifWgOQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675470409;
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=ZiGUkp9bf7T5CRKbGaBXd+ApHfvO9koI3UBK1mO+llg=;
b=WbBd7G7V65cONBNtc//rm4cDakiH4xEe5YPi7zf75D21mcvw+84Nx2MDwljIuc7QJGnl3P
sd982OAA0Xz6EtNNA+vxg+MH99LtJQvEevZZPH5HIBVTV75taflytdhSHeNp8K7rCi7wyD
RS+QRKCs1XVtngyBCB32vHKNiPclR1B6mjzNHz7nI16sHM3brA/mxFgGtf0DT6WMVz72B0
BEKLQcWlkIHVlTzBA2Jo2hLe/NfLZrvxW5VQGMXHJnvftLGQSOCz0K78cFCPZN6mm4nOwD
oaKrJeXOI/eiZRNJk+2Ycevpw4fPpjQdLMAGtOlEnVuLYkRMxAs5UJDozIXh5g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675470409; a=rsa-sha256; cv=none;
b=RO3YWlH5nmcJfPpE1rZ8DBZ7roecCEiVt0pyXlEMdB/Ls9+Vf955+DSrHe6c8M4RY9pcFC
K4E9BUvlb4r2xVwwVVcQmUDXJbjU6iuTkl9Dw2h5nV01jE96j4ER+EFb7WOcGvHl/CWN4W
il5N5Zcz8Hpu2kIUI6rLVpY/nY+uk9k2iEcXR501a1e9LOEPNYjhLf9M2hyzqKDoF3U6Gh
tyyt+Nab/V+DF2kPc7LUDmOgQuaf+a4OH+l5NOB+NSEzR/Itd+8nC35sfvU4Gu2QIZhFwa
IymLgurighkPp6r5WOKrHtSjH4koOQSCvC9AGEiWYiZdfeylQAZL0RSCcDeZfQ==
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 4P7tcm72mkzvTX;
Sat, 4 Feb 2023 00:26:48 +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 3140Qm4u053829;
Sat, 4 Feb 2023 00:26:48 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3140QmpB053828;
Sat, 4 Feb 2023 00:26:48 GMT
(envelope-from git)
Date: Sat, 4 Feb 2023 00:26:48 GMT
Message-Id: <202302040026.3140QmpB053828@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Xin LI <delphij@FreeBSD.org>
Subject: git: 3e955733117d - stable/13 - pwd_mkdb(8): Don't copy comments from /etc/master.passwd to /etc/passwd.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: delphij
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 3e955733117d1068acbcc19d7113ab5c7ccef2c9
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by delphij:
URL: https://cgit.FreeBSD.org/src/commit/?id=3e955733117d1068acbcc19d7113ab5c7ccef2c9
commit 3e955733117d1068acbcc19d7113ab5c7ccef2c9
Author: Andre Albsmeier <Andre.Albsmeier@siemens.com>
AuthorDate: 2010-03-11 10:53:47 +0000
Commit: Xin LI <delphij@FreeBSD.org>
CommitDate: 2023-02-04 00:25:54 +0000
pwd_mkdb(8): Don't copy comments from /etc/master.passwd to /etc/passwd.
The intention of /etc/passwd was to support legacy applications that are
not yet converted to use modern API like getpwent(3). Comments are not
defined in the legacy format, so copying them could break these
applications. Plus, it could leak sensitive information (e.g. encrypted
form of password of an user that was commented out instead of deleted
or disabled).
PR: bin/144652
(cherry picked from commit 0deb25bd9d6d2cdd4aa22f0e2754161e35f3785c)
---
usr.sbin/pwd_mkdb/pwd_mkdb.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index 6297bcb461db..261e7951a126 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -462,11 +462,14 @@ main(int argc, char *argv[])
error("put");
}
}
- /* Create original format password file entry */
- if (is_comment && makeold){ /* copy comments */
- if (fprintf(oldfp, "%s\n", line) < 0)
- error("write old");
- } else if (makeold) {
+ /*
+ * Create original style password file entry.
+ *
+ * Don't copy comments since this could reveal encrypted
+ * passwords if entries have been simply commented out
+ * in master.passwd.
+ */
+ if (makeold && !is_comment) {
char uidstr[20];
char gidstr[20];
From nobody Sat Feb 4 00:26:49 2023
X-Original-To: dev-commits-src-branches@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 4P7tcp2RVdz3kRCj;
Sat, 4 Feb 2023 00:26:50 +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 4P7tcp1jStz3s4N;
Sat, 4 Feb 2023 00:26:50 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675470410;
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=TrbdVqdhW1vnODDsIZbUvQAEKvhb4dkYDiNqg64cUR4=;
b=AKXijsU34Q2SCW+ZpOXkm1Tj/16eAHmmwUFefgKQxyo7HfBzzzSHBOWrdQtYU8SSoRbGBN
hijxweYUf1PcrxaQSjRBBGGZ5Zw2QqYKikLjmwInHr6DWEu2PR8XkEyK8w8tCR2xipVfyG
J6FLmtimkjZKzPATrjSfSBaSSWIzqX/YlfoOiuIGEibcdtKZ1IWbQ5a32P3b8w5/mfEjpu
3vbANQ+bsfzhOIdZlcNv/bwCDk2oTm5Pe6W5Uogf9ZsO++4sE2LFumzO1kx7cnWKyxDugk
Rvxj7E20VkLkQSCtLdPpNivF+NOmDTZi6JdvQg0d02C/WOpWDhWrwgmR95xw0g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675470410;
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=TrbdVqdhW1vnODDsIZbUvQAEKvhb4dkYDiNqg64cUR4=;
b=elwwo41un5xUmU09WEUY7VYecNijP2EZzwPKDWhjSJnge89wT+a3zK/GlpUXjZaDecfviY
3orJmNJ386Y+R+yYvEiXHKUMKiBpj25p4eWAr2y3MKyueyWDtUzk2h7mX2IAcIH4+BO1el
w/GpPW037xVNXdIfNbQuik8teFjSr+RZezuCzMX1CiewYBz0F+4qofXA8rFHe6DcVd/GN+
pai1pw9NfpyyUOoO/MKFbA0jmg9rnKLRuWRxXBIMydsejfEMpmPsm3tnK/sl1YjHW6ZQVV
YzDF/CbtPaGNf2eGNZomTjFzsqhyYWpgNxO1EKcrP5RfzST2J0LuosUdCpFiWg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675470410; a=rsa-sha256; cv=none;
b=WdU6FEm1cM1Rz/x/ZLE0YvfqQu2Xuab42DsNqmKg05qNv1npvouRUefkaQAVUG2VGugTo3
aW+3r+dau/a0OHOiazWDuG6Bt5KllofZveCRDbL9pSZge/nx/MmOVazG6YPf6AaaEvvVH1
RPnkJas2vfTyNU2hyDOkQaYI/NUgkK7eekyxqUBvXTEfGDG1YW25NipDwtg6/hbSa3Sw0q
A7pe2epAebs+94hyYORngyhK99NEFqFFSVjrg/zSAdC8NT8++lxn/WYopU81ojMiTkuNzi
kJVpWsjoZZQ0JNKwgkpkFP8de1c63XJ74iEVGAh6uP5+qCQpdHNL6hemfo80FQ==
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 4P7tcp0YmNzvjp;
Sat, 4 Feb 2023 00:26:50 +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 3140QnQI053853;
Sat, 4 Feb 2023 00:26:49 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3140QnDP053852;
Sat, 4 Feb 2023 00:26:49 GMT
(envelope-from git)
Date: Sat, 4 Feb 2023 00:26:49 GMT
Message-Id: <202302040026.3140QnDP053852@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Xin LI <delphij@FreeBSD.org>
Subject: git: d07eb716f35d - stable/13 - etcupdate: Chase test case after pwd_mkdb(8) no longer copies comments.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: delphij
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: d07eb716f35d592c5b2f25d547c80e6bf3b81245
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by delphij:
URL: https://cgit.FreeBSD.org/src/commit/?id=d07eb716f35d592c5b2f25d547c80e6bf3b81245
commit d07eb716f35d592c5b2f25d547c80e6bf3b81245
Author: Xin LI <delphij@FreeBSD.org>
AuthorDate: 2023-01-30 04:40:58 +0000
Commit: Xin LI <delphij@FreeBSD.org>
CommitDate: 2023-02-04 00:26:24 +0000
etcupdate: Chase test case after pwd_mkdb(8) no longer copies comments.
(cherry picked from commit 4bbf45cf561012da0eb10afe14d4da841add84f5)
---
usr.sbin/etcupdate/tests/preworld_test.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.sbin/etcupdate/tests/preworld_test.sh b/usr.sbin/etcupdate/tests/preworld_test.sh
index b7241542784f..2c11c37f1aac 100644
--- a/usr.sbin/etcupdate/tests/preworld_test.sh
+++ b/usr.sbin/etcupdate/tests/preworld_test.sh
@@ -214,7 +214,7 @@ check_trees()
missing /etc/inetd.conf
# These should be auto-generated by pwd_mkdb
- file /etc/passwd "" 9831537874bdc99adccaa2b0293248a1
+ file /etc/passwd "" e4650d2727044b22d513e6a02d86bcfa
file /etc/pwd.db
file /etc/spwd.db
}
From nobody Sat Feb 4 00:28:24 2023
X-Original-To: dev-commits-src-branches@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 4P7tfc3BTsz3kRGS;
Sat, 4 Feb 2023 00:28:24 +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 4P7tfc2mHsz3sQl;
Sat, 4 Feb 2023 00:28:24 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675470504;
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=HL0nzH7U2Psq684uap/gXeEWxbR8HTM0xRdtToXcnUk=;
b=Ke4U68uExGJbhhEyk8bgyh7pCaStnn5Clp0oyMjj+HyQkAuKjxizdWDj1gT3WbhOS0VPzF
JHCc8q9QDf6XufWyjvzp3okc1NtAtqp8GeWZ//FsGc0jQh96ka23Lja0AH2s/uLBLo+zl+
Cdsn1lXguvGz5fHRDChPvDsIXW4PC+w5uZlah1dNhAkcXGuPAEK+UTIDqrztIQD4rIkJn8
rJSf+ZIJdbITbWjeNsPm8TykZAIFLUvmaLMcVbr07CaS/3Uh+upaDkSmNpuhFSpfQMbUhb
89o0w9hUdlaGRwmtsvHRxKkUsz7GP/cDAn0AoRYt8dy55shjtcZ6r/yFDbZAgg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675470504;
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=HL0nzH7U2Psq684uap/gXeEWxbR8HTM0xRdtToXcnUk=;
b=Np6YwbB3z1DZSrhZA6NCTldiwJQnsKTEYhvr3L4YovHmIPOXDGRAlttSSeRBVkhcpm9FI8
0kF/2m8vbiH3O+1XqFtlQO1+GPPbDUEsKKGGRN+XKk3poNCs2/84IagDp/+/mZKFmPtSav
AWHyNP96WJI9dgIZ6CXS+tEENvCyvNW82Zp5z0uJpBDkum3akP+ENJI81PYPH73ZfUhynG
ezd1MIKv+GPQZMYr7gnMHZbsRWYlss+tfc2lmWhYWyZQ6mbJLah0S69VMzLw3fQ/yv/9vR
X9ULKVAwCItJ/6hCCqKypioKiH/higG8lmyGdfpob7M0ryCaUhKUo1AeUoy8hA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675470504; a=rsa-sha256; cv=none;
b=CI7zDCTKZLkMeNsj80dMyD+Cfz6zhUJToVhpZ3ifZUQWrozq6s7AIbm7bu+fZz+VTd2/qP
TJoRLQel0yHcnD2CJGRcgRW6kzs+p8R61G/q1QyRUc7j5vu1cMrYG3cgofev3mhpYRhI9o
PA7E+4Xjek7OrFsHYZNUqrcz6PuVev11SGAJyG4KCQGhZMB3ClMiTzZilqqy92mR9REJTW
XhXwnsac41Bld5f2Uivnv6pXApqJuzFwVcpZT+2Cfdwx+2KEsK4zpCs0rk1SH7r1PpuMNl
lvRKSgF9jLU0JWce4UNa2LJa4IMBfhdZPiKjMaPjbQoAYvcNAahrq+S7+TbdVg==
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 4P7tfc1pGZzvXC;
Sat, 4 Feb 2023 00:28:24 +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 3140SO2j054186;
Sat, 4 Feb 2023 00:28:24 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3140SOrg054185;
Sat, 4 Feb 2023 00:28:24 GMT
(envelope-from git)
Date: Sat, 4 Feb 2023 00:28:24 GMT
Message-Id: <202302040028.3140SOrg054185@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Xin LI <delphij@FreeBSD.org>
Subject: git: b96684daa837 - stable/12 - pwd_mkdb(8): Don't copy comments from /etc/master.passwd to /etc/passwd.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: delphij
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: b96684daa837462342093344a144e0ee636a9e22
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by delphij:
URL: https://cgit.FreeBSD.org/src/commit/?id=b96684daa837462342093344a144e0ee636a9e22
commit b96684daa837462342093344a144e0ee636a9e22
Author: Andre Albsmeier <Andre.Albsmeier@siemens.com>
AuthorDate: 2010-03-11 10:53:47 +0000
Commit: Xin LI <delphij@FreeBSD.org>
CommitDate: 2023-02-04 00:27:55 +0000
pwd_mkdb(8): Don't copy comments from /etc/master.passwd to /etc/passwd.
The intention of /etc/passwd was to support legacy applications that are
not yet converted to use modern API like getpwent(3). Comments are not
defined in the legacy format, so copying them could break these
applications. Plus, it could leak sensitive information (e.g. encrypted
form of password of an user that was commented out instead of deleted
or disabled).
PR: bin/144652
(cherry picked from commit 0deb25bd9d6d2cdd4aa22f0e2754161e35f3785c)
---
usr.sbin/pwd_mkdb/pwd_mkdb.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index 13fae9510af8..601e0e71bfd5 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -470,11 +470,14 @@ main(int argc, char *argv[])
error("put");
}
}
- /* Create original format password file entry */
- if (is_comment && makeold){ /* copy comments */
- if (fprintf(oldfp, "%s\n", line) < 0)
- error("write old");
- } else if (makeold) {
+ /*
+ * Create original style password file entry.
+ *
+ * Don't copy comments since this could reveal encrypted
+ * passwords if entries have been simply commented out
+ * in master.passwd.
+ */
+ if (makeold && !is_comment) {
char uidstr[20];
char gidstr[20];
From nobody Sat Feb 4 00:28:25 2023
X-Original-To: dev-commits-src-branches@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 4P7tfd4259z3kRJm;
Sat, 4 Feb 2023 00:28:25 +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 4P7tfd3H33z3sbd;
Sat, 4 Feb 2023 00:28:25 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675470505;
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=Ujps9ZmD4ItYA8dEmUggzJ2Cw88F6UgWylhjoZLVipI=;
b=ld0VhM5zSOTUAMcLZANCHT/XHiEmvexLX3mMIlZ2nQOaqiW8vtthpwkP7RpkiSWFovYdx9
sezCU0mdNEEIh46J97AjnrCoMHn9yaBsokBjdR1PSVQLGLhhNrLxVvWQ+VXw5eZFkOScTc
R7QJJOJJdu1lVsvz2YLxdvpkdtAacNDeYfJ7dP9uEgl+pj92uOfiqUxIXF4pr4wWjt5CRW
/xiGl0mrFkwWkCQn72Qo2IWiP6Tp09LNAIF/BaOHOc/aFqR+dHmcHTTrK9XUs+7PynXJ0H
aoegF7PWsH0ehuhEIYXQwCxMUGAM3dpl45B40fx5+HnAO4qqkPLjmlh2OSm2Lw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675470505;
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=Ujps9ZmD4ItYA8dEmUggzJ2Cw88F6UgWylhjoZLVipI=;
b=bP57NXpwkM5JqDKeumckukF1snm/7ttZ9f2TKLTZRgSdSb00WI9onzcP/fWSyp+I/gkoz8
r5WYYyfj8WjCMdEFaE7cHx0FPR/De9slazNMDWJfPGn2PWxEyyEfiEeS/Nl8Cy4ZQ1lDEK
tdgiOBr/Bu+xade9t0qI2tHRDKjwTnKfNTxiMfIRDEUllGzutQzwUZIaJcWhd8wOLlOkXO
r2gRR4GGtp4XGO3BFwoOJVozpVSD8AkYtgcNHLLEmZ9PtvBkkjeIerIo4ozKl2fypL/15N
Fs1tu5oF9KkRVlcLZTifyRQgGmxMajap4cIXGnhLZwJ/yC3ESVJZex2dbqgDAA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675470505; a=rsa-sha256; cv=none;
b=yVD3ucwWs4OQd3DuR3Cvw0Kzx71/PhbGlrzBULwwUB/VQfHn2Jpad28BdR0ytOdntbINGz
WVeNIyhg/iD27ddYH1ELBtsL87UCIbsWZyP36TrYqvWOJmtRyPr0PCzrOisTVg7rW727c7
WEKwRktNRq6CeSJ/UlBqzzO9mPJzVdAlS2cjJVto5+ioBw2PtVA7tUljwSXHiNe59q+i4j
fzbghDcpo5Kfl2N15U9j36VDfC8olwu0BiOjZd9X9//a0hY4DR1aryb2+hL8WIq37YkMfq
hYc54+yo34H9YclwxCiDDTwQ/t+ainEnX+MKhMM1HCBKZLZ+MwfzCF3f+fNm2Q==
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 4P7tfd2MkczvGB;
Sat, 4 Feb 2023 00:28:25 +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 3140SPYq054210;
Sat, 4 Feb 2023 00:28:25 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3140SPMG054209;
Sat, 4 Feb 2023 00:28:25 GMT
(envelope-from git)
Date: Sat, 4 Feb 2023 00:28:25 GMT
Message-Id: <202302040028.3140SPMG054209@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Xin LI <delphij@FreeBSD.org>
Subject: git: a47e1bdf89eb - stable/12 - etcupdate: Chase test case after pwd_mkdb(8) no longer copies comments.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: delphij
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: a47e1bdf89ebadeff01e5bf6b1086f88a5381723
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by delphij:
URL: https://cgit.FreeBSD.org/src/commit/?id=a47e1bdf89ebadeff01e5bf6b1086f88a5381723
commit a47e1bdf89ebadeff01e5bf6b1086f88a5381723
Author: Xin LI <delphij@FreeBSD.org>
AuthorDate: 2023-01-30 04:40:58 +0000
Commit: Xin LI <delphij@FreeBSD.org>
CommitDate: 2023-02-04 00:28:12 +0000
etcupdate: Chase test case after pwd_mkdb(8) no longer copies comments.
(cherry picked from commit 4bbf45cf561012da0eb10afe14d4da841add84f5)
---
usr.sbin/etcupdate/tests/preworld_test.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.sbin/etcupdate/tests/preworld_test.sh b/usr.sbin/etcupdate/tests/preworld_test.sh
index b7241542784f..2c11c37f1aac 100644
--- a/usr.sbin/etcupdate/tests/preworld_test.sh
+++ b/usr.sbin/etcupdate/tests/preworld_test.sh
@@ -214,7 +214,7 @@ check_trees()
missing /etc/inetd.conf
# These should be auto-generated by pwd_mkdb
- file /etc/passwd "" 9831537874bdc99adccaa2b0293248a1
+ file /etc/passwd "" e4650d2727044b22d513e6a02d86bcfa
file /etc/pwd.db
file /etc/spwd.db
}
From nobody Sat Feb 4 17:01:03 2023
X-Original-To: dev-commits-src-branches@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 4P8Jgz4WdJz3nc77;
Sat, 4 Feb 2023 17:01:03 +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 4P8Jgz3wMhz4Hfj;
Sat, 4 Feb 2023 17:01:03 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675530063;
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=e7aHgYofiQmY/mE181rBSdPBeOV7HxScUaSArDJfj/E=;
b=tlBn22g107/aJUbVy4tc58QdJW6XbJC8CRCMAXw/efrq29Wmdvq01gnyCJ5iUrFEycwxeE
heyB5/OKC4rfBocLUc4xLhRGtxBDx3aa9K9WuZuWK8BKv3slZyw2jjrvGdUO0gixd+QFgL
XDa/GMfl3a+anLxBnVcp+yTYSwIwgmFycwk1OskMGIu5DkGo55FSipadFesZSNOTs9+6pG
WjxmVftJ8MmXaSnQh3t0tELPaeEcyECctDLD9ZPPFbOlRYyhxP2OOfmTuB+HMaU2CqxM5M
ASaTMveiZoMNppuMV04/9CJwubnNcWfmbI3zZhmu03rYVQ5Fz6SjmJ84dhlkdw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675530063;
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=e7aHgYofiQmY/mE181rBSdPBeOV7HxScUaSArDJfj/E=;
b=QPy/6k6QadJG99ibGDW5E/ZCvvbBOunEt+HcbCBJXodIP67xzQzTNCQj6Ew4cA59bbaHZO
S3p4e+hXkmd/WAxtAQFFwl59pnq7tAlFJLOt/JGNcqeAmEQCgLz+wWMo1eDGSc1y1E060P
s9VeqlhAa9Lsb/JBErf0N1oUCKR6ISA62ZBw8CPNtBo7zcBUR53bnxLD11zi09/YiZymcW
TUffvmsJfNnm7UnAg3oOi/LyXf+T4v8vArIycBr/85+85v6zrlz11MD7ON5gYnQWcu41hk
c54TX6SXmY61/gVsKXOoEw/riKE1iuA4c6OxVKwhMWwhq+hu1yaV22QjQKjPKQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675530063; a=rsa-sha256; cv=none;
b=KRO2/+OxetsGLaGoFFIQcP3j81ESSILMe411B/y2LNfVg3cFyMD6wK3mD+rRMMFK9DZE6g
hfBSJSQPpo3C0/inl5KMmM6jky2wRlLX/YNmAv2A6fVRbkgmsx7Jl7qb/e1pC/h6FOWBZN
pz0g8Nq+nqIOz4G6S7fG09aWFPnKdmOAziB6rUBm44WV1F7h1TVSdodtL05nJijLCBUHzQ
nPhKDe+zLiN5iymu9Q1nM9JqzWtwK/C3ndLsAZ9pgiLdUE77uyWlmAqSIprx4gFQ/Oh+Q+
J6R8BJ5K7q69qFM1RiS8/7gbIbaUkC6fUJPF/UnvQu/aTepjzlOY3EfRiTbM4g==
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 4P8Jgz30q8zMP2;
Sat, 4 Feb 2023 17:01:03 +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 314H13bC072300;
Sat, 4 Feb 2023 17:01:03 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 314H13jc072298;
Sat, 4 Feb 2023 17:01:03 GMT
(envelope-from git)
Date: Sat, 4 Feb 2023 17:01:03 GMT
Message-Id: <202302041701.314H13jc072298@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Piotr Kubaj <pkubaj@FreeBSD.org>
Subject: git: 97ab40b1d7b5 - stable/13 - iwm(4), iwmfw(4): mention iwm7265Dfw
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: pkubaj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 97ab40b1d7b559fa5fc3b3c18f61b38dcbca6090
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by pkubaj (ports committer):
URL: https://cgit.FreeBSD.org/src/commit/?id=97ab40b1d7b559fa5fc3b3c18f61b38dcbca6090
commit 97ab40b1d7b559fa5fc3b3c18f61b38dcbca6090
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-02-04 13:12:56 +0000
Commit: Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-02-04 17:00:56 +0000
iwm(4), iwmfw(4): mention iwm7265Dfw
Correct documentation by mentioning iwm7265Dfw.
PR: 234584
Differential review: https://reviews.freebsd.org/D38374
Approved by: erj
(cherry picked from commit 29fa34aadbd3d93343573220a521caa0c248682d)
---
share/man/man4/iwm.4 | 4 +++-
share/man/man4/iwmfw.4 | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/share/man/man4/iwm.4 b/share/man/man4/iwm.4
index 2eddcbc83e2a..ed69f7e9dec4 100644
--- a/share/man/man4/iwm.4
+++ b/share/man/man4/iwm.4
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 28, 2020
+.Dd February 4, 2023
.Dt IWM 4
.Os
.Sh NAME
@@ -49,6 +49,7 @@ Choose one from:
.Cd "device iwm3168fw"
.Cd "device iwm7260fw"
.Cd "device iwm7265fw"
+.Cd "device iwm7265Dfw"
.Cd "device iwm8000Cfw"
.Cd "device iwm8265fw"
.Cd "device iwm9000fw"
@@ -71,6 +72,7 @@ iwm3160fw_load="YES"
iwm3168fw_load="YES"
iwm7260fw_load="YES"
iwm7265fw_load="YES"
+iwm7265Dfw_load="YES"
iwm8000Cfw_load="YES"
iwm8265fw_load="YES"
iwm9000fw_load="YES"
diff --git a/share/man/man4/iwmfw.4 b/share/man/man4/iwmfw.4
index 1704c735f292..877880c2e501 100644
--- a/share/man/man4/iwmfw.4
+++ b/share/man/man4/iwmfw.4
@@ -22,7 +22,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 28, 2020
+.Dd February 4, 2023
.Dt IWMFW 4
.Os
.Sh NAME
@@ -46,6 +46,7 @@ of the following:
.Cd "device iwm3168fw"
.Cd "device iwm7260fw"
.Cd "device iwm7265fw"
+.Cd "device iwm7265Dfw"
.Cd "device iwm8000Cfw"
.Cd "device iwm8265fw"
.Cd "device iwm9000fw"
From nobody Sat Feb 4 17:01:57 2023
X-Original-To: dev-commits-src-branches@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 4P8Jj13FBBz3ncQZ;
Sat, 4 Feb 2023 17:01:57 +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 4P8Jj12plhz4J1F;
Sat, 4 Feb 2023 17:01:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675530117;
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=zfDKueHtbih6E1gFJrWFpw0PPBcyOUslmwDQmpMGyT8=;
b=GC0/TBSInYeFU9SyL97X9oHZEIjlShCN8hZl1QcDRhPlbLK0QfEQfwLbxOxrnr/dtud2NJ
3XzoM8BtVJNqFrIsf5wA1rRocJsibEGbHw3e140ZULPBEv1I+PunWuGSF0c9CTsZqxLY/r
C7UCljJVdUOxgNkb6GL9L4A35YtppenZ3vKVx3kQSujQgNNhpqB8WIP0V5GQMNLjHd2ZgE
A1YvNPZMZG7TBRsVf+Tvni5ZgnUFfuZwH1AUr4pF6MBCXY1COHNwSjO/o1g7irQUUdN4eS
RVThl9Dq4yiirhwXW+mvBKauxks++xq4HQBq24zJAQGbDmekMgWZDbBkgzMeZA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675530117;
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=zfDKueHtbih6E1gFJrWFpw0PPBcyOUslmwDQmpMGyT8=;
b=YgHUO9L0E+peVL4kddmrK0LSqdfKAodVSfDXFjoQISfvqMeCGygf2AEczQN6FF8wMvdCHm
TTy4mBYMMq+kx4iD71Z3DLhijHsooYTxgW9IhDg9XoAmW6f2cewh3wDRmuzMRMr74L6+Fh
pYYao526lktSKTskwOY13Ofb6kTwbnNW6keYAnfaKgimOJzyUofbBr0488nSnqyhW/P/pD
MBRGG5d58FPIfjsRr6d42cA/dzW5SlAdvbbS2izEgzvJHrt3GiqrHjIgDbmR0U6ONwoe1R
+O8XyzhemqGJmiShvBljoRsgU4dAFM4xQafX6qIyZBvfmsRZyKIYFR4msVCr+w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675530117; a=rsa-sha256; cv=none;
b=jWJTzfsq3OWvO3+xYWj4BIIvGGVjjD+xui/laqE6rtvK9EIjGg5PGS3PG+5YyHACi9vULX
yox/GRVVKFy4nZJ8bD+lVwmSlTbVneWgrbV0BT0LnkCnsIGhwjYSTyM3KxxKHG1CqSaGMe
JGwfHC7WvYlqoC4qbRgRFoat0ofa1T6hczE57CIrhIeEkgHzi0lzretMnh5/T6EDYLhfZh
M49Nf5u1e43tSlTM6sAED9t731664qpWm1bkouwjUZx+Qh8iOyMV0qGD6IQcqpa5H2q0vN
AtHm26tv/+PTNjiZCRBf9K6jZgErZufCN1VKPaAR+eER/huER9+E/41v67Jlzg==
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 4P8Jj11smPzMMR;
Sat, 4 Feb 2023 17:01:57 +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 314H1vT2072536;
Sat, 4 Feb 2023 17:01:57 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 314H1vne072535;
Sat, 4 Feb 2023 17:01:57 GMT
(envelope-from git)
Date: Sat, 4 Feb 2023 17:01:57 GMT
Message-Id: <202302041701.314H1vne072535@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Piotr Kubaj <pkubaj@FreeBSD.org>
Subject: git: 9fcc1b60b7fa - stable/12 - iwm(4), iwmfw(4): mention iwm7265Dfw
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: pkubaj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 9fcc1b60b7fa9747510283519ede2accafc551dd
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by pkubaj (ports committer):
URL: https://cgit.FreeBSD.org/src/commit/?id=9fcc1b60b7fa9747510283519ede2accafc551dd
commit 9fcc1b60b7fa9747510283519ede2accafc551dd
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-02-04 13:12:56 +0000
Commit: Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-02-04 17:01:44 +0000
iwm(4), iwmfw(4): mention iwm7265Dfw
Correct documentation by mentioning iwm7265Dfw.
PR: 234584
Differential review: https://reviews.freebsd.org/D38374
Approved by: erj
(cherry picked from commit 29fa34aadbd3d93343573220a521caa0c248682d)
(cherry picked from commit 97ab40b1d7b559fa5fc3b3c18f61b38dcbca6090)
---
share/man/man4/iwm.4 | 4 +++-
share/man/man4/iwmfw.4 | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/share/man/man4/iwm.4 b/share/man/man4/iwm.4
index 2eddcbc83e2a..ed69f7e9dec4 100644
--- a/share/man/man4/iwm.4
+++ b/share/man/man4/iwm.4
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 28, 2020
+.Dd February 4, 2023
.Dt IWM 4
.Os
.Sh NAME
@@ -49,6 +49,7 @@ Choose one from:
.Cd "device iwm3168fw"
.Cd "device iwm7260fw"
.Cd "device iwm7265fw"
+.Cd "device iwm7265Dfw"
.Cd "device iwm8000Cfw"
.Cd "device iwm8265fw"
.Cd "device iwm9000fw"
@@ -71,6 +72,7 @@ iwm3160fw_load="YES"
iwm3168fw_load="YES"
iwm7260fw_load="YES"
iwm7265fw_load="YES"
+iwm7265Dfw_load="YES"
iwm8000Cfw_load="YES"
iwm8265fw_load="YES"
iwm9000fw_load="YES"
diff --git a/share/man/man4/iwmfw.4 b/share/man/man4/iwmfw.4
index 1704c735f292..877880c2e501 100644
--- a/share/man/man4/iwmfw.4
+++ b/share/man/man4/iwmfw.4
@@ -22,7 +22,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 28, 2020
+.Dd February 4, 2023
.Dt IWMFW 4
.Os
.Sh NAME
@@ -46,6 +46,7 @@ of the following:
.Cd "device iwm3168fw"
.Cd "device iwm7260fw"
.Cd "device iwm7265fw"
+.Cd "device iwm7265Dfw"
.Cd "device iwm8000Cfw"
.Cd "device iwm8265fw"
.Cd "device iwm9000fw"