From nobody Mon Oct 7 00:16:13 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMKSZ2Fnqz5Yks9; Mon, 07 Oct 2024 00:16: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMKSZ1J3Wz4Hwl; Mon, 7 Oct 2024 00:16:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728260174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wyRFxUccHMmfpIxjuhdNjEIcT8Q64KxugvJpHwgVFR8=; b=u6F6sn4dlBNDGyUD65wdMvzPCBCZ8wIA5Cnj+UdLuCCxrLPiyqHp0jZo1WNrBjW7A+ASQd hAGrqA7loApt7XtzNlQAtL6zXvDmSjK37vs0sEmyZBzokwYojOO9N+uiI6TPVkhkIyjCbx XkTQKNBb8aVzPi79Vats48ASMfCMzj8HCinj0NESh8XC5Ue9/R2G34Yj+Oj/D+w2KFE99c 9VXje3C7v9xrKayRs+VCGE9iR9rSWdb66QUiie3z1AXZYWsoLYcwU4pkOetXwpGRSBSvDd ULRy0b6vltdrrZ9qr7uGN9Plg5UX8/XYvRfMlFelB5a17xfRcsKUgJ779DTqUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728260174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wyRFxUccHMmfpIxjuhdNjEIcT8Q64KxugvJpHwgVFR8=; b=qkjQNAdxXxzhtUbIe8/knUg90YilBV4tX1+Zm9PWyOuV+CFh+PjefeflpmOyxBVUQjs5bs gc59sxpJfg9+PmpuBRoDqVnnyef1RX304PvlvcnJf8e/sQc1z5F8XExHQv/oigLvV+qbR0 GD5GGqGQVqzfqcUbcuF1H5PEj95iJjeJla26BMt3buuublL1SrVdFlMwVBGTe+qfg3NugD 3PwgBBcEqgg2zpfOw04Zz2FqRMcncpYSnHyyV+srl8wOgVoHUDbzcX4wX5YV3lhl6RwvwJ si7i/WyK+7146ZMRG0QeaDg5tCot0LkxETPnkwikJRLogHSOU1CUO3glibEfoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728260174; a=rsa-sha256; cv=none; b=irwgXRMCtOQPcESbDCrvO/yRAsLs5ac0eYd8uNjw44u7gdhfiSiM2q8vxMipcBYh9NiXnB JcOepSdp5SOHDqYfqwuF0715fG5hLDxOB6a6+C+7yUSgJpl9/7DKvHO3Mk21XXKhi27iEf bG6cz6bcuYrepKu0GSP3AGYLAVej8XXDyeSLOn5O8emQ324jbOveWQy2V9cbmuudmcu1n9 sduu1c30o7KWTiABhwuVl8K9c85FPp2AddvwPg5kvpOWo9RUHAkopHAcDCQuFhdrSegMut uX3BFxVzxCYT8ynimJRlI/WtzGdXWc78LNLBDPQRNbIobvyZho2fa39rq+v+/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 4XMKSZ077CzPJ0; Mon, 7 Oct 2024 00:16:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4970GDLf080351; Mon, 7 Oct 2024 00:16:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4970GDe1080348; Mon, 7 Oct 2024 00:16:13 GMT (envelope-from git) Date: Mon, 7 Oct 2024 00:16:13 GMT Message-Id: <202410070016.4970GDe1080348@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: fdd100a7150e - main - devctl: Add missing validation to DEV_RESET List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: fdd100a7150e34d8d98cb38e701b3cb073208653 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fdd100a7150e34d8d98cb38e701b3cb073208653 commit fdd100a7150e34d8d98cb38e701b3cb073208653 Author: Mark Johnston AuthorDate: 2024-10-06 22:56:40 +0000 Commit: Mark Johnston CommitDate: 2024-10-07 00:16:07 +0000 devctl: Add missing validation to DEV_RESET As in other ioctls which access the parent bus, we need to check for a NULL parent here. Otherwise it's possible to trigger a null pointer dereference by resetting the root device. Reported by: Elliott Mitchell Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D46965 --- sys/kern/subr_bus.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 7fe46995ee54..d0c41b59dbb6 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -5859,6 +5859,10 @@ devctl2_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, error = EINVAL; break; } + if (device_get_parent(dev) == NULL) { + error = EINVAL; + break; + } error = BUS_RESET_CHILD(device_get_parent(dev), dev, req->dr_flags); break; From nobody Mon Oct 7 02:11:35 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMN1g3zFDz5YrFX; Mon, 07 Oct 2024 02:11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMN1g3g1Hz4QPZ; Mon, 7 Oct 2024 02:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728267095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VMQse1mZzpfXgEgi9jz259e62GK4DK+j1n87h5Fu6xc=; b=LUe4t97ivbkYAdYFJy7N3Pc3e1BGLqZNYOSBDmlvBt42LputKr3u+sfZT4vQD0Py3q1JIp G3Ja0+n0lCijg8wydpzLmE/uEMSBfX3o0yGiAnGUaBNW8DR1t1hVfwnumIQCWfJ5/Xe62O pq5hJ5bimGstIlubPuKr6YYM3SGF+ZA4GrMognADdhtzDLPp5jkUhkkIIQyjrfJlKLj57o L/xVC2NseOh6eMhT590Gs/542xEbVZzrS2F2HxDHWgFhwh0KQbJ/4T8jyMKU3wBMXTSPKG 4Ig44Z+alOOZs5Rzk93MofKClb86HD2L6FPwVtnz0gy/loFTs6PBHDs6v012Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728267095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VMQse1mZzpfXgEgi9jz259e62GK4DK+j1n87h5Fu6xc=; b=bLyuuYlV0zBnkxlurQq2qcg5NPvfA2Zr9ItNqwSfLnoal0ypt0yfo9kMx+axIxuC2n4+1u FT9Ik4cJ9WXuYCnRPie0Pp9UUSIf3PxZwdMJvoEIcK94Iv7am967miJkQXNAwDV5XKWdYR t5DEZ9kNW3JsUtGVDzKmSxx5DB2WDSaBirEm3Yurp9PzMXP1d+fwm+DVOhQR/sO2M44m/S Oc/cI9JuFjGAjHqluowDpYC+r3Tj1P/+GITniUCJBSSZaQ72eWrfnd/JqZTMgUpDrD3q3d M2i674bQQotM9MAmIrg5tYHHSOgts/pDymMcW9ngwFxlIAjSXzba8AP+/NmXcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728267095; a=rsa-sha256; cv=none; b=kaAPSGotJrT5lTLiUBOYEE9QbE4euZNOFPu4Ce3/w4peOnumufZ3NWuWegmkrvYT5B9KR6 MYflENh0pX3dlZCUCJtXiolfpG1VdRenCMwfS7I4s/CWD7sDBMTe22zkElGjQlm6ieSqXx uBk0JeVtCnoO4oNtnil0WQiliFMgUUrDvZ23lgXH6VZ7Ho/ooS26WTY6iSrkfT8AeOTtP1 1ZIk9cOgjAmsAV26NtKFXzdMjjL5Xg/3O0crQpnH9nWfvCyEOSSx2Zmy90Uq17XI/MjIuR DReB3yql2H8UtKgm/ExwzonJ8i6jw2n1tTsV6jltY5s67Xz/PXWLqv6JuzFAcQ== 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 4XMN1g3G2czRyG; Mon, 7 Oct 2024 02:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4972BZxU078754; Mon, 7 Oct 2024 02:11:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4972BZs8078749; Mon, 7 Oct 2024 02:11:35 GMT (envelope-from git) Date: Mon, 7 Oct 2024 02:11:35 GMT Message-Id: <202410070211.4972BZs8078749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 5a5c22798130 - main - unbound: Vendor import 1.21.1 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5a5c2279813012882e59aa7bb51d50c5baba3b1e Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=5a5c2279813012882e59aa7bb51d50c5baba3b1e commit 5a5c2279813012882e59aa7bb51d50c5baba3b1e Merge: fdd100a7150e 9b8db746ac60 Author: Cy Schubert AuthorDate: 2024-10-07 01:44:05 +0000 Commit: Cy Schubert CommitDate: 2024-10-07 01:45:53 +0000 unbound: Vendor import 1.21.1 Release notes at https://nlnetlabs.nl/news/2024/Oct/03/unbound-1.21.1-released/ Security: CVE-2024-8508 MFC After: 3 days Merge commit '9b8db746ac608ff7cdad3c9ac7ac395319e4ea0f' contrib/unbound/aclocal.m4 | 292 +++++----- contrib/unbound/configure | 416 +++++++++----- contrib/unbound/configure.ac | 5 +- contrib/unbound/doc/README | 2 +- contrib/unbound/doc/example.conf.in | 2 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 2 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 2 +- contrib/unbound/install-sh | 174 +++--- contrib/unbound/ltmain.sh | 866 +++++++++++++++++++---------- contrib/unbound/util/configparser.c | 849 ++++++++++++++-------------- contrib/unbound/util/configparser.h | 4 +- contrib/unbound/util/data/msgencode.c | 77 +-- lib/libunbound/config.h | 6 +- 18 files changed, 1590 insertions(+), 1121 deletions(-) diff --cc lib/libunbound/config.h index e35470c55ae1,000000000000..82f7db249e3e mode 100644,000000..100644 --- a/lib/libunbound/config.h +++ b/lib/libunbound/config.h @@@ -1,1548 -1,0 +1,1548 @@@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* apply the fallthrough attribute. */ +#define ATTR_FALLTHROUGH __attribute__((fallthrough)); + +/* apply the noreturn attribute to a function that exits the program */ +#define ATTR_NORETURN __attribute__((__noreturn__)) + +/* apply the weak attribute to a symbol */ +#define ATTR_WEAK __attribute__((weak)) + +/* Directory to chroot to */ +#define CHROOT_DIR "/var/unbound" + +/* Define this to enable client subnet option. */ +/* #undef CLIENT_SUBNET */ + +/* Do sha512 definitions in config.h */ +/* #undef COMPAT_SHA512 */ + +/* Command line arguments used with configure */ +#define CONFCMDLINE "--with-ssl=/usr --with-libexpat=/usr --disable-dnscrypt --disable-dnstap --enable-ecdsa --disable-event-api --enable-gost --with-libevent --disable-subnet --disable-tfo-client --disable-tfo-server --with-pthreads--prefix=/usr --localstatedir=/var/unbound --mandir=/usr/share/man --build=freebsd" + +/* Pathname to the Unbound configuration file */ +#define CONFIGFILE "/var/unbound/unbound.conf" + +/* Define this if on macOSX10.4-darwin8 and setreuid and setregid do not work + */ +/* #undef DARWIN_BROKEN_SETREUID */ + +/* Whether daemon is deprecated */ +/* #undef DEPRECATED_DAEMON */ + +/* Deprecate RSA 1024 bit length, makes that an unsupported key */ +/* #undef DEPRECATE_RSA_1024 */ + +/* Define this to enable kernel based UDP source port randomization. */ +/* #undef DISABLE_EXPLICIT_PORT_RANDOMISATION */ + +/* default dnstap socket path */ +/* #undef DNSTAP_SOCKET_PATH */ + +/* Define if you want to use debug lock checking (slow). */ +/* #undef ENABLE_LOCK_CHECKS */ + +/* Define this if you enabled-allsymbols from libunbound to link binaries to + it for smaller install size, but the libunbound export table is polluted by + internal symbols */ +/* #undef EXPORT_ALL_SYMBOLS */ + +/* Define to 1 if you have the `accept4' function. */ +#define HAVE_ACCEPT4 1 + +/* Define to 1 if you have the `arc4random' function. */ +#define HAVE_ARC4RANDOM 1 + +/* Define to 1 if you have the `arc4random_uniform' function. */ +#define HAVE_ARC4RANDOM_UNIFORM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ARPA_INET_H 1 + +/* Whether the C compiler accepts the "fallthrough" attribute */ +#define HAVE_ATTR_FALLTHROUGH 1 + +/* Whether the C compiler accepts the "format" attribute */ +#define HAVE_ATTR_FORMAT 1 + +/* Whether the C compiler accepts the "noreturn" attribute */ +#define HAVE_ATTR_NORETURN 1 + +/* Whether the C compiler accepts the "unused" attribute */ +#define HAVE_ATTR_UNUSED 1 + +/* Whether the C compiler accepts the "weak" attribute */ +#define HAVE_ATTR_WEAK 1 + +/* If we have be64toh */ +/* #undef HAVE_BE64TOH */ + +/* Define to 1 if you have the `BIO_set_callback_ex' function. */ +/* #undef HAVE_BIO_SET_CALLBACK_EX */ + +/* Define to 1 if you have the `BIO_set_callback_ex' function. */ +/* #undef HAVE_BIO_SET_CALLBACK_EX */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BSD_STDLIB_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BSD_STRING_H */ + +/* Define to 1 if you have the `chown' function. */ +#define HAVE_CHOWN 1 + +/* Define to 1 if you have the `chroot' function. */ +#define HAVE_CHROOT 1 + +/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */ +/* #undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA */ + +/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */ +/* #undef HAVE_CRYPTO_THREADID_SET_CALLBACK */ + +/* Define to 1 if you have the `ctime_r' function. */ +#define HAVE_CTIME_R 1 + +/* Define to 1 if you have the `daemon' function. */ +#define HAVE_DAEMON 1 + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +/* #undef HAVE_DECL_ARC4RANDOM */ + +/* Define to 1 if you have the declaration of `arc4random_uniform', and to 0 + if you don't. */ +/* #undef HAVE_DECL_ARC4RANDOM_UNIFORM */ + +/* Define to 1 if you have the declaration of `evsignal_assign', and to 0 if + you don't. */ +/* #undef HAVE_DECL_EVSIGNAL_ASSIGN */ + +/* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you + don't. */ +#define HAVE_DECL_INET_NTOP 1 + +/* Define to 1 if you have the declaration of `inet_pton', and to 0 if you + don't. */ +#define HAVE_DECL_INET_PTON 1 + +/* Define to 1 if you have the declaration of `nghttp2_session_server_new', + and to 0 if you don't. */ +/* #undef HAVE_DECL_NGHTTP2_SESSION_SERVER_NEW */ + +/* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you + don't. */ +#define HAVE_DECL_NID_ED25519 1 + +/* Define to 1 if you have the declaration of `NID_ED448', and to 0 if you + don't. */ +#define HAVE_DECL_NID_ED448 1 + +/* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you + don't. */ +#define HAVE_DECL_NID_SECP384R1 1 + +/* Define to 1 if you have the declaration of `NID_X9_62_prime256v1', and to 0 + if you don't. */ +#define HAVE_DECL_NID_X9_62_PRIME256V1 1 + +/* Define to 1 if you have the declaration of `reallocarray', and to 0 if you + don't. */ +#define HAVE_DECL_REALLOCARRAY 1 + +/* Define to 1 if you have the declaration of `redisConnect', and to 0 if you + don't. */ +/* #undef HAVE_DECL_REDISCONNECT */ + +/* Define to 1 if you have the declaration of `sk_SSL_COMP_pop_free', and to 0 + if you don't. */ +#define HAVE_DECL_SK_SSL_COMP_POP_FREE 1 + +/* Define to 1 if you have the declaration of + `SSL_COMP_get_compression_methods', and to 0 if you don't. */ +#define HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS 1 + +/* Define to 1 if you have the declaration of `SSL_CTX_set_ecdh_auto', and to + 0 if you don't. */ +/* #undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO */ + +/* Define to 1 if you have the declaration of `strlcat', and to 0 if you + don't. */ +/* #undef HAVE_DECL_STRLCAT */ + +/* Define to 1 if you have the declaration of `strlcpy', and to 0 if you + don't. */ +/* #undef HAVE_DECL_STRLCPY */ + +/* Define to 1 if you have the declaration of `XML_StopParser', and to 0 if + you don't. */ +#define HAVE_DECL_XML_STOPPARSER 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the `DSA_SIG_set0' function. */ +#define HAVE_DSA_SIG_SET0 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ENDIAN_H */ + +/* Define to 1 if you have the `endprotoent' function. */ +#define HAVE_ENDPROTOENT 1 + +/* Define to 1 if you have the `endpwent' function. */ +#define HAVE_ENDPWENT 1 + +/* Define to 1 if you have the `endservent' function. */ +#define HAVE_ENDSERVENT 1 + +/* Define to 1 if you have the `ENGINE_cleanup' function. */ +/* #undef HAVE_ENGINE_CLEANUP */ + +/* Define to 1 if you have the `ERR_free_strings' function. */ +/* #undef HAVE_ERR_FREE_STRINGS */ + +/* Define to 1 if you have the `ERR_load_crypto_strings' function. */ +/* #undef HAVE_ERR_LOAD_CRYPTO_STRINGS */ + +/* Define to 1 if you have the `event_assign' function. */ +/* #undef HAVE_EVENT_ASSIGN */ + +/* Define to 1 if you have the `event_base_free' function. */ +/* #undef HAVE_EVENT_BASE_FREE */ + +/* Define to 1 if you have the `event_base_get_method' function. */ +/* #undef HAVE_EVENT_BASE_GET_METHOD */ + +/* Define to 1 if you have the `event_base_new' function. */ +/* #undef HAVE_EVENT_BASE_NEW */ + +/* Define to 1 if you have the `event_base_once' function. */ +/* #undef HAVE_EVENT_BASE_ONCE */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_EVENT_H */ + +/* Define to 1 if you have the `EVP_aes_256_cbc' function. */ +#define HAVE_EVP_AES_256_CBC 1 + +/* Define to 1 if you have the `EVP_cleanup' function. */ +/* #undef HAVE_EVP_CLEANUP */ + +/* Define to 1 if you have the `EVP_default_properties_is_fips_enabled' + function. */ +/* #undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED */ + + +/* Define to 1 if you have the `EVP_default_properties_is_fips_enabled' + function. */ +/* #undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED */ + +/* Define to 1 if you have the `EVP_DigestVerify' function. */ +#define HAVE_EVP_DIGESTVERIFY 1 + +/* Define to 1 if you have the `EVP_dss1' function. */ +/* #undef HAVE_EVP_DSS1 */ + +/* Define to 1 if you have the `EVP_EncryptInit_ex' function. */ +#define HAVE_EVP_ENCRYPTINIT_EX 1 + +/* Define to 1 if you have the `EVP_MAC_CTX_set_params' function. */ +/* #undef HAVE_EVP_MAC_CTX_SET_PARAMS */ + +/* Define to 1 if you have the `EVP_MD_CTX_new' function. */ +#define HAVE_EVP_MD_CTX_NEW 1 + +/* Define to 1 if you have the `EVP_sha1' function. */ +#define HAVE_EVP_SHA1 1 + +/* Define to 1 if you have the `EVP_sha256' function. */ +#define HAVE_EVP_SHA256 1 + +/* Define to 1 if you have the `EVP_sha512' function. */ +#define HAVE_EVP_SHA512 1 + +/* Define to 1 if you have the `ev_default_loop' function. */ +/* #undef HAVE_EV_DEFAULT_LOOP */ + +/* Define to 1 if you have the `ev_loop' function. */ +/* #undef HAVE_EV_LOOP */ + +/* Define to 1 if you have the header file. */ +#define HAVE_EXPAT_H 1 + +/* Define to 1 if you have the `explicit_bzero' function. */ +#define HAVE_EXPLICIT_BZERO 1 + +/* Define to 1 if you have the `fcntl' function. */ +#define HAVE_FCNTL 1 + +/* Define to 1 if you have the `FIPS_mode' function. */ +#define HAVE_FIPS_MODE 1 + +/* Define to 1 if you have the `fork' function. */ +#define HAVE_FORK 1 + +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +#define HAVE_FSEEKO 1 + +/* Define to 1 if you have the `fsync' function. */ +#define HAVE_FSYNC 1 + +/* Whether getaddrinfo is available */ +#define HAVE_GETADDRINFO 1 + +/* Define to 1 if you have the `getauxval' function. */ +/* #undef HAVE_GETAUXVAL */ + +/* Define to 1 if you have the `getentropy' function. */ +/* #undef HAVE_GETENTROPY */ + +/* Define to 1 if you have the `getifaddrs' function. */ +#define HAVE_GETIFADDRS 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GETOPT_H 1 + +/* Define to 1 if you have the `getpwnam' function. */ +#define HAVE_GETPWNAM 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `gettid' function. */ +/* #undef HAVE_GETTID */ + +/* Define to 1 if you have the `gettid' function. */ +/* #undef HAVE_GETTID */ + +/* Define to 1 if you have the `glob' function. */ +#define HAVE_GLOB 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GLOB_H 1 + +/* Define to 1 if you have the `gmtime_r' function. */ +#define HAVE_GMTIME_R 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GRP_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_HIREDIS_HIREDIS_H */ + +/* Define to 1 if you have the `HMAC_Init_ex' function. */ +#define HAVE_HMAC_INIT_EX 1 + +/* If we have htobe64 */ +/* #undef HAVE_HTOBE64 */ + +/* Define to 1 if you have the header file. */ +#define HAVE_IFADDRS_H 1 + +/* Define to 1 if you have the `if_nametoindex' function. */ +#define HAVE_IF_NAMETOINDEX 1 + +/* Define to 1 if you have the `if_nametoindex' function. */ +#define HAVE_IF_NAMETOINDEX 1 + +/* Define to 1 if you have the `inet_aton' function. */ +#define HAVE_INET_ATON 1 + +/* Define to 1 if you have the `inet_ntop' function. */ +#define HAVE_INET_NTOP 1 + +/* Define to 1 if you have the `inet_pton' function. */ +#define HAVE_INET_PTON 1 + +/* Define to 1 if you have the `initgroups' function. */ +#define HAVE_INITGROUPS 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* if the function 'ioctlsocket' is available */ +/* #undef HAVE_IOCTLSOCKET */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IPHLPAPI_H */ + +/* Define to 1 if you have the `isblank' function. */ +#define HAVE_ISBLANK 1 + +/* Define to 1 if you have the `kill' function. */ +#define HAVE_KILL 1 + +/* Use portable libbsd functions */ +/* #undef HAVE_LIBBSD */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBKERN_OSBYTEORDER_H */ + +/* Define if we have LibreSSL */ +/* #undef HAVE_LIBRESSL */ + +/* Define to 1 if you have the `localtime_r' function. */ +#define HAVE_LOCALTIME_R 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LOGIN_CAP_H 1 + +/* If have GNU libc compatible malloc */ +#define HAVE_MALLOC 1 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MINIX_CONFIG_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_NETDB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_IN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_TCP_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NETIOAPI_H */ + +/* Use libnettle for crypto */ +/* #undef HAVE_NETTLE */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NETTLE_DSA_COMPAT_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NETTLE_EDDSA_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_NET_IF_H 1 + +/* Define this to use nghttp2 client. */ +/* #undef HAVE_NGHTTP2 */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NGHTTP2_NGHTTP2_H */ + +/* Use libnss for crypto */ +/* #undef HAVE_NSS */ + +/* Define to 1 if you have the `OpenSSL_add_all_digests' function. */ +/* #undef HAVE_OPENSSL_ADD_ALL_DIGESTS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_BN_H 1 + +/* Define to 1 if you have the `OPENSSL_config' function. */ +#define HAVE_OPENSSL_CONFIG 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_CONF_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OPENSSL_CORE_NAMES_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_DH_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_DSA_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_ENGINE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_ERR_H 1 + +/* Define to 1 if you have the `OPENSSL_init_crypto' function. */ +#define HAVE_OPENSSL_INIT_CRYPTO 1 + +/* Define to 1 if you have the `OPENSSL_init_ssl' function. */ +#define HAVE_OPENSSL_INIT_SSL 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OPENSSL_PARAM_BUILD_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_RAND_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_RSA_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_SSL_H 1 + +/* Define to 1 if you have the `OSSL_PARAM_BLD_new' function. */ +/* #undef HAVE_OSSL_PARAM_BLD_NEW */ + +/* Define to 1 if you have the `poll' function. */ +#define HAVE_POLL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_POLL_H 1 + +/* Define if you have POSIX threads libraries and header files. */ +#define HAVE_PTHREAD 1 + +/* Have PTHREAD_PRIO_INHERIT. */ +#define HAVE_PTHREAD_PRIO_INHERIT 1 + +/* Define to 1 if the system has the type `pthread_rwlock_t'. */ +#define HAVE_PTHREAD_RWLOCK_T 1 + +/* Define to 1 if the system has the type `pthread_spinlock_t'. */ +#define HAVE_PTHREAD_SPINLOCK_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PWD_H 1 + +/* Define if you have Python libraries and header files. */ +/* #undef HAVE_PYTHON */ + +/* Define to 1 if you have the `random' function. */ +#define HAVE_RANDOM 1 + +/* Define to 1 if you have the `RAND_cleanup' function. */ +/* #undef HAVE_RAND_CLEANUP */ + +/* If we have reallocarray(3) */ +#define HAVE_REALLOCARRAY 1 + +/* Define to 1 if you have the `recvmsg' function. */ +#define HAVE_RECVMSG 1 + +/* Define to 1 if you have the `sendmsg' function. */ +#define HAVE_SENDMSG 1 + +/* Define to 1 if you have the `setregid' function. */ +/* #undef HAVE_SETREGID */ + +/* Define to 1 if you have the `setresgid' function. */ +#define HAVE_SETRESGID 1 + +/* Define to 1 if you have the `setresuid' function. */ +#define HAVE_SETRESUID 1 + +/* Define to 1 if you have the `setreuid' function. */ +/* #undef HAVE_SETREUID */ + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `setsid' function. */ +#define HAVE_SETSID 1 + +/* Define to 1 if you have the `setusercontext' function. */ +#define HAVE_SETUSERCONTEXT 1 + +/* Define to 1 if you have the `SHA512_Update' function. */ +/* #undef HAVE_SHA512_UPDATE */ + +/* Define to 1 if you have the `shmget' function. */ +#define HAVE_SHMGET 1 + +/* Define to 1 if you have the `sigprocmask' function. */ +#define HAVE_SIGPROCMASK 1 + +/* Define to 1 if you have the `sleep' function. */ +#define HAVE_SLEEP 1 + +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define to 1 if you have the `socketpair' function. */ +#define HAVE_SOCKETPAIR 1 + +/* Using Solaris threads */ +/* #undef HAVE_SOLARIS_THREADS */ + +/* Define to 1 if you have the `srandom' function. */ +#define HAVE_SRANDOM 1 + +/* Define if you have the SSL libraries installed. */ +#define HAVE_SSL /**/ + +/* Define to 1 if you have the `SSL_CTX_set_alpn_protos' function. */ +#define HAVE_SSL_CTX_SET_ALPN_PROTOS 1 + +/* Define to 1 if you have the `SSL_CTX_set_alpn_select_cb' function. */ +#define HAVE_SSL_CTX_SET_ALPN_SELECT_CB 1 + +/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */ +#define HAVE_SSL_CTX_SET_CIPHERSUITES 1 + +/* Define to 1 if you have the `SSL_CTX_set_security_level' function. */ +#define HAVE_SSL_CTX_SET_SECURITY_LEVEL 1 + +/* Define to 1 if you have the `SSL_CTX_set_tlsext_ticket_key_evp_cb' + function. */ +/* #undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB */ + +/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */ +#define HAVE_SSL_GET0_ALPN_SELECTED 1 + +/* Define to 1 if you have the `SSL_get0_peername' function. */ +#define HAVE_SSL_GET0_PEERNAME 1 + +/* Define to 1 if you have the `SSL_get1_peer_certificate' function. */ +/* #undef HAVE_SSL_GET1_PEER_CERTIFICATE */ + +/* Define to 1 if you have the `SSL_set1_host' function. */ +#define HAVE_SSL_SET1_HOST 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDARG_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDBOOL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* Define to 1 if you have the `strptime' function. */ +#define HAVE_STRPTIME 1 + +/* Define to 1 if you have the `strsep' function. */ +#define HAVE_STRSEP 1 + +/* Define to 1 if `ipi_spec_dst' is a member of `struct in_pktinfo'. */ +/* #undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST */ + +/* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */ +#define HAVE_STRUCT_SOCKADDR_UN_SUN_LEN 1 + +/* Define if you have Swig libraries and header files. */ +/* #undef HAVE_SWIG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSLOG_H 1 + +/* Define to 1 if systemd should be used */ +/* #undef HAVE_SYSTEMD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_ENDIAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IPC_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SHA2_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SHM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SYSCTL_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_TARGETCONDITIONALS_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_TIME_H 1 + +/* Define to 1 if you have the `tzset' function. */ +#define HAVE_TZSET 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `usleep' function. */ +#define HAVE_USLEEP 1 + +/* Define to 1 if you have the `vfork' function. */ +#define HAVE_VFORK 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VFORK_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_WINDOWS_H */ + +/* Using Windows threads */ +/* #undef HAVE_WINDOWS_THREADS */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_WINSOCK2_H */ + +/* Define to 1 if `fork' works. */ +#define HAVE_WORKING_FORK 1 + +/* Define to 1 if `vfork' works. */ +#define HAVE_WORKING_VFORK 1 + +/* Define to 1 if you have the `writev' function. */ +#define HAVE_WRITEV 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_WS2TCPIP_H */ + +/* Define to 1 if you have the `X509_VERIFY_PARAM_set1_host' function. */ +#define HAVE_X509_VERIFY_PARAM_SET1_HOST 1 + +/* Define to 1 if you have the `_beginthreadex' function. */ +/* #undef HAVE__BEGINTHREADEX */ + +/* If HMAC_Init_ex() returns void */ +/* #undef HMAC_INIT_EX_RETURNS_VOID */ + +/* if lex has yylex_destroy */ +#define LEX_HAS_YYLEX_DESTROY 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Define to the maximum message length to pass to syslog. */ +#define MAXSYSLOGMSGLEN 10240 + +/* Define if memcmp() does not compare unsigned bytes */ +/* #undef MEMCMP_IS_BROKEN */ + +/* Define if mkdir has one argument. */ +/* #undef MKDIR_HAS_ONE_ARG */ + +/* Define if the network stack does not fully support nonblocking io (causes + lower performance). */ +/* #undef NONBLOCKING_IS_BROKEN */ + +/* Put -D_ALL_SOURCE define in config.h */ +/* #undef OMITTED__D_ALL_SOURCE */ + +/* Put -D_BSD_SOURCE define in config.h */ +/* #undef OMITTED__D_BSD_SOURCE */ + +/* Put -D_DEFAULT_SOURCE define in config.h */ +/* #undef OMITTED__D_DEFAULT_SOURCE */ + +/* Put -D_GNU_SOURCE define in config.h */ +/* #undef OMITTED__D_GNU_SOURCE */ + +/* Put -D_LARGEFILE_SOURCE=1 define in config.h */ +/* #undef OMITTED__D_LARGEFILE_SOURCE_1 */ + +/* Put -D_POSIX_C_SOURCE=200112 define in config.h */ +/* #undef OMITTED__D_POSIX_C_SOURCE_200112 */ + +/* Put -D_XOPEN_SOURCE=600 define in config.h */ +/* #undef OMITTED__D_XOPEN_SOURCE_600 */ + +/* Put -D_XOPEN_SOURCE_EXTENDED=1 define in config.h */ +/* #undef OMITTED__D_XOPEN_SOURCE_EXTENDED_1 */ + +/* Put -D__EXTENSIONS__ define in config.h */ +/* #undef OMITTED__D__EXTENSIONS__ */ + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "unbound" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "unbound 1.21.0" ++#define PACKAGE_STRING "unbound 1.21.1" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "unbound" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "1.21.0" ++#define PACKAGE_VERSION "1.21.1" + +/* default pidfile location */ +#define PIDFILE "/var/unbound/unbound.pid" + +/* Define to necessary symbol if this constant uses a non-standard name on + your system. */ +/* #undef PTHREAD_CREATE_JOINABLE */ + +/* Return type of signal handlers, but autoconf 2.70 says 'your code may + safely assume C89 semantics that RETSIGTYPE is void.' */ +#define RETSIGTYPE void + +/* if REUSEPORT is enabled by default */ +#define REUSEPORT_DEFAULT 0 + +/* default rootkey location */ +#define ROOT_ANCHOR_FILE "/var/unbound/root.key" + +/* default rootcert location */ +#define ROOT_CERT_FILE "/var/unbound/icannbundle.pem" + +/* version number for resource files */ - #define RSRC_PACKAGE_VERSION 1,21,0,0 ++#define RSRC_PACKAGE_VERSION 1,21,1,0 + +/* Directory to chdir to */ +#define RUN_DIR "/var/unbound" + +/* Shared data */ +#define SHARE_DIR "/var/unbound" + +#ifdef __LP64__ +/* The size of `size_t', as computed by sizeof. */ +#define SIZEOF_SIZE_T 8 +/* The size of `size_t'. */ +/* The size of `pthread_t', as computed by sizeof. */ +#define SIZEOF_PTHREAD_T 8 +#else +#define SIZEOF_SIZE_T 4 +/* The size of `size_t'. */ +/* The size of `pthread_t', as computed by sizeof. */ +#define SIZEOF_PTHREAD_T 4 +#endif + +/* The size of `time_t', as computed by sizeof. */ +#ifdef __i386__ +#define SIZEOF_TIME_T 4 +#else +#define SIZEOF_TIME_T 8 +#endif + +/* The size of `unsigned long', as computed by sizeof. */ +#ifdef __LP64__ +#define SIZEOF_UNSIGNED_LONG 8 +#else +#define SIZEOF_UNSIGNED_LONG 4 +#endif + +/* define if (v)snprintf does not return length needed, (but length used) */ +/* #undef SNPRINTF_RET_BROKEN */ + +/* Define to 1 if libsodium supports sodium_set_misuse_handler */ +/* #undef SODIUM_MISUSE_HANDLER */ + +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define STDC_HEADERS 1 + +/* use default strptime. */ +#define STRPTIME_WORKS 1 + +/* Use win32 resources and API */ +/* #undef UB_ON_WINDOWS */ + +/* the SYSLOG_FACILITY to use, default LOG_DAEMON */ +#define UB_SYSLOG_FACILITY LOG_DAEMON + +/* default username */ +#define UB_USERNAME "unbound" + +/* use to enable lightweight alloc assertions, for debug use */ +/* #undef UNBOUND_ALLOC_LITE */ + +/* use malloc not regions, for debug use */ +/* #undef UNBOUND_ALLOC_NONREGIONAL */ + +/* use statistics for allocs and frees, for debug use */ +/* #undef UNBOUND_ALLOC_STATS */ + +/* define this to enable debug checks. */ +/* #undef UNBOUND_DEBUG */ + +/* Define to 1 to use cachedb support */ +/* #undef USE_CACHEDB */ + +/* Define to 1 to enable dnscrypt support */ +/* #undef USE_DNSCRYPT */ + +/* Define to 1 to enable dnscrypt with xchacha20 support */ +/* #undef USE_DNSCRYPT_XCHACHA20 */ + +/* Define to 1 to enable dnstap support */ +/* #undef USE_DNSTAP */ + +/* Define this to enable DSA support. */ +#define USE_DSA 1 + +/* Define this to enable ECDSA support. */ +#define USE_ECDSA 1 + +/* Define this to enable an EVP workaround for older openssl */ +/* #undef USE_ECDSA_EVP_WORKAROUND */ + +/* Define this to enable ED25519 support. */ +#define USE_ED25519 1 + +/* Define this to enable ED448 support. */ +#define USE_ED448 1 + +/* Define this to enable GOST support. */ +/* #undef USE_GOST */ + +/* Define to 1 to use ipsecmod support. */ +/* #undef USE_IPSECMOD */ + +/* Define to 1 to use ipset support */ +/* #undef USE_IPSET */ + +/* Define if you enable libevent */ *** 611 LINES SKIPPED *** From nobody Mon Oct 7 07:57:07 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMWhM327Kz5XTGd; Mon, 07 Oct 2024 07:57: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMWhM2F3Nz4qSM; Mon, 7 Oct 2024 07:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728287827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QaXllej631HN9aWAHnG7sUrS+tEPZwJFQEXzF0EQZVE=; b=XE0/AU9mJmA56zM49vn0b800+qFg+QGq4j1XXnoxEi+F0dywF6z1/IdVEfEeULuZFuwztN 2w4y+Vei9NEfWIB27TIN5CM9hjLO4j4EX1D+VfsX4SEOhPVovhED+cK3aA6LqL1eYz3Afb FO5/TdtmH5ElOIybyjvUtNTHmyCi5hIEiiXgfrqoqw0LiQtlaa3eQNhG+rH3ClLMjgzgiL viTRb6qXSjN0RkW+7qOlaanentdiLNpry1xtV5qOmmZHAGvxdEDzKuc8VzSHaA/jHu9l4P N1ait2d6JSseUgWQzuA2OmAhy40ckqM9jve+5hOzlPOGsRW/igd0qCttyGsBiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728287827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QaXllej631HN9aWAHnG7sUrS+tEPZwJFQEXzF0EQZVE=; b=OO9FkY+6zF7WmR7Arib74R84LLzpgcFo+a51U17guSHUbMsqguPeuqw4mPV/j+qjkmWXu2 RRobjiDXgL1dTs7UoIZ1shPcOSqEJKYcx46c0Cz0xP7T3oQdyI2bIP1aVOm9XPdcjAkKX1 0p1ZXYHXQvfsEfokVqpaW0ZELfufXVfK6LOM/npBxbOpQRMHFr2oKQ5p8R8934MoVk5wP2 IfN9f5Dqw+oKq/AYCgv5LnKuVBBr0wwk0QcPun+vWwLjrCnVxW94cavOJ5RSGuhI5OSqSR VZBNieGpwsVB91CWlzRlBvQ8cemb/ih7HwLILv7iGWQt17/lZ1k4WFBvMqntrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728287827; a=rsa-sha256; cv=none; b=MXmuh67+D0xyZAI5us8dRq8zDF8xqRMZ98W+wZUP1cKhCbY29+l6Auz5AzwQOUuHyw2abr rkz9UmjytpfNIuh6k9f2OOkgYVESuWGRQ37CYUr8NdtxyioYK8rYzWeZ7igf4Uy0PHhnBV pBHXokBqnRWpyebLauGQjQB9iLI6eXTuo4l2rZ8NroWHISCJL5X7u1RySPEJnPXJKcl8eI BpeU77PpLV/RxML1T0JDjx73TncrrEvnpKmwDN+PA9VhMOJrZpuNCvajqeeq0yGhHzzOj+ yBBK/jeCdPuLlsyYW4T9dL2zEfLEcnZDzVEJDgLDYBIInE3qvh5pvJqb8RPmlA== 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 4XMWhM1pKFzdl7; Mon, 7 Oct 2024 07:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4977v7Un060590; Mon, 7 Oct 2024 07:57:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4977v7uq060587; Mon, 7 Oct 2024 07:57:07 GMT (envelope-from git) Date: Mon, 7 Oct 2024 07:57:07 GMT Message-Id: <202410070757.4977v7uq060587@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zsolt Udvari Subject: git: 245895723816 - main - Add myself (uzsolt) to the calendar List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: uzsolt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2458957238164417cb7dea55087bd648a972f9d1 Auto-Submitted: auto-generated The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/src/commit/?id=2458957238164417cb7dea55087bd648a972f9d1 commit 2458957238164417cb7dea55087bd648a972f9d1 Author: Zsolt Udvari AuthorDate: 2024-10-07 07:54:00 +0000 Commit: Zsolt Udvari CommitDate: 2024-10-07 07:54:00 +0000 Add myself (uzsolt) to the calendar Reported by: mckusick --- usr.bin/calendar/calendars/calendar.freebsd | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd index bc5f0a5d90ba..6135a5fdfa4c 100644 --- a/usr.bin/calendar/calendars/calendar.freebsd +++ b/usr.bin/calendar/calendars/calendar.freebsd @@ -210,6 +210,7 @@ 05/16 Johann Kois born in Wolfsberg, Austria, 1975 05/16 Marcus Alves Grando born in Florianopolis, Santa Catarina, Brazil, 1979 05/17 Thomas Abthorpe born in Port Arthur, Ontario, Canada, 1968 +05/18 Zsolt Udvari born in Hodmezovasarhely, Hungary, 1981 05/19 Philippe Charnier born in Fontainebleau, France, 1966 05/19 Ian Dowse born in Dublin, Ireland, 1975 05/19 Sofian Brabez born in Toulouse, France, 1984 From nobody Mon Oct 7 08:24:58 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMXJV3PnTz5XW7g; Mon, 07 Oct 2024 08:24: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMXJV2txlz4skg; Mon, 7 Oct 2024 08:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728289498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T5d/mqupdjb+glPGrzSQ1QLqMTVZdoo0rQT0U+31mFg=; b=TE5p4Ukoyw1uXVlTVooKP5lcPQEC3f0Hp6uM4l4PjN0BYwfqNT+nbMu6HggC61nDg53wq+ ckTmMB6U5LafjXlIx473zS5QsLeeqyjU5m6VBrKmvspaPwTef8gKgPAXsNQ8mSDjJW5gwS ilNkX0WErwdeUmflnEbeuCtUMNkqNm7PboOymEqfKzKTzD4KmjDOPZraoOT+Dg67G08tsY uUdzhYx8ApgYk0z75b1JEvHfZFUB880OtvZMgQgBM3veRECKsaTWU49a4Z0qJ3bF3ef02C wugqaT8/mRoQN+hxHodrbCfkA2gYKmOU3H5Mbq8s3vpe6cPjFkJmwS3Y2NPlgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728289498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T5d/mqupdjb+glPGrzSQ1QLqMTVZdoo0rQT0U+31mFg=; b=BGwO9cEpNjXI11R277CNGqizOeCv5UsBBBIamWUscpL8JcrCWqwBn7lTAlYGGweV5g6jFy pL3TPtCo2Li0Q+7lxc0+taqAnI1j6J69KEcvUXwYIuCRDqn7l1/jbNKGKh+Fra7iYCZjtY n5WyEkH86WC8NGZqPZbN18/Al5/+H5z6MW+CbvXsZaik9+yCg8cwY2NCPQ70iniHXcn6Ew HWvEvyZX9U3Z0NUPoSs3T6fz4ZE6oc+hCYL515RCXEci0FKLSQYUsJZc83XGAM5folqGxK DexmF3sgqVzDMTpwpvbyS1W4eFTuiuDRnIrBIgNiOpqE+/yjWA5sgRcRtPGYwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728289498; a=rsa-sha256; cv=none; b=sSY+T4s669TCI2EJAWSHsyBow7OEOniBS61euXoMlEKEhg2NjChvxNFDdRiGqn53aZKSTh ij0z8YJd0fYBF+xmboRthZzL5L2gWkIKfYJm1A5pjBopcx/Os40TeuxK3tRiVQdjOoeOjC QO2Q8+5+I5n+akeBAgDui7HIDs9zt/M7K+7g67vrjTFkomNZ04i4oZksqVvLUzgMOYj7sb +MzDFvuDjC31FfCzkn2N3P2KrVUmD40b2kJwKLYwJsgDW/RXiAvCEyN6mpiSnNBpBvBnlO yanxWaf6yB3egkcaXMYf+ju/r4H7oLrikZIq69BQpCW5ogYy0AAs5ONdHOclRA== 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 4XMXJV21f7zdyC; Mon, 7 Oct 2024 08:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4978OwI6011722; Mon, 7 Oct 2024 08:24:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4978OwsJ011719; Mon, 7 Oct 2024 08:24:58 GMT (envelope-from git) Date: Mon, 7 Oct 2024 08:24:58 GMT Message-Id: <202410070824.4978OwsJ011719@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8771dc950a46 - main - sysv_ipc: remove sys/cdefs.h include List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8771dc950a463b35d5cdafd71c86dd5a2dbb9096 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8771dc950a463b35d5cdafd71c86dd5a2dbb9096 commit 8771dc950a463b35d5cdafd71c86dd5a2dbb9096 Author: Konstantin Belousov AuthorDate: 2024-10-05 09:08:03 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-07 08:22:12 +0000 sysv_ipc: remove sys/cdefs.h include Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46959 --- sys/kern/sysv_ipc.c | 1 - sys/kern/sysv_msg.c | 1 - sys/kern/sysv_sem.c | 1 - sys/kern/sysv_shm.c | 1 - 4 files changed, 4 deletions(-) diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c index b812739958df..dc7cac13fdd8 100644 --- a/sys/kern/sysv_ipc.c +++ b/sys/kern/sysv_ipc.c @@ -36,7 +36,6 @@ * $NetBSD: sysv_ipc.c,v 1.9 1995/06/02 19:04:22 mycroft Exp $ */ -#include #include "opt_sysvipc.h" #include diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c index 0620fbd175af..1e84d151b4af 100644 --- a/sys/kern/sysv_msg.c +++ b/sys/kern/sysv_msg.c @@ -55,7 +55,6 @@ * SUCH DAMAGE. */ -#include #include "opt_sysvipc.h" #include diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index d8c10f837105..ad4243464a96 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -44,7 +44,6 @@ * SUCH DAMAGE. */ -#include #include "opt_sysvipc.h" #include diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 835b44ab332a..90b95c7db8e7 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -68,7 +68,6 @@ * SUCH DAMAGE. */ -#include #include "opt_sysvipc.h" #include From nobody Mon Oct 7 08:24:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMXJW4K4Hz5XWWN; Mon, 07 Oct 2024 08:24: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMXJW3fMCz4shC; Mon, 7 Oct 2024 08:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728289499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UVh7AJflniNJCRQWMI2j4cmiIGArpdQCYwRTgLGNGps=; b=mcmc0QF6znnJUl/gdnvwuOt00RxcROPrKKXSZ3pFipVBu8CXuIQpSX6kX2vUWqUBbaXHF2 u+auYG8C/tgz06ixkFyv5uDRuvUNG/bp8+oP9YscdJiPKSf+4x6xU0hGO4fVPZRAcwFVQp pTpSvga+uZzTCEkK5PPqs4aiW0MioYfK/SfN5N7uiaD3QVOUQmplgHkjJVWs7BCVtgBz6m ncZg5BWngFSm2Kj9hbmaXCTKcD6Hrq8BlOd8K8rRzyJo2ktcJq8OMP3m/WDKJ+FKguUtG4 naQ06JonUAvPkvIFWYtMD6rS2DJqPSGhIdlfJy8apt9lfUl55hLyAneMTh29Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728289499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UVh7AJflniNJCRQWMI2j4cmiIGArpdQCYwRTgLGNGps=; b=ph1lMM7pHim8KlZ6jhp8+Mvp1QdGeCgkH6bwKbsNSMghFm50rIzAWVxNhU02ayN6WEoGRt mJAo6inbjhkaqSMvumD4cvotOGreugDdGXJxF82VDZYjVor+dG0+gKSjkfu/XXbyq2yejn kWyMfzvC13ZxfiPwrEkWeeDt/5GZgjk4ReyxkznieQ77wHCho4oWmYn84Mn3ueFUamMsuS 8btncdSNnPEGsU2Ky3oP5ddjrKySiAP4vqizyXyaeUc75ZdOx3JgPod1RLmKhufQ3kNZ+M wlj8fAkai0poMjJDE2rg2s3qQ1EHq34UeXz/w3L5ltacSe7ROttP2vADt/7cxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728289499; a=rsa-sha256; cv=none; b=sTgzLyogjMjIYlGP03Foh3OR1sBkuVSc/FVQGBlegltEGbviW0BMW8m1pDQqJ2ghtXcVjg G3R/aNI0vXh1KSCpJJBdHoSSRPi7WkFywBJPPFGm1w7GWWzm8cw8LZ411Ye6SJ2rV6iaUo eI2xGyebsMB5gkQUlNq6la4w5GZYHrjhjBAgtTruWDK+RVJ1i5HL/jICFJmSa3ZCYu7sfq GYonkptFd18hx8/U1UXxpkvA6940sSj7Q1LlwNhzt5FGqsKILjvDeLUoNcifZAQEN/fze3 9E9cAezqjKzTbHk4pDUx+tJh19OykazXJ8M6lug9t+dFDIDKraGbm9uyWrbxfQ== 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 4XMXJW24SBzdgJ; Mon, 7 Oct 2024 08:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4978OxUV011762; Mon, 7 Oct 2024 08:24:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4978OxtG011759; Mon, 7 Oct 2024 08:24:59 GMT (envelope-from git) Date: Mon, 7 Oct 2024 08:24:59 GMT Message-Id: <202410070824.4978OxtG011759@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 34935a6b3723 - main - vm_object: reformat flags definitions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34935a6b3723422ef27ce4eb80fbe52c3dab12fc Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=34935a6b3723422ef27ce4eb80fbe52c3dab12fc commit 34935a6b3723422ef27ce4eb80fbe52c3dab12fc Author: Konstantin Belousov AuthorDate: 2024-10-06 20:54:30 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-07 08:22:12 +0000 vm_object: reformat flags definitions Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46959 --- sys/vm/vm_object.h | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index 71a1c33c7f26..3eaab1282fa6 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -182,23 +182,25 @@ struct vm_object { /* * Flags */ -#define OBJ_FICTITIOUS 0x0001 /* (c) contains fictitious pages */ -#define OBJ_UNMANAGED 0x0002 /* (c) contains unmanaged pages */ -#define OBJ_POPULATE 0x0004 /* pager implements populate() */ -#define OBJ_DEAD 0x0008 /* dead objects (during rundown) */ -#define OBJ_ANON 0x0010 /* (c) contains anonymous memory */ -#define OBJ_UMTXDEAD 0x0020 /* umtx pshared was terminated */ -#define OBJ_SIZEVNLOCK 0x0040 /* lock vnode to check obj size */ -#define OBJ_PG_DTOR 0x0080 /* dont reset object, leave that for dtor */ -#define OBJ_SHADOWLIST 0x0100 /* Object is on the shadow list. */ -#define OBJ_SWAP 0x0200 /* object swaps, type will be OBJT_SWAP +#define OBJ_FICTITIOUS 0x00000001 /* (c) contains fictitious pages */ +#define OBJ_UNMANAGED 0x00000002 /* (c) contains unmanaged pages */ +#define OBJ_POPULATE 0x00000004 /* pager implements populate() */ +#define OBJ_DEAD 0x00000008 /* dead objects (during rundown) */ +#define OBJ_ANON 0x00000010 /* (c) contains anonymous memory */ +#define OBJ_UMTXDEAD 0x00000020 /* umtx pshared was terminated */ +#define OBJ_SIZEVNLOCK 0x00000040 /* lock vnode to check obj size */ +#define OBJ_PG_DTOR 0x00000080 /* do not reset object, leave that + for dtor */ +#define OBJ_SHADOWLIST 0x00000100 /* Object is on the shadow list. */ +#define OBJ_SWAP 0x00000200 /* object swaps, type will be OBJT_SWAP or dynamically registered */ -#define OBJ_SPLIT 0x0400 /* object is being split */ -#define OBJ_COLLAPSING 0x0800 /* Parent of collapse. */ -#define OBJ_COLORED 0x1000 /* pg_color is defined */ -#define OBJ_ONEMAPPING 0x2000 /* One USE (a single, non-forked) mapping flag */ -#define OBJ_PAGERPRIV1 0x4000 /* Pager private */ -#define OBJ_PAGERPRIV2 0x8000 /* Pager private */ +#define OBJ_SPLIT 0x00000400 /* object is being split */ +#define OBJ_COLLAPSING 0x00000800 /* Parent of collapse. */ +#define OBJ_COLORED 0x00001000 /* pg_color is defined */ +#define OBJ_ONEMAPPING 0x00002000 /* One USE (a single, non-forked) + mapping flag */ +#define OBJ_PAGERPRIV1 0x00004000 /* Pager private */ +#define OBJ_PAGERPRIV2 0x00008000 /* Pager private */ /* * Helpers to perform conversion between vm_object page indexes and offsets. From nobody Mon Oct 7 08:25:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMXJY28kkz5XWbM; Mon, 07 Oct 2024 08:25: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMXJX4kHnz4sNC; Mon, 7 Oct 2024 08:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728289500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xmh5N9BIPhj+sp2cUIH0muiOUkLMuwyj/aWagZIDK9E=; b=v4KFJxm6e+gDttRTsjJukJtqxmmtwIoHn3xGwNoNTFIzU3uNow41OlopdNnNwZiWayXtqL NgsHUci3Qdrfg2onK/+AfmLF4hTOTu7+1lGPTw8DswaHzkitELGfpqwiPQz+WkFWHsqZm2 HcEWa1DEsowkVP0l/0JiQSPcg1KNHWET61Nhz6ghWP2OLK+nBq51eUYeauBiTZr7KcbQKK Gw7FBPvJXRZG27UrpXiBIngvLPnPjnSjG328312bSIJy0cqKDg0tSl0sfx4gNF4qBaZCjZ ubl6WtVfxQACHiA+k0FwMHx3+cNVVcPBoZLgSCi8gZ057mK6A8EAeXaFt1GAEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728289500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xmh5N9BIPhj+sp2cUIH0muiOUkLMuwyj/aWagZIDK9E=; b=XwHdwWzqfhIu7MYo5ZjY87oec6nSf3i1PPnpQZpGqLDG6SoFN9Ktf2l9ub28wfPAPD7hYc NQZIy7RDcHHg3p3TK5dMix6/XiOlQThA1HcY1r5jVTmgRR4812WogrlfcoIHfVnAgJIouB mtYcJ0ChUMU3zKZtGrwzR0eLlbQok1/ALuTuufEgAhtt6vMBVF8V+ieTsQDkObic8ntxoy BFcNMYSewRfki2eG2xGx09FisD6o591+7D3yd00LyL5WJ5Azp0v69U5TGKY9F/qv/33shj TSf+WOIVwNKjSGsCZbq9JrgNYnT0fogh/OVDSY3kpRMg10ITJ9MUosiTmMoaPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728289500; a=rsa-sha256; cv=none; b=bN7pw8wxZw6aWEfpwfvLeDZk/TZVZGYPJThcuER8xbTZ0IsyoTu8hajDduPX33ueoUYODi Yq7sBtTnzlFoWd6IeJ2CVlq65+MpC3jM8Z39iXAg7w2a17JxYPAZOu7stgOvYq2QVzsvNb evvlIf5+Sr7qcenFzDmTbtbye3CYaOoHrNBORSyHDRF5dC5Ku4LTSylcP3AdcwOtShg2OU 40g06K7A6oAtEnVWvVpS8WuDrFuR2l0It9AkRQE9QBSUZeM2rWIT3A49FwECPlASkIwOgb PpcPP6U/mQ4RwymP0bh2GFHACML7ESE135tNZelJD3J8e1RXc6O4Sp27bWBmZw== 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 4XMXJX2sSxzdmd; Mon, 7 Oct 2024 08:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4978P0np011838; Mon, 7 Oct 2024 08:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4978P0CO011835; Mon, 7 Oct 2024 08:25:00 GMT (envelope-from git) Date: Mon, 7 Oct 2024 08:25:00 GMT Message-Id: <202410070825.4978P0CO011835@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f186252e0d6e - main - vm_object: add OBJ_SYSVSHM flag to indicate SysV shm backing object List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f186252e0d6ef970a23c6af12ec34003df56055d Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f186252e0d6ef970a23c6af12ec34003df56055d commit f186252e0d6ef970a23c6af12ec34003df56055d Author: Konstantin Belousov AuthorDate: 2024-10-05 09:08:51 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-07 08:22:12 +0000 vm_object: add OBJ_SYSVSHM flag to indicate SysV shm backing object Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46959 --- sys/kern/sysv_shm.c | 4 ++++ sys/vm/vm_object.h | 1 + 2 files changed, 5 insertions(+) diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 90b95c7db8e7..4dbe77f19b07 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -742,6 +742,10 @@ shmget_allocate_segment(struct thread *td, key_t key, size_t size, int mode) return (ENOMEM); } + VM_OBJECT_WLOCK(shm_object); + vm_object_set_flag(shm_object, OBJ_SYSVSHM); + VM_OBJECT_WUNLOCK(shm_object); + shmseg->object = shm_object; shmseg->u.shm_perm.cuid = shmseg->u.shm_perm.uid = cred->cr_uid; shmseg->u.shm_perm.cgid = shmseg->u.shm_perm.gid = cred->cr_gid; diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index 3eaab1282fa6..73284fddd2a6 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -201,6 +201,7 @@ struct vm_object { mapping flag */ #define OBJ_PAGERPRIV1 0x00004000 /* Pager private */ #define OBJ_PAGERPRIV2 0x00008000 /* Pager private */ +#define OBJ_SYSVSHM 0x00010000 /* SysV SHM */ /* * Helpers to perform conversion between vm_object page indexes and offsets. From nobody Mon Oct 7 08:25:01 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMXJY6fxNz5XVww; Mon, 07 Oct 2024 08:25: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMXJY54MNz4sfV; Mon, 7 Oct 2024 08:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728289501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nTNqw6JHDEKO5VurjkLm6QqLQCjJZwcudG2/j7MDxBo=; b=ApQegMbvCZSVyqobgqx13PVRt5Xbrh1jCjJrrshYzQLqwXIBn78rY2oPsOfgdqVeq88nqE S7tgmW755VNq1dvJte9TDLjDPw4xMTB17j7UGUsCZcWJTVB/w+jue6LgMKsRg+RjufibyZ pdxIdkE2+501jjZ8mfHCLVqWZNKaK9KyCZ8gYTSBv7clk5hpeWf48eUuqf+9Bik1PFYZ3j Kn/VSefnnvAxpsCLngG0x4Si3o8JJkKCMWYWovN+bytml8p42qJ2Qt45YL/FlZow5qVSFf mXgGN7uLj3XQw+uSC6Rj3nF/pgJoDEAhLKg6nnm61+Axc8HzGflSA0yXmY+S0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728289501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nTNqw6JHDEKO5VurjkLm6QqLQCjJZwcudG2/j7MDxBo=; b=OhWxBSD9q3TJrDmo5kotzp0S3W8501SZwQtaic5fawVnGMVWUrUGKKQ7xGH3CSpJKieLCQ wed0J+I+YKfoBILZKahWoZCpQ9sr5CwxfZCHRI+0UggUmxg9K8c1YQySH2AG1qNUXc7THj Gg1w09h47jaG4KXiLawACyrNuqKZYIi46C2dcw0gng3dF3HgIiCnI3o7pHCDwdrlVVSM+o Xpqx/OwL7X7NTI9r9Ifaar0CDmiXgikegOb2qweYIwjMG/pWVc+V3ZkQ3dkZzWRB25yIW4 B1OVNgUYqaJ1t5k64PwtkYh4OvPIcKFW2W4S1qEIA2msrhytq3Ne2LSAlzyRlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728289501; a=rsa-sha256; cv=none; b=vlebvSWDqsx4yyCgULu1d7yxEkvcRcSgrQLTjVAnJY+0v1a3liRugcGZaozefvr+b7sq49 Fqk0RGDaHBs3Zh/TSFtQPYoZcmcEvUOZcOQgSWc1C+4ZbQ3qmwuxcpglyQst8dYxzSR2a+ CcOPwUX2Sta75/47eg+rpeZVsJ1UgZ5TjPoAdGfbNFLu0g3n5WniIGZAvAQnfdx0fhGsx/ 4wIIgRcQPH/sncpsiPn+k+qiHFYV+XtgxEkMHfGbqdHPATm3n7BNN5ZJjOcpJ/psfnYfP+ Ak6hfDS0yvy8sGGp9Y6u43U2UKQHXEQl8AExz/UNDsdVp8dbXAOHr55Bx9CQVg== 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 4XMXJY3JNkzfMN; Mon, 7 Oct 2024 08:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4978P1NR011904; Mon, 7 Oct 2024 08:25:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4978P1jA011901; Mon, 7 Oct 2024 08:25:01 GMT (envelope-from git) Date: Mon, 7 Oct 2024 08:25:01 GMT Message-Id: <202410070825.4978P1jA011901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: b72029589e64 - main - sysvshm: add shmobjinfo() function to find key/seq of the segment backed by obj List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b72029589e64e04b8f9714ad8535b723276e2e02 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b72029589e64e04b8f9714ad8535b723276e2e02 commit b72029589e64e04b8f9714ad8535b723276e2e02 Author: Konstantin Belousov AuthorDate: 2024-10-05 09:14:15 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-07 08:22:12 +0000 sysvshm: add shmobjinfo() function to find key/seq of the segment backed by obj Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46959 --- sys/kern/sysv_ipc.c | 11 +++++++++++ sys/kern/sysv_shm.c | 27 +++++++++++++++++++++++++++ sys/sys/ipc.h | 3 +++ sys/sys/shm.h | 2 ++ 4 files changed, 43 insertions(+) diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c index dc7cac13fdd8..7240d7cd7150 100644 --- a/sys/kern/sysv_ipc.c +++ b/sys/kern/sysv_ipc.c @@ -50,6 +50,8 @@ #ifndef SYSVSHM void (*shmfork_hook)(struct proc *, struct proc *) = NULL; void (*shmexit_hook)(struct vmspace *) = NULL; +void (*shmobjinfo_hook)(struct vm_object *, key_t *key, + unsigned short *seq) = NULL; /* called from kern_fork.c */ void @@ -66,6 +68,15 @@ shmexit(struct vmspace *vm) if (shmexit_hook != NULL) shmexit_hook(vm); } + +void +shmobjinfo(struct vm_object *obj, key_t *key, unsigned short *seq) +{ + *key = 0; /* For non-present sysvshm.ko */ + *seq = 0; + if (shmobjinfo_hook != NULL) + shmobjinfo_hook(obj, key, seq); +} #endif /* diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 4dbe77f19b07..60e3fe92a4b7 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -133,6 +133,8 @@ static int shmunload(void); #ifndef SYSVSHM static void shmexit_myhook(struct vmspace *vm); static void shmfork_myhook(struct proc *p1, struct proc *p2); +static void shmobjinfo_myhook(vm_object_t obj, key_t *key, + unsigned short *seq); #endif static int sysctl_shmsegs(SYSCTL_HANDLER_ARGS); static void shm_remove(struct shmid_kernel *, int); @@ -856,6 +858,29 @@ shmexit_myhook(struct vmspace *vm) } } +#ifdef SYSVSHM +void +shmobjinfo(vm_object_t obj, key_t *key, unsigned short *seq) +#else +static void +shmobjinfo_myhook(vm_object_t obj, key_t *key, unsigned short *seq) +#endif +{ + int i; + + *key = 0; /* For statically compiled-in sysv_shm.c */ + *seq = 0; + SYSVSHM_LOCK(); + for (i = 0; i < shmalloced; i++) { + if (shmsegs[i].object == obj) { + *key = shmsegs[i].u.shm_perm.key; + *seq = shmsegs[i].u.shm_perm.seq; + break; + } + } + SYSVSHM_UNLOCK(); +} + static void shmrealloc(void) { @@ -962,6 +987,7 @@ shminit(void) #ifndef SYSVSHM shmexit_hook = &shmexit_myhook; shmfork_hook = &shmfork_myhook; + shmobjinfo_hook = &shmobjinfo_myhook; #endif /* Set current prisons according to their allow.sysvipc. */ @@ -1029,6 +1055,7 @@ shmunload(void) #ifndef SYSVSHM shmexit_hook = NULL; shmfork_hook = NULL; + shmobjinfo_hook = NULL; #endif sx_destroy(&sysvshmsx); return (0); diff --git a/sys/sys/ipc.h b/sys/sys/ipc.h index ab4d2bdb567f..e945d385ae33 100644 --- a/sys/sys/ipc.h +++ b/sys/sys/ipc.h @@ -127,6 +127,7 @@ struct ipc_perm { struct thread; struct proc; struct vmspace; +struct vm_object; #if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \ defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7) @@ -137,6 +138,8 @@ void ipcperm_new2old(struct ipc_perm *, struct ipc_perm_old *); int ipcperm(struct thread *, struct ipc_perm *, int); extern void (*shmfork_hook)(struct proc *, struct proc *); extern void (*shmexit_hook)(struct vmspace *); +extern void (*shmobjinfo_hook)(struct vm_object *obj, key_t *key, + unsigned short *seq); #else /* ! _KERNEL */ diff --git a/sys/sys/shm.h b/sys/sys/shm.h index df32230dcdc7..d50168a087ba 100644 --- a/sys/sys/shm.h +++ b/sys/sys/shm.h @@ -149,6 +149,7 @@ struct shm_info { #ifdef _KERNEL struct proc; struct vmspace; +struct vm_object; extern struct shminfo shminfo; @@ -158,6 +159,7 @@ extern struct shminfo shminfo; void shmexit(struct vmspace *); void shmfork(struct proc *, struct proc *); +void shmobjinfo(struct vm_object *obj, key_t *key, unsigned short *seq); int kern_get_shmsegs(struct thread *td, struct shmid_kernel **res, size_t *sz); From nobody Mon Oct 7 08:25:02 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMXJb0Yskz5XW6t; Mon, 07 Oct 2024 08:25: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMXJZ5yQtz4shk; Mon, 7 Oct 2024 08:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728289502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TqT+gWxuHSUn5VxPVGTCTHpMuSyfXWsXGMiahCcrGSo=; b=iXogUh0GSP+18B941P4tAEMQIdY1zlc0zIpJ6uJQWkdLUffOLJz/4x61sOmSZ8ZgiTFpSm D8Da2mUXRtcBs68xJWdv2edyjQ66fbpofIANtWSFu3gamU12S24aP1M4mkzjW7fkzHwTMz 2risFk81hBky340LgzMjMmmSlhgvgPA7fqoEPmeIWLbZ29NoiHK8hRwQWIoh257yqUlkoN Wt59pSJr/ypxSq4VsUNbOc2Hfg8ra0ZS8vEyDrIyRm/VFQkUtos5988NNdyNjY97+QEFoo GkUadYuvKoPA2stwMxM0ezj2okkDp8WIx+qOZkiHC8YkSm6V7kWSvDac3BqbdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728289502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TqT+gWxuHSUn5VxPVGTCTHpMuSyfXWsXGMiahCcrGSo=; b=IMi2wrr+gYeAFCQf1bgnGwHIhbTEPmP4IxsbcVkkZRQnXPBCpvmCSpBWYJ4qg3FQQ31XYW LfLk6F7+sCAwdOVj2BxzP0p6NCqDMWqxkV3B6/lc6Ymu9smDX15eOJfaCPGyApqxLJVtN2 xz7X2dULeAxJNMu2t7HSM2U7UqOc7AmdjGzhlN5fLo+pA5+IzFSNor1WFG9zsENHC4uqbv ateGW/SqDJlHPDSP2+ZgQYKNR+UBPdNJ22UJd5dodAigd6uum6MF0yneh7O0wHxdhSFqZD VCIGGls9ICGu+JzuRaURF+IOqJCUQ2tESn6dE0DwwhaVChTHSEbm5091ToF1GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728289502; a=rsa-sha256; cv=none; b=NFROCWAIomO7Fhff9PagZAImoH5E0zPiVh/3NHhTHHlqIT0PgWQZNqqseT5QRCNzaP5049 HBw7bsPuwRpMUefn9dRmreNBqdn5DLU3FbnmP2/uu8yXgZIngZlBPYaBUhls3Jj6aQS+Fq MfEbsDM+XuzZ5AFXxGOtqcFrqFVuBphuZKSwvtwW3TEZ1y4zAQ+uV+PQCPvJfppQoLw96A SkT6hsgC3qUP5ilGuaIqzl6iCGrRwLqAqFssflfZbk+iJV9B9NNPVxGKUUs+dGqhi89tgg YEgRTRjXVMYaS7lmyfLq4LlUGTdCEpfklOcYW916b56foMM6H8PwR4jgmmSO6Q== 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 4XMXJZ4dblzfXP; Mon, 7 Oct 2024 08:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4978P23q011966; Mon, 7 Oct 2024 08:25:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4978P20f011963; Mon, 7 Oct 2024 08:25:02 GMT (envelope-from git) Date: Mon, 7 Oct 2024 08:25:02 GMT Message-Id: <202410070825.4978P20f011963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d3dd6bd40395 - main - kinfo_vmentry: report mappings of the SysV shm segments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3dd6bd4039573eb74cd77da5b92e68b04296888 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d3dd6bd4039573eb74cd77da5b92e68b04296888 commit d3dd6bd4039573eb74cd77da5b92e68b04296888 Author: Konstantin Belousov AuthorDate: 2024-10-05 09:15:12 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-07 08:22:12 +0000 kinfo_vmentry: report mappings of the SysV shm segments Mark such mappings with the new flag KVME_FLAG_SYSVSHM. Provide segment key in kve_vn_fileid, vnode never can back shm mapping. Provide sequence number in kve_vn_fsid_freebsd11. Reviewed by: markj (previous version) Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46959 --- sys/kern/kern_proc.c | 10 ++++++++++ sys/sys/user.h | 1 + 2 files changed, 11 insertions(+) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index c47f5a15f252..02d3b9fd69cd 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -60,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -2615,6 +2617,8 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) vm_offset_t addr; unsigned int last_timestamp; int error; + key_t key; + unsigned short seq; bool guard, super; PROC_LOCK_ASSERT(p, MA_OWNED); @@ -2705,6 +2709,12 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) kve->kve_ref_count = obj->ref_count; kve->kve_shadow_count = obj->shadow_count; VM_OBJECT_RUNLOCK(obj); + if ((lobj->flags & OBJ_SYSVSHM) != 0) { + kve->kve_flags |= KVME_FLAG_SYSVSHM; + shmobjinfo(lobj, &key, &seq); + kve->kve_vn_fileid = key; + kve->kve_vn_fsid_freebsd11 = seq; + } if (vp != NULL) { vn_fullpath(vp, &fullpath, &freepath); kve->kve_vn_type = vntype_to_kinfo(vp->v_type); diff --git a/sys/sys/user.h b/sys/sys/user.h index cd0535f0d765..00cfbf09b4d6 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -514,6 +514,7 @@ struct kinfo_lockf { #define KVME_FLAG_GROWS_UP 0x00000010 #define KVME_FLAG_GROWS_DOWN 0x00000020 #define KVME_FLAG_USER_WIRED 0x00000040 +#define KVME_FLAG_SYSVSHM 0x00000080 #if defined(__amd64__) #define KINFO_OVMENTRY_SIZE 1168 From nobody Mon Oct 7 08:25:03 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMXJc1MTzz5XW7l; Mon, 07 Oct 2024 08:25: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMXJb6T1Nz4sn9; Mon, 7 Oct 2024 08:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728289503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NVG/RSYMJWETDOIKyXAL0GYiZl2hZVyhVXz9OoYxt/8=; b=LdxAqpqHDDx98dnbZuNRP8MGfi+85LAndb3MFLnRVxa2nMvwwlAVvyEmf3P39G9p+usjSZ 82IzHx+cy2WxGtrf87lq3g2m80sie0GwdmUPpx1riyLjF5UUFH4VjbFGX6XyuOwnXdcDEG ms4Yq1qvGyEi6A8qOLA8uxK4+La11vSvh+vDPTGKm1wP18ZTwQr/deb0xdP3DkBYvwA8im eC+iyq1ligpkG+wt74hpsE/NSduKc/xW1o+mGa/W+LbQh/R7ttVMwV7n79CLahYDkLQd1P BFp+MSugVxUicQBHzFbRsDTwJSa9R8Vpe7NlKn5biN7Gyd97wK6q4Rdfpq7eXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728289503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NVG/RSYMJWETDOIKyXAL0GYiZl2hZVyhVXz9OoYxt/8=; b=acNqxdDIRxWMVc0bncmkgTNgkCzGOGcvVeey06F0mwzKg9VxoNS5oIzWrKYH3oIvKWIauL V8piebCjIZLvdT8/eyZQXgwWp5A4V9DNCbmeQCmSU7rqcoD4mVqzSiqVEtix7sePINvN0R BzwQ6yHXNKQbSEOfjzsa8aJsXDpqQwnpYygjjK6OuMuXqwM9O4K4hklebiMJhC+S2AcTDP uUfxQ3GHi3rrqSBdOnLglk7anK4W8EIuzSVc5vDCCq8JgC5GfjU42dyQyxJLIeFZ0CEdB2 8DZ5XsAHPSxBVbBcIpWMGv0j44T7eWhe4Di6xD3kXjMKwsVCX6JeJRyuplmFUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728289503; a=rsa-sha256; cv=none; b=gihdlZNnBBnNg93BGn1j3qS9fdLtp4utz1SM6AJPD/tleefI2YHgCSVmrrFl0CLddFocQJ G1sFQ/I6Xg/X80F1orCMBrU2sRpTG651Mv/A2ZcQBLBCdi5u2PWIy3rnblORFd4Flk2tWp 22Cb4hRTLkEc/FqvjkVS+ks96gwLwZvxW8KYFw02Touia2hnJ3Xjse3PXiN6e4qo3dDPVQ hyb2hzZ2uCZtrJ60UlmJPG8/6uuS3NMc6xlXKr9DEyrmMwVN2bPuApTa3ELaoFAb2moUUA kwDosQOYKh3aCwkprUinougoorhPJ/lSZNE2EqJUu7GtOg92aPhsuZnMXbE4mg== 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 4XMXJb5Jv8zfZQ; Mon, 7 Oct 2024 08:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4978P3Bx012027; Mon, 7 Oct 2024 08:25:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4978P3oc012024; Mon, 7 Oct 2024 08:25:03 GMT (envelope-from git) Date: Mon, 7 Oct 2024 08:25:03 GMT Message-Id: <202410070825.4978P3oc012024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6a3fbdc7e9c8 - main - kinfo_vmobject: report backing object of the SysV shm segments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a3fbdc7e9c8323a1c13c4afcc65f89cb47911e6 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a3fbdc7e9c8323a1c13c4afcc65f89cb47911e6 commit 6a3fbdc7e9c8323a1c13c4afcc65f89cb47911e6 Author: Konstantin Belousov AuthorDate: 2024-10-05 09:20:21 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-07 08:22:12 +0000 kinfo_vmobject: report backing object of the SysV shm segments Use reserved work for kvo_flags. Mark such object with KVMO_FLAG_SYSVSHM. Provide segment key in kvo_vn_fileid, vnode never can back shm mapping. Provide sequence number in kvo_vn_fsid_freebsd11. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46959 --- sys/sys/user.h | 5 ++++- sys/vm/vm_object.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/sys/sys/user.h b/sys/sys/user.h index 00cfbf09b4d6..1fd802b03a42 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -577,6 +577,8 @@ struct kinfo_vmentry { #define kve_vn_fsid kve_type_spec._kve_vn_fsid #define kve_obj kve_type_spec._kve_obj +#define KVMO_FLAG_SYSVSHM 0x0001 + /* * The "vm.objects" sysctl provides a list of all VM objects in the system * via an array of these entries. @@ -600,7 +602,8 @@ struct kinfo_vmobject { uint64_t kvo_me; /* Uniq handle for anon obj */ uint64_t _kvo_qspare[6]; uint32_t kvo_swapped; /* Number of swapped pages */ - uint32_t _kvo_ispare[7]; + uint32_t kvo_flags; + uint32_t _kvo_ispare[6]; char kvo_path[PATH_MAX]; /* Pathname, if any. */ }; #define kvo_vn_fsid kvo_type_spec._kvo_vn_fsid diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 86f9271341df..85fc27d169d6 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -67,6 +67,7 @@ #include #include #include +#include #include #include #include @@ -77,6 +78,7 @@ #include #include #include +#include #include #include #include @@ -2506,6 +2508,8 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) vm_page_t m; u_long sp; int count, error; + key_t key; + unsigned short seq; bool want_path; if (req->oldptr == NULL) { @@ -2553,6 +2557,7 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) kvo->kvo_memattr = obj->memattr; kvo->kvo_active = 0; kvo->kvo_inactive = 0; + kvo->kvo_flags = 0; if (!swap_only) { TAILQ_FOREACH(m, &obj->memq, listq) { /* @@ -2590,6 +2595,12 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) kvo->kvo_swapped = sp > UINT32_MAX ? UINT32_MAX : sp; } VM_OBJECT_RUNLOCK(obj); + if ((obj->flags & OBJ_SYSVSHM) != 0) { + kvo->kvo_flags |= KVMO_FLAG_SYSVSHM; + shmobjinfo(obj, &key, &seq); + kvo->kvo_vn_fileid = key; + kvo->kvo_vn_fsid_freebsd11 = seq; + } if (vp != NULL) { vn_fullpath(vp, &fullpath, &freepath); vn_lock(vp, LK_SHARED | LK_RETRY); From nobody Mon Oct 7 08:25:04 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMXJd3w5tz5XWWR; Mon, 07 Oct 2024 08:25: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMXJd1HjRz4swh; Mon, 7 Oct 2024 08:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728289505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oHfLc+Jj2O8Xrt2U/oWKKPMtXQRS8v32zqLueAdKtDQ=; b=R/RIvHgALtwrhmEDjYO6irGU3ypkoN/QAsTY5wMbJdVHPvHg0SU9T3SZ6bTIRRtWwNuvs3 Uzi+rpx5WxMnrPG4/2sOvAEiymV+s3KUN0SOrt6KXsACIbwq3n4L62TGpnIFGTy5mw6hXi d8fDqJ68ZRMpwr4fLsGC4o0uEqXeabWOCRkPXs3y2TsPxpzXEq0fixhXyMGBHxFl4Xy1VS tQdy+rMW4mpWJLQDDU1cKWwkQwt/7rsKReBhFxoD/K63QTi6OUxiXXNWcTEumqpL00Q0Zn rRX9jfuSPu6RXGOiA1iPO3oGcGLgYy0CdB0m6mxdgFtErewXiFTcXea+GnGSfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728289505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oHfLc+Jj2O8Xrt2U/oWKKPMtXQRS8v32zqLueAdKtDQ=; b=qAxrm4A5zz7XZMlQtiGBtXveMLaq/Hbgo28zVX9petN61ODO55gpF5GROKfpQ/hTaa9FUy InWHQ3oWTOjHmlcl8gjpqesrsE6x+1HH7i5AenXygTq4RrkxigHNvzuwKqflOMKaTw1CR2 zrGBtxLxom472gWUqRmZxsgl+4+jB+kt+mdFxmtLWPqwHD/8DflAnnHVU0YmMLAYtdB4kb k9Q8JH8prQRYqU7yQSw/4uwLpg26DAdUJOb6PmlD+7nTP1VnID9wLc81BrNHh7jCdfJSMt mFn7J19uep6bZkvIX/Z+DW89bWHaU0DBqwlBloxzsksjGHIeKR2q3LKMd5qBiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728289505; a=rsa-sha256; cv=none; b=imxR1dNpNX3dWvW6fXTZ8364o5ZMM5o2yqVpkeBwvUXsuHwQVutQw1YN5RQoIJ1in7yjXb t+VympTVC1fc0jDzsjIAVb+eckktsys6J8hr4JxTr9MwdLRQ/fsScykhScoSwSBKvK+/7q PwLPODqY5oNxi9+h7wzh2vZFF2TNeTrjd/1/3Dv1TTi6WRS76v0zeSHTOG3OAHqAJcUfcb /dnopIjp0d6f+aJpKsAoqPma1Vf2Rfe1NzvbBSVZu3+aw8xXtLkrE39+n3CrTzvqVNp/KI Pc2IfxPWaL+9vRyv6YUM1XNSkU8Y6dq0oM+Dw9YdSz6QzVVI0nXSeiwDp7V0sw== 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 4XMXJc6hGGzdyD; Mon, 7 Oct 2024 08:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4978P4b2012077; Mon, 7 Oct 2024 08:25:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4978P4Df012074; Mon, 7 Oct 2024 08:25:04 GMT (envelope-from git) Date: Mon, 7 Oct 2024 08:25:04 GMT Message-Id: <202410070825.4978P4Df012074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 65b832eb6ff7 - main - procstat vm: report SysV shm segment mapping List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65b832eb6ff76464a65cbf6ba730a54364a5fdc2 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=65b832eb6ff76464a65cbf6ba730a54364a5fdc2 commit 65b832eb6ff76464a65cbf6ba730a54364a5fdc2 Author: Konstantin Belousov AuthorDate: 2024-10-05 09:34:59 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-07 08:22:12 +0000 procstat vm: report SysV shm segment mapping Also print its key and sequence number. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46959 --- usr.bin/procstat/procstat_vm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/usr.bin/procstat/procstat_vm.c b/usr.bin/procstat/procstat_vm.c index 843c941c89c8..e899b365a9d1 100644 --- a/usr.bin/procstat/procstat_vm.c +++ b/usr.bin/procstat/procstat_vm.c @@ -114,6 +114,8 @@ procstat_vm(struct procstat *procstat, struct kinfo_proc *kipp) KVME_FLAG_GROWS_DOWN ? "true" : "false"); xo_emit("{en:wired/%s}", kve->kve_flags & KVME_FLAG_USER_WIRED ? "true" : "false"); + xo_emit("{en:sysvshm/%s}", kve->kve_flags & + KVME_FLAG_SYSVSHM ? "true" : "false"); xo_close_container("kve_flags"); switch (kve->kve_type) { case KVME_TYPE_NONE: @@ -164,6 +166,10 @@ procstat_vm(struct procstat *procstat, struct kinfo_proc *kipp) } xo_emit("{d:kve_type/%-2s} ", str); xo_emit("{e:kve_type/%s}", lstr); + if ((kve->kve_flags & KVME_FLAG_SYSVSHM) != 0) + xo_emit(" {:sysvipc:/sysvshm(%ju:%u)/%ju:%u}", + (uintmax_t)kve->kve_vn_fileid, + kve->kve_vn_fsid_freebsd11); xo_emit("{:kve_path/%-s/%s}\n", kve->kve_path); xo_close_instance("vm"); } From nobody Mon Oct 7 08:25:05 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMXJf2qBJz5XW7r; Mon, 07 Oct 2024 08:25: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMXJf0kcTz4stZ; Mon, 7 Oct 2024 08:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728289506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X5jyV78e+8SIDA+10babrDjolfimFOj31aKG7trydyg=; b=dKFWaNoNZ8+L3ezKwf/UtuGuWOqfl5oLJIjl3aQbFce3S0HElZ2DsSEVxXSBWGWP7sOVyQ SutPRBgRSiTRN+KRDQHw6C3CY92tSdW90ZNKH8JVm6y6o32+PD5V4dw0p6Jvlhxy1xKVwA y5P9pS8kgIdOLviC/8aQvV4ph1lagdoOtHSBnors/rfAL1LAdR41XhL8fE5BnIrLL5jZzz wIJRyF386MLSQPx/2fYKTRbiBZ/VZpU5S/J5sE49tLbGe1cHgFbtrug89KBd5WEXyPRvWk jguK9/8pGBnmPM8uTnK1YQ+6q6+RgvsYB6PTZGqkuYZa88kqXMfcLCGBGq6T1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728289506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X5jyV78e+8SIDA+10babrDjolfimFOj31aKG7trydyg=; b=AkHw1wZR8IWhmWS0eCFAwHNyXFQowl736gAVR/jKI2hJRa8+rnFTLr4D59kssXwwzwiOkV diiYV367cppua/iIRxKfGLydCfum0ftcWmeUich08bsm+c9soXTg3LJ5+4r8OqhsSdfzaR Vjp31qt4brjkkru0TEJbCL8/lQWOyEUpYVTEV3iull9qzNEBJ8Qg0SFZzIGuD8pEZyITRG DEmMN6fvQiMNq9DJ9HdtVHDFw4vxyHSec6lLnRieGVNuDRAorSwFIoSjFK9dltmSdTHz/5 cZDjBU1rCXXql9SPWdBaLtrp+5iWuc6RtCNq5e84I+ow1epV86/FbQkVeKSX/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728289506; a=rsa-sha256; cv=none; b=DisixowcLvcQQMMhLq8EIUAUidgT0tF1Vz/hCFjjmOdJ1ZbOPUN3lWM2JJ4zYCSMsLpTRH KRL+sryWUztgRhUF5Ktkhc5SyzGF4KAklxz+iuqre8bNU/dutAtq2P+QGb9vc5Okep2mb6 u73n4/MXQlT2H1Dfv0BbMDwKFdKAyuroNKVHE5f37u2PgVreU2Xqbu+G+cQYzJxIWmtNrb Z02OgxJVr5ynEPKj29Tz+4dnaDIOABAo8SkdPSPszDVRcVIRPmLgH6Y7a5DAkl9swJ2q// 4Exp02UjE7WV4m9qVDoahvXV1hjcbEGj6mJCxfaehj/zUVJfBT3FuZ7DSdfzjg== 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 4XMXJd75PfzfZR; Mon, 7 Oct 2024 08:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4978P5R3012149; Mon, 7 Oct 2024 08:25:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4978P5cC012146; Mon, 7 Oct 2024 08:25:05 GMT (envelope-from git) Date: Mon, 7 Oct 2024 08:25:05 GMT Message-Id: <202410070825.4978P5cC012146@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2d84f79c4e45 - main - vmstat -o: report objects backing SysV shm segments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d84f79c4e451cac179c7b2111a7f6cba60960b3 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2d84f79c4e451cac179c7b2111a7f6cba60960b3 commit 2d84f79c4e451cac179c7b2111a7f6cba60960b3 Author: Konstantin Belousov AuthorDate: 2024-10-05 09:43:25 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-07 08:22:13 +0000 vmstat -o: report objects backing SysV shm segments Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46959 --- usr.bin/vmstat/vmstat.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 1d0eb4c9283f..8c7790403786 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1539,6 +1539,9 @@ display_object(struct kinfo_vmobject *kvo) break; } xo_emit("{:type/%-2s} ", str); + if ((kvo->kvo_flags & KVMO_FLAG_SYSVSHM) != 0) + xo_emit("{:sysvshm/sysvshm(%ju:%u)} ", + (uintmax_t)kvo->kvo_vn_fileid, kvo->kvo_vn_fsid_freebsd11); xo_emit("{:path/%-s}\n", kvo->kvo_path); xo_close_instance("object"); } From nobody Mon Oct 7 09:41:45 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMZ160ZTgz5Xcdj; Mon, 07 Oct 2024 09:41: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMZ16051qz44S5; Mon, 7 Oct 2024 09:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728294106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t3SjjswJrz1Xsy/ti6Yectfp4zWjHoTebvq5eOscKIk=; b=Q8vcRbub1DX0lBr6mOq6A0kxQRVlG9N7XOsPWsl0hSu8AqK3Rk5lyaW2OYihpB5TaaOXCZ X1qNqgqwur+bD2ystUt5pDRvSiKH9MvyF6xW6nQX5wXrK7SMYDNW4JLw8+UEYToRQB2ccl 2U+mjNg3b/h492E2kG0mZHw6yYgESdwKHFae7wwiOrIv53Pp+kGzDl/Ym7Jmw3l6gHTodu uDZIEnnqfE1iB5jMlZOdof/eP28Mt8mZYEIkaaS5eycylivzrUPSGbj8OyMFMZi+TIyXhl TIDxqygUvIsLCreVA+LzcXc1vq5FEDKmrqUfbkFIL+p+nw99neWzcibJ6nfzTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728294106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t3SjjswJrz1Xsy/ti6Yectfp4zWjHoTebvq5eOscKIk=; b=rWooWSvGZ0NY9PnYYg5t5jV087pKhmV7ZyGwz27ibfhp8Ehkn23J3Ra8WMohnUiKOcqBZR mMocL9IDadVbpDvvr7CXpBBxpgkZqKyhHMVouHZ7scu8ndZIzdf6z2sy+vBcfYhBqOhno1 AgrC+wrE7b1/FIROYwtC+whRjD147brFjeo0V91ynwsGju4zC0tfCCXBIcnyzI6Y4u3CjQ f+h/8XkDUsr/oBAn+etyPVoAhzBi74D9ZAdeksKTJ6RNA7gUN5pQVKb4w3hqLyWQpp7ugO xtaHksaCL86M+HZnxNtgUIOh/fWPP6dQfhtj9W7ydmCi1ua1HBXzS/fhc8tCpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728294106; a=rsa-sha256; cv=none; b=ECCWC5ln+yheEa7jTg/Zr8703cHeF68YGSQfbem0+GpTMXqcLtHy4cKeqHIyMHpL86Vj8z e5P4E2t6L2S4AYdT/xxQfz/5fJiQboMZ3k+Itm/9rrkH+agrgKLMmhkAZZxZ3ucxVLsADh f9tgecxa9uFppy4A5JLKO/+f+/RK7hcsfKVxcLlQ/5yAGsP5XEGFiXZvy+kf7vX75QjqV6 YWMmLwK1b4JMiIly3v+n5qLLHCOqK7O15T0yoHo/YKFdp5GbVj0atxhS5DnHo+lYNBOIIP jKfMS0/RcJv5FVUjebexKxahlBAWNBpjfsg2Fq+eY8n4Bc2fU+gomvfgqNmGYw== 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 4XMZ156dx5zh9W; Mon, 7 Oct 2024 09:41:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4979fjAD047554; Mon, 7 Oct 2024 09:41:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4979fjpE047551; Mon, 7 Oct 2024 09:41:45 GMT (envelope-from git) Date: Mon, 7 Oct 2024 09:41:45 GMT Message-Id: <202410070941.4979fjpE047551@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Gmelin Subject: git: 1d7a33888e09 - main - fetch: correct env var name for --crl option to work List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: grembo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d7a33888e09f86feb4c2c9f9640d936be07ce9d Auto-Submitted: auto-generated The branch main has been updated by grembo: URL: https://cgit.FreeBSD.org/src/commit/?id=1d7a33888e09f86feb4c2c9f9640d936be07ce9d commit 1d7a33888e09f86feb4c2c9f9640d936be07ce9d Author: Franco Fichtner AuthorDate: 2024-10-07 09:36:19 +0000 Commit: Michael Gmelin CommitDate: 2024-10-07 09:37:28 +0000 fetch: correct env var name for --crl option to work Reviewed by: grembo MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D46973 --- usr.bin/fetch/fetch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c index 8b3ccbd3ab98..5e4b14289ca7 100644 --- a/usr.bin/fetch/fetch.c +++ b/usr.bin/fetch/fetch.c @@ -1059,7 +1059,7 @@ main(int argc, char *argv[]) setenv("SSL_CLIENT_KEY_FILE", optarg, 1); break; case OPTION_SSL_CRL_FILE: - setenv("SSL_CLIENT_CRL_FILE", optarg, 1); + setenv("SSL_CRL_FILE", optarg, 1); break; case OPTION_SSL_NO_SSL3: setenv("SSL_NO_SSL3", "", 1); From nobody Mon Oct 7 09:49:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMZBX4K9bz5XckV; Mon, 07 Oct 2024 09:49: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMZBX3TRWz45PN; Mon, 7 Oct 2024 09:49:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728294596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dE655WIcVMi4DEGPWgFMu46zadqxIPzMVJO3PUDFQVo=; b=ArWy5AA0bPVanGVuZmSqWgHcUht0T8W5PJK5GjLTmnLl5PN0jpFOVLErOolZHoHgODNmLW +aIu9v3uRs5yZ90GpxWqSom+ERMmxFJe93kU+ZKyGKBSfQh0No/OsS7J1FpqbRc57H3tre PBOzGfZOtIjraIwkrqziqhHqulyv7prwh+mneQYI0+SMNHqM+7dRdZ/2plsrc68GlDtfPw ehdJcNiooMc3DXz0gY5XHeQWYYkflqF0KhNmowANXJr8EIypBZImHIJg0jn3qwTaiOO7SH aYH+iGXLJUHJvCbxz9U+TUjx4VYQrezdV99do52T5ukagjVpIj3tSOdVsiVs7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728294596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dE655WIcVMi4DEGPWgFMu46zadqxIPzMVJO3PUDFQVo=; b=Y5efqgQ40noxHa1zrxuoHw22kfizlZ37MXF5de3S8DfLE54r15+ARrcTOu1u3eIGmC6Xzt aUOW08Bre3auwTOQoQo3DuThcd4LQd4BJ+dBJfRtVgRA6NWICxg9yoVHo0qw4Hm3G36quF ZNb2JX5XCN/k3QdsIjYlQ0Mu0UPmdqixdk7pc43UabfXzCQhN8Txf2g9rWmOjo+vLKs+3i 0cEPlUDmRZcNB1KA2V0LxiNcVCz4NzUxEnayeOwfpmU5wiczKAZWrz76iwbPw5zvELbVSP RA2DQOkC1+qv0I5sAcu7L8Umh9NzfGk25lE5YaGHeNXLFdEh/oBANLycHr+g6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728294596; a=rsa-sha256; cv=none; b=b896ry4BL35pozq+zNsvxV7EHLllu8toofuaFv6uSJ8ESR3VhBKGB8zfEnMH5guuzxvU0e oLP/NwNGm65qxPSbdOzkoyYtxjvBguyMoqdmXB4bL+ZJb48VP7rlRTMJ9dzMsYMnoBWZ2T acCBaeM+H61Hledh+z0TqCBtBtq7g1ub9AKiCKyE6BljNNrOCrtjE0oFu/6h7wbDWufRkj VJ/PpECV0xpnrykZDB+H3NTPNd9Ghz8kog0/DNwqVW7Gi/4F3BzP0Y0lepDQlkWkPQqJ21 EWxn5UVi29p64phj2FEmJ0LQBnW6tYpDjZil/v3OBXBO3YODewg8y4Au+aemrA== 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 4XMZBX2yxYzhDK; Mon, 7 Oct 2024 09:49:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4979nuO0049220; Mon, 7 Oct 2024 09:49:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4979nuWN049218; Mon, 7 Oct 2024 09:49:56 GMT (envelope-from git) Date: Mon, 7 Oct 2024 09:49:56 GMT Message-Id: <202410070949.4979nuWN049218@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 65e7a648693c - main - genl: allow to monitor all know groups List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65e7a648693cc151990688f48c190df1c1fc858b Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=65e7a648693cc151990688f48c190df1c1fc858b commit 65e7a648693cc151990688f48c190df1c1fc858b Author: Baptiste Daroussin AuthorDate: 2024-10-07 09:45:21 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-07 09:46:32 +0000 genl: allow to monitor all know groups Add a special keyword "all" for the group name, which allows genl to monitor all groups in an existing family --- usr.bin/genl/genl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/usr.bin/genl/genl.c b/usr.bin/genl/genl.c index e3acb872a39e..eaf20d20e890 100644 --- a/usr.bin/genl/genl.c +++ b/usr.bin/genl/genl.c @@ -197,6 +197,7 @@ monitor_mcast(int argc __unused, char **argv) struct _getfamily_attrs attrs; struct pollfd pfd; bool found = false; + bool all = false; void (*parser)(struct snl_state *ss, struct nlmsghdr *hdr); parser = parser_fallback; @@ -210,8 +211,10 @@ monitor_mcast(int argc __unused, char **argv) } if (!snl_get_genl_family_info(&ss, argv[0], &attrs)) errx(EXIT_FAILURE, "Unknown family '%s'", argv[0]); + if (strcmp(argv[1], "all") == 0) + all = true; for (uint32_t i = 0; i < attrs.mcast_groups.num_groups; i++) { - if (strcmp(attrs.mcast_groups.groups[i]->mcast_grp_name, + if (all || strcmp(attrs.mcast_groups.groups[i]->mcast_grp_name, argv[1]) == 0) { found = true; if (setsockopt(ss.fd, SOL_NETLINK, @@ -221,7 +224,8 @@ monitor_mcast(int argc __unused, char **argv) == -1) err(EXIT_FAILURE, "Cannot subscribe to command " "notify"); - break; + if (!all) + break; } } if (!found) From nobody Mon Oct 7 10:12:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMZhB2SWTz5Xg9g; Mon, 07 Oct 2024 10:12: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMZhB1x7Fz46rM; Mon, 7 Oct 2024 10:12:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728295930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rtsS/a9EgY/pA90T3eoLXjtSePLiGtSvpvUFw24DEsI=; b=ubAmA8X8ug6anqYzJyq7l1VQG/Dx5AltPRBp6+2VTv4h+GJwCYAKrpth6IZY7EkT82pdYm bYViKPNOs6VRyZfJSPUMe//xD+OVmv2idRR9mvu0PEiVaF8vu3n6UzPomYOWVhK7QfhrbL yoSMiLeFwUqtSLVee86hj/BTsyV+9dWWnw9gBkznfNFWhVKm/bzRGBBABT3W1SrEwg/ORQ Exk95bhFGlTcW1Ve1I37eA9WSZAsbpcAN9WxPwX7WREa/6YP/Nco9Qv7NgTldZHrDo9uup QHsp5hmrFE4v3MC1I1LpVlKat43VWbfuU0oIqpQJnQesLD8KG86jJI+W/dVsBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728295930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rtsS/a9EgY/pA90T3eoLXjtSePLiGtSvpvUFw24DEsI=; b=OO7wnqhBIC32a59BP0eL9kYJmiOPL1Tu/sUhE2ZDQjI2sbQIIB6/fb8sf1DpEwvCy+e2Vz 7wADeTIPwHePJyQVbeKenMxKwHY68pMzSUxbvb68Z8Zrlcpe377BonApvUe5VAzBV5rTL2 xO5WgpsURjGKCB+XQHT7L+dx7PuaSbTaOCWI6WUZov2EahnQa+2Bcv1xWOmVRcBbtFzYkV k9UdhoXcDNDt6HsRwnOQdxiML1xYOZnAmbInsdfCG47ZF2//g90JykVrCw7bY6tq2m2SJ1 1kbCDjZsssTuTRD5YWxisi1bSXPTzjBDBcBTuI06FBayBofvkBe/5V0v+so1OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728295930; a=rsa-sha256; cv=none; b=ODb4sUSKkU6ovCN7DVIHNy2Cg87tZ/aQq7ne2WErlBUEcHCjKkHKYIsyx3V1j6NOOauuQ9 BpBX49fS+e9fUa7zv/EmTy6CEz40OvrPYPLDhVBduBr1AXiitqWEewHPJ4cnaQ0+6IZ5sx ukc7dHLg5ZSP7SBOnaaxP7gxJwCVr1Jx/E8HLzqjQKUcM4lBAAp+R/2IMI7bYYQ8G2a5VV BbBIrWzmPyeYpUMu7W+MVpRvPndzsJDPQuq05ZExH52OX2nJMrMsS4gQbUGvukZ5LT0ZjN HlnMoekn62AXb5KgowGFqN3Lp6rH47b1IMwaRGu+LFjhB1kr3bCOf1+WBgCsog== 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 4XMZhB1XzkzjKD; Mon, 7 Oct 2024 10:12:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497ACAa8098985; Mon, 7 Oct 2024 10:12:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497ACA7T098982; Mon, 7 Oct 2024 10:12:10 GMT (envelope-from git) Date: Mon, 7 Oct 2024 10:12:10 GMT Message-Id: <202410071012.497ACA7T098982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: f45132db215b - main - genl: subscribe to all if no group is provided List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f45132db215be4d811e0efa0d01bcab72e4d0a59 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f45132db215be4d811e0efa0d01bcab72e4d0a59 commit f45132db215be4d811e0efa0d01bcab72e4d0a59 Author: Baptiste Daroussin AuthorDate: 2024-10-07 10:07:07 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-07 10:07:07 +0000 genl: subscribe to all if no group is provided the monitor command now subscribes too all groups if no "multicast group" is provided, this avoid potential collision with a group that could be named "all" --- usr.bin/genl/genl.1 | 13 +++++++++---- usr.bin/genl/genl.c | 6 +++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/usr.bin/genl/genl.1 b/usr.bin/genl/genl.1 index b3d66298eb00..8aafd24dd6f3 100644 --- a/usr.bin/genl/genl.1 +++ b/usr.bin/genl/genl.1 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Oct 5, 2023 +.Dd Oct 5, 2024 .Dt GENL 1 .Os .Sh NAME @@ -35,7 +35,8 @@ .Pp .Nm Cm list .Pp -.Nm Cm monitor Ao family Ac Ao multicast group Ac +.Nm Cm monitor Ao family Ac +.Op multicast group .Sh DESCRIPTION The .Nm @@ -52,7 +53,7 @@ Id of the operation if any and associated capabilities .It multicast groups If of the available multicast group if any and it associated name .El -.It Cm monitor Ao family Ac Ao multicast group Ac +.It Cm monitor Ao family Ac Oo multicast group Oc Connect to the .Ar family protocol and subscribe to the @@ -60,7 +61,11 @@ protocol and subscribe to the then print the received messages in a readable format if the protocol is known. So far only .Qq nlctrl -is known. +and +.Qq nlsysevent +are known. If no +.Ar multicast group +are provided then all the groups are subsribed to. .El .Sh SEE ALSO .Xr genetlink 4 , diff --git a/usr.bin/genl/genl.c b/usr.bin/genl/genl.c index eaf20d20e890..88880c4bacbd 100644 --- a/usr.bin/genl/genl.c +++ b/usr.bin/genl/genl.c @@ -51,7 +51,7 @@ static struct commands { const char *usage; int (*cmd)(int argc, char **argv); } cmds[] = { - { "monitor", "monitor ", monitor_mcast }, + { "monitor", "monitor [multicast group]", monitor_mcast }, { "list", "list", list_families }, }; @@ -205,13 +205,13 @@ monitor_mcast(int argc __unused, char **argv) if (!snl_init(&ss, NETLINK_GENERIC)) err(EXIT_FAILURE, "snl_init()"); - if (argc != 2) { + if (argc < 1 || argc > 2) { usage(); return (EXIT_FAILURE); } if (!snl_get_genl_family_info(&ss, argv[0], &attrs)) errx(EXIT_FAILURE, "Unknown family '%s'", argv[0]); - if (strcmp(argv[1], "all") == 0) + if (argc == 1) all = true; for (uint32_t i = 0; i < attrs.mcast_groups.num_groups; i++) { if (all || strcmp(attrs.mcast_groups.groups[i]->mcast_grp_name, From nobody Mon Oct 7 10:12:11 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMZhC485zz5Xg0Z; Mon, 07 Oct 2024 10:12: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMZhC2xm9z4777; Mon, 7 Oct 2024 10:12:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728295931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q1RqGzJAVibN+2SvtCyGy8PD+IAitSjEdjyrgMdjpSg=; b=Sz3KBbuV2HIb8KqjRgtJUeMOFDX+HNtVLEFLUT888XjJHeLt/Odm/PVMwc0Gzu+DD0lh1q Zc97RG8qBcQLJ3wTKf9RI/Y5R+aua0aUN+4j18cPtnfGVzIheI66Npt0bit2SGAffQDHmb 3lj5jcOdBuVKz/ZfLfMWuxfKEqYRx60IBqXPVxz6ut6TL2N4ZXqxbL6IF2kLzsuMR13u+S 0TQndDPoCCdVd4Yqu6aGT8NT72JbCEVr8CUqgheoQWnbcYP4PyF4H5WP5aHRGozg5UJMsJ ID6jFkJBFI8+zciFGGt7XWRdjZ3fkRnSvAzBEiZ+QgNS2tpM8UwTsdHTWqssxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728295931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q1RqGzJAVibN+2SvtCyGy8PD+IAitSjEdjyrgMdjpSg=; b=O7m4/uG9B3Qudwt2C+9zx3nwjmYyH2g/wGGF/zu/nPKxZlPoO0X2B9yQ1o4F/RGWV5+Lat pqZIdnSV1NV15EBw/ZmWnBS1Lio415uJliAvwqhoIgWD63wRvSU52YsD23fqqMXPhv4tvO bMBBw2si4k4MjJcECPCrCf8oJAra44Ikb0gk3xpVkbDKS/8fTpTe9b3ljd0Z05Vd2erB+x sUHgPlc0hGx0G99pIm0V4+hSc6JOOyqISWVWSao3ENAfgUTXhG7GGVd26iMPTf3/5mmyZW WByLDfc1VkUDZgqWMo1K4jmcJKfMmOVYfnLlKyjBCMakaoXjqx6+eSOY44jeuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728295931; a=rsa-sha256; cv=none; b=uVotEtcsKxQvm8R5cpv08TJpqzk8Am8wqzd/bAD5lQY8gJq+3BHf94e/o0JHsbDFYVxRv/ pLfcMlMfKt0fSAPDdH+KOAbjLO4QRA02dXffTq3acifLLBN85i4JIuWtqb4yt1qocU4REe HxedBk7orHQUFr7HLMRdIB7dlK7dMh1SZmt60tYv0HsfzteB3IU+wu5TfqztSeHgcX2XiF b0bsK0JV7pe7oJNX3hjPU3OZfOyWhgOJK7rYlW65pKTGkYoZRrmImBPSJ7EmjABeqiVNEx 0GyEA5wTSDraAqUIX44mmZWS5remME6Kf2VGhW1dckjZC7J+YoOXFAFA/GMooA== 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 4XMZhC2YRMzhry; Mon, 7 Oct 2024 10:12:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497ACBgr099021; Mon, 7 Oct 2024 10:12:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497ACB7S099018; Mon, 7 Oct 2024 10:12:11 GMT (envelope-from git) Date: Mon, 7 Oct 2024 10:12:11 GMT Message-Id: <202410071012.497ACB7S099018@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 33938d88e35b - main - genl(1): fix typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33938d88e35b88c5f28ca10aac89d871fc9edc3f Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=33938d88e35b88c5f28ca10aac89d871fc9edc3f commit 33938d88e35b88c5f28ca10aac89d871fc9edc3f Author: Baptiste Daroussin AuthorDate: 2024-10-07 10:08:29 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-07 10:08:29 +0000 genl(1): fix typo --- usr.bin/genl/genl.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/genl/genl.1 b/usr.bin/genl/genl.1 index 8aafd24dd6f3..9837744fa8e3 100644 --- a/usr.bin/genl/genl.1 +++ b/usr.bin/genl/genl.1 @@ -51,7 +51,7 @@ Lists all available generic netlink protocols, and presents its details: .It operations Id of the operation if any and associated capabilities .It multicast groups -If of the available multicast group if any and it associated name +Id of the available multicast group if any and it associated name .El .It Cm monitor Ao family Ac Oo multicast group Oc Connect to the From nobody Mon Oct 7 10:14:58 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMZlR12KTz5XgK0; Mon, 07 Oct 2024 10:14: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMZlR0CKbz47sJ; Mon, 7 Oct 2024 10:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728296099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=flt3GI0AShHKEdwBQ5SOOC14oOKwS5Gc3goub80ytLw=; b=vfWuCKwRx92qwCq4KG8dPgIXQSWuHYcLxIWqANYyt6wCMYY46IUHdj6ArJTOIOpD/y0Gar VM/a8OviEeJxBYHfc6ltdmBUfyaFwAuU+zaYamj/p02LCaF4BBbyIP/otnHa4ZtNbXVrhG pCle1Uc4JDENGs1Z8U8hWXIwAySn3EkAze4rnBbVFiEwQPwntNb+yLgsIJJdhOAvqfpYnD 3ryT87SZSmWQfhXpt3ZhPGA1M/RxY9vCA77GfDWlvH9yhStjymtTSoQwwU/kqYk78bzAHL NFG/48u/lriNyQM8bNwGp58pJvC5FpSjWbJTFtqlS/1JdJWixcuviW4tHVPkqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728296099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=flt3GI0AShHKEdwBQ5SOOC14oOKwS5Gc3goub80ytLw=; b=q0ISK7OR7ghwDalTxHFB9VspEAYYM1NonWQUdrmLOWH0Cy4AGOcznY1JUCscJJd/Ln1BFn kG30C5zfVAHlDPEUbPVD2wZPrsVC0+ofkqwon7NGTVTf8gSn2AR3chE5Cz8Br2vuxkcw4V Og6EAYmQPOUHNSME4YiQDi9e+9LmJW2JdLujQQDTfb/dyznec6w3ar0dnfgjwUYnefg0tz TE0/FWh0Yp3I7u/NNajyPUZk8qHlB/jJFOBuYUlfOHdOq+kw2RSrXEz4vWJkF6cQN21TFa gI1CCPByBwYbsI2737SU21n/T+YrLkWeVLfi7A6T2KR7RJr7Y8zsDk0RZL0gfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728296099; a=rsa-sha256; cv=none; b=Pw/k7OTBU8EMnK3xhGPijQE/gsqQ+w6xcD/LYx+XHLXxJzcZWyxp4t44aBgnt1ystXUsKG yo4gvVXuM7JS58hgZx9VSMG5xOZq+ZwDYX6VW4Liya7dlmxWtoaqc/vM1pCevJ+JVFn/DI eubXnEJD0F+n+CI36pKoArjfN20lo9LpUHRUy5b77fYU+WqmtCHtrmUIdyPB9jPuxuLblQ wKhzpIbB9EuK+NPGbMUmRPat3v2qziXUewJJYOAXNdP/qeuuzGbnmNdiNi/pVYJqkk+cXH k9EcrJEv7AJBvqVan1lDs4ApBkEJTtVTcKK0+jgNkapWd1v3cyv9GGhuk4H0PA== 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 4XMZlQ6qmMzhQs; Mon, 7 Oct 2024 10:14:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497AEwOp000392; Mon, 7 Oct 2024 10:14:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497AEwQ9000389; Mon, 7 Oct 2024 10:14:58 GMT (envelope-from git) Date: Mon, 7 Oct 2024 10:14:58 GMT Message-Id: <202410071014.497AEwQ9000389@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 883722891aa9 - main - genl: add parser for nlsysevent List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 883722891aa92fc6033020c67ec7f2f0d9fedf95 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=883722891aa92fc6033020c67ec7f2f0d9fedf95 commit 883722891aa92fc6033020c67ec7f2f0d9fedf95 Author: Baptiste Daroussin AuthorDate: 2024-10-07 09:43:50 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-07 10:11:20 +0000 genl: add parser for nlsysevent genl monitor nlsysevent is now able to print the messages received --- usr.bin/genl/genl.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/usr.bin/genl/genl.c b/usr.bin/genl/genl.c index 88880c4bacbd..48c74fa20c81 100644 --- a/usr.bin/genl/genl.c +++ b/usr.bin/genl/genl.c @@ -40,10 +40,12 @@ #include #include #include +#include static int monitor_mcast(int argc, char **argv); static int list_families(int argc, char **argv); static void parser_nlctrl_notify(struct snl_state *ss, struct nlmsghdr *hdr); +static void parser_nlsysevent(struct snl_state *ss, struct nlmsghdr *hdr); static void parser_fallback(struct snl_state *ss, struct nlmsghdr *hdr); static struct commands { @@ -60,8 +62,25 @@ static struct mcast_parsers { void (*parser)(struct snl_state *ss, struct nlmsghdr *hdr); } mcast_parsers [] = { { "nlctrl", parser_nlctrl_notify }, + { "nlsysevent", parser_nlsysevent }, }; +struct nlevent { + const char *name; + const char *subsystem; + const char *type; + const char *data; +}; +#define _OUT(_field) offsetof(struct nlevent, _field) +static struct snl_attr_parser ap_nlevent_get[] = { + { .type = NLSE_ATTR_SYSTEM, .off = _OUT(name), .cb = snl_attr_get_string }, + { .type = NLSE_ATTR_SUBSYSTEM, .off = _OUT(subsystem), .cb = snl_attr_get_string }, + { .type = NLSE_ATTR_TYPE, .off = _OUT(type), .cb = snl_attr_get_string }, + { .type = NLSE_ATTR_DATA, .off = _OUT(data), .cb = snl_attr_get_string }, +}; +#undef _OUT +SNL_DECLARE_GENL_PARSER(nlevent_get_parser, ap_nlevent_get); + struct genl_ctrl_op { uint32_t id; uint32_t flags; @@ -183,6 +202,20 @@ parser_nlctrl_notify(struct snl_state *ss, struct nlmsghdr *hdr) dump_family(&family); } +void +parser_nlsysevent(struct snl_state *ss, struct nlmsghdr *hdr) +{ + struct nlevent ne = {}; + if (snl_parse_nlmsg(ss, hdr, &nlevent_get_parser, &ne)) { + printf("system=%s subsystem=%s type=%s", ne.name, ne.subsystem, ne.type); + if (ne.data) { + printf(" %s", ne.data); + if (ne.data[strlen(ne.data) -1] != '\n') + printf("\n"); + } + } +} + void parser_fallback(struct snl_state *ss __unused, struct nlmsghdr *hdr __unused) { @@ -209,6 +242,7 @@ monitor_mcast(int argc __unused, char **argv) usage(); return (EXIT_FAILURE); } + if (!snl_get_genl_family_info(&ss, argv[0], &attrs)) errx(EXIT_FAILURE, "Unknown family '%s'", argv[0]); if (argc == 1) From nobody Mon Oct 7 10:51:32 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMbYc3GLWz5Xhvg; Mon, 07 Oct 2024 10:51: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMbYc2mlVz4Cv1; Mon, 7 Oct 2024 10:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728298292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oWIZGNbJ+Jkoi5DoTqg3fgIvfQC7sfdrKJzxFW2FEwQ=; b=e12AGEo+UnkgWF3bWVY1Z/TilLg9evMW9NofcjCc4az35SaK9UW8VBjpqlvjOUz5DxzNJY x41/BPLRJ5UYNzhmCbktRKMDpjY8Ru4cv0kEmPLfcVIqVygezb8eu54X+X+GvPeKl6nbfx FtTXRQZKNXB7VHQtPwTdYsXfWfb06hgHg6NGEBAEmYnSfkOaQB06AvEgztb8XG48cVtvAi /e3bxkqgtgqHd76xjPz7EZrbZG/Qppd/J11KBc1NtdNzWY7mU7Dy4mICTHbZX9Ymb+5wNF ZeYlCkHnJ7HateaFyNyvKK4ozalxM4hbw/HjWdsdPEI6ZJUXnsDGlLT/f+hDzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728298292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oWIZGNbJ+Jkoi5DoTqg3fgIvfQC7sfdrKJzxFW2FEwQ=; b=D73MtRLJhHfRx7TH6iJRErA4nEz0GkyfCoUSw0fd1PlamUeyhxNuALMxp+GpJRexTABjzh ONvnInrYIKx52TjQb5Vp0R21zUv16MMOIjD+9C89Tpbl/AxvhX/5NtGtiu1RdDFeO6eE3J D2AkYYhQAB/cqHSMrBPKE8zQPhpjAPQU2ReNopjtNAYHabtFmaqbGJr6Due0PFXq1n7amL 9cK1gTxnN+4IHHBf3l9SHFV3ODRubNBmIusLYDwNRdFnz2TiL3tsFSL+QX2wX04zMxp7jQ l/20UDebGp7FsfdnHvjPkjSXsMSjy/54fI33lRkZXmuLyqdY5dVn4eBUuCyBSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728298292; a=rsa-sha256; cv=none; b=xH2E61Jt8A92h6a1pofhg13nbuoXTyi84YnJj4DUVdIJqbIpXCrqhtKj77a9wodRkriE3L 59YZo7+79Xq7m3qWwK1t/J7ynXewlSIrxB25ZLWsXtcBZAheMHMS4J0GXqEElzjsVvb9HV QKgIWNnglrbFAImW3Xo/t3HNHrIWI4mYqIUNAE0gvsWXtbILR4i1sFA1jSV84nq6K51z93 JOOymQqJNLCqpVSSpAv8j7vt5w5GnddLQUq8WAVPzQ80lyosJxTRGouKOyKtrTi0WCEdLW o9JdJGC0mlw+P0mONtKYlvMThTCdGwHXzBPM0bzcjcl1wx0TUq4jylrH058m0A== 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 4XMbYc2Mxszk7R; Mon, 7 Oct 2024 10:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497ApWlo064312; Mon, 7 Oct 2024 10:51:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497ApWMf064309; Mon, 7 Oct 2024 10:51:32 GMT (envelope-from git) Date: Mon, 7 Oct 2024 10:51:32 GMT Message-Id: <202410071051.497ApWMf064309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2918dbc1ccd8 - main - sysctl.3: Remove KERN_QUANTUM List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2918dbc1ccd899865fc6e5854fc056800617944f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2918dbc1ccd899865fc6e5854fc056800617944f commit 2918dbc1ccd899865fc6e5854fc056800617944f Author: Konstantin Belousov AuthorDate: 2024-09-27 03:00:40 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-07 10:49:46 +0000 sysctl.3: Remove KERN_QUANTUM It is not present in the sources and 'git log -S KERN_QUANTUM main' returns nothing. Reviewed by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46823 --- lib/libc/gen/sysctl.3 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3 index 7896e99e275f..35109b8d1da8 100644 --- a/lib/libc/gen/sysctl.3 +++ b/lib/libc/gen/sysctl.3 @@ -346,7 +346,6 @@ information. .It Dv KERN_OSTYPE Ta string Ta no .It Dv KERN_POSIX1 Ta integer Ta no .It Dv KERN_PROC Ta node Ta not applicable -.It Dv KERN_QUANTUM Ta integer Ta yes .It Dv KERN_SAVED_IDS Ta integer Ta no .It Dv KERN_SECURELVL Ta integer Ta raise only .It Dv KERN_UPDATEINTERVAL Ta integer Ta no @@ -472,9 +471,6 @@ implies the current process. .It Dv KERN_PROC_ARGS Ta "A process ID" .It Dv KERN_PROC_PATHNAME Ta "A process ID" .El -.It Li KERN_QUANTUM -The maximum period of time, in microseconds, for which a process is allowed -to run without being preempted if other processes are in the run queue. .It Li KERN_SAVED_IDS Returns 1 if saved set-group and saved set-user ID is available. .It Li KERN_SECURELVL From nobody Mon Oct 7 10:51:33 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMbYd5JzPz5Xj3w; Mon, 07 Oct 2024 10:51: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMbYd3nR1z4CwN; Mon, 7 Oct 2024 10:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728298293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S25VawZy9LBv9m8h5YGTx1KZCmS3CAIIXn5odlxaG0s=; b=p24AaYrwUrSBq3nJ5JAFL8grujDNeYHXN3Udc0OF3KNNVl/Jt5kAkym7HUY+LeLDh27E7Z oeczd9akh2/Eg7YpYAxt3S5AP4d4YdYsfqItrHQ7lrnyXCdhlOnP7AkvQ8cLsQTRoNs7lD YQiPNL6u5KPL3kGzjZinUvqKCojNI7AWk5fSIuLBTA9GMg2p9mSasoKBk6pw4oGJQL21fx LCJS1nzsSbrWkJM1Pmm7BUEAUAnvtq+cAO2Ny1RxUG6kkl/MZ7XouRa3F8tVutkeet9ZJp j5GiNm3QW+n3vEX+mYgaBMZ07IDkmHtWmUvHn4eb/0whc2flMmzgu9L5p3J3xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728298293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S25VawZy9LBv9m8h5YGTx1KZCmS3CAIIXn5odlxaG0s=; b=QVImFtu0btBG9KwSSzkRfxShVFavAvO0qUYsccQlhhqiaFvbPFd9WAnCuTTym2x4thYP4e WlbXoyRhBJxSwY7ZKSz3Rdh7Ek7vMgwWvWPM5DmMakxckv4X9GA7qtObWzXvuv3gLkEvMw lJzgK+QRaLZV+ZjbSLhuDR1rzMmiVitH8FahSPiBwuMMhNAphdFCB8RxyyyxcZcSWtyxcu 03E/29IlD+wwoXoGd3zzVirxPsMoytCNo5Axw1ffOav6j19LyfnH/b0XEB0vneIDqxFgba Y7uJlmEHIIgGYaA8yUtIoVEI0Tq3I0h8zRc4Ko7xAqmiOkJHGTZ01OTg0nTmJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728298293; a=rsa-sha256; cv=none; b=E3hVnnJRUMZ6XaRFF03N9aJV//Xd8bBXy0gxE+kGAs6St4uOuyZPkZf/oExhPCoDrmwrJq oNFrIBUKYaM7ufckZh6EbKQz71zDAPHYrZmrk2YpTmzVeuuYCSgHkF431fxxnli9Xz4JFP p7+kvG0ASadO+zK0ijD2/xqr6DlaXcPuV/JshbkkkGLDIQAgeZLgGD/73pBzX1Ybtseqel ti0sErurxkR8JtO75x/WYRPCCwgfAO/txDuCqVZ4CK4W1TfpTZeH+CcCmhFk/Waw8MQaOr K/O2SGTPVQAMT6VyiB9FWUxZuyiM6bRzJ7DnHw27Z8rJD6UkuMlc6j1wubgY9g== 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 4XMbYd3Nw7zjwW; Mon, 7 Oct 2024 10:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497ApXW6064366; Mon, 7 Oct 2024 10:51:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497ApXSr064363; Mon, 7 Oct 2024 10:51:33 GMT (envelope-from git) Date: Mon, 7 Oct 2024 10:51:33 GMT Message-Id: <202410071051.497ApXSr064363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 4e2803878f54 - main - sysctl.3: document missing fixed oids from the kern. node List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e2803878f547f2036d8e9bde4633e0ed96bc46c Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4e2803878f547f2036d8e9bde4633e0ed96bc46c commit 4e2803878f547f2036d8e9bde4633e0ed96bc46c Author: Konstantin Belousov AuthorDate: 2024-09-27 03:08:09 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-07 10:49:54 +0000 sysctl.3: document missing fixed oids from the kern. node Reviewed by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46823 --- lib/libc/gen/sysctl.3 | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3 index 35109b8d1da8..92e30cd6cdb4 100644 --- a/lib/libc/gen/sysctl.3 +++ b/lib/libc/gen/sysctl.3 @@ -325,6 +325,7 @@ information. .Bl -column "KERNXMAXFILESPERPROCXXX" "struct clockrateXXX" -offset indent .It Sy Second Level Name Ta Sy Type Ta Sy Changeable .It Dv KERN_ARGMAX Ta integer Ta no +.It Dv KERN_ARND Ta integer Ta no .It Dv KERN_BOOTFILE Ta string Ta yes .It Dv KERN_BOOTTIME Ta struct timeval Ta no .It Dv KERN_CLOCKRATE Ta struct clockinfo Ta no @@ -332,9 +333,13 @@ information. .It Dv KERN_HOSTID Ta integer Ta yes .It Dv KERN_HOSTUUID Ta string Ta yes .It Dv KERN_HOSTNAME Ta string Ta yes +.It Dv KERN_IOV_MAX Ta integer Ta yes .It Dv KERN_JOB_CONTROL Ta integer Ta no +.It Dv KERN_LOCKF Ta struct kinfo_lockf Ta no +.It Dv KERN_LOGSIGEXIT Ta integer Ta yes .It Dv KERN_MAXFILES Ta integer Ta yes .It Dv KERN_MAXFILESPERPROC Ta integer Ta yes +.It Dv KERN_MAXPHYS Ta integer Ta no .It Dv KERN_MAXPROC Ta integer Ta no .It Dv KERN_MAXPROCPERUID Ta integer Ta yes .It Dv KERN_MAXVNODES Ta integer Ta yes @@ -346,15 +351,28 @@ information. .It Dv KERN_OSTYPE Ta string Ta no .It Dv KERN_POSIX1 Ta integer Ta no .It Dv KERN_PROC Ta node Ta not applicable +.It Dv KERN_PS_STRINGS Ta integer Ta no .It Dv KERN_SAVED_IDS Ta integer Ta no .It Dv KERN_SECURELVL Ta integer Ta raise only .It Dv KERN_UPDATEINTERVAL Ta integer Ta no +.It Dv KERN_USRSTACK Ta integer Ta no .It Dv KERN_VERSION Ta string Ta no .El .Bl -tag -width 6n .It Li KERN_ARGMAX The maximum bytes of argument to .Xr execve 2 . +.It Li KERN_ARND +.Xr arc4rand 9 +Fills the buffer with random bytes from in-kernel random data generator. +This is an alternative interface for +.Xr read 2 +of +.Xr random 4 +device, which does not depend on accessibility and correct mounting options +of the +.Xr devfs 4 +node. .It Li KERN_BOOTFILE The full pathname of the file from which the kernel was loaded. .It Li KERN_BOOTTIME @@ -379,8 +397,18 @@ Get or set the host ID. Get or set the host's universally unique identifier (UUID). .It Li KERN_HOSTNAME Get or set the hostname. +.It Li KERN_IOV_MAX +The maximum accepted number of elements in an input-output vector (iovec), +see +.Xr readv 2 +and +.Xr writev 2 . .It Li KERN_JOB_CONTROL Return 1 if job control is available on this system, otherwise 0. +.It Li KERN_LOCKF +Returns the list of the file advisory locks currently known to kernel. +.It Li KERN_LOGSIGEXIT +Controls logging of process exit due to untrapped signals. .It Li KERN_MAXFILES The maximum number of files that may be open in the system. .It Li KERN_MAXFILESPERPROC @@ -389,6 +417,10 @@ This limit only applies to processes with an effective uid of nonzero at the time of the open request. Files that have already been opened are not affected if the limit or the effective uid is changed. +.It Li KERN_MAXPHYS +Specifies the maximum block I/O size. +Can be changed by the tunable +.Ev kern.maxphys . .It Li KERN_MAXPROC The maximum number of concurrent processes the system will allow. .It Li KERN_MAXPROCPERUID @@ -471,12 +503,18 @@ implies the current process. .It Dv KERN_PROC_ARGS Ta "A process ID" .It Dv KERN_PROC_PATHNAME Ta "A process ID" .El +.It Li KERN_PS_STRINGS +Reports the location of the process +.Vt ps_strings +structure after exec, for the ABI of the querying process. .It Li KERN_SAVED_IDS Returns 1 if saved set-group and saved set-user ID is available. .It Li KERN_SECURELVL The system security level. This level may be raised by processes with appropriate privilege. It may not be lowered. +.It Li KERN_USRSTACK +Reports the top of the main thread user stack for the current process. .It Li KERN_VERSION The system version string. .El From nobody Mon Oct 7 10:51:34 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMbYg1740z5Xj40; Mon, 07 Oct 2024 10:51: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMbYf5qd5z4D2d; Mon, 7 Oct 2024 10:51:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728298294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bR7qCNMDIA/juYQ9IHYoip7k4ick55txQuJD3C5cyEY=; b=mxwKrjPLMyBJ2iSbgIMMSXh251dMyxlhxEP7InBFkuaZPKQPZqaLJsRBIjpjONdyE7nwsE clizW1xxZWiG07Y7WFxoenoWhaKvmUOsRyqRK8Zzy9UUDBjhIDSHExOu4W66IZsQ7wvsHh otooJvgkcS9Sc7QUyCwliWQZ5rjSoLXpz0Pdu5gC9BUlQzVAvngaeHwV7in9fJ53dQtrZN mH0e9rQx/30cSCKYatvAfZr+QY+RJvGLOExdiRHpiC/fUapuh0WdF2BcsZTKnZKTS7irsL ZlSVbjXy/RIG4czQgldzsXLvXmENk0h1/pG4f0xqEqLbeUUHD+YVdc8CDwcDjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728298294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bR7qCNMDIA/juYQ9IHYoip7k4ick55txQuJD3C5cyEY=; b=NCNUSqSYuBDI9NLbuFnswdWRtSKDzlUj30dobeGM05p0oM60naEhecH0JLuoB4qYBDY4k5 84G0zZTOrVV0dfYJAGrnqi+WoS2ZemkMahshdxaICOqMztP3xI7HbMLGQZ/BM5DNiwQNqB 7wKuj5348HzAtrEU5i4AAiMTRYnZKZ7wXHkivl/tfaKx57K4vqiRq7YTzmrRJ/u21lz8sn eszxtzfA9T9ZiepgrB83kE9qqKfPZgdLt06p/Z658cdHKrt18Gku3ck62Hlcp1x2DCzi0R kiefR8GhfnQjmmPcIc4t9SjUL1W21eayIIb89mKWepu6vzTjiHGGHknRiOc4HQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728298294; a=rsa-sha256; cv=none; b=BAmuqoepXhXj4f9t1F/9Ajcxptewa8Ke+raOYgYL4mQd7QLAJn5yo9eg2ZZNdjxfopB+hq ZTljt7xbb+/NRGbx3hHjTOs/ipK/Rgdy5YG5Fo8D54utSvVOJIc7X9u+qDfw/mYcTg7wTv a+R3r7vHIMN6OqHuFBiM6tPq5Z+5IrOQM2yOUIWzSevoMx4rK09yfYMzWYBqLLkCyfhxgk FAya2GnxJNv6ghmTX+TgucLVTuEhQrIMN2qZojlp5xiQtqfJhWPUh8Gl26uIARN7MhFZMZ ySN9rnKaZLolexmmPVhzWNyqJElNEY/yHYIqyG5dCqgyPyNKvoMT4hMaJYzqyw== 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 4XMbYf44LPzk7Z; Mon, 7 Oct 2024 10:51:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497ApYlE064421; Mon, 7 Oct 2024 10:51:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497ApYUb064418; Mon, 7 Oct 2024 10:51:34 GMT (envelope-from git) Date: Mon, 7 Oct 2024 10:51:34 GMT Message-Id: <202410071051.497ApYUb064418@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cdd9629921c6 - main - sysctl.3: document missing oids from kern.proc. node List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cdd9629921c6551abac583aeafc5c6bd380ccac2 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cdd9629921c6551abac583aeafc5c6bd380ccac2 commit cdd9629921c6551abac583aeafc5c6bd380ccac2 Author: Konstantin Belousov AuthorDate: 2024-09-27 03:32:15 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-07 10:50:00 +0000 sysctl.3: document missing oids from kern.proc. node Reviewed by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46823 --- lib/libc/gen/sysctl.3 | 114 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 98 insertions(+), 16 deletions(-) diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3 index 92e30cd6cdb4..bf526169a4ce 100644 --- a/lib/libc/gen/sysctl.3 +++ b/lib/libc/gen/sysctl.3 @@ -477,31 +477,113 @@ whose size depends on the current number of such objects in the system. .It Dv KERN_PROC_ALL Ta None .It Dv KERN_PROC_PID Ta A process ID .It Dv KERN_PROC_PGRP Ta A process group +.It Dv KERN_PROC_SESSION Ta A session .It Dv KERN_PROC_TTY Ta A tty device -.It Dv KERN_PROC_UID Ta A user ID +.It Dv KERN_PROC_UID Ta An effective user ID .It Dv KERN_PROC_RUID Ta A real user ID +.It Dv KERN_PROC_GID Ta An effective group ID +.It Dv KERN_PROC_RGID Ta A real group ID .El .Pp -If the third level name is -.Dv KERN_PROC_ARGS -then the command line argument +For the following names, the miscellaneous information about the target +process, which is specified by the fourth level of the oid name, +is returned. +A process ID of +.Li \-1 +specifies the current process. +.Bl -column "Third Level NameXXXXXX" "TypeXXXXXX" -offset indent +.It Sy Third Level Name Ta Sy Fourth Level +.It Dv KERN_PROC_ARGS Ta "Set of strings" +.It Dv KERN_PROC_PATHNAME Ta "String" +.It Dv KERN_PROC_KSTACK Ta "struct kinfo_stack []" +.It Dv KERN_PROC_VMMAP Ta "struct kinfo_vmentry []" +.It Dv KERN_PROC_FILEDESC Ta "struct kinfo_file []" +.It Dv KERN_PROC_GROUPS Ta "gid_t []" +.It Dv KERN_PROC_ENV Ta "Set of strings" +.It Dv KERN_PROC_AUXV Ta "Elf_Auxinfo []" +.It Dv KERN_PROC_RLIMIT Ta "Integer" +.It Dv KERN_PROC_RLIMIT_USAGE Ta "rlim_t []" +.It Dv KERN_PROC_PS_STRINGS Ta "Integer" +.It Dv KERN_PROC_UMASK Ta "Integer/short" +.It Dv KERN_PROC_OSREL Ta "Integer" +.It Dv KERN_PROC_SIGTRAMP Ta "Integer" +.It Dv KERN_PROC_CWD Ta "String" +.It Dv KERN_PROC_NFDS Ta "Integer" +.It Dv KERN_PROC_SIGFASTBLK Ta "Integer" +.It Dv KERN_PROC_VM_LAYOUT Ta "struct kinfo_vm_layout" +.El +.Pp +.Bl -tag -compact +.It Dv KERN_PROC_ARGS +The command line argument array is returned in a flattened form, i.e., zero-terminated arguments follow each other. The total size of array is returned. It is also possible for a process to set its own process title this way. -If the third level name is -.Dv KERN_PROC_PATHNAME , -the path of the -process' text file is stored. -For -.Dv KERN_PROC_PATHNAME , -a process ID of +.It Dv KERN_PROC_PATHNAME +The path of the process' text file is returned. +.It Dv KERN_PROC_KSTACK +The in-kernel call stacks for the threads of the specified process. +.It Dv KERN_PROC_VMMAP +The description of the map entries for the process. +.It Dv KERN_PROC_FILEDESC +The file descriptors for files opened in the specified process. +.It Dv KERN_PROC_GROUPS +Groups associated with the process. +.It Dv KERN_PROC_ENV +The set of strings representing the environment of the specified process. +.Pp +Note that from the kernel point of view, environment exists only at the +time of +.Xr execve 2 +system call. +This node method tries to reconstruct the environment from the known +breadcrumbs left in the process address space, but it is not guaranteed +to succeed or to represent the current value as maintained by the program. +.It Dv KERN_PROC_AUXV +The set of ELF auxv entries. +See the note above about environment, which is also applicable to auxv. +.It Dv KERN_PROC_RLIMIT +Additinal OID name element must be supplied, specifiing the resource name +as in +.Xr getrlimit 2 . +The call returns the given resource limit for the process. +.It Dv KERN_PROC_RLIMIT_USAGE +Like +.Dv KERN_PROC_RLIMIT , +but instead of the limit, returns the accounted resource usage. +For resources which do not have a meaningful current value, .Li \-1 -implies the current process. -.Bl -column "Third Level NameXXXXXX" "Fourth LevelXXXXXX" -offset indent -.It Sy Third Level Name Ta Sy Fourth Level -.It Dv KERN_PROC_ARGS Ta "A process ID" -.It Dv KERN_PROC_PATHNAME Ta "A process ID" +is returned. +.It Dv KERN_PROC_PS_STRINGS +Returns the location of the +.Vt ps_strings +structure at the time of the last call to +.Xr execve 2 +in the specified process. +.It Dv KERN_PROC_UMASK +The current umask value, see +.Xr umask 2 . +.It Dv KERN_PROC_OSREL +The value of osrel for the process, that is the osrel the currently executed +image was compiled for. +Read from the note of the elf executable at +.Xr execve 2 +time. +Might be modified by the process. +.It Dv KERN_PROC_SIGTRAMP +Address of the signal trampoline in the process address space, +where, simplifying, the kernel passes control for signal delivery. +.It Dv KERN_PROC_CWD +Returns the current working directory for the process. +.It Dv KERN_PROC_NFDS +Returns the total number of opened file descriptors for the process. +.It Dv KERN_PROC_SIGFASTBLK +Returns the address of the +.Xr sigfastblock 2 +location, if active. +.It Dv KERN_PROC_VM_LAYOUT +Fills a structure describing process virtual address space layout. .El .It Li KERN_PS_STRINGS Reports the location of the process From nobody Mon Oct 7 10:51:35 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMbYh00lqz5Xhyf; Mon, 07 Oct 2024 10:51:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMbYg5TDYz4D7H; Mon, 7 Oct 2024 10:51:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728298295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NrGapBFVtBn3PL0dx3aTKlkcUYaVc5ighxyLe3UJpgw=; b=MttrdoZ2WyTvRIoStF8Yd1p0/dtZc7bnpQbif5lzFJVC5NLTbFTXIlcxji5wIxtjXICAq8 bCNx+ujFiXwNvfs8rQbeXLwxpCq6kgTp0snrg+siGQx5QIAI3N+9rmbw4uocUrSwPBFbg4 f8NXH/Xiu1Stq/DsOCcGtL3CB2TvKF55+Ts/QGPQdlka3KOFlU65g1jJOE1cMG5Z+sz+gj Hy2pJJTLNFdAVckpOoT16ni5Y1CGFNDvBz269VgdPbfkNW/QYt210OhYEPc2H5htGjC/sq JzJe1f1Jy21rO+C4vrXzpCx/8NZoHsZI4V5m+tqL6ufufYqOQDAU10QifqIJEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728298295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NrGapBFVtBn3PL0dx3aTKlkcUYaVc5ighxyLe3UJpgw=; b=ksnm3d7lnKVUDQWmo0iTEKJsCtOR5sAH+wqtpTkP4AsQV/H8s8nfgywrNENYVJYWLEtmbj BCQk9JHPb17nUNDU6wkeWarXSZs0JtuJj52yv400hpiZ1xF+I2yXf/ayxTxAectuMQIr1g RvwujTreOR7VmpJJn3+zeE6Gc8qF6jH6Wq3MNK99lQQDeFwuAg0Lzh5NKeZjxoGGY8ndWh 69fFpkWhWABj3JBYdRja2AwTV4KS6Vy9yKAnbajIsdocQOyvEs3KjlZiHsMreuT5y1V9oX 3ch6G7sG4MXYzaitnzECzToXVq0UX0harg5ssnw9F1uqw8lhvdq4cdsJv8ofeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728298295; a=rsa-sha256; cv=none; b=l1MPHbOfsPzouRT+GDvdGxzntNLtcPdZrnLC2nb08Ueoq4TFkXIe1w2dvEZQbeyZeBNa5b tmmpRTV85Qa5THVOy8WZfM0cCEHoYipFjXEqQ8dmF/CXqKEUuiDnkOpNRUC6F58FcCsmdO cnDwNYXbD9MLzB4GTR8zs91wIxWTg0kSCYtYWjMnCFqThoGrtzBoO0cwCtFtfYkaqfZ4Fn ymVKmc6Y3vczHNuwoqo528zHPTSO+hiokV2R3yTcZuyDccyPZESt8cB0YeaG+RSOgvAf+a KGfCsB2MMwaQyA/i7KZ+MEDr+op+qSBWza0GECrW11DM9K1j8to0dCINFtpWrg== 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 4XMbYg53D6zjfP; Mon, 7 Oct 2024 10:51:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497ApZ3V064466; Mon, 7 Oct 2024 10:51:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497ApZK7064463; Mon, 7 Oct 2024 10:51:35 GMT (envelope-from git) Date: Mon, 7 Oct 2024 10:51:35 GMT Message-Id: <202410071051.497ApZK7064463@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3670421e2193 - main - getrlimitusage.2: add the man page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3670421e21932c44225b9457c50dd67da3abcd84 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3670421e21932c44225b9457c50dd67da3abcd84 commit 3670421e21932c44225b9457c50dd67da3abcd84 Author: Konstantin Belousov AuthorDate: 2024-09-27 19:12:21 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-07 10:50:08 +0000 getrlimitusage.2: add the man page Reviewed by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46823 --- lib/libsys/Makefile.sys | 1 + lib/libsys/getrlimitusage.2 | 100 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index 7454f5a47720..aa7fd811d2f8 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -218,6 +218,7 @@ MAN+= abort2.2 \ getpriority.2 \ getrandom.2 \ getrlimit.2 \ + getrlimitusage.2 \ getrusage.2 \ getsid.2 \ getsockname.2 \ diff --git a/lib/libsys/getrlimitusage.2 b/lib/libsys/getrlimitusage.2 new file mode 100644 index 000000000000..2e3dc744ab23 --- /dev/null +++ b/lib/libsys/getrlimitusage.2 @@ -0,0 +1,100 @@ +.\" Copyright (c) 2024 The FreeBSD Foundation, Inc. +.\" +.\" This documentation was written by +.\" Konstantin Belousov under sponsorship +.\" from the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd September 27, 2024 +.Dt GETRLIMITUSAGE 2 +.Os +.Sh NAME +.Nm getrlimitusage +.Nd Query usage of the current process' limited resources +.Sh LIBRARY +.Lb libc +.Sh SYNOPSIS +.In sys/resource.h +.Ft int +.Fn getrlimitusage "unsigned which" "int flags" "rlim_t *res" +.Sh DESCRIPTION +The +.Nm +system call allows the process to query current consumption of the resources +limited by the +.Xr setrlimit 2 +call. +.Pp +The +.Fa which +argument specifies the resource, same as for +.Xr getrlimit 2 +and +.Xr setrlimit 2 +calls, see their man page for the list of enforced resource types. +.Pp +The +.Fa flags +argument modifies the behavior of the call in the following ways: +.Bl -tag -width GETRLIMITUSAGE_XXXXXX +.It Va GETRLIMITUSAGE_EUID +Query the resource usage for user identified by effective UID of the process, +instead of the real UID (which is default for accounting). +.El +.Sh RETURN VALUES +.Rv -std +.Sh ERRORS +The +.Fn getrlimitusage +system call will fail if: +.Bl -tag -width Er +.It Bq Er EFAULT +The address specified for +.Fa res +is invalid. +.It Bq Er EINVAL +The resource specified to +.Fn getrlimitusage +in the +.Fa which +argument is unknown. +.It Bq Er ENXIO +The resource specified to +.Fn getrlimitusage +in the +.Fa which +argument is not accounted, but only enforced in specific situations. +Examples of such resources are +.Va RLIMIT_FSIZE +and +.Va RLIMIT_CORE . +.El +.Sh SEE ALSO +.Xr procstat 1 , +.Xr getrlimit 2 , +.Xr setrlimit 2 . +.Sh HISTORY +The +.Fn getrlimitusage +system call appeared in +.Bx 15.0 . From nobody Mon Oct 7 11:19:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMc9f1Twjz5Xkr3; Mon, 07 Oct 2024 11:19: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMc9d6GGmz4JSZ; Mon, 7 Oct 2024 11:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728299957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uOxb3RSD1HMNyY7n8pdkVqrUqIlZbn4fogADNfUncYM=; b=I7Qi4ky19Jz3K5PEA5gtvfGwka5Cpgae6Rubnj+i+ElcPzeaf6da6AWQOBXQSjfECREzAe qxAMUIc8tYYjwQpIgvtzjWd06QHvEe1kYDCyhIihsfQzkCJ1GBgJXxtFU9S1ZCkejTv4jg 8JfCONtB8U8JRuFHzmhDCkhMxlpu1urOCnjixTKxLy50Cj5D05MdxDlT7njujphWILW7pm qrHNEg94Ui/eA7fFgKZr7fFY9gxn13ALkM55xcYa7pQDmQRGzzzl2lGlxOBCDJhxbAmd8y HZUEHWygzvzOi7yH3qu5T9J/tZKuuEVI5whVEyaFqR/YZ+xShWD/xVHt4OsHpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728299957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uOxb3RSD1HMNyY7n8pdkVqrUqIlZbn4fogADNfUncYM=; b=JeiQXFdKP70kNKiAwJrl4TXxpSRXcKLgpxLL2gNzsaPlNURk4n+IjRCy+ncsAxwFrzTAvL F4UGCgNRKOUiAf3B+tMhykqN3zesqUB01Oc2qxqc7WOrfXJWju3YPMCe3naZZHuwyszn6X yBpGk/NVs8w9wZ79IuIFsC/Jm7ZsYoIGqbRhtDhr/E6q6wGCqUIty+lnU0tI+mSgDPuPVn 0qtm8qT00Uj4XxN9xZMmW1MmukU0a/zkcn9C1RakSRC9Gb5YwimvJrldGln5V70wFbRdqz Qhxs1GGkLiB1YMTSBXXLTwnGZnrszd8AR1NIuCgxebkZl5CfFxYuo6zkq81H1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728299957; a=rsa-sha256; cv=none; b=lKEKrp92mRv5Kim2kDcQO2b8YeofZy0fsYHhwgHvtuu+cCRS3FiCWMzOnuJPvnFLWgzXEA b4jpncngEKFuaBnAE+QAOwe6iINHpm1QNcav0jIHHh9+4IN5pC3XvEdqtOqf7YUaxZzLeY YG+vE8jO/lkojGXbaRTRNRawnMKvdRWi3BKh9+Ps2Z6HJm9r2KL4b9hGBfD6oC9DtNSpnj oxLrId3vY/tMNJRSYa7YkPWfmPFeO2vnHeQX0Q1rziERgOdkjZoLQqT6Nhe6f9bL6sDCxj Cxv4PczcgACc7Pmf9/JvE3zKc/v5nG96VvcGs/gQl+7C6171Tzlce45lpEHRxw== 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 4XMc9d1jg5zkZp; Mon, 7 Oct 2024 11:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497BJHXn003509; Mon, 7 Oct 2024 11:19:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497BJHKc003506; Mon, 7 Oct 2024 11:19:17 GMT (envelope-from git) Date: Mon, 7 Oct 2024 11:19:17 GMT Message-Id: <202410071119.497BJHKc003506@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Igor Ostapenko Subject: git: dfcb8de5ef80 - main - dummymbuf: Log the entire rule set if no delimiters are present List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: igoro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dfcb8de5ef803b45e9c1e3974ce12f507d43900d Auto-Submitted: auto-generated The branch main has been updated by igoro: URL: https://cgit.FreeBSD.org/src/commit/?id=dfcb8de5ef803b45e9c1e3974ce12f507d43900d commit dfcb8de5ef803b45e9c1e3974ce12f507d43900d Author: Igor Ostapenko AuthorDate: 2024-10-07 11:16:44 +0000 Commit: Igor Ostapenko CommitDate: 2024-10-07 11:16:44 +0000 dummymbuf: Log the entire rule set if no delimiters are present An empty string was printed instead. Reviewed by: kp Approved by: kp (mentor) Differential Revision: https://reviews.freebsd.org/D46964 --- sys/net/dummymbuf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/net/dummymbuf.c b/sys/net/dummymbuf.c index b90fc55f458b..f7aef562c8d2 100644 --- a/sys/net/dummymbuf.c +++ b/sys/net/dummymbuf.c @@ -223,6 +223,7 @@ read_rule(const char **cur, struct rule *rule, bool *eof) while (**cur == ' ') (*cur)++; rule->syntax_begin = *cur; + rule->syntax_len = strlen(rule->syntax_begin); /* syntax_len */ char *delim = strchr(*cur, ';'); From nobody Mon Oct 7 12:01:49 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMd6j3gvkz5Xn4G; Mon, 07 Oct 2024 12:01: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMd6j3BMcz4NL5; Mon, 7 Oct 2024 12:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728302509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RVFB31bTf8PbWzLVgMxZN28lve5p5D9oJCkyAUpHn3g=; b=w0YZRUMMg0Qt6cVBn3lk3diaDVHPY1IZj11VHAxgdF15VAUPbnJu1cBwWTmTCbHDuIGVp/ MwY5Riu+X9Yr3B6ql/j8ITUppVk6Ch9AdL/8PQ08urBam83lmcqRrT90uqZgyzdPlTs2Qf Xz4En64cjXC2hKDXDX8WJpD6C3XLxP9sJ6zbb3PlsjAqcYP5YFuGrvIE2R8KCBoClttgem M5itor18rAng1hVewzlFiSn7TUwq0JgmjSpxm7Pdoj/raC0dOlxsF+AltBDwL2Q4ORNqhH M5r7wjZg91aJqze1p4NexLiOZvVh9pTjPhNKivq7Ouxj2jByaWMkIi2E4C69Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728302509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RVFB31bTf8PbWzLVgMxZN28lve5p5D9oJCkyAUpHn3g=; b=IJSfwtDTosl3M3qGJRt19VaYLv/ptW6Wz50kkjAMGkvr99tWQDFVX5DotCSdxGmhfu7ujq RqW+Js5GrR0L7RPiyS6Nap+cngmOI4DTHr8jpjnsKlq2scHQH79KJotHHRnMedAJfYBmHj 2X56UBNPwzTKDGW/A1EUrNnNQtRUouHT9ySbnQV+ENB3Yct84jcOnMUHJd1fyNTZVuwygy ajkqN6TsGDjmWayZcoRaH6Yp+1VavBWy01CxT30dBqiRuIyn0xoBPzI61OseKfW3W3+xL/ 4LkHDml0xkczZHtWh7No+oj/cHqro5uxJx1px291EUMyvqDsLnd0isiTn0cNvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728302509; a=rsa-sha256; cv=none; b=E+R/1zL6ERw9l4Gxy7cHVhqr73TLK6J7IeN/oCoix88Q1TWbQBtYFHr7v02Ek2J2oEl70Z 0J1hCv0N/yktbpf7TDhfW5o927ZJ+Kgi0N36fleJPz9tyCoytF4W4oJmz2OIznL/NMkXI2 6McJd5LwxU+1SHYHNWxcWJXJifjK6e5EZZ0/f7aKLUhQ/YqHNBDHzopR24b6sL/2MUrcSX s2VB1I4tmJ6vxi0NEHtp3yTIS2evlAO0vQdo6aeyXjN19XonHll8lnXbK+KZcVxSgTIfin WY4Z+RGfDvZVrR4r4uuwIZuIl/gIeJzYTVTN+OSD5OqWMtpJxO7YsLXti0+hJg== 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 4XMd6j2nVWzllP; Mon, 7 Oct 2024 12:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497C1ni9086466; Mon, 7 Oct 2024 12:01:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497C1neK086463; Mon, 7 Oct 2024 12:01:49 GMT (envelope-from git) Date: Mon, 7 Oct 2024 12:01:49 GMT Message-Id: <202410071201.497C1neK086463@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 8b41e693fc39 - main - libsys: connect membarrier.2 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b41e693fc3956385d5771d60ee93e18001a5a0d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8b41e693fc3956385d5771d60ee93e18001a5a0d commit 8b41e693fc3956385d5771d60ee93e18001a5a0d Author: Ed Maste AuthorDate: 2024-10-07 11:58:09 +0000 Commit: Ed Maste CommitDate: 2024-10-07 12:01:34 +0000 libsys: connect membarrier.2 Sponsored by: The FreeBSD Foundation --- lib/libsys/Makefile.sys | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index aa7fd811d2f8..04795445a374 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -246,6 +246,7 @@ MAN+= abort2.2 \ listen.2 \ lseek.2 \ madvise.2 \ + membarrier.2 \ mincore.2 \ minherit.2 \ mkdir.2 \ From nobody Mon Oct 7 13:33:29 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMg8T4fMqz5Y8W0; Mon, 07 Oct 2024 13:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMg8T3DkTz4X5b; Mon, 7 Oct 2024 13:33:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728308009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9oPxPwTxUIOWPJ5mLf79VOthx9fSCjiqAxUC2Zh6bwk=; b=Wj7T2c6mwU3sL4bGsmq5wx1+YGYKoFWjd76deIYP6JeOkKoy7AqRrjJ+8cPmnnk92dUyOG D+xrlSyzssrgPGWClBw/O194AF8bqU/gtCeMCb2mnE/RJyzYj0EJA7HaJjA1N+13qPHJLF NQFiBtSQXwDiSFN/gJqgLH+3YfwuS3RxTmok/uQ10kExpnlfRcMfaOEVyqKgiIY5SLt65S D46jZVWFEV45m1DO3f6hKBFIgCPqxbTDFTvRSZ8sIc63nn9crdjz2Zw8jYnsXWznvxSejB DA7iEkwzGKdOhRl6q+64ycCRA64R67kEByljDV2doRdSHa16Kj76iuOU6tYyHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728308009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9oPxPwTxUIOWPJ5mLf79VOthx9fSCjiqAxUC2Zh6bwk=; b=rpiJTUV2wugBVaVq3yJcSxPpKAHGURZAQ4Ygah6mA2SJzYrYfaZ5E5777tEZkxyOi4Jbv+ 4znyOcZ5449Pg42r38NlOXOc53fb1Cpib4lVXLEleRnu/QuujIzfF+blhmgQbzM6ttcy2I CYAFyTsygRAgkzUHCI0YiZVMLc9dtFrlZB31P5Amq6yUDDzww5FH1D/HUNsAaYUxnrno36 LDE7GatuXxNNhUTKZMTO2AuPGDhucF+grAVmApKugX6ndCpxt5IJtlTv+aRFMGZW0FvhqB O8mBQZyRbTDDn+uSQecmwSW2NzszcTC9UXutdMu9R5ezNNrVEcpLSeQpJV32Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728308009; a=rsa-sha256; cv=none; b=rY2M2MLwP/JStgXJZrzrOyO1eOC7MMODY5JvecPL4D1YdYK6QEjvE6amCQYOR+5o106VTz MlTb/2W/LGZO5K/EblksXma3pup6R840OJZqaN+A9uiVJV6j1x/OZj8DaU29xqWo8OlHEt hABarVexpJeMl6aEyPFaODrDL+zPB12Rum5fSdwlf1IyRzvoxLhjLg3iXWa44kE25tpPz3 3aSqtkGE0Lr85GoROvBFGGz/eRhh42gdJ0lfs1+O3+40pFBcaAmtFz0AG1AfdU1eSj1mGK YAVTXw0rg0pCaqSwPgB25X+LxhU4PV5MFz7fFBdoOkGwGmfTKzuBcH8Q4VoKNA== 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 4XMg8T2qyYzp25; Mon, 7 Oct 2024 13:33:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497DXTDU040328; Mon, 7 Oct 2024 13:33:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497DXTij040325; Mon, 7 Oct 2024 13:33:29 GMT (envelope-from git) Date: Mon, 7 Oct 2024 13:33:29 GMT Message-Id: <202410071333.497DXTij040325@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 782766a32d96 - main - genl: small cleanup List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 782766a32d963587a6aac8521aedd132b68a9dab Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=782766a32d963587a6aac8521aedd132b68a9dab commit 782766a32d963587a6aac8521aedd132b68a9dab Author: Baptiste Daroussin AuthorDate: 2024-10-07 13:28:54 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-07 13:28:54 +0000 genl: small cleanup Following up from another review using basically the same code: remove useless cast replace uint32_t with unsigned int. No functional changes expected --- usr.bin/genl/genl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/genl/genl.c b/usr.bin/genl/genl.c index 48c74fa20c81..df2758c273f3 100644 --- a/usr.bin/genl/genl.c +++ b/usr.bin/genl/genl.c @@ -247,13 +247,13 @@ monitor_mcast(int argc __unused, char **argv) errx(EXIT_FAILURE, "Unknown family '%s'", argv[0]); if (argc == 1) all = true; - for (uint32_t i = 0; i < attrs.mcast_groups.num_groups; i++) { + for (unsigned int i = 0; i < attrs.mcast_groups.num_groups; i++) { if (all || strcmp(attrs.mcast_groups.groups[i]->mcast_grp_name, argv[1]) == 0) { found = true; if (setsockopt(ss.fd, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP, - (void *)&attrs.mcast_groups.groups[i]->mcast_grp_id, + &attrs.mcast_groups.groups[i]->mcast_grp_id, sizeof(attrs.mcast_groups.groups[i]->mcast_grp_id)) == -1) err(EXIT_FAILURE, "Cannot subscribe to command " From nobody Mon Oct 7 14:19:41 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMh9n4401z5YCjV; Mon, 07 Oct 2024 14:19: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMh9n1xrLz4cMJ; Mon, 7 Oct 2024 14:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728310781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XEDoVTE34+Pty2lIn678ByncgYqe/+n6Vt+gJ8IocXQ=; b=Hy6PAw7it18XU5P97Kyx7Ty9/e+KtG6mrB8De4JtySZDe6Ov3a5XbpuBDgm2kFMvZN19qO sSZNO/z1VD0yRFBGqRk2c7l7Ce+09tlxfUb58D8WFfxibDpxVS+mPlTbwhg6M1kGW600Tc jOsyWxgSviOu8qu7OtyyMUmVWZr7TwsjXZ5UkU6dWFRmLqQFKmvpqGO18zbZH75T+z0TY5 UIeQUg3OK6G9Sl98nK+IhmBxnGQr4JD/fOJbjBYQV1NGb64uaZtxcu0QnOEb2ve195MHld hHhZxg63fiVUFp9mgQSdeWjQW2RmFsyhhodZdWxbmCbJNj2LYNs4CD3thHZQHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728310781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XEDoVTE34+Pty2lIn678ByncgYqe/+n6Vt+gJ8IocXQ=; b=iHBJpHvjq/Xjux5oPxSSYzcH2Z+MiJigXj72N9UxOK+aHS8D/wubnbThjudjmSjzSHRUMD 5baa0wRYjMuLeRX5/CrCJew1xOWOKsnLUwIpgr5mQjvrmHOyqYTzphhoMH5TdclQAj2rwT jN+kBzYxghlHaPZGcUuM5XxZ0W29MG48RoPQKXXRIN7fzhtjF7rTeh3bEkm4wivQazz5R/ WKmpRNjo6OuGo36Blb+n74p5Wv+5QMPmz0aDCjchiCa9WshJ1QH2ewt4D9IamCso0bL8GZ 6mx9Sspfp5mLUp/BjLGejOEZ+exkuTozHurqSQrAMEU4uuopBrudPmAwhDYy9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728310781; a=rsa-sha256; cv=none; b=g6OBT+Ijl4Wo4vqfUHmmgV+UH4eZ2eOgQjrYt8um92emRvLd4Q9LyrG3xq574qGgaw7Ccq z0RYWYa5G1K0Osle8iR1oY02tX2pAvXPSkSmQKrKinoD6IUNrZ2ndkEhPF5p1Vk0Lqr6xh HrqnJplJfCxPv38/1wqh8n/ItcfxEH7/socdJk/RPRHL1tm5/2h5mhkrYYp2gMRjd19FO6 KufAAK9bklaulpLLa2Pjgj3D+m1WRi0dRjzX130YS/MIMvpBzInXqWfjSvQBkGVPRzD9cm pt4gk51rotkaVyTtrHbQ+gyiAINYUHCGLQY5NdyT+bSDHPonKOAc8dJTzQsotw== 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 4XMh9n1YSDzpWw; Mon, 7 Oct 2024 14:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497EJfGH010137; Mon, 7 Oct 2024 14:19:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497EJfnv010134; Mon, 7 Oct 2024 14:19:41 GMT (envelope-from git) Date: Mon, 7 Oct 2024 14:19:41 GMT Message-Id: <202410071419.497EJfnv010134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 816100089283 - main - iflib: Make iflib_stop() static List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8161000892830ee52bc8048be91b40cdad25fea8 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8161000892830ee52bc8048be91b40cdad25fea8 commit 8161000892830ee52bc8048be91b40cdad25fea8 Author: Zhenlei Huang AuthorDate: 2024-10-07 14:19:02 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-07 14:19:02 +0000 iflib: Make iflib_stop() static It is declared as static. Make the definition consistent with the declaration. This follows 7ff9ae90f0bd and partially reverts 09f6ff4f1a47. Reviewed by: erj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46185 --- sys/net/iflib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index a2e2c3efa1ad..997da7ca5b00 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -2585,7 +2585,7 @@ iflib_media_status(if_t ifp, struct ifmediareq *ifmr) CTX_UNLOCK(ctx); } -void +static void iflib_stop(if_ctx_t ctx) { iflib_txq_t txq = ctx->ifc_txqs; From nobody Mon Oct 7 14:49:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMhqw3xyXz5YHjQ; Mon, 07 Oct 2024 14:49: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMhqw3N59z4LWX; Mon, 7 Oct 2024 14:49:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728312556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAG5RNw6CxPuAyvWFifGZ9OKs8JnZAAuxDJKKjueGDs=; b=GwK7dLWvmbwRCaIpxOmAADfR5Tjn/jeUISgv7U3aE0wq3vCsjfWgZlVlx8qWS26K+9DkEF LKb6SvVfYgV9djWxEc76/0PIXp+/zD+2Nxhy/9Hycv9Hke71C2jtVQ4tupDvdyNq/FhkTf oSBezLDUm0cGoL7CobAittNPCV/usTyvZIMX7Vg9ZvcCuRFcYTyDbyTU6rW0YNds//YLQO AGp6zE0OqfUx7jqfsnEWrr4aOoQ+eNiTtPAWHs6W6D0cCGGWVgOe9M1lswWgrYCH1mkkAR juuHckZ02alAeUacxDl41mhvZBUPfsX7gOEYVVZXcM0wBPdzvzRbzX09gdKs7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728312556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAG5RNw6CxPuAyvWFifGZ9OKs8JnZAAuxDJKKjueGDs=; b=OrBVL+O5LzN75nqgRPQd9cIxhscWNbqJwJ7hU99OyFwVnUOFKS92jUkwqI5j3nhlQNsYar s+k//5SYIRJLehzzKhBqQq1L8go335NWA0x0lyH0BAxAtIId+ac/5txyQGG0vmTBKxxG+V 4l5dzUIolAQbNVkYrYjWDjjoP3zKDDZhtThixxA7aiGTBgWfbjqR4Z04kOkLcDEqMdNRWW 3mICaGdu/0xqvLJXstu4fAWWiOhpAkLeXy+uE5ANIMRM2+e15QlWUSnVk7i406tzvtw6jG Se43RgvRC96RiyVcNxmmqAVrIioih2Mg/nygt8SumW/AZmKgCRQMK5vKn8tisg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728312556; a=rsa-sha256; cv=none; b=g2h7w5yF59ns2KKkhEoLncn3WC1B8REfb+Ii8NnNwHBunvGAhFn6JUl2Kn1cvDP3GMD1Bj L2jM4ULzJvcX5kfuHcpw1nD8TM8VCmZmZXlAIU1LJHiGZ5Pfn78Pe19xF/jJ/ivMi1YZZC ZTBBNiUpfmqo5PUuLSL71kV9LA2pY2GD5z6nebJjQkPgGMfXM5W0cd26ZyvQekMb5OrmBS JEcMVZhRtJ6mIj35Qo3xzajxaWdOM0JcN7Yyvz/7dS9MngbFZHMJ/MQYK118P/SpJ41SZ2 CvMMYwvxEzqm357q4eiLcWj3HZiDVVD1vpPqCSxDXTapXLUmAQVDX/dtW/rwmQ== 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 4XMhqw2zLVzqlx; Mon, 7 Oct 2024 14:49:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497EnGgP081584; Mon, 7 Oct 2024 14:49:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497EnGKw081581; Mon, 7 Oct 2024 14:49:16 GMT (envelope-from git) Date: Mon, 7 Oct 2024 14:49:16 GMT Message-Id: <202410071449.497EnGKw081581@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 3326ab87cc22 - main - getsockopt: improve locking for SOL_SOCKET level socket options List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3326ab87cc22cb70a41e13aefd8684ff0feed01f Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3326ab87cc22cb70a41e13aefd8684ff0feed01f commit 3326ab87cc22cb70a41e13aefd8684ff0feed01f Author: Michael Tuexen AuthorDate: 2024-10-07 14:46:41 +0000 Commit: Michael Tuexen CommitDate: 2024-10-07 14:46:41 +0000 getsockopt: improve locking for SOL_SOCKET level socket options Ensure SOLISTENING() is done inside SOCK_LOCK()/SOCK_UNLOCK() for getsockopt() handling of SOL_SOCKET-level socket options. Reviewed by: markj, rscheff MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D46881 --- sys/kern/uipc_socket.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 189e8ca5b498..a139a9d1f301 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -4117,23 +4117,31 @@ integer: goto integer; case SO_SNDBUF: + SOCK_LOCK(so); optval = SOLISTENING(so) ? so->sol_sbsnd_hiwat : so->so_snd.sb_hiwat; + SOCK_UNLOCK(so); goto integer; case SO_RCVBUF: + SOCK_LOCK(so); optval = SOLISTENING(so) ? so->sol_sbrcv_hiwat : so->so_rcv.sb_hiwat; + SOCK_UNLOCK(so); goto integer; case SO_SNDLOWAT: + SOCK_LOCK(so); optval = SOLISTENING(so) ? so->sol_sbsnd_lowat : so->so_snd.sb_lowat; + SOCK_UNLOCK(so); goto integer; case SO_RCVLOWAT: + SOCK_LOCK(so); optval = SOLISTENING(so) ? so->sol_sbrcv_lowat : so->so_rcv.sb_lowat; + SOCK_UNLOCK(so); goto integer; case SO_SNDTIMEO: @@ -4190,15 +4198,21 @@ integer: break; case SO_LISTENQLIMIT: + SOCK_LOCK(so); optval = SOLISTENING(so) ? so->sol_qlimit : 0; + SOCK_UNLOCK(so); goto integer; case SO_LISTENQLEN: + SOCK_LOCK(so); optval = SOLISTENING(so) ? so->sol_qlen : 0; + SOCK_UNLOCK(so); goto integer; case SO_LISTENINCQLEN: + SOCK_LOCK(so); optval = SOLISTENING(so) ? so->sol_incqlen : 0; + SOCK_UNLOCK(so); goto integer; case SO_TS_CLOCK: From nobody Mon Oct 7 16:01:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMkRq1xH7z5YMrb; Mon, 07 Oct 2024 16:01: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMkRq1V3Jz4TPP; Mon, 7 Oct 2024 16:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728316919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y+yV3Xucau/qgu+mfNXXWOdiqkrrVeJznWWLe5+2tzc=; b=c5G5FtgE+2XJPHlIsnK0d/skEZ5T2y3nhY3ScaSoehYFrV+44AB6OlXBwHkdJi9bYIc34x +5NJauqYbMh8mNwPQCNLZxfrqwFVmusdD62wIZtL9FZgqaTDr+uvaBDenchg0l4G0YrhLj XGi2a4qKb6WsADg+zUtyU9X2Fn9rJHwXjT8j4nLOOztWt36Uv0OcmD4HUvr3KNpZs39i8i P8sXQCjJ0Zi9a9ChOsVKcoz7qw+US3+4qKnFcaK0OGK4MVSGBto6d98nIi0RoR1EizKimC E/dS1qsNcb8AxBSVyk+VxUNn3/9TKU2ulKL2jtq3syan+1tTMmu6H+SdUl+sCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728316919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y+yV3Xucau/qgu+mfNXXWOdiqkrrVeJznWWLe5+2tzc=; b=iObehK5SKXtHdiS29EsG2ErlT7LLwb0SyJ1W0+oLqeodqLI5g5CA4gK1qByYuKQKKFXrjw 2t97anSmpeZPTR175TM+HnLuK5j7ULJpJICSL9iePmBoN4lzZx2LH+M74geT4XI3d+hMtC EDtWcFwCiEnoM/axP2LUzz7Mi3eoLYOt3qR/95t775/uNnlFu2Ymw72fZFG3h8B3faVSl+ PFz8IKk3pSuTCykVk5l0sQYJPq0mpZMwUI8SQLs4u+RQ9YCVVwSuTm+fVPXN4qT+TLhrqt TWZNz3T1L7yP1N5ct4Ht0+uhFkYXcAkP+qX014bwH7ANAQSU3dyMaoujVR/tKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728316919; a=rsa-sha256; cv=none; b=XBA2ciTwC+4iL2YIDiCo09LBLCSbHhirmSsGkUIh6NLk911J84oOT2etfugyGsqKsaIxoZ RvjLVZjWMYhuYj1gknqV2LY543M+KZZPUTbkfYLdXasUUQA622GHhGWpFNfSSJp/zBlg7G 5vFQRMy21Zq1tIF60rVuXRJopf3xipOoa3SA5KIHF37Z81wEUw8tA/7Z1uAOyGz1S4ORG+ e1QymjymoZEBKLLfWroNTPZqFvsXC5+us2fNOfVLOfHcf3RdA7sTNK1wNIvVxwL8vM4/rg d7hAqOaHz2vfcWc1SOib3kbqmLHf67UZ8Uk/Dspt4VZEkQWY2yY1vdGLbf2a+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 4XMkRq14pyzt9H; Mon, 7 Oct 2024 16:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497G1xMO016930; Mon, 7 Oct 2024 16:01:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497G1xlr016927; Mon, 7 Oct 2024 16:01:59 GMT (envelope-from git) Date: Mon, 7 Oct 2024 16:01:59 GMT Message-Id: <202410071601.497G1xlr016927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: f5c847ae849a - main - pkg: prefer .pkg extension List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5c847ae849aab9354d0956afd683f1c90bfd91e Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f5c847ae849aab9354d0956afd683f1c90bfd91e commit f5c847ae849aab9354d0956afd683f1c90bfd91e Author: Ed Maste AuthorDate: 2024-10-07 15:11:09 +0000 Commit: Ed Maste CommitDate: 2024-10-07 16:01:36 +0000 pkg: prefer .pkg extension .pkg is the default extension as of commit c244b1d8a387, falling back to .txz if not found. PR: 281924 Reviewed by: bapt Fixes: a2aac2f5e564 ("pkg(7): when bootstrapping first search for pkg.bsd file then pkg.txz") Fixes: c244b1d8a387 ("pkg: settle the uniq extension to .pkg instead of .bsd") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46977 --- usr.sbin/pkg/pkg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index 70086886fbc5..cc23ffb8c257 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -895,7 +895,7 @@ static const char args_bootstrap_message[] = static const char args_add_message[] = "Too many arguments\n" -"Usage: pkg add [-f] [-y] {pkg.txz}\n"; +"Usage: pkg add [-f] [-y] {pkg.pkg}\n"; static int pkg_query_yes_no(void) @@ -1167,7 +1167,7 @@ main(int argc, char *argv[]) if (add_pkg) { if (pkgarg == NULL) { - fprintf(stderr, "Path to pkg.txz required\n"); + fprintf(stderr, "Path to pkg.pkg required\n"); exit(EXIT_FAILURE); } if (access(pkgarg, R_OK) == -1) { From nobody Mon Oct 7 16:12:50 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMkhM02jxz5YNKy; Mon, 07 Oct 2024 16:12: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMkhL6KKhz4VvS; Mon, 7 Oct 2024 16:12:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728317570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7e6WXIkhGJV+cffQltwi4OJmZP+viKosiC1sw1zrELM=; b=kbWKr7x2Dz3fCtPswQZGM883SkGfgyOxo0eIfrbdtxBOfbbfSGyXIRTWyByr8e5GXZNT3N ruyfOJQkAwYjvdkjQ/ICcCbtbokrw2HKFQjLkGhiXGQkZU0KXov7f9os9TbuV1ubhGEGSX RPCl1C0AxVpJy86yjnQEjHWQTsa9ztVL7gH4NA5U4xEB6ajk45WiQgYbPTf3ZISrtKr2vM OQ+CHCPVzqKf9EsvL7nXQUgSsq00vMlHC8BQKB5aJ+yhCrrHqFVtYf57CLHNanK3SYU5+k oBpdeMLTD54/bcJNc713mbfoqvz3s9eTYjma7UrtZW/kH0jqdvxHK8YOQZ3U2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728317570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7e6WXIkhGJV+cffQltwi4OJmZP+viKosiC1sw1zrELM=; b=cyHRiPDfoInQ+JmKoDCu42w431hWJEOUdIRxKMYmc1vldiO9aB2NR4PXxSkN8aC46ehlhG Z9g4MXe0cQ5UJrfmVaqV3lrvXE2GOY6ZuMAd+TM2PnqWgB92V5hXV6mx2E1nKFtWVtFrb+ +nsFQ+kzOiR2dlJJumlWHYIX0eZYPMlXLvqWKst5LKc1f917EqM0oqFlHNAJ/gQQr63Oi1 aZmFlOrdybotjYdbLO3QVH5QLu19Xm3t9F8dauvi+a6GmrHrqvvksSngn+8qAnwpk3Jmla gGmk4i5YjQiNuT6AkQLlUAa1pdCJIpiqZETKjnSRJGffkjT69u+ZMVJpD484sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728317570; a=rsa-sha256; cv=none; b=A8OVaARBV9VjwhQInvMcUe/aF5BjERmthG99egWqsw6EBs5UAYkyc8JA/GlSBBlbhw2FB3 7g5kLjXE0WA8pCW4GzSbuZfrOQL2QqjvaJCUx09lA+HVfEvLFjJkIoI5xTB7+UXQcTbXhi 1w0zPyQSqOXu6T/bf5tMdgVTMT3md9zaXH52Cs35LvRuFjBCPPOEW91d5QPUQKo9F7fQBs az7+dFQZGotUXHD0oz9907ChHJrHUR1dJTFs523wfLxm2Obql8yt+g1aLxNF6DA9CbkgfH XGCJ2s7Wzg7DMqWosdc20rvalQj0ZmUO4Lb406B3+ByKEgCrb8r8d3T0EDk89g== 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 4XMkhL5wFGzt4Q; Mon, 7 Oct 2024 16:12:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497GCoNt034373; Mon, 7 Oct 2024 16:12:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497GCoQb034370; Mon, 7 Oct 2024 16:12:50 GMT (envelope-from git) Date: Mon, 7 Oct 2024 16:12:50 GMT Message-Id: <202410071612.497GCoQb034370@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 6af02087d2c7 - main - swap_pager: rename iter init functions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6af02087d2c7333bd3de8917c73688607464be3e Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=6af02087d2c7333bd3de8917c73688607464be3e commit 6af02087d2c7333bd3de8917c73688607464be3e Author: Doug Moore AuthorDate: 2024-10-07 16:11:33 +0000 Commit: Doug Moore CommitDate: 2024-10-07 16:11:33 +0000 swap_pager: rename iter init functions Add _init to the function names of the functions that initialize iterators for swblks. Reported by: alc, markj Reviewed by: alc Differential Revision: https://reviews.freebsd.org/D46974 --- sys/vm/swap_pager.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 3a8c7e0f5777..807215647a93 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -564,7 +564,7 @@ swblk_is_empty(vm_object_t object) } static struct swblk * -swblk_iter(struct pctrie_iter *blks, vm_object_t object, +swblk_iter_init(struct pctrie_iter *blks, vm_object_t object, vm_pindex_t pindex) { VM_OBJECT_ASSERT_LOCKED(object); @@ -575,7 +575,7 @@ swblk_iter(struct pctrie_iter *blks, vm_object_t object, } static struct swblk * -swblk_iter_limit(struct pctrie_iter *blks, vm_object_t object, +swblk_iter_limit_init(struct pctrie_iter *blks, vm_object_t object, vm_pindex_t pindex, vm_pindex_t limit) { VM_OBJECT_ASSERT_LOCKED(object); @@ -1851,7 +1851,7 @@ swap_pager_swapped_pages(vm_object_t object) return (0); res = 0; - for (sb = swblk_iter(&blks, object, 0); sb != NULL; + for (sb = swblk_iter_init(&blks, object, 0); sb != NULL; sb = swblk_iter_next(&blks)) { for (i = 0; i < SWAP_META_PAGES; i++) { if (sb->d[i] != SWAPBLK_NONE) @@ -1885,7 +1885,7 @@ swap_pager_swapoff_object(struct swdevt *sp, vm_object_t object) vm_page_iter_init(&pages, object); swp_pager_init_freerange(&range); - sb = swblk_iter(&blks, object, 0); + sb = swblk_iter_init(&blks, object, 0); while (sb != NULL) { if ((object->flags & OBJ_DEAD) != 0) { /* @@ -1959,7 +1959,7 @@ swap_pager_swapoff_object(struct swdevt *sp, vm_object_t object) * after blks.index. */ pctrie_iter_reset(&pages); - sb = swblk_iter(&blks, object, blks.index); + sb = swblk_iter_init(&blks, object, blks.index); continue; } if (sb_empty) { @@ -2231,7 +2231,7 @@ swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, swp_pager_init_freerange(&range); d_mask = 0; last = pindex + count; - for (sb = swblk_iter_limit(&blks, srcobject, pindex, last), + for (sb = swblk_iter_limit_init(&blks, srcobject, pindex, last), start = swblk_start(sb, pindex); sb != NULL; sb = swblk_iter_next(&blks), start = 0) { limit = MIN(last - blks.index, SWAP_META_PAGES); @@ -2308,7 +2308,7 @@ swp_pager_meta_free(vm_object_t object, vm_pindex_t pindex, vm_pindex_t count, swp_pager_init_freerange(&range); vm_page_iter_init(&pages, object); last = pindex + count; - for (sb = swblk_iter_limit(&blks, object, pindex, last), + for (sb = swblk_iter_limit_init(&blks, object, pindex, last), start = swblk_start(sb, pindex); sb != NULL; sb = swblk_iter_next(&blks), start = 0) { limit = MIN(last - blks.index, SWAP_META_PAGES); @@ -2409,7 +2409,7 @@ swap_pager_find_least(vm_object_t object, vm_pindex_t pindex) struct swblk *sb; int i; - if ((sb = swblk_iter(&blks, object, pindex)) == NULL) + if ((sb = swblk_iter_init(&blks, object, pindex)) == NULL) return (OBJ_MAX_SIZE); if (blks.index < pindex) { for (i = pindex % SWAP_META_PAGES; i < SWAP_META_PAGES; i++) { @@ -2882,7 +2882,7 @@ vmspace_swap_count(struct vmspace *vmspace) goto unlock; pi = OFF_TO_IDX(cur->offset); e = pi + OFF_TO_IDX(cur->end - cur->start); - for (sb = swblk_iter_limit(&blks, object, pi, e), + for (sb = swblk_iter_limit_init(&blks, object, pi, e), start = swblk_start(sb, pi); sb != NULL; sb = swblk_iter_next(&blks), start = 0) { limit = MIN(e - blks.index, SWAP_META_PAGES); From nobody Mon Oct 7 16:48:53 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMlTy1GMnz5YQ27; Mon, 07 Oct 2024 16:48: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMlTy0gv7z4b1q; Mon, 7 Oct 2024 16:48:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728319734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/0GNJM369WiOk4P93fKusZROw35os56kn3+93LLBp8k=; b=nITSV9XMfHg+uQ+rGbdjjUJ+ZI/LDSwnj58j028NwxcTZebpgaaKFq+szcc8JB1hmt+cwb 9spByeaUPfk8uTEho+M7S/cZgbMUznL8P2/UlEA9j8ssjVRVZejIU3RoMgaIiVXCiIL3lF Mz1AyJU+c2Nht+ksiCC8AVzSIZyHSTtmBsAkK8AOodVMzQgf5bwxDiU4fE7eTbnI4Dro5u uS0B2m1pXx/XVUhHT1BCxg4xKrBrIn1VcASFZEuL8n+3KsBYgmoy4fpJPHBtC/6RgE+XK8 MJBWb9yUmo2DMM9Fi+ckNYTyl0uO0ZAU1454jsMHHVPlZsthCEd7/fDwyclEDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728319734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/0GNJM369WiOk4P93fKusZROw35os56kn3+93LLBp8k=; b=wB7DeitiU8B4JhsCFcc8axjtmAqH21iXCO+/Sw3kLU81b7JHQRD0ql41R/uX9IP1+lNxvB nc0rHT1BBi5o2hocA3vLi95zC3dsW8PT+W4F2B19N92QglG5vgY2QL9+xfthCTCIJCmCVD 1V08tee+iw0zxvemWUV+s7Xd+FVG5DEXF8frQjihn4ezdmIxTHyMmacdMFWEeG2QePdvzZ 6mAWDoX0M66GuirrE1eDq8DGFmk+m891BMAiTOsC8DZAF3u2aL/MrLuJ+4FT+DDP4ayZSN Bsb5tmjg4cljMt/3tH2y4Uw7hooqcWuF7ikbma/hUFP41euqB4k899LUs+u0iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728319734; a=rsa-sha256; cv=none; b=rS1qnOlxPKLSknhw51zobaroGptN1ZfPzmdsOYZjgnvffHAUA9Jup0F/CMWndvpJ4pfrgx vrfEHCoyH60tvQFkMEAdZH0776LzLSony0eFViHKEAzcEwEdV7qb/c/ft71r06eXCZWLsw A0mSEC4AY05MFB5J6Qmg7Af5Ml7sn7rvOpG6Vb/DgsmMoxUSPBs8MvniwDL6Etdegsf/d5 kzKlvhpJUciqZMnlxAqqb94A9Y6RP9b93M6YrL+GcuXQ1eAF0mihoSS8waeMQ5Oo+lJNOY ECJjUtx8rdGCnAWZ4gWDJtNtdJhE4BGyMN4rNCnX1ObOCQ+Kyx0G7bI4WbUj5g== 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 4XMlTy06pXzv2p; Mon, 7 Oct 2024 16:48:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497GmrD5086094; Mon, 7 Oct 2024 16:48:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497GmrKN086091; Mon, 7 Oct 2024 16:48:53 GMT (envelope-from git) Date: Mon, 7 Oct 2024 16:48:53 GMT Message-Id: <202410071648.497GmrKN086091@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: a02f9685edd1 - main - vm_meter: Add counter for NOFREE pages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a02f9685edd168ef51e2e6fd98f09c9b866fa9a9 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=a02f9685edd168ef51e2e6fd98f09c9b866fa9a9 commit a02f9685edd168ef51e2e6fd98f09c9b866fa9a9 Author: Bojan Novković AuthorDate: 2024-10-07 14:56:08 +0000 Commit: Bojan Novković CommitDate: 2024-10-07 16:46:32 +0000 vm_meter: Add counter for NOFREE pages This change adds a new counter that tracks the total number of permanently allocated pages. Differential Revision: https://reviews.freebsd.org/D46978 Reviewed by: alc, markj --- sys/sys/vmmeter.h | 8 ++++++++ sys/vm/vm_meter.c | 2 ++ sys/vm/vm_page.c | 1 + 3 files changed, 11 insertions(+) diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h index 36321be22205..ac4d2f7e7c90 100644 --- a/sys/sys/vmmeter.h +++ b/sys/sys/vmmeter.h @@ -120,6 +120,7 @@ struct vmmeter { counter_u64_t v_rforkpages; /* (p) pages affected by rfork() */ counter_u64_t v_kthreadpages; /* (p) ... and by kernel fork() */ counter_u64_t v_wire_count; /* (p) pages wired down */ + counter_u64_t v_nofree_count; /* (p) permanently allocated pages */ #define VM_METER_NCOUNTERS \ (offsetof(struct vmmeter, v_page_size) / sizeof(counter_u64_t)) /* @@ -174,6 +175,13 @@ vm_wire_count(void) return (VM_CNT_FETCH(v_wire_count)); } +static inline u_int +vm_nofree_count(void) +{ + + return (VM_CNT_FETCH(v_nofree_count)); +} + /* * Return TRUE if we are under our severe low-free-pages threshold * diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c index 7348577fc3cb..faf4074ef0c6 100644 --- a/sys/vm/vm_meter.c +++ b/sys/vm/vm_meter.c @@ -90,6 +90,7 @@ struct vmmeter __read_mostly vm_cnt = { .v_rforkpages = EARLY_COUNTER, .v_kthreadpages = EARLY_COUNTER, .v_wire_count = EARLY_COUNTER, + .v_nofree_count = EARLY_COUNTER, }; u_long __exclusive_cache_line vm_user_wire_count; @@ -386,6 +387,7 @@ VM_STATS_UINT(v_free_target, "Pages desired free"); VM_STATS_UINT(v_free_min, "Minimum low-free-pages threshold"); VM_STATS_PROC(v_free_count, "Free pages", vm_free_count); VM_STATS_PROC(v_wire_count, "Wired pages", vm_wire_count); +VM_STATS_PROC(v_nofree_count, "Permanently allocated pages", vm_nofree_count); VM_STATS_PROC(v_active_count, "Active pages", vm_active_count); VM_STATS_UINT(v_inactive_target, "Desired inactive pages"); VM_STATS_PROC(v_inactive_count, "Inactive pages", vm_inactive_count); diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 6256472e0336..67a9c2119ab8 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -2594,6 +2594,7 @@ vm_page_alloc_nofree_domain(int domain, int req) } m = &nqp->ma[nqp->offs++]; vm_domain_free_unlock(vmd); + VM_CNT_ADD(v_nofree_count, 1); return (m); } From nobody Mon Oct 7 16:48:55 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMlTz2qGJz5YQSR; Mon, 07 Oct 2024 16:48: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMlTz2Ccdz4Zrd; Mon, 7 Oct 2024 16:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728319735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G64bX6z/gYKAjnKsGNvCLeyv6XZCcMYLHF+jkPTWZn0=; b=AfQQwKU9wCMSKAvSnc+zS9jM6L6ZPR3pGOp/8AMTdR6G3R13KZbiePDYPljA9gadBRJsCJ OiuT5/ihMLixpk5TJOmBz508V6EH8UfCj46Fq66ZEqgRzK1Uj6tKiZC1cTyYkc6/DslAzs vLq0TPncucyW7Vywfwk/630owCYlv+NFaZDP41pV7imWewZBA93VV/r7WDhaC+JyX0HooL /OTOR6eux1gq+xp6ZLFoXrYT1beu37o3ThfSNLBVV+4RLaI9wOXJgKbgmWmBu4MH5CCUc2 tAdFJyuBE1zqgiSbYCgP+cmBYVX4p0ulrA1JpHzZyvWJO44M/NvrDLg1GWFhAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728319735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G64bX6z/gYKAjnKsGNvCLeyv6XZCcMYLHF+jkPTWZn0=; b=L2qmZCZsUVAAyYE7dvIfRdDaL7OZsuznRSAAFbHOOU3F6XqQ81zdt/jeGMAYYTwVL+LOdy xcGso8HR7ro2FZTWkeFJhaVheczv4JFGA7kVdsrYvGXFSnUfgaol2agrD96w4VFSRfbxE5 Q0ALtQi8DPcKapdqhUlZ199xcLVSRbhBKnuo0hw56IdnQw9XkUlc93c9UUmmDN51bRCU8c anL26uZGY80ZZdeF+kSMZXGnehEnCJO5G+U/xc4kvkIW64BgxcN40vGQ6T6/fl8ZbtASUh +EYsIW4uTmm0LZ2n5BOyDcFCHuLzUC+ZfcTu6DNbb1EdslxOxNExbSmph4NbGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728319735; a=rsa-sha256; cv=none; b=shC/sMvE0hS52tSzWqxI0vCipsLaVOnyWP81Tq+yXLbnUlOZl9IOw5wqlb92hjI8Cf8/na U81jASZnHHCBKu1XGzY44GTRq4I5RKSpvL6i3Wv8tC79QpI0GywszNZR7JjY+0GzFpJv0w KzuCWWBKlvq3pmXIjmfY79Ju4AUcSG+TTwBYBXyM+mEAm6GMoSiJfm4BpY3KLmqiagmiF1 MUmmiju+w8L1XuYWKxHlM7t0W+zCRW6ovbk0mRW791A4Xan1/9NtBL0G9e+Z3hiCx4V6AY oB7//0WKI5wCXByBQOwGzgkcPEOvpdTo+G0Hh2X9MCfl1zMa/DY9tRCrXCyPOw== 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 4XMlTz15yxztX8; Mon, 7 Oct 2024 16:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497Gmt1G086148; Mon, 7 Oct 2024 16:48:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497GmtRj086145; Mon, 7 Oct 2024 16:48:55 GMT (envelope-from git) Date: Mon, 7 Oct 2024 16:48:55 GMT Message-Id: <202410071648.497GmtRj086145@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 596a36ddc478 - main - vmstat: Add NOFREE page count to -s report List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 596a36ddc47889e1b3bde00566cef2d8695c2847 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=596a36ddc47889e1b3bde00566cef2d8695c2847 commit 596a36ddc47889e1b3bde00566cef2d8695c2847 Author: Bojan Novković AuthorDate: 2024-10-07 15:02:42 +0000 Commit: Bojan Novković CommitDate: 2024-10-07 16:46:32 +0000 vmstat: Add NOFREE page count to -s report This change adds the number of permanently allocated pages to the 'sum' structure report. Differential Revision: https://reviews.freebsd.org/D46980 Reviewed by: markj --- usr.bin/vmstat/vmstat.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 8c7790403786..8d6c40a4d2fd 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -142,6 +142,7 @@ static struct __vmmeter { u_int v_free_count; u_int v_wire_count; u_long v_user_wire_count; + u_int v_nofree_count; u_int v_active_count; u_int v_inactive_target; u_int v_inactive_count; @@ -558,6 +559,7 @@ fill_vmmeter(struct __vmmeter *vmmp) GET_VM_STATS(vm, v_free_count); GET_VM_STATS(vm, v_wire_count); GET_VM_STATS(vm, v_user_wire_count); + GET_VM_STATS(vm, v_nofree_count); GET_VM_STATS(vm, v_active_count); GET_VM_STATS(vm, v_inactive_target); GET_VM_STATS(vm, v_inactive_count); @@ -1004,6 +1006,8 @@ dosum(void) sum.v_wire_count); xo_emit("{:virtual-user-wired-pages/%9lu} {N:virtual user pages wired " "down}\n", sum.v_user_wire_count); + xo_emit("{:nofree-pages/%9u} {N:permanently allocated pages}\n", + sum.v_nofree_count); xo_emit("{:free-pages/%9u} {N:pages free}\n", sum.v_free_count); xo_emit("{:bytes-per-page/%9u} {N:bytes per page}\n", sum.v_page_size); From nobody Mon Oct 7 17:00:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMlkn0Nj2z5YQxB; Mon, 07 Oct 2024 17:00: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMlkm6yt9z4d9Q; Mon, 7 Oct 2024 17:00:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728320401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4m02/wxfX66g7jKkCREU2s+Me2uNc0WhfVLTnmI2tZI=; b=hga4s3ee2ijDtFVY5NshDU/0bzd7NNtk5ZA3wZLUQ+nhSvls1GJ2kblsu4DA3gJZWBxtLF BByn9ZVBPxYrtBIetJqvTCTG3DB8V+HAMxnTKBkS9JgpfUz2HScACyRum4cPmO0ipbIR6B WKhWobXSDslEMvsRJHLqh8KlTTKqQx7ZJR0IEToA+Ieu102kWM9bAdqjDVG0B6X+uhdY7o MrX1aF3euWW+jyhUhS7Zgmeeat+MkWC9QnT6947Ed8LaLat656VRIDFdQ7PXLDYY9lYUmF qOqvQJl11cntiuvTOVONsLG4ck72pIQRom06ei4AAbvUYn3IBpxxXSZned4KNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728320401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4m02/wxfX66g7jKkCREU2s+Me2uNc0WhfVLTnmI2tZI=; b=PaD1auaZND+GIrdoetmkYis6b7Iq+KrVRXwHC3YhkoYPycGC8UEmAYp0Cl2pGw3zsPY9oz 5xUOKz8bc9Ht22VJ9qGYmyaEpTnp8eIRyHC0knET9BsDvFU0vFCvR/32yx7zNVS/RjLDcQ rORVkaInLj+ATYy2ZztoLaaGoZrDTRp5GhPRtN60fpge/fm+LowkT/dHp5X0nBXoJPcjGy icke+O7lWb0IdP78bKFea5aVyqjK4ZeJWkyUXy/n45YkbTUqQ4MwK6Twud3x9EcYfi7Jd3 ojSx8hiAvQR77wOw6T6dKYioAavWDncXO/KbVJNraHHycgQJiXh1eHjP15AaLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728320401; a=rsa-sha256; cv=none; b=OgACx7JfGW2D1sswiLVDwZ+Q/DJf3RixhtGml/11JjlmqIw0GYnG/U7INJh+yrSHXbmjv/ 6zdU7eQaYO/wleypkbtk/SsDoXEEEMUIW5G9GDfvNrSaHvMOXnNHXKEfryPoKbJgziOaPH t9lvW8aXPtXxqWaF3hrc1ov/RzzB4DBpboqS3qhk9fsAXMD2oZKP+wWEho1CS8q0sIVbfm Cgu7F1rPiWJ6xfsKsdN29Ei5AF92SkQO9kO1dT/Wz8KV3PZlv7QHIUPese/06vl+gJwxaX wFFPn1WPVaSuM5Zd3F2wwYwsPf97tJn1DoJUJOiNmbR94z8Mse/DmtTtWPBz2Q== 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 4XMlkm6RzkzvRV; Mon, 7 Oct 2024 17:00:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497H00TY004392; Mon, 7 Oct 2024 17:00:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497H007m004367; Mon, 7 Oct 2024 17:00:00 GMT (envelope-from git) Date: Mon, 7 Oct 2024 17:00:00 GMT Message-Id: <202410071700.497H007m004367@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: 9dd5105f22a2 - main - xen: expose support for poweroff/reboot/suspend on xenbus List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9dd5105f22a2276cf099f0e10e318294fcc4f6a7 Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=9dd5105f22a2276cf099f0e10e318294fcc4f6a7 commit 9dd5105f22a2276cf099f0e10e318294fcc4f6a7 Author: Roger Pau Monné AuthorDate: 2024-09-30 17:27:56 +0000 Commit: Roger Pau Monné CommitDate: 2024-10-07 16:59:45 +0000 xen: expose support for poweroff/reboot/suspend on xenbus Some toolstacks won't attempt the signal power actions on xenbus unless the VM explicitly exposes support for them. FreeBSD supports all power actions, hence signal on xenbus such support by setting the nodes to the value of "1". Sponsored by: Cloud Software Group Reviewed by: markj Differential review: https://reviews.freebsd.org/D46859 --- sys/dev/xen/control/control.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c index 1dc1df935b84..4601db70ef16 100644 --- a/sys/dev/xen/control/control.c +++ b/sys/dev/xen/control/control.c @@ -394,6 +394,20 @@ xctrl_on_watch_event(struct xs_watch *watch, const char **vec, unsigned int len) } /*------------------ Private Device Attachment Functions --------------------*/ + +static void +notify_support(void) +{ + /* + * Notify kernel is ready to handle "control/shutdown" events. Ignore + * errors if the nodes haven't been created by the toolstack, as the + * parent "control" directory should be read-only for the guest. + */ + xs_write(XST_NIL, "control", "feature-poweroff", "1"); + xs_write(XST_NIL, "control", "feature-reboot", "1"); + xs_write(XST_NIL, "control", "feature-suspend", "1"); +} + /** * \brief Identify instances of this device type in the system. * @@ -455,6 +469,8 @@ xctrl_attach(device_t dev) EVENTHANDLER_REGISTER(shutdown_final, xctrl_shutdown_final, NULL, SHUTDOWN_PRI_LAST); + notify_support(); + return (0); } @@ -479,6 +495,14 @@ xctrl_detach(device_t dev) return (0); } +static int +xctrl_resume(device_t dev) +{ + notify_support(); + + return (0); +} + /*-------------------- Private Device Attachment Data -----------------------*/ static device_method_t xctrl_methods[] = { /* Device interface */ @@ -486,6 +510,7 @@ static device_method_t xctrl_methods[] = { DEVMETHOD(device_probe, xctrl_probe), DEVMETHOD(device_attach, xctrl_attach), DEVMETHOD(device_detach, xctrl_detach), + DEVMETHOD(device_resume, xctrl_resume), DEVMETHOD_END }; From nobody Mon Oct 7 17:00:01 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMlkp25fnz5YQ3d; Mon, 07 Oct 2024 17:00: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMlkp0Xdxz4dDK; Mon, 7 Oct 2024 17:00:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728320402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JohhLwcmsECs0opJX6JyAOd7bA+xH05c10LfdQSgQEg=; b=DEZWJTl9rGjeCX4sFPl6RL8MsEwn9Ebyr31XG+sc1X32spz9HhcmawQ/m8lxpgVJz8D6ce W+h7UYmMsK0VJ/WRA7KsB1yxCQLsTjyNFriQzoa+RWt+LQ6ObBUw4iYHgwnLMxOHBw9sjq 6L0YTdkogBeRRUbLqe8hcPhlyIfVrNU0IRpariXJpm5PU77TQG3bZK3r0LLA6Mu0teby6o 7tOHwXrR7WGovmJGy+uq6yQ/VOny2rRxKsEtO41E0wNs/5z0tPbzaqlmuyHsphqZRi8wUY kWgom6zP60nj/9NYfzGtZPfpKTOgQpLGGM9ZQUG4hAxeLeYT+We0ubGjdQHTzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728320402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JohhLwcmsECs0opJX6JyAOd7bA+xH05c10LfdQSgQEg=; b=ImmzWSeabOmWLsch4v5hgUIy45W+GJR1uPr17S07JHoWUOJfnB0sIvo5ZdoeSUcIDAwNm4 NP4ywzhNJjiuuFjkjlpRlzpxNuOSpICWHuYrJpVV5qKWBRGftNpM8HfU/Jw0jrURX+PMb8 BoX7NGHHwnL6g+pM+2KdnRwraU8Zm+8iXz+uTGukqFyHX9l7AXXef6SPeEWVmBBuDb+moy AEkFFcHsfiYfl7OBv32JRpFz7jviHhRSKD7UpDvDgS5GYpE9T5TsrJP1ch7ZRdAdZpeGM7 qZVQvNAB7bIWQN9LGeV4pUoeD3At16t5JFK4voGPOxKIo6wAXT4CHEzLU/jXYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728320402; a=rsa-sha256; cv=none; b=GnvBtfwya/Sms5Yg+ilMqi350V/+V2FM7o22Pefknn/9qIV+J05AzPhG1N458jtNjzSx+Z glJHXiZuBqa9iEJ0g1AVE3vJLH+LUL6a2X2kccWncd5QDVXyROUlKcl4TU0LPi145/Xggd hkMAHNciT+8wqc1E0e7ictGk36WL08fvvYK5GvVC6ACztiFS3qyuOsX3WSWWK57xXOzf/9 PAPWt3XyhJ7Hib5LuYG3lysiYwam5CyIpqAkFbNEEJvZG0Qq02mXGi+QBVONYs4AvuRfVX 1qGBrGgeJ4TU4TuA25R1NN74Np47D0VWR97e5SXM9Uh1Zod/tBxJIpsv2O/QiQ== 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 4XMlkn713LzvHp; Mon, 7 Oct 2024 17:00:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497H01xV005627; Mon, 7 Oct 2024 17:00:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497H01RV005620; Mon, 7 Oct 2024 17:00:01 GMT (envelope-from git) Date: Mon, 7 Oct 2024 17:00:01 GMT Message-Id: <202410071700.497H01RV005620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: 9a73b5b1e843 - main - xen: remove PV suspend/resume support copyright List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a73b5b1e8430dedca205115bf618d5c56c7a56e Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=9a73b5b1e8430dedca205115bf618d5c56c7a56e commit 9a73b5b1e8430dedca205115bf618d5c56c7a56e Author: Roger Pau Monné AuthorDate: 2024-10-01 09:37:06 +0000 Commit: Roger Pau Monné CommitDate: 2024-10-07 16:59:45 +0000 xen: remove PV suspend/resume support copyright Thew code for PV suspend/resume support has long been removed, also remove the copyright notice associated with it. There are still two copyright blocks with (to my understanding) slightly different wordings of the BSD 2 clause license. I however don't feel like merging them due to those wording differences. The removal of the PV suspend/resume code was done in ed95805e90ec0f61683cd402a42e6f915339de7d. Sponsored by: Cloud Software Group Reviewed by: imp Differential revision: https://reviews.freebsd.org/D46860 --- sys/dev/xen/control/control.c | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c index 4601db70ef16..123df4992894 100644 --- a/sys/dev/xen/control/control.c +++ b/sys/dev/xen/control/control.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-4-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010 Justin T. Gibbs, Spectra Logic Corporation * All rights reserved. @@ -30,39 +30,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -/*- - * PV suspend/resume support: - * - * Copyright (c) 2004 Christian Limpach. - * Copyright (c) 2004-2006,2008 Kip Macy - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Christian Limpach. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - /*- * HVM suspend/resume support: * From nobody Mon Oct 7 17:05:35 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMlsD2P4Jz5YRXS; Mon, 07 Oct 2024 17:05:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMlsD0qb7z4fTg; Mon, 7 Oct 2024 17:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728320736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uTaRIZKQgWpV7cUAP+32I0qTmxMcg7JSsPBg1s8nDuo=; b=Y17UywYnut9txgBAxnne0iKW/FKLkbUv4Xe0b6Y4adKX2XFYh3iJL8aSk/EBwJ0HE7qB7G mnnM6jPKEwIqhgYWrk7pf4dmD7/W7bSs0nl1ftK0eMzBLKgc39HBv7VgRAOlyKy70nFUOK yQECMl69N4HRj+NNWHASPwtkQMx0YH2pEtITBdVWdAwTYqJlXGX+cREfvoiEn4efWkyat0 a96ldXSEb94s5/5lt65yjQ8BjdZzXJ6N9NUVhniJf8vos5CqTOIU50k6rGPTkbAdmBJAQX kUoJ8RTiklk0LrvDCLWpOx7GIAFQr4aS3uPTnBNut5iGpX3WeKPZMx+Ps/pXrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728320736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uTaRIZKQgWpV7cUAP+32I0qTmxMcg7JSsPBg1s8nDuo=; b=IZF4RNZQLTq/wGSTgN/TgAbX4qgk7nqPrg8u+a91YndahafqgKOkDzesC/JO2vXvEv0Px8 J8D1UidT9Sj7Mj/R+m36Oo+JOGuwXbaw1WpsrNiqms1dxFuySZglqKkmFvaVitWvTLMDuk ExmnBnKv8F38CNpiQph6Vd1Fbs7eh/t/tMgDSFQ6y+4Ta4it0D2KIDMKWv8XaWiaSDcKrM WpCdT5Z4wqbtOFlmhkLajNNMFlZN/5xZYWxYgUctTk8iWP/qJHJR/YfSHgp1RN7ZbY7jre oSyDXcLkEgo/NjRiwCw8Y2YEvKlhNo5GRu05qCdEKkTm68dOf3Jxg8p2Bw6gHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728320736; a=rsa-sha256; cv=none; b=EO4o15OzPvLO7pmDCLEKo4w92bo3LtdB+Ykk1E2HErKW1d238xqLlVYbLFjIqP/fBt4c5d d2Acch1tlXhcYwCbUzqme9++CoE5pvJxjYNZB/9esqteKjGZrV9EP1YCYx7ItiQttq0JW3 b5nS5w27k9ad7RWcqvsWZZs2x0RjftXnCFD4jPGcuyUGWu18XH89+MTfXHqUkU9IngeuDe TARwgks4FYraE8f3MJurSvlEXP0edJhUyADr0byQfQH46X08ucdez8Jvf8gxCDsFTQrGWA 8+C0VQHFnqImCwLTibjecsWIcoHMi01ilZnQBlfBQ1KGftmokztpo6Mw9FhhCA== 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 4XMlsD0Pz9zvSR; Mon, 7 Oct 2024 17:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497H5Zu4020715; Mon, 7 Oct 2024 17:05:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497H5Z9T020712; Mon, 7 Oct 2024 17:05:35 GMT (envelope-from git) Date: Mon, 7 Oct 2024 17:05:35 GMT Message-Id: <202410071705.497H5Z9T020712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: be9243409d6b - main - pkg: improve error message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be9243409d6be99f5d7815b6d074a85a6e84f7ce Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=be9243409d6be99f5d7815b6d074a85a6e84f7ce commit be9243409d6be99f5d7815b6d074a85a6e84f7ce Author: Ed Maste AuthorDate: 2024-10-07 16:33:12 +0000 Commit: Ed Maste CommitDate: 2024-10-07 17:05:07 +0000 pkg: improve error message Print the complete list of url that have failed PR: 281924 Co-authored-by: Baptiste Daroussin Differential Revision: https://reviews.freebsd.org/D46983 --- usr.sbin/pkg/pkg.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index cc23ffb8c257..6138ca37e439 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -855,7 +855,11 @@ bootstrap_pkg(bool force, const char *fetchOpts) goto cleanup; fetchfail: - warnx("Error fetching %s: %s", url, fetchLastErrString); + for (int j = 0; bootstrap_names[j] != NULL; j++) { + warnx("Attempted to fetch %s/Latest/%s", packagesite, + bootstrap_names[j]); + } + warnx("Error: %s", fetchLastErrString); if (fetchLastErrCode == FETCH_RESOLV) { fprintf(stderr, "Address resolution failed for %s.\n", packagesite); fprintf(stderr, "Consider changing PACKAGESITE.\n"); From nobody Mon Oct 7 17:36:08 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMmXS72k0z5YT1H; Mon, 07 Oct 2024 17:36: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMmXS6X0Dz4k2s; Mon, 7 Oct 2024 17:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728322568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EL8vuF+Cdc9LPGa9lENQJBqble2437ZrkWALqJak0VE=; b=HP9N0DBosYAYTxWyztVZKWEDfOivmu+My185SpWJtP17RqC74rwAf1KUd4b4JfqDOM2I+W RqeE0fB2+dU9dGXvWbWhlnq63k/z6TCMsdFwkObHxEM5Gs3AxNSWieQBeCcgNEu4VR225K 1SK+nSsiRvrcOptL8xUtdr98vQiZQTKWLklTgzyLJ8Cb441D1E/uGlYkj9cbDuN98OBAnM /6aLUh3DY6w6bqqKUi35Hpcm4xskooMlFT3Ima42YNrDKv8ENhEuaGfp4r1ez/UmRW+Urm 3zpC5VH6mDqph1gtvC55RbnthYlSzYNMjXY6WKulI5Xn9bIXbzZBUNNAIJXwdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728322568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EL8vuF+Cdc9LPGa9lENQJBqble2437ZrkWALqJak0VE=; b=Ab/i9zQfzhbMVBC049rqlDEfcITjyQ1UGr7jfzPjstDOKR7r5TCVNJFkgrw3DtvzOUTJlV 53o6nIcrFAMru65wsCIxFISNba8V5hFcOvOUG2zkGm4MrxHdUKDXdELCZASVu8Frnkzvjr AaF3X51JRAPOzgaVJ8cznhm880MwQVJs35QbnJBVtkImIu4px32HVtUIsa8PCvbDlw95B5 k7yHkw3pn5bxyhg0ULAseaCWKK1lFLhsdUcsoXGBjBFt7kqw5mpVNxVFSub1DFIYHIVYPk w3zpg9BIYkHJ8E55Ta+TDTDOYZ/mKdy6Tbxy8gIxzZQqD54OR4l/kcxVhyL0TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728322568; a=rsa-sha256; cv=none; b=Dz5h/GWXUkVsdF2rE58S8wUXmYxIw7VcC8SsrByC3OyUFtEnhTm+FStXH79k6fqus1hl+w OPRa0qRzSuX9IHq3xFiUunlJ4qfJ0WZr0QsdGJDqc4AQgm+yh1xjVkHLRUgwYSldeIgWpv HmAOshRs9WMETHyq+R1/GAKed1tmJCvwXCAbVvO8R5ceongPZr5KVAo6zeHVUStajirsY6 5m56Dok+8k8tmS2D/BHsVVcjNLyC8Qs6z1JKooS/vPGCDfBW/xSli01efwWgpGQ8n20fXA QQhyX0T9Ih9NILgDjwMWSezR+VJy0Fc7EjN7D/lGE5E4BVOr4DBztjZVd+b0Zw== 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 4XMmXS67HkzwML; Mon, 7 Oct 2024 17:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497Ha82j071393; Mon, 7 Oct 2024 17:36:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497Ha8N9071390; Mon, 7 Oct 2024 17:36:08 GMT (envelope-from git) Date: Mon, 7 Oct 2024 17:36:08 GMT Message-Id: <202410071736.497Ha8N9071390@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 52e5a66eac22 - main - cxgbe(4): Use correct synchronization when marking the adapter offline. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 52e5a66eac22d24e29f204c5b65232378e71f4cf Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=52e5a66eac22d24e29f204c5b65232378e71f4cf commit 52e5a66eac22d24e29f204c5b65232378e71f4cf Author: Navdeep Parhar AuthorDate: 2024-10-04 18:11:22 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-07 17:25:53 +0000 cxgbe(4): Use correct synchronization when marking the adapter offline. adapter->flags are guarded by a synch_op, as noted in the comment in adapter.h where the flags are defined. Fixes: 5241b210a4e cxgbe(4): Basic infrastructure for ULDs to participate in adapter reset. MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/t4_main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 508f3f08f22a..57cc41bb50fa 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -1990,18 +1990,23 @@ restart_adapter(struct adapter *sc) static inline void set_adapter_hwstatus(struct adapter *sc, const bool usable) { - mtx_lock(&sc->reg_lock); if (usable) { /* Must be marked reusable by the designated thread. */ + ASSERT_SYNCHRONIZED_OP(sc); MPASS(sc->reset_thread == curthread); + mtx_lock(&sc->reg_lock); atomic_clear_int(&sc->error_flags, HW_OFF_LIMITS); + mtx_unlock(&sc->reg_lock); } else { /* Mark the adapter totally off limits. */ + begin_synchronized_op(sc, NULL, SLEEP_OK, "t4hwsts"); + mtx_lock(&sc->reg_lock); atomic_set_int(&sc->error_flags, HW_OFF_LIMITS); + mtx_unlock(&sc->reg_lock); sc->flags &= ~(FW_OK | MASTER_PF); sc->reset_thread = NULL; + end_synchronized_op(sc, 0); } - mtx_unlock(&sc->reg_lock); } static int From nobody Mon Oct 7 18:41:40 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMp041vM8z5YXxj; Mon, 07 Oct 2024 18:41: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMp041S1Cz4rx7; Mon, 7 Oct 2024 18:41:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728326500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZhOq60BvVzzTkpyno8xNR4jgYHQ4ihq1ZzV3EFmBe3o=; b=eMQHTTmgBorv9KzGv3izizeAydvgalxGkAijCvqDWOrYMHFI7oWftZhuRnunA4tbd1fL72 oRGmLG+d9r5V3/kDeMxRFjPeNl9th+HbuNjBAIW9/nZFrsyLpx8d+kMi/KfQWyWYTkrYvV rdrveF0thU0VwWLiuO6eM5WbYGxCwEkxWYwOkkMefdoeqW/5vXEOka/Vl3yjfxB1RAVFFO Er84e/G2xwB9TEIQ73dqRb5dfJcMwVM51Y007pHxNK8432UOUdTu0N81CKW0I2sGMJbhq7 KOjFLIiHwAk2lOzvdKzgPpq1YgYzj9gQmXqHq/9p6l9YXqMAnIUoL2dXwP0wcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728326500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZhOq60BvVzzTkpyno8xNR4jgYHQ4ihq1ZzV3EFmBe3o=; b=uYruqo43rM51Z2WelgH20VdwZFaPSrSdz0JKE3EUQNgAhlFue/W5XSO9cMtiNtGtquM845 hsShtMcUCpFcQ2iRy+ksue5mRi887OHRvhun3e36sV+ed6vsyIu4TP/1j5mXcTdldWDHFn k6/3WKAwCj8NH4/fYwLDfqrOb0DZBVBevfLy9VYJFR3ZoyPyaVyOfcH869JqPC47PsamyJ gDXd2TyaqlqiOcubSfm+zX7WPne/EwnpXBKc1lRm7izRpn7pIHJM8+nTNtIMphS8AY3uv2 5mM49FzXiG++Prum4DBtCauYdpEG0sBUqO2724uuwrL9zKT7rq4tDIFrif0n5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728326500; a=rsa-sha256; cv=none; b=QdQMzjRFSkSeBFkT04h+kaGZPQrzI2gGzCjxb0R3IzXnLOMTljCLd/junHK0Vt73Of7A/i oDDda2HRyegiGxhfG78o+d6mBdqICKFlW5tp91ObbyDMdDfRbpp9ToI52DOtTmZGILHBCj m7urXGy/hiRCqMTQYOHcuPg7X/25QRkIoXsM0JKDHjNxFDiK2sAUIuozkscNWZK4HHsEB+ 5v5IMEjfE2tdBzKBI85wVjHhw8pYO/8q9M1Y3Lh02TwIZvhHSV2w2REXjs3F0Clm1M5pAq tJnH4FXX/UDm/tFGhGPjbuynIoVcUUryTNlv6neksxrbJuBiI192k7hbuyazlg== 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 4XMp0413B1zxwd; Mon, 7 Oct 2024 18:41:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497IfeJa088839; Mon, 7 Oct 2024 18:41:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497IferN088836; Mon, 7 Oct 2024 18:41:40 GMT (envelope-from git) Date: Mon, 7 Oct 2024 18:41:40 GMT Message-Id: <202410071841.497IferN088836@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: c801836ff43d - main - manuals: Fix "skipping end of block" .El errors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c801836ff43deea3c86935abcad1069bfcd3989c Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c801836ff43deea3c86935abcad1069bfcd3989c commit c801836ff43deea3c86935abcad1069bfcd3989c Author: Graham Percival AuthorDate: 2024-10-03 18:19:04 +0000 Commit: Mitchell Horne CommitDate: 2024-10-07 18:37:47 +0000 manuals: Fix "skipping end of block" .El errors These were reported by `mandoc -T lint ...` as errors; this commit only handles unnecessary .El commands. The rendered output (in ascii and html) is not affected by this commit. Signed-off-by: Graham Percival Reviewed by: mhorne MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1447 --- cddl/usr.sbin/zfsd/zfsd.8 | 1 - share/man/man4/ahc.4 | 1 - share/man/man4/ahd.4 | 1 - share/man/man4/gve.4 | 2 -- share/man/man4/mem.4 | 1 - share/man/man5/rc.conf.5 | 1 - usr.sbin/bhyve/bhyve.8 | 1 - usr.sbin/pnfsdskill/pnfsdskill.8 | 1 - 8 files changed, 9 deletions(-) diff --git a/cddl/usr.sbin/zfsd/zfsd.8 b/cddl/usr.sbin/zfsd/zfsd.8 index d6b0e1d4bd22..d668e0e8ee9e 100644 --- a/cddl/usr.sbin/zfsd/zfsd.8 +++ b/cddl/usr.sbin/zfsd/zfsd.8 @@ -154,7 +154,6 @@ will log interesting events and its actions to syslog with facility .Em daemon and identity .Op zfsd . -.El .Sh FILES .Bl -tag -width a -compact .It Pa /var/db/zfsd/cases diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4 index 8bc689cb8395..38712c1f08b6 100644 --- a/share/man/man4/ahc.4 +++ b/share/man/man4/ahc.4 @@ -155,7 +155,6 @@ units 0, 2, and 5. A value of 0x8a enables it for units 1, 3, and 7. .Pp Note that controllers can be dynamically configured through a device hint documented below. -.El .Ed .Sh BOOT OPTIONS The following options are switchable by setting values in diff --git a/share/man/man4/ahd.4 b/share/man/man4/ahd.4 index d7404662a06b..12340d05ccf7 100644 --- a/share/man/man4/ahd.4 +++ b/share/man/man4/ahd.4 @@ -107,7 +107,6 @@ disconnection, and the host adapter's .Tn SCSI ID. -.El .Sh CONFIGURATION OPTIONS To statically configure one or more controllers to assume the target role: .Pp diff --git a/share/man/man4/gve.4 b/share/man/man4/gve.4 index 95c125507bd5..a674d6b64803 100644 --- a/share/man/man4/gve.4 +++ b/share/man/man4/gve.4 @@ -127,7 +127,6 @@ Tx queue-specific allocation failures: .It "Failed to alloc desc ring for tx ring %d" .It "Failed to vmap fifo, qpl_id = %d" .El -.El .Pp The following messages are recorded when the interface detach fails: .Bl -diag @@ -200,7 +199,6 @@ does not support the transmission of VLAN-tagged packets. All VLAN-tagged traffic is dropped. .Sh SUPPORT Please email gvnic-drivers@google.com with the specifics of the issue encountered. -.El .Sh SEE ALSO .Xr ifconfig 8 , .Xr netstat 8 diff --git a/share/man/man4/mem.4 b/share/man/man4/mem.4 index 68969d281532..595cb8a60e5f 100644 --- a/share/man/man4/mem.4 +++ b/share/man/man4/mem.4 @@ -198,7 +198,6 @@ should be set to to update an existing or establish a new range, or to .Dv MEMRANGE_SET_REMOVE to remove a range. -.El .Ss Live Kernel Dumps .Pp The diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 9626e3ef79fd..7d50bd1398e2 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -5039,7 +5039,6 @@ but can be enabled via setting .Va sshd_svcj to .Dq Li YES . -.El .Sh FILES .Bl -tag -width "/etc/defaults/rc.conf" -compact .It Pa /etc/defaults/rc.conf diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 6c725537f97a..5d7462a73c5e 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -640,7 +640,6 @@ Emulate a TPM device. The argument .Ar path needs to point to a valid TPM device path, i.e. .Pa /dev/tpm0 . -.El .Pp Supported options for .Ar type : diff --git a/usr.sbin/pnfsdskill/pnfsdskill.8 b/usr.sbin/pnfsdskill/pnfsdskill.8 index a08492fdb966..97919bd65a83 100644 --- a/usr.sbin/pnfsdskill/pnfsdskill.8 +++ b/usr.sbin/pnfsdskill/pnfsdskill.8 @@ -62,7 +62,6 @@ by the MDS or reported to the MDS by a client. .Pp The pNFS service should continue to run normally so long as the number of operational DSs is at least as many as the level of mirroring. -.El .Sh SEE ALSO .Xr nfsv4 4 , .Xr pnfs 4 , From nobody Mon Oct 7 18:41:41 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMp053PGxz5YXmd; Mon, 07 Oct 2024 18:41: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMp052lBgz4rx8; Mon, 7 Oct 2024 18:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728326501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dYxHALKBa2P0DUiEA5aaQlcu71EUdLX09JfY57u8bm0=; b=RDEdYOcm0bBgwxsEbuFzm3AVtJYxFlEqUkq2/6ddM8xSgfIKA4APygmHoAtQ4XjdEdDflh m8/WH8aBAuIVQcfXglSvY0M9IUEXVYTc9PnkDmCWHpeEVWd4qN4OR0D6pjvhvI35SjQVoM hwf6DYaP7oxMGn33BjpPJTqv+7GEEYDEyY2ZjJz/qS8h6A8e3cxtXXeGe088epka14f+Uc Zo7stXVCG5JY964pGEyuB5OiWSWy0PCEBlRGqokPL02HGNodBGDgFi8C2+iDWKpzpv8oB4 MgNSe16EzDvw+LoqpvOsKLx+AxUbmu7Ifjn5lsQgC1GO5/TGrdIBgvwojwDRaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728326501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dYxHALKBa2P0DUiEA5aaQlcu71EUdLX09JfY57u8bm0=; b=dpY+wH7O9A/d4G4CD7LC6iSkcaVayxSMfluij9EUR+7Qk1fOjL/Kb6hcUWqppdWd2CmGYE DJHB5rVzpVDx3rm7dyn0Ta1GY6qakugsZpzRqjZLHfclh7aJG83z+M/TzLiOw8vXX1wCix GxWbCv+b7vrveMqaIHLCX9XjJpl8N/QYbHkRpb4mdHcTzHdr17jdniy8YPNR4kmtQYhGVJ 2wMoBzY9erzPG+h+U6IGzA2SIuzcrerMWXBSclp7OfdLa27p5Om2wqc6FIt2hh7hqDnEKA ZrAc60OFxOgS5ogytHwOAwTuZc+XK5PwsZ1n3o+kvkZ99vPEBqJvq2lRsPh12Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728326501; a=rsa-sha256; cv=none; b=wue9n87E2Q4KKX3aVr7y0cwY1Q2J+JgKHrKGJhsCzEXkOo4nE1Cq/fEN4WG/aB0L1Tf5Ey MgHbFnN2z4xNTfAQe6EdsT2Nz+b6YiIu93drseFiFxqTHr561+CPbE4QDVh7yjCMgQAzHi N3ytDdstsAX6uVajACp/er+ECEgXkUmLeqOwj/KaRQlIvD+u7Exr9MJxNJsir6tpvoNVlc elebIa/SatZzxLAe5vsX3pu1TpobGn/sryC4mFK1Etua2hI8CcpfilmwYPdbW+zcbtikg4 oQj/aP8ERG3jGwYQEXoFmTWO2Bbw0VeULkZoW4dqd9U+4wT1RE8FNzeB4YvWOg== 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 4XMp052Lyhzy0H; Mon, 7 Oct 2024 18:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497Iffie088892; Mon, 7 Oct 2024 18:41:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497Iffux088889; Mon, 7 Oct 2024 18:41:41 GMT (envelope-from git) Date: Mon, 7 Oct 2024 18:41:41 GMT Message-Id: <202410071841.497Iffux088889@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: d21e322d563e - main - manuals: Fix "missing end of block" errors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d21e322d563e0fd1f92c22205c2ced4bcd22dc23 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d21e322d563e0fd1f92c22205c2ced4bcd22dc23 commit d21e322d563e0fd1f92c22205c2ced4bcd22dc23 Author: Graham Percival AuthorDate: 2024-10-03 18:43:13 +0000 Commit: Mitchell Horne CommitDate: 2024-10-07 18:40:58 +0000 manuals: Fix "missing end of block" errors These were reported by `mandoc -T lint ...` as errors. The rendered output (in ascii and html) is not affected by this commit. Signed-off-by: Graham Percival Reviewed by: mhorne MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1448 --- lib/libc/gen/makecontext.3 | 1 + lib/libc/posix1e/acl_cmp_np.3 | 1 + lib/libc/posix1e/acl_extended_file_np.3 | 1 + lib/libpathconv/abs2rel.3 | 1 + lib/libpathconv/rel2abs.3 | 1 + sbin/init/init.8 | 1 + sbin/pflowctl/pflowctl.8 | 1 + share/man/man4/ahd.4 | 1 + share/man/man4/splash.4 | 1 + 9 files changed, 9 insertions(+) diff --git a/lib/libc/gen/makecontext.3 b/lib/libc/gen/makecontext.3 index bcf836979962..198c541d40a6 100644 --- a/lib/libc/gen/makecontext.3 +++ b/lib/libc/gen/makecontext.3 @@ -152,6 +152,7 @@ via .Fn makecontext ; portable applications should not rely on the implementation detail that it may be possible to pass pointer arguments to functions. +.Ef .Sh HISTORY The .Fn makecontext diff --git a/lib/libc/posix1e/acl_cmp_np.3 b/lib/libc/posix1e/acl_cmp_np.3 index a8dca4959d2e..5e47df833d0d 100644 --- a/lib/libc/posix1e/acl_cmp_np.3 +++ b/lib/libc/posix1e/acl_cmp_np.3 @@ -63,6 +63,7 @@ to the corresponding value: .Bl -tag -width Er .It Bq Er EINVAL Either first or second argument does not point to a valid ACL. +.El .Sh SEE ALSO .Xr acl 3 , .Xr posix1e 3 diff --git a/lib/libc/posix1e/acl_extended_file_np.3 b/lib/libc/posix1e/acl_extended_file_np.3 index 26572be9d2b3..4673e9c3e417 100644 --- a/lib/libc/posix1e/acl_extended_file_np.3 +++ b/lib/libc/posix1e/acl_extended_file_np.3 @@ -75,6 +75,7 @@ to the corresponding value: .Bl -tag -width Er .It Bq Er EACCES Search permission is denied for a component of the path prefix. +.El .Sh SEE ALSO .Xr extattr_get_file 2 , .Xr posix1e 3 diff --git a/lib/libpathconv/abs2rel.3 b/lib/libpathconv/abs2rel.3 index 634f294800e4..9240ef1662e2 100644 --- a/lib/libpathconv/abs2rel.3 +++ b/lib/libpathconv/abs2rel.3 @@ -93,6 +93,7 @@ The .Fa size argument is greater than zero but smaller than the length of the pathname plus 1. +.El .Sh SEE ALSO .Xr rel2abs 3 .Sh AUTHORS diff --git a/lib/libpathconv/rel2abs.3 b/lib/libpathconv/rel2abs.3 index f889f427450d..1f607fd739e1 100644 --- a/lib/libpathconv/rel2abs.3 +++ b/lib/libpathconv/rel2abs.3 @@ -90,6 +90,7 @@ argument is zero. The .Fa size argument is greater than zero but smaller than the length of the pathname plus 1 +.El .Sh SEE ALSO .Xr abs2rel 3 .Sh AUTHORS diff --git a/sbin/init/init.8 b/sbin/init/init.8 index 4f988438cd35..8f6e78b79d7b 100644 --- a/sbin/init/init.8 +++ b/sbin/init/init.8 @@ -396,6 +396,7 @@ back to the default, so that the .Pa /etc/rc script is executed with the standard shell .Pa /bin/sh . +.El .Sh FILES .Bl -tag -width /var/log/init.log -compact .It Pa /dev/console diff --git a/sbin/pflowctl/pflowctl.8 b/sbin/pflowctl/pflowctl.8 index 8c4142f31396..407947613f6f 100644 --- a/sbin/pflowctl/pflowctl.8 +++ b/sbin/pflowctl/pflowctl.8 @@ -83,6 +83,7 @@ and 10.0.0.2:1234 as destination: .Bd -literal -offset indent # pflowctl -s pflow0 src 10.0.0.1 dst 10.0.0.2:1234 .Ed +.El .Sh SEE ALSO .Xr netintro 4 , .Xr pf 4 , diff --git a/share/man/man4/ahd.4 b/share/man/man4/ahd.4 index 12340d05ccf7..c173a8cef619 100644 --- a/share/man/man4/ahd.4 +++ b/share/man/man4/ahd.4 @@ -119,6 +119,7 @@ units 0, 2, and 5. A value of 0x8a enables it for units 1, 3, and 7. Note that controllers can be dynamically configured through a device hint documented below. +.Ed .Sh BOOT OPTIONS The following options are switchable by setting values in .Pa /boot/device.hints . diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4 index b001663c4fa5..8de18434c52f 100644 --- a/share/man/man4/splash.4 +++ b/share/man/man4/splash.4 @@ -253,6 +253,7 @@ and include the following lines: .Bd -literal -offset indent splash="/boot/images/freebsd-logo-rev.png" boot_mute="YES" +.Ed .\".Sh DIAGNOSTICS .Sh SEE ALSO .Xr vidcontrol 1 , From nobody Mon Oct 7 18:41:42 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMp0701frz5YJdq; Mon, 07 Oct 2024 18:41: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMp063Ydnz4rgl; Mon, 7 Oct 2024 18:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728326502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=neYKS3yItInZ2q5XNyk0tiwb/AQp7WgYcTMzjX/SBIM=; b=YR+g5DkWYBzzgKMx+UdRXQTllZ+2yt0G4GxdBzR0ae9V+idtpXU3M6VQR6mXQD8HGGKpn3 GZlSKb75WJmz8Lh5S2b3ov+kU75EnILDK6iMzylYq0LJNdaUiCxudBjQo+CdAKKqBReHJP 3+QOoCwfcMKSJpw8jGatetQ9jeVRZECH1Zjb9r1ZCs9MgZ79VsdRSny+nGImfM1glIofyf y3BSadCPBoBsAKTInyEEf/hP+KThTI4Ya9YrhSLdSVE1KTPiD2CaSSLPJLPLBACkCx4siH gnQxDE+kVcdIcSPy/mi5emnbOrRfI0fewacEp5YFoAod7qkBj+2n+E1WGGcVog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728326502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=neYKS3yItInZ2q5XNyk0tiwb/AQp7WgYcTMzjX/SBIM=; b=g6ogOF1FGBNFVzX4KUsA8Cxfca5vNhYgskr9LMWsyvW7vbPziISlcZ4Rn4jyqnlFMW+yLZ asUbIsMuGyccvyfOcF5V6XPJgve/xjtLUrrtNszx+XiTlgwwgQ8rvcjBAAW7vmFsJtuujo zZuPG/k7UGE7gci4OCxxCnw0evb1fjzIU15s5w7VCF0X7vfsvehAnjTOC9lj1Jrm2mmuV1 OfB7DiKSW8mLePA4Y7Mrmm/9dWqmFrPVlErVfgKrbSQRAco2DVzZwZc/K3jkBnJAxiiT8Z 3a3wWcZQe0xwO0VfDruxbt8v+TK0AuMwCk9L4L+Mqt8Hm8g1+6ZBcFnvoULySw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728326502; a=rsa-sha256; cv=none; b=ajpR/EMy2A4RguWsgeFuYq/aerh0663WQ68nncORU7ZRjWZwXkHMu3cEX37xy8wK+/oZbp 04ggDJz7uyNfUZ6111LUNhlEpUEJ7x/zkv/LSCYgEFFZ8dG3qbn/zH/8NZ+G47+LHj0kCG mCvZbXmwuBGrbDihCr7x7xN6jc801LnTHVy/9zaT2m/2+GJOjKvdWBhp/8DfqNOSmw0Ir6 AJwly2z6NP/P2KgUt2C/agXvHkLPbmxI9LMczb1wuSmu3VnFOX7kcJDGL1JkHAMCQ9L/gm VnnnZbc7q+0i5p+RDC+az8VZBojV9Z8dNJ1wCYQNeEhae2/+Sb0WYPnG6vL/hg== 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 4XMp062vhFzxwg; Mon, 7 Oct 2024 18:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497Ifg0f088931; Mon, 7 Oct 2024 18:41:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497IfgCP088928; Mon, 7 Oct 2024 18:41:42 GMT (envelope-from git) Date: Mon, 7 Oct 2024 18:41:42 GMT Message-Id: <202410071841.497IfgCP088928@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: c8b31033c397 - main - manuals: Misc syntax fixes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8b31033c3971b2b7349804ffda0cea5e4835b40 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c8b31033c3971b2b7349804ffda0cea5e4835b40 commit c8b31033c3971b2b7349804ffda0cea5e4835b40 Author: Graham Percival AuthorDate: 2024-10-04 03:40:23 +0000 Commit: Mitchell Horne CommitDate: 2024-10-07 18:41:14 +0000 manuals: Misc syntax fixes These were reported by `mandoc -T lint ...` as errors. The rendered output (in ascii and html) is not affected by this commit. Additional clarification: there was a non-breaking space in lib/libcasper/services/cap_grp/cap_grp.3. Signed-off-by: Graham Percival Reviewed by: mhorne MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1449 --- lib/libc/gen/exec.3 | 1 - lib/libcasper/services/cap_grp/cap_grp.3 | 2 +- share/man/man4/iwlwififw.4 | 10 +++++----- share/man/man5/rc.conf.5 | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/libc/gen/exec.3 b/lib/libc/gen/exec.3 index ce289ebf502a..41ab18fa89ef 100644 --- a/lib/libc/gen/exec.3 +++ b/lib/libc/gen/exec.3 @@ -49,7 +49,6 @@ .Fn execlp "const char *file" "const char *arg" ... NULL .Ft int .Fn execle "const char *path" "const char *arg" ... NULL "char *const envp[]" -.Fc .Ft int .Fn exect "const char *path" "char *const argv[]" "char *const envp[]" .Ft int diff --git a/lib/libcasper/services/cap_grp/cap_grp.3 b/lib/libcasper/services/cap_grp/cap_grp.3 index 9647b1936b0c..578d8edffbfa 100644 --- a/lib/libcasper/services/cap_grp/cap_grp.3 +++ b/lib/libcasper/services/cap_grp/cap_grp.3 @@ -59,7 +59,7 @@ .Fn cap_getgrgid_r "cap_channel_t *chan" "gid_t gid" "struct group *grp" "char *buffer" "size_t bufsize" "struct group **result" .Ft int .Fn cap_setgroupent "cap_channel_t *chan" "int stayopen" -.Ft int +.Ft int .Fn cap_setgrent "cap_channel_t *chan" .Ft void .Fn cap_endgrent "cap_channel_t *chan" diff --git a/share/man/man4/iwlwififw.4 b/share/man/man4/iwlwififw.4 index a377f6b51f78..debd0cda36b5 100644 --- a/share/man/man4/iwlwififw.4 +++ b/share/man/man4/iwlwififw.4 @@ -46,10 +46,10 @@ driver. .Bl -column -compact "Vendor" "Device" "Subv. " "Subd. " "Firmware-Prefix" .It Ar Name .It Ar Vendor Ta Ar Device Ta Ar Subv. Ta Ar Subd. Ta Ar Firmware-Prefix -.% --------------------------------------------------------------------- -.% This list is manually generated from a sysctl and post-processing. -.% Edits will be overwritten on next update. -.% --------------------------------------------------------------------- +.\" --------------------------------------------------------------------- +.\" This list is manually generated from a sysctl and post-processing. +.\" Edits will be overwritten on next update. +.\" --------------------------------------------------------------------- .It "" .It Intel(R) Dual Band Wireless AC 7260 .It 0x8086 Ta 0x08b1 Ta any Ta 0x4070 Ta iwlwifi-7260 @@ -1340,7 +1340,7 @@ driver. .It "" .It Intel(R) TBD Sc device .It 0x8086 Ta any Ta any Ta any Ta (null) -.% --------------------------------------------------------------------- +.\" --------------------------------------------------------------------- .El .Pp .Em Note: diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 7d50bd1398e2..2897efffd780 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -5008,7 +5008,7 @@ variable is set to .Dq Li YES , this particular service is started in a service jail named -.Va svcj- Ns Ar name Ac . +.Va svcj- Ns Ar name . The .Va svcj_all_enable From nobody Mon Oct 7 19:40:28 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMqHw46Vjz5YMRC; Mon, 07 Oct 2024 19:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMqHw3LtMz4x2D; Mon, 7 Oct 2024 19:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728330028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mm21lqNXQ1wK3GvQEiq0aXMPK7u4zrHHSV4GYhUQkpU=; b=qidleLmUmvNNPti5tcU2UhVTRt7mb0O1/pv1VskhIVL8yM9i/CsxQHv0fAiI21AXSw63n8 +tg2+D13RYkmowzLgO/iTYIL+1fq9jgrd7pRTCwwfPPGa5UXDKLWHeZtJnZuWq4oPcYKPp dJgkyxjr0aESDL6XFm5swDZIJcnuZPBB24RiRVeeV2ni4kZXvPDxA6QGKnp5UIqpDGizz+ 0sErEWx0/Zc4xMHaLcxB52hxkJWCgw39HzXGAgJN0Eh9qcs8aEGn/w41H2GGRQnuaNNB1n Cr2uYC2kEzmS2NbQz6FeAmFljazTF3gDgWU5j+5UifwZ+MDSjvH9XrlIfSk5Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728330028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mm21lqNXQ1wK3GvQEiq0aXMPK7u4zrHHSV4GYhUQkpU=; b=g5JWUiY8S7kHwBG/E0FFsTuI9AUw4kZp375m0QdcXeYXUF+cI7uKQvP6/alLxWoArIQ+h2 rMLXL7T6vB5HcBEtUOl/vEt3d+SyAtJntdWZ9Xp0Np1g42lcXWLdHx3TGe+8AJmIDkEw3D Sp8iB8VS2wq5lagimvtCWxAWH35OkCdir4t0CqHYwchKsB7OBB9CwB2X12nH8YIYvd4ayB c252/psGEuKFBQiP5OFS+FwbksIthZecuTSviaf1ql5xEiRAPPcwcgG6cXNSU6NMNnUAFK rpxb4LPv8oy5x33uvbGMjMl9Hq57wIlo/k3rFw3w25U7BL86dw3FsFZ2BsoQuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728330028; a=rsa-sha256; cv=none; b=ftTv0q1H0Zp0MRCyIXv33kDT7JtGguF4LEDczLHuvIBqVg75vukl0HnETcEZQhgdxukIa/ ZP1ND1mrDbt2x3GfQJfxmy+abBVUGyMsG+QVg8upiVTOWvIhVMQ2hZjDBL905qnstcmfeG nYX6zwRZ6bIqANLL0hl9N9HThKpeh1e92bhyfLyVz8ogLiLn+7W5IsNlrfdAZFAfLubBoq a8jk60BnNSREyPpHGi3Y+2I3lnY21GU6vk3fmA+gy7uN5mMTxP632s5Q65lOp0eViVl1tD mfVyZCX+uYbJXiosBWZwtifSMCc3QCMWbUyyRWf+S3fYnfjqx7Vfjg8RJ5HGpg== 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 4XMqHw2rcWzytY; Mon, 7 Oct 2024 19:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497JeSju085573; Mon, 7 Oct 2024 19:40:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497JeSdA085570; Mon, 7 Oct 2024 19:40:28 GMT (envelope-from git) Date: Mon, 7 Oct 2024 19:40:28 GMT Message-Id: <202410071940.497JeSdA085570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 6684779b3215 - main - capsicum-test: rights are propagated on accept(2) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6684779b321590c71f162390bcf28feee2a3b967 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6684779b321590c71f162390bcf28feee2a3b967 commit 6684779b321590c71f162390bcf28feee2a3b967 Author: Ed Maste AuthorDate: 2024-10-07 18:26:58 +0000 Commit: Ed Maste CommitDate: 2024-10-07 19:40:06 +0000 capsicum-test: rights are propagated on accept(2) As of commit 85b0f9de11c3 ("capsicum: propagate rights on accept(2)") a capability is generated from accept(cap_fd,...). Enable the corresponding test code. PR: 201052 Reviewed by: oshogbo Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46994 --- contrib/capsicum-test/capsicum-freebsd.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/capsicum-test/capsicum-freebsd.h b/contrib/capsicum-test/capsicum-freebsd.h index 96ceb9b6d5f1..da7bb38f073b 100644 --- a/contrib/capsicum-test/capsicum-freebsd.h +++ b/contrib/capsicum-test/capsicum-freebsd.h @@ -59,10 +59,9 @@ typedef unsigned long cap_ioctl_t; // Too many links #define E_TOO_MANY_LINKS EMLINK -// TODO(FreeBSD): uncomment if/when FreeBSD propagates rights on accept. -// FreeBSD does not generate a capability from accept(cap_fd,...). -// https://bugs.freebsd.org/201052 -// #define CAP_FROM_ACCEPT +// As of commit 85b0f9de11c3 ("capsicum: propagate rights on accept(2)") +// FreeBSD generates a capability from accept(cap_fd,...). +#define CAP_FROM_ACCEPT // TODO(FreeBSD): uncomment if/when FreeBSD propagates rights on sctp_peeloff. // FreeBSD does not generate a capability from sctp_peeloff(cap_fd,...). // https://bugs.freebsd.org/201052 From nobody Mon Oct 7 20:52:31 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMrv40S8qz5YSGt; Mon, 07 Oct 2024 20:52: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMrv402H6z53Tk; Mon, 7 Oct 2024 20:52:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728334352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TLuaj+yLjTKhL4ATm7I9yBZ2xlaOWv75UoRAOtmt5wg=; b=GKAe1UiqmDABXV/VAKevvWBhu7IbsPYRPTG3zWxo6YGlTP5yA6GJCppf5ZqMbVhXtQmVe/ ZC2DTQbuBxQR075x/+tzVxrLrZJMNYgWDsgPchNbXz52o/mwQs02Bza2IWjmhC0xB8KNrx 8S0GsNuT/SXlYSSDZX5p3hrtcgEiY2tD4pLwG4ah4X/yYME2cTFbjamHdve8ixfiBAg/bL 638K4qJAM13raithmRMMq+rd+v5CjwJDGvlabvQemzXGrqVf8PzlD4pVZ9U/rkYZqeDcrC tAe+ha+pI7zugl0rSztmLxeJ05Spfy1i7rmEp7sNwYgbWHfvP3CH4sZhASOqJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728334352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TLuaj+yLjTKhL4ATm7I9yBZ2xlaOWv75UoRAOtmt5wg=; b=d96LgC8YbCFq6LyAqcjjVeil3eHGJDIJub+OnORO5dGoqIWAHc9mQWd1qmlSVAcO/NyXIl ecczyzXs91chxAJOqrjh+oDoLvEzzzYjBhwoGn5e/YcWBw8XEexC/ovEUFZBfTKLodE9rT iFQSRgy9jwMB9WmopKmE0Vdu9Rf5KpRvnQ47wfEuFihlCj3/KCVP9zMmP40kUieofLg5lP OqP879vyTBrZdkUqEvBgjskF70wSfdk3RVgEJWgLUa2oZS3pE/7Fhc0bq8yERf/4zz7/Mj 8e3MwN1F4AiUIHZ1UgPqtRa+jfJcuoHS+pqS5+m/krs4oiWrnVXH9peQ3zF3fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728334352; a=rsa-sha256; cv=none; b=O1kjfNlp8Sqrt8urNRT85yguIbrRPShYc5bn9IAMGMvEpgj8vBA8aiCe/gcUq97MDDZBnt kOh29gFm04SP2IAICQcSU4cFLHCXrv9oeu4AfGhLcj1fDI09gsSXXAkTmm17s2941PSqlD 64epAGnWb9Lhe3K3HOSN37wiK4HM2NCywX8kkBraHOhWf5f6qGixjfHTvphhhvafj+gBA/ 01HTiO72hL94YUF3IJB9s3Xe7mnWD3npIhO7s3rgX18Wzjttz84HvrxGIQsPzM9mGCol7W 4YH6g90pE4ZeboIByrIikDcXumFeYPKInc8S8mHFSWq886C6+LDOFsKTC7Y9lw== 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 4XMrv36l1bz12Wn; Mon, 7 Oct 2024 20:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497KqVpo011314; Mon, 7 Oct 2024 20:52:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497KqV5r011311; Mon, 7 Oct 2024 20:52:31 GMT (envelope-from git) Date: Mon, 7 Oct 2024 20:52:31 GMT Message-Id: <202410072052.497KqV5r011311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d8b32da2354d - main - vm_page: Use atomic loads for cmpset loops List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d8b32da2354d2fd72ae017fd63affa3684786e1f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d8b32da2354d2fd72ae017fd63affa3684786e1f commit d8b32da2354d2fd72ae017fd63affa3684786e1f Author: Mark Johnston AuthorDate: 2024-10-07 20:50:36 +0000 Commit: Mark Johnston CommitDate: 2024-10-07 20:52:08 +0000 vm_page: Use atomic loads for cmpset loops Make sure that the compiler loads the initial value value only once. Because atomic_fcmpset is used to load the value for subsequent iterations, this is probably not needed, but we should not rely on that. I verified that code generated for an amd64 GENERIC kernel does not change. Reviewed by: dougm, alc, kib Tested by: pho MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46943 --- sys/vm/vm_page.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 67a9c2119ab8..3a8d8d137dc1 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -2097,7 +2097,7 @@ _vm_domain_allocate(struct vm_domain *vmd, int req_class, int npages) * Attempt to reserve the pages. Fail if we're below the limit. */ limit += npages; - old = vmd->vmd_free_count; + old = atomic_load_int(&vmd->vmd_free_count); do { if (old < limit) return (0); @@ -4239,7 +4239,7 @@ vm_page_wire_mapped(vm_page_t m) { u_int old; - old = m->ref_count; + old = atomic_load_int(&m->ref_count); do { KASSERT(old > 0, ("vm_page_wire_mapped: wiring unreferenced page %p", m)); @@ -4273,7 +4273,7 @@ vm_page_unwire_managed(vm_page_t m, uint8_t nqueue, bool noreuse) * Use a release store when updating the reference count to * synchronize with vm_page_free_prep(). */ - old = m->ref_count; + old = atomic_load_int(&m->ref_count); do { KASSERT(VPRC_WIRE_COUNT(old) > 0, ("vm_page_unwire: wire count underflow for page %p", m)); @@ -4568,7 +4568,7 @@ vm_page_try_blocked_op(vm_page_t m, void (*op)(vm_page_t)) ("vm_page_try_blocked_op: page %p is not busy", m)); VM_OBJECT_ASSERT_LOCKED(m->object); - old = m->ref_count; + old = atomic_load_int(&m->ref_count); do { KASSERT(old != 0, ("vm_page_try_blocked_op: page %p has no references", m)); From nobody Mon Oct 7 20:52:32 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMrv52XSpz5YSGv; Mon, 07 Oct 2024 20:52: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMrv50sPLz544J; Mon, 7 Oct 2024 20:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728334353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XXX91/icJctssQFaVf43GXa9efLBPmpUAuLlJ2Cn/ts=; b=Eq/LHf9+j2qYBR2XTufrMMDNbuakYoI69OYy0hwyZX78cVY0XlMW3kdrl1FtObXYRqysEH h79AakC+fmKb4aNLOPD0GsuTopLEokOQWY1tBKMJdyZUfPk4qELC45s5hZXGH45qk2Ud2j uUBj5c1JEMR6gRjgvEvuy8G08qbOLmOiEW1MGaY+WK0HZp14rcPn2UEs+opKxpRrILnYR5 LoujRFGuXaVRwpCFhgirLUQrC9HQPWvOBzHBjtxTunIZ3Kz7u5tSBw87BgNuekAF38vsBf oWNewc4F/1whJmeA+EDf0dJ0OKn3PzE5rUWxYoT/wkVbhZ9Ell/0/M3e+nKCcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728334353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XXX91/icJctssQFaVf43GXa9efLBPmpUAuLlJ2Cn/ts=; b=pqI+aS9dgnVwUv0MNR6AG0MEKdo+RJO3P03UtOwIdZ1VEi2v7/ZQlg1SbYloUdIyiPogSx lEhR9ZSnWLWAathIthGBvB5YOB1+R0Wx9AYBN13CZgwCTpzP+YQuj7OD5N5C6VywG+OGB+ cVawPS3GFiOru9JqSPqtlaEwbSrh+yuwy16GzBLXgAEjCrHq1MfB0JedvziV062uM/+Uc4 RYV8PbAb7p8dFasmNqlsilCINdGPHnJX1TDVDxMZNelPoegAg89DPWwggaot90d0nX1oVn E6pw8qpbNrg1O3vVwr0/ne/GrV1bPaaFdClaAk2qVSZJjXYAqDi1K+rwE6+r5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728334353; a=rsa-sha256; cv=none; b=jkVznV6wVqvDJmQrNfAmE04PjQ7nvzH3i6h0EoWZ0WXbDoRU2Oui4EAP6jGET3ZMR/6ts6 f7jqC8meVQfQqGF6ayc8stDv0LgTwxKw7puUXmlkh/R3+DPSNRlPLCrasd+2cunEt2pRXA nvA+gtZaEZdBH2DOHE2tsC9zCmeLRNFvtOFE99d/E6aC3tjQ4DRQh4xuLfjQTp9bTR7GQM 8iuAn2dd8lEg4j7nkyaWMlGvKNXs71U8GgtpQX+4Pn7zCQ03wPTsuuKMK2LxLopKVq2ue5 fL68AwCDY0vZmkfNpMlQEr7VpKQXpiYsnATHJ6LWXtZfbHwONnFLvZU9V9XcPg== 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 4XMrv5092Tz12Tc; Mon, 7 Oct 2024 20:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497KqWpr011369; Mon, 7 Oct 2024 20:52:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497KqWVR011366; Mon, 7 Oct 2024 20:52:32 GMT (envelope-from git) Date: Mon, 7 Oct 2024 20:52:32 GMT Message-Id: <202410072052.497KqWVR011366@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c59166e5b4e8 - main - vm_page: Fix a logic bug in vm_page_unwire_managed() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c59166e5b4e8821556a3d23af7bd17ca556f2e22 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c59166e5b4e8821556a3d23af7bd17ca556f2e22 commit c59166e5b4e8821556a3d23af7bd17ca556f2e22 Author: Mark Johnston AuthorDate: 2024-10-07 20:50:49 +0000 Commit: Mark Johnston CommitDate: 2024-10-07 20:52:15 +0000 vm_page: Fix a logic bug in vm_page_unwire_managed() When releasing a page reference, we have logic for various cases, based on the value of the counter. But, the implementation fails to take into account the possibility that the VPRC_BLOCKED flag is set, which is ORed into the counter for short windows when removing mappings of a page. If the flag is set while the last reference is being released, we may fail to add the page to a page queue when the last wiring reference is released. Fix the problem by performing comparisons with VPRC_BLOCKED masked off. While here, add a related assertion. Reviewed by: dougm, kib Tested by: pho MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D46944 --- sys/vm/vm_page.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 3a8d8d137dc1..1f0b364dbde2 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -4275,10 +4275,13 @@ vm_page_unwire_managed(vm_page_t m, uint8_t nqueue, bool noreuse) */ old = atomic_load_int(&m->ref_count); do { + u_int count; + KASSERT(VPRC_WIRE_COUNT(old) > 0, ("vm_page_unwire: wire count underflow for page %p", m)); - if (old > VPRC_OBJREF + 1) { + count = old & ~VPRC_BLOCKED; + if (count > VPRC_OBJREF + 1) { /* * The page has at least one other wiring reference. An * earlier iteration of this loop may have called @@ -4287,7 +4290,7 @@ vm_page_unwire_managed(vm_page_t m, uint8_t nqueue, bool noreuse) */ if ((vm_page_astate_load(m).flags & PGA_DEQUEUE) == 0) vm_page_aflag_set(m, PGA_DEQUEUE); - } else if (old == VPRC_OBJREF + 1) { + } else if (count == VPRC_OBJREF + 1) { /* * This is the last wiring. Clear PGA_DEQUEUE and * update the page's queue state to reflect the @@ -4296,7 +4299,7 @@ vm_page_unwire_managed(vm_page_t m, uint8_t nqueue, bool noreuse) * clear leftover queue state. */ vm_page_release_toq(m, nqueue, noreuse); - } else if (old == 1) { + } else if (count == 1) { vm_page_aflag_clear(m, PGA_DEQUEUE); } } while (!atomic_fcmpset_rel_int(&m->ref_count, &old, old - 1)); @@ -4572,6 +4575,8 @@ vm_page_try_blocked_op(vm_page_t m, void (*op)(vm_page_t)) do { KASSERT(old != 0, ("vm_page_try_blocked_op: page %p has no references", m)); + KASSERT((old & VPRC_BLOCKED) == 0, + ("vm_page_try_blocked_op: page %p blocks wirings", m)); if (VPRC_WIRE_COUNT(old) != 0) return (false); } while (!atomic_fcmpset_int(&m->ref_count, &old, old | VPRC_BLOCKED)); From nobody Mon Oct 7 21:01:33 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMs5T606Zz5YSLj; Mon, 07 Oct 2024 21:01: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMs5T5M0Cz5577; Mon, 7 Oct 2024 21:01:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728334893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dpDc/yi+tlcuNllltkx0PE3A8WA1H9hDo2gp1DbanWI=; b=PIxsBEJ2FdRVBCC0lACvy1qalwpaRx4K+fF/K3QZLsP+AFr6kaGTCKk9kGoK43qT70DRvB 6broS6wHSCueiMms7YNYIZcUoxaqgyP8Gt1uWfZNoJhGe9TO1mDrcYljXrtxlrf5vNOJyr BP+kk8gzkiFZNs7wFcvlbplkhaFGiOhkGOThUqjA1IylIwPrzi8mR1EZpMoXtwCbXFs/C9 Mi46c6fExwLhN9cbrkgRYfa2aSycKdZtDesoaDU3B2rMEaZCsXagV9XmF+fdzFkYOUkpAJ SEQY+EPaXajuPzlK2CqikDesVzN9/h3LAA6UKfZKIW+IaNsbgXxyTfMvmgkM9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728334893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dpDc/yi+tlcuNllltkx0PE3A8WA1H9hDo2gp1DbanWI=; b=ZvPWjKII4tzHXBKzsgw1wazukX0Ep8AysVI2WLYV8sDc5bBHm+7BSy1YTlR3/nW3ousMOM Nagr4rw66eqKM0BDOTNRsD7vIhXCZzGP27oC5LU+eNZkYhjbZChUvCVc9Y0pnD22QQCuOf 9ErhXwu1kshw4R7+ZP5OgD/3eG2708lfR1jt/lNYc1ZncShIigj1F7YS9rXxQiuFgfZ8f1 XkZAh2nPJUYp4gwLOdD6DUp6agBQsuwXBMMczVpJ46NexJy2CHnkLCJhL6UxgOFTXaXwvM lJ9V0zyCYUEX+zmk4qBXFMxfXg4RjCoE/XRgAyXA/PSNLnWLusn3DNcbsxi/Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728334893; a=rsa-sha256; cv=none; b=Ht3DOPHmIwF5oROVRgx/OvwKBImeTLuWfZq34SgIjhnPoM4qKpkRjxk4zLLk+l80gRfwyH uCaggivRl9QwNqzEn+ZvjK/X6NM/29pK3ThIfD3DHopYFOI8zPm+y/FQa3k2Wrgd8POXWg l1JrZN6hnQyU9CClihm/tAgnR4XPbp4Lm/2GiyFce16t8rWpW44gsgOhidlCh424KiSwEI SGzkLnaA1B/9uXGoEOR1ue4BFXlsSg2KDC2RFQ4qPeBvLUydp3fJYRwn5GzylV1SZM7BPs lHYYAwfdidmf/Wrgm06bZ8BUxrgUA19htBzp+v2UbbVyyR6L9vqok5ude7P+/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 4XMs5T4yqSz12jk; Mon, 7 Oct 2024 21:01:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497L1XiM027042; Mon, 7 Oct 2024 21:01:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497L1X28027039; Mon, 7 Oct 2024 21:01:33 GMT (envelope-from git) Date: Mon, 7 Oct 2024 21:01:33 GMT Message-Id: <202410072101.497L1X28027039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 334af5e4131b - main - env: Add a handful of test cases. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 334af5e4131b21c658203635bf713d6a59846585 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=334af5e4131b21c658203635bf713d6a59846585 commit 334af5e4131b21c658203635bf713d6a59846585 Author: Dag-Erling Smørgrav AuthorDate: 2024-10-07 21:00:17 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-07 21:01:09 +0000 env: Add a handful of test cases. MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D46996 --- etc/mtree/BSD.tests.dist | 2 + usr.bin/env/Makefile | 5 +++ usr.bin/env/tests/Makefile | 6 +++ usr.bin/env/tests/env_test.sh | 100 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 113 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 67dc71fbfda4..8cac5e8d55e2 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1097,6 +1097,8 @@ .. du .. + env + .. factor .. file diff --git a/usr.bin/env/Makefile b/usr.bin/env/Makefile index 81f18e58f80e..f284770af5bb 100644 --- a/usr.bin/env/Makefile +++ b/usr.bin/env/Makefile @@ -1,7 +1,12 @@ +.include + PACKAGE= runtime PROG= env SRCS= env.c envopts.c LIBADD= util +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests + .include diff --git a/usr.bin/env/tests/Makefile b/usr.bin/env/tests/Makefile new file mode 100644 index 000000000000..3d2f77b34b67 --- /dev/null +++ b/usr.bin/env/tests/Makefile @@ -0,0 +1,6 @@ +PACKAGE= tests + +ATF_TESTS_SH= env_test +BINDIR= ${TESTSDIR} + +.include diff --git a/usr.bin/env/tests/env_test.sh b/usr.bin/env/tests/env_test.sh new file mode 100644 index 000000000000..7568f81ab603 --- /dev/null +++ b/usr.bin/env/tests/env_test.sh @@ -0,0 +1,100 @@ +# +# Copyright (c) 2024 Klara, Inc. +# +# SPDX-License-Identifier: BSD-2-Clause +# + +magic_words="Squeamish $$ Ossifrage" + +atf_test_case basic +basic_head() +{ + atf_set "descr" "Basic test case" +} +basic_body() +{ + atf_check -o match:"^magic_words=${magic_words}\$" \ + env magic_words="${magic_words}" + export MAGIC_WORDS="${magic_words}" + atf_check -o match:"^MAGIC_WORDS=${magic_words}\$" \ + env + unset MAGIC_WORDS +} + +atf_test_case unset +unset_head() +{ + atf_set "descr" "Unset a variable" +} +unset_body() +{ + export MAGIC_WORDS="${magic_words}" + atf_check -o not-match:"^MAGIC_WORDS=" \ + env -u MAGIC_WORDS + unset MAGIC_WORDS +} + +atf_test_case empty +empty_head() +{ + atf_set "descr" "Empty environment" +} +empty_body() +{ + atf_check env -i +} + +atf_test_case true +true_head() +{ + atf_set "descr" "Run true" +} +true_body() +{ + atf_check env true +} + +atf_test_case false +false_head() +{ + atf_set "descr" "Run false" +} +false_body() +{ + atf_check -s exit:1 env false +} + +atf_test_case false +false_head() +{ + atf_set "descr" "Run false" +} +false_body() +{ + atf_check -s exit:1 env false +} + +atf_test_case altpath +altpath_head() +{ + atf_set "descr" "Use alternate path" +} +altpath_body() +{ + echo "echo ${magic_words}" >magic_words + chmod 0755 magic_words + atf_check -s exit:127 -e match:"No such file" \ + env magic_words + atf_check -o inline:"${magic_words}\n" \ + env -P "${PWD}" magic_words +} + +atf_init_test_cases() +{ + atf_add_test_case basic + atf_add_test_case unset + atf_add_test_case empty + atf_add_test_case true + atf_add_test_case false + atf_add_test_case altpath +} From nobody Mon Oct 7 21:01:34 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMs5V6cR9z5YSTZ; Mon, 07 Oct 2024 21:01: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMs5V5zjBz554k; Mon, 7 Oct 2024 21:01:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728334894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UPnKIu8IWEH4Emg1rUW3mM2ptqPms1iOecMaWXfSeRc=; b=cHzgWCtmR06xENfLLSNwmMZatN3TWFOJuBEwU36spe51++HuMN55xyyBRVQFYCGzDxMJ3i LbPu5EOSC7tUi3T6YrL9WzqIDazQSvHiiibIwRo0lAuL71aWNSb9riHljw07HNzXaITdOn m+wG0/5y/Uzh+IBo9rffP+Gx+/abPNI113H40VRnubJaI6JuZI4SpapEr5UhQ/5TkNdQPJ 1yKV+gZFMJIQ4q/y+UA8CZdB+YXXgDJxExIZEWn0xRSodrn8qeilzEP/w9w7REGFbgXY8u Uy5u3P0EBTJMwB/lEw3qvH2i78SuwIw8phptBdKNF6xQU+cY0x+Zy5ydblQ4ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728334894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UPnKIu8IWEH4Emg1rUW3mM2ptqPms1iOecMaWXfSeRc=; b=IS//aIw3/oaCWVCVVCp8Je6S3lXhZd7xW8Og5uG0wT8AJzqFTyJHjUaCapN2bF/U6b8HOf nIX/gBA08+54OmjQLWpPC16YIc9YpAInhXufziCskB/EXR3SVZqSjiyrNfRJe00X+N0jq2 4Nq6JEgbzAfRliL5mSAspq77rqzdtX34p3SMzfB0N0l9+6VhPOZoivNfgT7e5wRXFIRcW8 /l7OCxKn+ZFozrcWvA7eT6e5BozQPNt2R+sgQmeTlfLXfQPDYGebeMQ0TVde26bLQ2NE7o itjULtozP3IjBiL7BD11O8GO1jn2WZbug9NG9THzpCo6EXP+8pCuI9YBVM/FKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728334894; a=rsa-sha256; cv=none; b=k1IFuDY7rwBhmi/J0D9vVJHRSXTCQkJw4TcA9V6GeAZQiSHmSzqLuh6NlMLMDh+m7c2h6j 9MPRSexSwtSHnJKO+vVFz4J0CVfizpC30Yq8j3g2lzahdFOpFtBEOouTwfsuW1TchCiq/+ t/QgsqZ92EpnplHH4epsWNFFU4u9tVaPLaQshdaFesjfqyc/ixCHApom9lkCjSrF0y5SVa ytV3vVrHSxH659la1Ar7o6qEsCH8pgKf+oRguqQrbfnlk1vEpVao41Ga/QzAd2AaPUBx4b Px9xShv05KnvAemnjb2IyKfAx5oeCIDLXNCMLVWPbemPRdzg2iguZPBnJDa0UA== 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 4XMs5V5bD6z12V6; Mon, 7 Oct 2024 21:01:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497L1Y15027082; Mon, 7 Oct 2024 21:01:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497L1YwG027079; Mon, 7 Oct 2024 21:01:34 GMT (envelope-from git) Date: Mon, 7 Oct 2024 21:01:34 GMT Message-Id: <202410072101.497L1YwG027079@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a0dfb0668b45 - main - env: Improve documentation. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: a0dfb0668b45506de97beb4c7acbe3fd1ba69fc8 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a0dfb0668b45506de97beb4c7acbe3fd1ba69fc8 commit a0dfb0668b45506de97beb4c7acbe3fd1ba69fc8 Author: Dag-Erling Smørgrav AuthorDate: 2024-10-07 21:00:38 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-07 21:01:09 +0000 env: Improve documentation. * The `env` utility's inability to run a command whose name contains an equal sign is a feature, not a bug, so move that paragraph up from the BUGS section to the DESCRIPTION section. * Mention that this can be worked around by prefixing the command name with `command`, and add an example of this to the EXAMPLE section. * Add a test case which verifies that `env` does not run a command with an equal sign in its name even if it exists, and also demonstrates the workaround. MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D46997 --- usr.bin/env/env.1 | 28 +++++++++++++++++++--------- usr.bin/env/tests/env_test.sh | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/usr.bin/env/env.1 b/usr.bin/env/env.1 index 2b98ef40d053..5581d3838a7b 100644 --- a/usr.bin/env/env.1 +++ b/usr.bin/env/env.1 @@ -28,7 +28,7 @@ .\" SUCH DAMAGE. .\" From FreeBSD: src/usr.bin/printenv/printenv.1,v 1.17 2002/11/26 17:33:35 ru Exp .\" -.Dd March 3, 2021 +.Dd October 7, 2024 .Dt ENV 1 .Os .Sh NAME @@ -171,6 +171,19 @@ Both and .Ar utility may not be specified together. +.Pp +The +.Nm +utility does not handle values of +.Ar utility +which have an equals sign +.Pq Ql = +in their name, for obvious reasons. +This can easily be worked around by interposing the +.Xr command 1 +utility, which simply executes its arguments; see +.Sx EXAMPLES +below. .\" .Ss Details of -S (split-string) processing The processing of the @@ -469,6 +482,11 @@ and options: .Pp .Dl "#!/usr/bin/env -S-P/usr/local/bin:/usr/bin:${PATH} perl" +.Pp +To execute a utility with an equal sign in its name: +.Bd -literal -offset indent +env name=value ... command foo=bar arg ... +.Ed .Sh COMPATIBILITY The .Nm @@ -514,14 +532,6 @@ options were added in .Sh BUGS The .Nm -utility does not handle values of -.Ar utility -which have an equals sign -.Pq Ql = -in their name, for obvious reasons. -.Pp -The -.Nm utility does not take multibyte characters into account when processing the .Fl S diff --git a/usr.bin/env/tests/env_test.sh b/usr.bin/env/tests/env_test.sh index 7568f81ab603..da238caaf7fa 100644 --- a/usr.bin/env/tests/env_test.sh +++ b/usr.bin/env/tests/env_test.sh @@ -89,6 +89,25 @@ altpath_body() env -P "${PWD}" magic_words } +atf_test_case equal +equal_head() +{ + atf_set "descr" "Command name contains equal sign" +} +equal_body() +{ + echo "echo ${magic_words}" >"magic=words" + chmod 0755 "magic=words" + atf_check -o match:"^${PWD}/magic=words$" \ + env "${PWD}/magic=words" + atf_check -o match:"^magic=words$" \ + env -P "${PATH}:${PWD}" "magic=words" + atf_check -o inline:"${magic_words}\n" \ + env command "${PWD}/magic=words" + atf_check -o inline:"${magic_words}\n" \ + env PATH="${PATH}:${PWD}" command "magic=words" +} + atf_init_test_cases() { atf_add_test_case basic @@ -97,4 +116,5 @@ atf_init_test_cases() atf_add_test_case true atf_add_test_case false atf_add_test_case altpath + atf_add_test_case equal } From nobody Mon Oct 7 21:16:33 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XMsQn5vfCz5YTH8; Mon, 07 Oct 2024 21:16: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XMsQn5Nd3z56KS; Mon, 7 Oct 2024 21:16:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728335793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dBRHr7LtRzuzPRqSWUtSrIJGUNEY1+cRFiPODkHLBL0=; b=Bf2T2tsRuBB11/j71gA70I5kJE8s9N8VT7mY4x+zbF0WunfyUAEYOdGZj9w1Dx9tkV13fu OWlt1WeCCIah9ENhudbRd0RTgHDXJ+jyj1SzxBR9QLcM77v3Iwe2Ohc4XFMNFSFYJ9+qoN p+4c1VvC9nDItwMiqfBv0MCs6ItyAsOtfYFwdKoH77yUbtI+7WvwtDVuPib0EiM3kUYk3C 3EAnzGFZfuWLjq/hjmm228+5Ymcm1fUIYRtkcm0sCbMnh6FHh6cLK5P59Cnuh9yxBGH7q0 0dkfz+rH1SmMWe31Rl0bV/IdxGvww4W9TIX/18vLTbwRho1wopz1X4PL5/BfXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728335793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dBRHr7LtRzuzPRqSWUtSrIJGUNEY1+cRFiPODkHLBL0=; b=dPBV/ZDqr0eCMI3JIivaboPnesguclxmyD1xAsIfoG/QmPwapnMQj5Uq7Hp/sfsgmf/mzI RPafFY68b5dhx7uR26vHZoAZBjTUDUPcHW6T30WzB1GPAIWtWZSY5rNAfkapm9Mek1x2Zc 7Sh8PiRGZAo6pT23QQAks1JHEkXLYOgDKWxEhlQyZJ4qBrqI8X7bA13YXZqXcUdbq6pl/N Ck1WFKxsBNpwiWUVvTnml173xVvFV2wQx4ckEAFlxu/nPFMqmu53jpxWZYOdZKwjkPeHF/ Xq1IQD2DZGdh2rHiL7mQurVdDSg3yixskkRV3ueudAPCevD91zUpyx1JewlPCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728335793; a=rsa-sha256; cv=none; b=t7ksU0LWxN0HXx2gHaFuAenAwjPrmNuNZfZM+3IB0ZR5f8n5Rz2+UDjuK9VWJCMgAtThQ7 zkXwGLlq6/BEpKUrkaBV/WffjSoi89vhVSgNpEl60xa8HGQiTfKxmHvaBtOcVCTfvtRB9E erCWNC39EuUXlWOlLo00yJgkwVy1nMmGLCPDpdL+K23Uzw3ucUwdXtIe+mO0lJK1TUVeSs yUnwSYcVIXtfLNEA4K3IA4M699sMeacBxCktbiEgVlhEkUp5DRzyZ05/tmI8Vr7aJGJxiG 9cgdy3VFFjHfEK+mV+09zXFv5KV5Gzg4oepgGUG8HjQ09vYd1RCZ/9kCoetJ2g== 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 4XMsQn4gqdz12Rm; Mon, 7 Oct 2024 21:16:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 497LGXFE047971; Mon, 7 Oct 2024 21:16:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497LGXif047968; Mon, 7 Oct 2024 21:16:33 GMT (envelope-from git) Date: Mon, 7 Oct 2024 21:16:33 GMT Message-Id: <202410072116.497LGXif047968@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 3ebb738a9313 - main - bsd-family-tree: FreeBSD 13.4 and OpenBSD 7.6 added List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ebb738a93139fd2f8826a62b5f282480f2e19d5 Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=3ebb738a93139fd2f8826a62b5f282480f2e19d5 commit 3ebb738a93139fd2f8826a62b5f282480f2e19d5 Author: Maxim Konovalov AuthorDate: 2024-10-07 21:16:19 +0000 Commit: Maxim Konovalov CommitDate: 2024-10-07 21:16:19 +0000 bsd-family-tree: FreeBSD 13.4 and OpenBSD 7.6 added --- share/misc/bsd-family-tree | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 0849e883e2c3..7cc017c6d47d 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -456,14 +456,17 @@ FreeBSD 5.2 | | | | | | | | | | | | | | | FreeBSD | | NetBSD | | | | | 13.3 | | 9.4 | | | - | | | | | | | - | | | *--NetBSD | | | - | | | | 10.0 | | | - | | | | | | | - | | | | | OpenBSD 7.5 | - | | | | NetBSD | | - | FreeBSD | | 8.3 | | - | 14.1 | | | | + | | | | | | | | + | | | | *--NetBSD | | | + | | | | | 10.0 | | | + | | | | | | | | + | | | | | | OpenBSD 7.5 | + | | | | | NetBSD | | + | | | | | 8.3 | | + | FreeBSD | | | | | + | 14.1 | | | | | + | FreeBSD | | | | + | 13.4 | | OpenBSD 7.6 | | | | | | FreeBSD 15 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -899,6 +902,8 @@ OpenBSD 7.5 2024-04-05 [OBD] NetBSD 9.4 2024-04-20 [NBD] NetBSD 8.3 2024-05-04 [NBD] FreeBSD 14.1 2024-06-04 [FBD] +FreeBSD 13.4 2024-09-17 [FBD] +OpenBSD 7.6 2024-10-08 [OBD] Bibliography ------------------------ From nobody Tue Oct 8 04:22:48 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XN2tc6ltdz5YvDb; Tue, 08 Oct 2024 04:22: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XN2tc6534z4bQb; Tue, 8 Oct 2024 04:22:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728361368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pPojhcH3AbfZmQWK+Pol+8Qn/EJu3l761FYGclwjzAE=; b=bDXIHDwTdI4nearPBbp+mKkFKvwUb1L5DvXayQhQFvEO29EgdAZFN73LT5oShiA0H/uSAl Lx4yosES+Q8DRvWbQbVP7KviLI9VUntFpP1qovxI7s+XVxxhhzztXrZahXlqfP87UBElXi XuQC+2jvW9fkLQ9n3v08N5oyHRCFMZeReydd0TXRWT1BTz73CgmBIMShWQQkz44fBgrEic BU02dqSdiIbJgkEIO+n+23nOXovKgHsjwJ1JsmprS7ETobrIGyZlYPv1xUuNRXDx4qmceb P3PPf8mU47K66LvoQ3ReyJ6wdTKlZLUJw9huZGOVYRRo5IbW45Xu4EMuQogzgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728361368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pPojhcH3AbfZmQWK+Pol+8Qn/EJu3l761FYGclwjzAE=; b=ZpnQNXSGWqJecUtx66Nj4Fuin7H55LR6KzoEakK5kum7ufeJTjwoIlfGRqMCWpUKwr9edU vbvMvyPDmKxVSNmxQLcSozOm2nrrmKTMQBWT25MrSZWGtR8rd9X0udpPYig+Ao+NE1+ZlE 98vCZkE3v3urbgl8IB1qJdZOejwoKLI8paRrNqZn+dk1iogfGmAlpypfkc0OmBCS0+/+AW S7Fvo2WqM8+Fkn4dKYTRQX/4d44khS/cPQ9SmahHbktm+HUxuhGWW47HYTefkYO/kTLQ4+ WQV8BQQ1Y+A5GDQ1bMIhVn4iUAJmtE0NtVjNOcX8HNR6JwjLidW+bdTYx+XUMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728361368; a=rsa-sha256; cv=none; b=nywHJlVa3QlOm6tbZhw2LdR0dfI3nsTEfKgjLdxn9L2qIImK8M1/mTjLf0vOjRVTZ2R2Sz 4w5hyl1n7RxzmG+I1DgGALuQKuubA4hVYfuvs9BFsr0sYCiEETg1dDRWJrWDEXBlM0QDY/ 0OVFO2Bj1ka1GsVfDSH+Aahklqit7EW/ow/P1hcgvzv8K88yfYoCDqxjqut3txJw62L01W lNBSspOK/RP4GIgNW5WYp5Mi/huQbdrE6l+f8+0ohqTC6mI2Y4CZ80kKGbHzJrZWTTExxQ aEye1vKzfo0sXC4LtNebOtXbCryukY7wKvp5iqTnyYDke/OiubFUNDcFdboYpw== 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 4XN2tc5hH7zGGv; Tue, 8 Oct 2024 04:22:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4984MmrU078528; Tue, 8 Oct 2024 04:22:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4984MmYt078525; Tue, 8 Oct 2024 04:22:48 GMT (envelope-from git) Date: Tue, 8 Oct 2024 04:22:48 GMT Message-Id: <202410080422.4984MmYt078525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 6c711019f289 - main - nvme: Don't create sysctl for io queues not created List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c711019f289320f38eda47dcb55b188342a4476 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6c711019f289320f38eda47dcb55b188342a4476 commit 6c711019f289320f38eda47dcb55b188342a4476 Author: Warner Losh AuthorDate: 2024-10-08 03:08:57 +0000 Commit: Warner Losh CommitDate: 2024-10-08 04:22:40 +0000 nvme: Don't create sysctl for io queues not created When we can't set the number of I/O queues ont he admin queue, we continue on. However, we don't create the I/O queue structures, so having pointers (NULL) into them for sysctls makes no sense and leads to a panic when accessed. When summing up different stats, also skip the ioq stats when it's NULL. Sponsored by: Netflix --- sys/dev/nvme/nvme_sysctl.c | 61 +++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 20 deletions(-) diff --git a/sys/dev/nvme/nvme_sysctl.c b/sys/dev/nvme/nvme_sysctl.c index 447f48e0bdd5..c66f1ed51c9c 100644 --- a/sys/dev/nvme/nvme_sysctl.c +++ b/sys/dev/nvme/nvme_sysctl.c @@ -176,8 +176,10 @@ nvme_sysctl_num_cmds(SYSCTL_HANDLER_ARGS) num_cmds = ctrlr->adminq.num_cmds; - for (i = 0; i < ctrlr->num_io_queues; i++) - num_cmds += ctrlr->ioq[i].num_cmds; + if (ctrlr->ioq != NULL) { + for (i = 0; i < ctrlr->num_io_queues; i++) + num_cmds += ctrlr->ioq[i].num_cmds; + } return (sysctl_handle_64(oidp, &num_cmds, 0, req)); } @@ -191,8 +193,10 @@ nvme_sysctl_num_intr_handler_calls(SYSCTL_HANDLER_ARGS) num_intr_handler_calls = ctrlr->adminq.num_intr_handler_calls; - for (i = 0; i < ctrlr->num_io_queues; i++) - num_intr_handler_calls += ctrlr->ioq[i].num_intr_handler_calls; + if (ctrlr->ioq != NULL) { + for (i = 0; i < ctrlr->num_io_queues; i++) + num_intr_handler_calls += ctrlr->ioq[i].num_intr_handler_calls; + } return (sysctl_handle_64(oidp, &num_intr_handler_calls, 0, req)); } @@ -206,8 +210,10 @@ nvme_sysctl_num_retries(SYSCTL_HANDLER_ARGS) num_retries = ctrlr->adminq.num_retries; - for (i = 0; i < ctrlr->num_io_queues; i++) - num_retries += ctrlr->ioq[i].num_retries; + if (ctrlr->ioq != NULL) { + for (i = 0; i < ctrlr->num_io_queues; i++) + num_retries += ctrlr->ioq[i].num_retries; + } return (sysctl_handle_64(oidp, &num_retries, 0, req)); } @@ -221,8 +227,10 @@ nvme_sysctl_num_failures(SYSCTL_HANDLER_ARGS) num_failures = ctrlr->adminq.num_failures; - for (i = 0; i < ctrlr->num_io_queues; i++) - num_failures += ctrlr->ioq[i].num_failures; + if (ctrlr->ioq != NULL) { + for (i = 0; i < ctrlr->num_io_queues; i++) + num_failures += ctrlr->ioq[i].num_failures; + } return (sysctl_handle_64(oidp, &num_failures, 0, req)); } @@ -236,8 +244,10 @@ nvme_sysctl_num_ignored(SYSCTL_HANDLER_ARGS) num_ignored = ctrlr->adminq.num_ignored; - for (i = 0; i < ctrlr->num_io_queues; i++) - num_ignored += ctrlr->ioq[i].num_ignored; + if (ctrlr->ioq != NULL) { + for (i = 0; i < ctrlr->num_io_queues; i++) + num_ignored += ctrlr->ioq[i].num_ignored; + } return (sysctl_handle_64(oidp, &num_ignored, 0, req)); } @@ -251,8 +261,10 @@ nvme_sysctl_num_recovery_nolock(SYSCTL_HANDLER_ARGS) num = ctrlr->adminq.num_recovery_nolock; - for (i = 0; i < ctrlr->num_io_queues; i++) - num += ctrlr->ioq[i].num_recovery_nolock; + if (ctrlr->ioq != NULL) { + for (i = 0; i < ctrlr->num_io_queues; i++) + num += ctrlr->ioq[i].num_recovery_nolock; + } return (sysctl_handle_64(oidp, &num, 0, req)); } @@ -271,8 +283,10 @@ nvme_sysctl_reset_stats(SYSCTL_HANDLER_ARGS) if (val != 0) { nvme_qpair_reset_stats(&ctrlr->adminq); - for (i = 0; i < ctrlr->num_io_queues; i++) - nvme_qpair_reset_stats(&ctrlr->ioq[i]); + if (ctrlr->ioq != NULL) { + for (i = 0; i < ctrlr->num_io_queues; i++) + nvme_qpair_reset_stats(&ctrlr->ioq[i]); + } } return (0); @@ -413,12 +427,19 @@ nvme_sysctl_initialize_ctrlr(struct nvme_controller *ctrlr) nvme_sysctl_initialize_queue(&ctrlr->adminq, ctrlr_ctx, que_tree); - for (i = 0; i < ctrlr->num_io_queues; i++) { - snprintf(queue_name, QUEUE_NAME_LENGTH, "ioq%d", i); - que_tree = SYSCTL_ADD_NODE(ctrlr_ctx, ctrlr_list, OID_AUTO, - queue_name, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "IO Queue"); - nvme_sysctl_initialize_queue(&ctrlr->ioq[i], ctrlr_ctx, - que_tree); + /* + * Make sure that we've constructed the I/O queues before setting up the + * sysctls. Failed controllers won't allocate it, but we want the rest + * of the sysctls to diagnose things. + */ + if (ctrlr->ioq != NULL) { + for (i = 0; i < ctrlr->num_io_queues; i++) { + snprintf(queue_name, QUEUE_NAME_LENGTH, "ioq%d", i); + que_tree = SYSCTL_ADD_NODE(ctrlr_ctx, ctrlr_list, OID_AUTO, + queue_name, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "IO Queue"); + nvme_sysctl_initialize_queue(&ctrlr->ioq[i], ctrlr_ctx, + que_tree); + } } SYSCTL_ADD_COUNTER_U64(ctrlr_ctx, ctrlr_list, OID_AUTO, "alignment_splits", From nobody Tue Oct 8 04:29:33 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XN32P4PxHz5YvHL; Tue, 08 Oct 2024 04:29: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XN32P3t1rz4c8q; Tue, 8 Oct 2024 04:29:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728361773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5adWVJsFLJq8QZMFhbgw3EIXpqSHi1s+Ozl5Vi2aOO0=; b=DFEObXstDLEEo0zBimOHVUs76g1UczNsuk23RCl1/1rK6mHbI6BMTaj+eANft2+X+lGaew G1G7LL8yEsKPV2QHN25rWPTWHegJLJ6XsG6j4WAO1PdLQR/wpnC3qYD511wVFRp3jkd9Tr OobfmNEZz7XMhsaWNgKSQMwe5XPvAYM59MufQ5xWKGT3ZDUzpGC7Vonh7eX+ZgEqfpYlWy O+IdS+9vSipYBwOZ3B9vlYMUKt+v9039sEevaGPp5DKvn641czN7FxHydU07413aJRRyYt NCpGZuGmE8ZliF9Jk/yMza4+ABaVaq8PVN5YF55SOk4D9McMdlVJotYEff4Ijg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728361773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5adWVJsFLJq8QZMFhbgw3EIXpqSHi1s+Ozl5Vi2aOO0=; b=ARayQl5QDX6o3yxrRjxSGEeXZwA5LpO21UEYZ97K1nSKQLVD6Ak58NiGg805rqzOX2wHp+ USRG3O17UcBsMnoa5PdycnVdnU3FHdTFvN/rGW6bKGKVURAq6HfhccdOEKCCc7pRImjCna KAuh47i/MHRcIjaonhr4GbE/wSuCsS+Yt4kpSGdLD7MKZYJkhonbERHsQYhKIokmeicwN0 bRwXZ71HJ3D3vdRNTjp99BrWvegFODZXGqB5MluoYe5EXuCggss7/ByOXZxxMRkk9v0Sho rAjVUfQ0OYfDVDnK4Px5/vSX+Mi9KJDXMnrPpnPxTwMV06PkcRvwrmQYtE90sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728361773; a=rsa-sha256; cv=none; b=hl+EbBecsozXNhRzp5cBEaG9z8BZeXRoX23tSJXVm3IIY7MHG6IAgqnLh54D8NnRrqVnB5 SOp5MpVKii8MN6NlM5YyB+5oVUQffuVWaPNN59SkaNwmxWir2WGGwnxPX9MhucJGXjGSrv FRfpb0T5f2cn0RTyhSGv2tnlR+8NmUdYSQTyyOiv9o8Z2VaYDGoFjjIcq3VOJNec5QekSM ZqtIhP2dwvr7gCoJI5USbkcBPBM2cF9mF5uNlOCeAetPicXlgJZZIwy1sBLAxgcmsa9eLM zf8dLnTGxT8lCjp1z8bLl/wq81GQnFcbqRunDLLFICX7xu5hWw3bEizfCUtVZg== 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 4XN32P3TKfzG3d; Tue, 8 Oct 2024 04:29:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4984TX0R079647; Tue, 8 Oct 2024 04:29:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4984TXnM079644; Tue, 8 Oct 2024 04:29:33 GMT (envelope-from git) Date: Tue, 8 Oct 2024 04:29:33 GMT Message-Id: <202410080429.4984TXnM079644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: 0a2cfd653e86 - main - libkldelf: add a private library for kernel/kld-related ELF parsing List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a2cfd653e86ac41c4e6e32a449d133c0ee6d677 Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=0a2cfd653e86ac41c4e6e32a449d133c0ee6d677 commit 0a2cfd653e86ac41c4e6e32a449d133c0ee6d677 Author: Ka Ho Ng AuthorDate: 2024-10-08 04:24:07 +0000 Commit: Ka Ho Ng CommitDate: 2024-10-08 04:24:07 +0000 libkldelf: add a private library for kernel/kld-related ELF parsing The libkldelf library was originally a part of kldxref(8). It exposed ELF parsing helpers specialized in parsing KLDs and the kernel executable. The library can be used to read metadata such as linker_set, mod_depend, mod_version and PNP match info, and raw data from the ELF. To promote the reuse of the facilities the ELF parsing code is separated from kldxref(8) into a new private library. kldxref(8) is modified to link against the libkldelf library. Sponsored by: Juniper Networks, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D46719 --- Makefile.inc1 | 11 +++++++++-- lib/Makefile | 1 + lib/libkldelf/Makefile | 21 +++++++++++++++++++++ lib/libkldelf/Makefile.depend | 16 ++++++++++++++++ {usr.sbin/kldxref => lib/libkldelf}/ef.c | 2 +- {usr.sbin/kldxref => lib/libkldelf}/ef_aarch64.c | 2 +- {usr.sbin/kldxref => lib/libkldelf}/ef_amd64.c | 2 +- {usr.sbin/kldxref => lib/libkldelf}/ef_arm.c | 2 +- {usr.sbin/kldxref => lib/libkldelf}/ef_i386.c | 2 +- {usr.sbin/kldxref => lib/libkldelf}/ef_mips.c | 2 +- {usr.sbin/kldxref => lib/libkldelf}/ef_obj.c | 2 +- {usr.sbin/kldxref => lib/libkldelf}/ef_powerpc.c | 2 +- {usr.sbin/kldxref => lib/libkldelf}/ef_riscv.c | 2 +- {usr.sbin/kldxref => lib/libkldelf}/elf.c | 2 +- usr.sbin/kldxref/ef.h => lib/libkldelf/kldelf.h | 6 +++--- share/mk/src.libnames.mk | 2 ++ usr.sbin/kldxref/Makefile | 13 ++++--------- usr.sbin/kldxref/kldxref.c | 2 +- 18 files changed, 67 insertions(+), 25 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 557bbc825625..118e864b69b8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2509,8 +2509,12 @@ ${_bt}-lib/libdwarf: ${_bt_m4_depend} _bt_libelf_depend=${_bt}-lib/libelf .endif +_libkldelf= lib/libkldelf +${_bt}-lib/libkldelf: ${_bt_libelf_depend} +_bt_libkldelf_depend=${_bt}-lib/libkldelf + _kldxref= usr.sbin/kldxref -${_bt}-usr.sbin/kldxref: ${_bt_libelf_depend} +${_bt}-usr.sbin/kldxref: ${_bt_libelf_depend} ${_bt_libkldelf_depend} # flua is required to regenerate syscall files. It first appeared during the # 13.0-CURRENT cycle, thus needs to be built on -older releases and stable @@ -2773,6 +2777,7 @@ bootstrap-tools: ${_bt}-links .PHONY ${_cat} \ ${_kbdcontrol} \ ${_elftoolchain_libs} \ + ${_libkldelf} \ ${_kldxref} \ lib/libopenbsd \ usr.bin/mandoc \ @@ -3216,7 +3221,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ lib/libfigpar \ ${_lib_libgssapi} \ lib/libjail \ - lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \ + lib/libkiconv lib/libkldelf lib/libkvm \ + lib/liblzma lib/libmd lib/libnv \ lib/libzstd \ ${_lib_casper} \ lib/ncurses/tinfo \ @@ -3251,6 +3257,7 @@ _prebuild_libs+= lib/libregex .endif lib/libgeom__L: lib/libexpat__L lib/libsbuf__L +lib/libkldelf__L: lib/libelf__L lib/libkvm__L: lib/libelf__L .if ${MK_RADIUS_SUPPORT} != "no" diff --git a/lib/Makefile b/lib/Makefile index 221eac74ee26..e4a4aa95a1ef 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -66,6 +66,7 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ libiscsiutil \ libjail \ libkiconv \ + libkldelf \ libkvm \ liblua \ liblzma \ diff --git a/lib/libkldelf/Makefile b/lib/libkldelf/Makefile new file mode 100644 index 000000000000..0d1716f17fca --- /dev/null +++ b/lib/libkldelf/Makefile @@ -0,0 +1,21 @@ +.include + +PACKAGE= runtime +LIB= kldelf +PRIVATELIB= yes + +SRCS= ef.c \ + ef_obj.c \ + elf.c \ + ef_aarch64.c \ + ef_arm.c \ + ef_amd64.c \ + ef_i386.c \ + ef_mips.c \ + ef_powerpc.c \ + ef_riscv.c +WARNS?= 2 + +LIBADD= elf + +.include diff --git a/lib/libkldelf/Makefile.depend b/lib/libkldelf/Makefile.depend new file mode 100644 index 000000000000..b0aa274151ad --- /dev/null +++ b/lib/libkldelf/Makefile.depend @@ -0,0 +1,16 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libelf \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/kldxref/ef.c b/lib/libkldelf/ef.c similarity index 99% rename from usr.sbin/kldxref/ef.c rename to lib/libkldelf/ef.c index 975626e46046..052798ee31e4 100644 --- a/usr.sbin/kldxref/ef.c +++ b/lib/libkldelf/ef.c @@ -41,7 +41,7 @@ #include #include -#include "ef.h" +#include "kldelf.h" #define MAXSEGS 16 struct ef_file { diff --git a/usr.sbin/kldxref/ef_aarch64.c b/lib/libkldelf/ef_aarch64.c similarity index 99% rename from usr.sbin/kldxref/ef_aarch64.c rename to lib/libkldelf/ef_aarch64.c index b61de3b032ab..d2db29f22891 100644 --- a/usr.sbin/kldxref/ef_aarch64.c +++ b/lib/libkldelf/ef_aarch64.c @@ -31,7 +31,7 @@ #include #include -#include "ef.h" +#include "kldelf.h" /* * Apply relocations to the values obtained from the file. `relbase' is the diff --git a/usr.sbin/kldxref/ef_amd64.c b/lib/libkldelf/ef_amd64.c similarity index 99% rename from usr.sbin/kldxref/ef_amd64.c rename to lib/libkldelf/ef_amd64.c index fde032dcabc2..7295835f75b3 100644 --- a/usr.sbin/kldxref/ef_amd64.c +++ b/lib/libkldelf/ef_amd64.c @@ -33,7 +33,7 @@ #include #include -#include "ef.h" +#include "kldelf.h" /* * Apply relocations to the values obtained from the file. `relbase' is the diff --git a/usr.sbin/kldxref/ef_arm.c b/lib/libkldelf/ef_arm.c similarity index 99% rename from usr.sbin/kldxref/ef_arm.c rename to lib/libkldelf/ef_arm.c index cc5e265f821e..657294dc9fb0 100644 --- a/usr.sbin/kldxref/ef_arm.c +++ b/lib/libkldelf/ef_arm.c @@ -34,7 +34,7 @@ #include #include -#include "ef.h" +#include "kldelf.h" /* * Apply relocations to the values obtained from the file. `relbase' is the diff --git a/usr.sbin/kldxref/ef_i386.c b/lib/libkldelf/ef_i386.c similarity index 99% rename from usr.sbin/kldxref/ef_i386.c rename to lib/libkldelf/ef_i386.c index 962ed2bc0664..ae571e2d50f2 100644 --- a/usr.sbin/kldxref/ef_i386.c +++ b/lib/libkldelf/ef_i386.c @@ -33,7 +33,7 @@ #include #include -#include "ef.h" +#include "kldelf.h" /* * Apply relocations to the values obtained from the file. `relbase' is the diff --git a/usr.sbin/kldxref/ef_mips.c b/lib/libkldelf/ef_mips.c similarity index 99% rename from usr.sbin/kldxref/ef_mips.c rename to lib/libkldelf/ef_mips.c index e4aeedb5c08b..99790e11a9c3 100644 --- a/usr.sbin/kldxref/ef_mips.c +++ b/lib/libkldelf/ef_mips.c @@ -36,7 +36,7 @@ #include #include -#include "ef.h" +#include "kldelf.h" /* * Apply relocations to the values obtained from the file. `relbase' is the diff --git a/usr.sbin/kldxref/ef_obj.c b/lib/libkldelf/ef_obj.c similarity index 99% rename from usr.sbin/kldxref/ef_obj.c rename to lib/libkldelf/ef_obj.c index ac83137cd394..e09bd036b71e 100644 --- a/usr.sbin/kldxref/ef_obj.c +++ b/lib/libkldelf/ef_obj.c @@ -43,7 +43,7 @@ #include #include -#include "ef.h" +#include "kldelf.h" typedef struct { GElf_Addr addr; diff --git a/usr.sbin/kldxref/ef_powerpc.c b/lib/libkldelf/ef_powerpc.c similarity index 99% rename from usr.sbin/kldxref/ef_powerpc.c rename to lib/libkldelf/ef_powerpc.c index f72cc1d85e20..33f09c0d69ef 100644 --- a/usr.sbin/kldxref/ef_powerpc.c +++ b/lib/libkldelf/ef_powerpc.c @@ -33,7 +33,7 @@ #include #include -#include "ef.h" +#include "kldelf.h" /* * Apply relocations to the values obtained from the file. `relbase' is the diff --git a/usr.sbin/kldxref/ef_riscv.c b/lib/libkldelf/ef_riscv.c similarity index 99% rename from usr.sbin/kldxref/ef_riscv.c rename to lib/libkldelf/ef_riscv.c index 46b9b66bee58..bda04bb2c39a 100644 --- a/usr.sbin/kldxref/ef_riscv.c +++ b/lib/libkldelf/ef_riscv.c @@ -36,7 +36,7 @@ #include #include -#include "ef.h" +#include "kldelf.h" /* * Apply relocations to the values obtained from the file. `relbase' is the diff --git a/usr.sbin/kldxref/elf.c b/lib/libkldelf/elf.c similarity index 99% rename from usr.sbin/kldxref/elf.c rename to lib/libkldelf/elf.c index f98c39b69c0b..da319ffc6c98 100644 --- a/usr.sbin/kldxref/elf.c +++ b/lib/libkldelf/elf.c @@ -44,7 +44,7 @@ #include #include -#include "ef.h" +#include "kldelf.h" SET_DECLARE(elf_reloc, struct elf_reloc_data); diff --git a/usr.sbin/kldxref/ef.h b/lib/libkldelf/kldelf.h similarity index 99% rename from usr.sbin/kldxref/ef.h rename to lib/libkldelf/kldelf.h index 9d3dc1b1b435..e0a8cc627ff2 100644 --- a/usr.sbin/kldxref/ef.h +++ b/lib/libkldelf/kldelf.h @@ -32,8 +32,8 @@ * SUCH DAMAGE. */ -#ifndef _EF_H_ -#define _EF_H_ +#ifndef _KLDELF_H_ +#define _KLDELF_H_ #include #include @@ -312,4 +312,4 @@ int elf_reloc(struct elf_file *ef, const void *reldata, Elf_Type reltype, __END_DECLS -#endif /* _EF_H_*/ +#endif /* _KLDELF_H_*/ diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 1e0a04e83fe3..092e1b444beb 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -27,6 +27,7 @@ _PRIVATELIBS= \ gtest_main \ heimipcc \ heimipcs \ + kldelf \ ldns \ sqlite3 \ ssh \ @@ -312,6 +313,7 @@ _DP_bsnmp= crypto .endif _DP_geom= bsdxml sbuf _DP_cam= sbuf +_DP_kldelf= elf _DP_kvm= elf _DP_casper= nv _DP_cap_dns= nv diff --git a/usr.sbin/kldxref/Makefile b/usr.sbin/kldxref/Makefile index fc9b0b4215fc..c41517a78904 100644 --- a/usr.sbin/kldxref/Makefile +++ b/usr.sbin/kldxref/Makefile @@ -1,17 +1,12 @@ PACKAGE= runtime PROG= kldxref MAN= kldxref.8 -SRCS= kldxref.c ef.c ef_obj.c elf.c -SRCS+= ef_aarch64.c \ - ef_arm.c \ - ef_amd64.c \ - ef_i386.c \ - ef_mips.c \ - ef_powerpc.c \ - ef_riscv.c +SRCS= kldxref.c + +CFLAGS+=-I${SRCTOP}/lib/libkldelf WARNS?= 2 -LIBADD= elf +LIBADD= elf kldelf .include diff --git a/usr.sbin/kldxref/kldxref.c b/usr.sbin/kldxref/kldxref.c index 6bb0469a9ff5..eed754e1e730 100644 --- a/usr.sbin/kldxref/kldxref.c +++ b/usr.sbin/kldxref/kldxref.c @@ -51,7 +51,7 @@ #include #include -#include "ef.h" +#include #define MAXRECSIZE (64 << 10) /* 64k */ #define check(val) if ((error = (val)) != 0) break From nobody Tue Oct 8 04:29:34 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XN32Q5X7pz5Yv5f; Tue, 08 Oct 2024 04:29: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XN32Q4rmSz4c6d; Tue, 8 Oct 2024 04:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728361774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wFYXeNv8dTP5/4JTpjF9uKby0wEbus23RYpIDBSfkhw=; b=fNFt+RfsZjIV7WID+I/L76CFaO0aJCjWSjOE6bS+ay84xeTVW4Du2uVVPieLRh80PMpPS/ 5gxYAi1gq1LRNwrvabS1Ta4YMrTzA0JuKn5H1SCHIDDYVDTHTgM1bKnucjZcJAtlTAuNNh Yhi1CLBwGlfT5HC25hKLutupc80hVp7bX8EruF52itkmmESOzVR0aqenYwCmUu3azjXVm4 pooOzLNuUjSRQWoY6zSkJdbPPZgAP+3CJhQWrzu8/WSdjhJcEIlhT+vLtWtAVv0s7oncma fIHPWMVPaTbTLMOEQnX34s34xsx2W2K7MmNyee1FB0StNIA3xu4dpqRLFFPRDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728361774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wFYXeNv8dTP5/4JTpjF9uKby0wEbus23RYpIDBSfkhw=; b=N4xmNmeBvo8cQA/ZSRYg26OwMQJnu8yi85+s0NquGgt+oHBwqU7m1KjkpC9E/XmquWZFaQ 0Gazi8QuL/6xbS40adj24m2Puz6vNiY0Wwzpia8o0qsXHB03ssVJojGIYxVtHFSDvlBn1m HoYCkI9XxR2GRDvApCbpX/VzdCgwuZ7xSgyqKjHM0ilSGZssfeeYe8jWsU3Zh0X6UIiVjc B1c6J8WLPHhzwr7cfeWFaGMOmZXCUgbEDyuYh0MU+244mfemn/UenFXjMvnVTqrSmY0PoS A8CxnD9dB/g1jpl6VTg/m/fO+TelWDefRklUIfOvP1VmZ7N26NRxDb4wv0M0Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728361774; a=rsa-sha256; cv=none; b=WcW2n9E2K2WpECQw8VWtiaRl3+Un7HOPJyrKxciz6aqo/oIqZPmndWtv/w5BuvoQ1A+qfn 4sO6MYFKVmpdVNFK7SOXXQZdvGDdStcLySNm2ucipMVUBtSmy8f732bk9pmWR2CJ2qD2iW iI58fIHszynd5/pz24HHiQNcabPdBbAqbO5IpucR8k9IB02naytWHUlMBX2e4p5EXIXx+H V+4uCgMjzgtOLFdPnkpeNeiRfj4TBi5cGpnLURzP61E1Z6jWjOyXZ3j5Apm70NLF8u+6uA Or4mhsDpeAf3qlMwogbXeohu2D65a/E5iiomgNEQC76ObDppIhpfIjSsNu51Cw== 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 4XN32Q4S3wzFqX; Tue, 8 Oct 2024 04:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4984TYk9079691; Tue, 8 Oct 2024 04:29:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4984TYtp079688; Tue, 8 Oct 2024 04:29:34 GMT (envelope-from git) Date: Tue, 8 Oct 2024 04:29:34 GMT Message-Id: <202410080429.4984TYtp079688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: 2c7d84795628 - main - libkldelf: add elf_lookup_symbol function List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c7d84795628cb9c7a266718b99b6bca68e0a135 Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=2c7d84795628cb9c7a266718b99b6bca68e0a135 commit 2c7d84795628cb9c7a266718b99b6bca68e0a135 Author: Ka Ho Ng AuthorDate: 2024-10-08 04:24:37 +0000 Commit: Ka Ho Ng CommitDate: 2024-10-08 04:29:10 +0000 libkldelf: add elf_lookup_symbol function The elf_lookup_symbol function looks up the symbol with a given symbol name. A pointer to the GElf_Sym of the symbol is returned if the symbol exists in the opened ELF file. Sponsored by: Juniper Networks, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D46764 --- lib/libkldelf/ef.c | 1 + lib/libkldelf/ef_obj.c | 1 + lib/libkldelf/elf.c | 6 ++++++ lib/libkldelf/kldelf.h | 13 +++++++++++++ 4 files changed, 21 insertions(+) diff --git a/lib/libkldelf/ef.c b/lib/libkldelf/ef.c index 052798ee31e4..dcd87fe2bf83 100644 --- a/lib/libkldelf/ef.c +++ b/lib/libkldelf/ef.c @@ -89,6 +89,7 @@ static struct elf_file_ops ef_file_ops = { .seg_read_string = ef_seg_read_string, .symaddr = ef_symaddr, .lookup_set = ef_lookup_set, + .lookup_symbol = ef_lookup_symbol, }; static void diff --git a/lib/libkldelf/ef_obj.c b/lib/libkldelf/ef_obj.c index e09bd036b71e..32a7c17127ed 100644 --- a/lib/libkldelf/ef_obj.c +++ b/lib/libkldelf/ef_obj.c @@ -109,6 +109,7 @@ static struct elf_file_ops ef_obj_file_ops = { .seg_read_string = ef_obj_seg_read_string, .symaddr = ef_obj_symaddr, .lookup_set = ef_obj_lookup_set, + .lookup_symbol = ef_obj_lookup_symbol, }; static GElf_Off diff --git a/lib/libkldelf/elf.c b/lib/libkldelf/elf.c index da319ffc6c98..8af02622de13 100644 --- a/lib/libkldelf/elf.c +++ b/lib/libkldelf/elf.c @@ -686,3 +686,9 @@ elf_reloc(struct elf_file *efile, const void *reldata, Elf_Type reltype, return (efile->ef_reloc(efile, reldata, reltype, relbase, dataoff, len, dest)); } + +int +elf_lookup_symbol(struct elf_file *efile, const char *name, GElf_Sym **sym) +{ + return (EF_LOOKUP_SYMBOL(efile, name, sym)); +} diff --git a/lib/libkldelf/kldelf.h b/lib/libkldelf/kldelf.h index e0a8cc627ff2..71de31a94291 100644 --- a/lib/libkldelf/kldelf.h +++ b/lib/libkldelf/kldelf.h @@ -48,6 +48,8 @@ (ef)->ef_ops->symaddr((ef)->ef_ef, symidx) #define EF_LOOKUP_SET(ef, name, startp, stopp, countp) \ (ef)->ef_ops->lookup_set((ef)->ef_ef, name, startp, stopp, countp) +#define EF_LOOKUP_SYMBOL(ef, name, sym) \ + (ef)->ef_ops->lookup_symbol((ef)->ef_ef, name, sym) /* XXX, should have a different name. */ typedef struct ef_file *elf_file_t; @@ -67,6 +69,7 @@ struct elf_file_ops { GElf_Addr (*symaddr)(elf_file_t ef, GElf_Size symidx); int (*lookup_set)(elf_file_t ef, const char *name, GElf_Addr *startp, GElf_Addr *stopp, long *countp); + int (*lookup_symbol)(elf_file_t ef, const char *name, GElf_Sym **sym); }; typedef int (elf_reloc_t)(struct elf_file *ef, const void *reldata, @@ -310,6 +313,16 @@ int elf_read_mod_pnp_match_info(struct elf_file *efile, GElf_Addr addr, int elf_reloc(struct elf_file *ef, const void *reldata, Elf_Type reltype, GElf_Addr relbase, GElf_Addr dataoff, size_t len, void *dest); +/* + * Find the symbol with the specified symbol name 'name' within the given + * 'efile'. 0 is returned when such a symbol is found, otherwise ENOENT is + * returned. + * + * XXX: This only return the first symbol being found when traversing symtab. + */ +int elf_lookup_symbol(struct elf_file *efile, const char *name, + GElf_Sym **sym); + __END_DECLS #endif /* _KLDELF_H_*/ From nobody Tue Oct 8 04:29:35 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XN32S0q35z5YvM9; Tue, 08 Oct 2024 04:29:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XN32R69fWz4cC7; Tue, 8 Oct 2024 04:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728361775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D0RQpERiirhtoAJx+tC71u4Itzed0SzHJTNh+Fh3FTo=; b=cG1dyNyQJuZvEIs1Gbww33FGlqMr6YjfFGRSM8VCGUCNxhfywoPYPzJWBKG9mM1p71nUZz +nrelkKnYguHhbYlOBhATPNEqcvpfKW6i68Qsv1YRz0J7Gz8tna+bI5j+zsFPSdlNA60E8 /t5qjd7h2/WI2oCaqYUe01H6IT5xJ2hHviNpFM76ie8HIzjFvBDELrggN8GPOm9EaR4ZHR ZrARZO79bqcCjjlHG9aeBi8Splcnl12Ge3/uRDN51V6Kjgf9diwUtNdmmMJBDbxuIRycCn LlYWSsRhwxWICcPppdkVeAi8FXDx7XfXS7nzH2PeqeL+m5W78y2p28TxMqI9uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728361775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D0RQpERiirhtoAJx+tC71u4Itzed0SzHJTNh+Fh3FTo=; b=gJafdwGfMX9wHw1CsFUaqfVJmP3gxcH6Xzi/8tIoX5gRApe+qoJg6KNrE+C9/iwHHzEwZP +1ezZBHi13C+7OmMTsfal4frNI/tjRjdBe7gfj3/5RvLzFQcnHM4LyL6+3Pt7FMgVNnBxQ 9kLW/S6xLrz9zUDUckyNc8YGhJb7AsegOaAh/8NqX+Ye5jOBA6RxQIfB24zFo6CcdmCKg4 5GcPHFH3QGsU/5yZaai0FTlvgN2f2JKJm12gs71Yhzf2a4eP4SkxNUmcFTHcNY7hkNVFnE 92J+DI8mSRR1Fy3NDe6dBaQ6SyB6IkBru2tITHlTnXdj3YkBpL62gWUFLp4ang== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728361775; a=rsa-sha256; cv=none; b=kNpuW6Wm5BvCd2swMugGz50wlDr/kd3L1E8Vro2luxL4fc5a6Gi1649yhsxtuhHXe9Lvai khv7tQ+RmJy0p1BXrVt+WRHdQy/LO5p+laX/0ym9JlKyUdqya5kAPnfaqiK2+lIugTggVZ o7G2l5lNOGJP4L5ZOy500nwAO202cvwvRkcfXEbEPBnJMzA7PpvYKPq86OYBMo8DNvuTkq Anu2b960bw8SE7j5xqBFiiD1FcqMcamzKS4pj/BSRGvNukoHVj1iXMceePd8d/aJ0NDJys 2YrTWucU+luLuCXwfRXBtTZJCtoDYCiZKg5IY+dHSkxXlaeSARHyTG7KDF5VOA== 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 4XN32R5TL4zGJt; Tue, 8 Oct 2024 04:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4984TZ9c079741; Tue, 8 Oct 2024 04:29:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4984TZKS079738; Tue, 8 Oct 2024 04:29:35 GMT (envelope-from git) Date: Tue, 8 Oct 2024 04:29:35 GMT Message-Id: <202410080429.4984TZKS079738@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: 550ee2d03c5b - main - libkldelf: use warnx instead of printf List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 550ee2d03c5b88bc5d74b257ffcb3ed2c06a60bb Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=550ee2d03c5b88bc5d74b257ffcb3ed2c06a60bb commit 550ee2d03c5b88bc5d74b257ffcb3ed2c06a60bb Author: Ka Ho Ng AuthorDate: 2024-10-08 04:25:36 +0000 Commit: Ka Ho Ng CommitDate: 2024-10-08 04:29:10 +0000 libkldelf: use warnx instead of printf Sponsored by: Juniper Networks, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D46893 --- lib/libkldelf/ef_obj.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libkldelf/ef_obj.c b/lib/libkldelf/ef_obj.c index 32a7c17127ed..30e0d7886995 100644 --- a/lib/libkldelf/ef_obj.c +++ b/lib/libkldelf/ef_obj.c @@ -345,20 +345,20 @@ ef_obj_open(struct elf_file *efile, int verbose) if ((ef->nprogtab != 0 && ef->progtab == NULL) || (ef->nrel != 0 && ef->reltab == NULL) || (ef->nrela != 0 && ef->relatab == NULL)) { - printf("malloc failed\n"); + warnx("malloc failed"); error = ENOMEM; goto out; } if (elf_read_symbols(efile, symtabindex, &ef->ddbsymcnt, &ef->ddbsymtab) != 0) { - printf("elf_read_symbols failed\n"); + warnx("elf_read_symbols failed"); goto out; } if (elf_read_string_table(efile, &shdr[symstrindex], &ef->ddbstrcnt, &ef->ddbstrtab) != 0) { - printf("elf_read_string_table failed\n"); + warnx("elf_read_string_table failed"); goto out; } @@ -367,7 +367,7 @@ ef_obj_open(struct elf_file *efile, int verbose) shdr[hdr->e_shstrndx].sh_type == SHT_STRTAB) { if (elf_read_string_table(efile, &shdr[hdr->e_shstrndx], &ef->shstrcnt, &ef->shstrtab) != 0) { - printf("elf_read_string_table failed\n"); + warnx("elf_read_string_table failed"); goto out; } } @@ -413,7 +413,7 @@ ef_obj_open(struct elf_file *efile, int verbose) ef->reltab[rl].sec = shdr[i].sh_info; if (elf_read_rel(efile, i, &ef->reltab[rl].nrel, &ef->reltab[rl].rel) != 0) { - printf("elf_read_rel failed\n"); + warnx("elf_read_rel failed"); goto out; } rl++; @@ -422,7 +422,7 @@ ef_obj_open(struct elf_file *efile, int verbose) ef->relatab[ra].sec = shdr[i].sh_info; if (elf_read_rela(efile, i, &ef->relatab[ra].nrela, &ef->relatab[ra].rela) != 0) { - printf("elf_read_rela failed\n"); + warnx("elf_read_rela failed"); goto out; } ra++; From nobody Tue Oct 8 06:44:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XN62g5xk8z5Z3Gj; Tue, 08 Oct 2024 06:44: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XN62g4NGsz40N9; Tue, 8 Oct 2024 06:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728369899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F5qETBIoVxVf3HcNit9ycOxcGaCHf40R++cYiefd9Bg=; b=RN1ZHp3eUCTX6VfYS11CyLuv8PkrGWGlXv/1+4m07VTb+ZrroJ0rrUdJdQw4fKwgUlTihC L0E1spybNa5whPq/kenrKC7MLryyFMMF7z/AnGr5/yfTiV5v5rRdWUfvDk+PbqcOUxJ/xT +GFmx+5137eb0DsRnD8RFBXcYxkwHjCWEf5CwFozDSttWIxgVRH/uWgylZE3lyyrHdkhQU FD7uACFFWf/hPrQrPiAIMewSsonqB9Hpn2JHDa86EdywICM/hkGh56vHWnLYWz07ZK0/Fj tctM3B+1uPsYDMwHvEZbkLkRjpo798e5oNcTZd6p4WUnCRpIA6YB/b8rcyaKpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728369899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F5qETBIoVxVf3HcNit9ycOxcGaCHf40R++cYiefd9Bg=; b=LUVGlQ06vTC561CkBEP1d9qXvgi5sibTtdt6z+yTqcDfQJOpzLwYYMF8ukUs3jIxdTddsb BHVGVXp3tmbvgNrv9MHUm6dWq6AZAF4t2C/zBNOeSwC4ScoRWOAgemV/W5IVRH/NE6kbKX 6gut2E1OMuKJytt1D1Oo2S4G99tjGqUZ1FO38UelwMdbZA2+5iVCqOjdAo1LiglA2xOwDL CDldppBrNWCKGgNxv+wI09asjHhDIiS4CBfPpDQycJBzLBMYlWMF2xv4lPMC1SpIlrmObW 0296OqLUUtTSyhKE3bmjxlWIo36rMKolkRj4s56IO84P8pFQ+oug0d5oGEg+Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728369899; a=rsa-sha256; cv=none; b=b+wGVQ9BWcrU0k1H5CjVV/9VOvAdaQeToORkXQ71pe7hd/AV+wwgpeHMmFBMOWZi3Tx39t qwGUntzNnarrlieOXr4JWzkyX3luJZTWQbQjf966nuxQx7ukLMdoI1+WvhmJsEZxHcmW92 xJFQ0O4cwFp/2rD2LcW2Lcsxd8+Z5OgVWHq1EQ4+sm8rsN3qGB3nm/v10MmSmSAkw8vJa1 x8iesh2iNqm9hEoqq8z2xX+3o40AfdKmpcyz3k4+TNOihmm5uJgrIzHIgXtZYM7ZY7bHab vSxA6RrssWxvSyt3Q7kPsBE4NvToBzlaNU/LPW6BhnqceQrDJvp1A2MhD7zgVg== 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 4XN62g3skQzKj6; Tue, 8 Oct 2024 06:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4986ixQ1016103; Tue, 8 Oct 2024 06:44:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4986ix29016100; Tue, 8 Oct 2024 06:44:59 GMT (envelope-from git) Date: Tue, 8 Oct 2024 06:44:59 GMT Message-Id: <202410080644.4986ix29016100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 88a198af3c20 - main - powerd: use nlsysevent if possible List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88a198af3c20730f638a60aa699f4d5aa1650512 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=88a198af3c20730f638a60aa699f4d5aa1650512 commit 88a198af3c20730f638a60aa699f4d5aa1650512 Author: Baptiste Daroussin AuthorDate: 2024-10-07 08:48:55 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-08 06:40:58 +0000 powerd: use nlsysevent if possible instead of depending on devd and its socket, try to use nlsysevent instead. This makes powerd independant from devd. Approved by: des Reviewed by: des Differential Revission: https://reviews.freebsd.org/D46972 --- usr.sbin/powerd/powerd.c | 113 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 106 insertions(+), 7 deletions(-) diff --git a/usr.sbin/powerd/powerd.c b/usr.sbin/powerd/powerd.c index 8517b4f2bf0b..7be24e0c01ad 100644 --- a/usr.sbin/powerd/powerd.c +++ b/usr.sbin/powerd/powerd.c @@ -29,17 +29,26 @@ #include #include +#include +#include #include #include #include #include #include +#include +#include +#include +#include +#include + #include #include #include #include #include +#include #include #include #include @@ -88,7 +97,8 @@ static int read_freqs(int *numfreqs, int **freqs, int **power, int minfreq, int maxfreq); static int set_freq(int freq); static void acline_init(void); -static void acline_read(void); +static void acline_read(int rfds); +static bool netlink_init(void); static int devd_init(void); static void devd_close(void); static void handle_sigs(int sig); @@ -117,6 +127,7 @@ typedef enum { #ifdef USE_APM ac_apm, #endif + ac_acpi_netlink, } acline_mode_t; static acline_mode_t acline_mode; static acline_mode_t acline_mode_user = ac_none; @@ -124,6 +135,8 @@ static acline_mode_t acline_mode_user = ac_none; static int apm_fd = -1; #endif static int devd_pipe = -1; +static bool try_netlink = true; +static struct snl_state ss; #define DEVD_RETRY_INTERVAL 60 /* seconds */ static struct timeval tried_devd; @@ -325,9 +338,48 @@ acline_init(void) } } +struct nlevent { + const char *name; + const char *subsystem; + const char *type; + const char *data; +}; +#define _OUT(_field) offsetof(struct nlevent, _field) +static struct snl_attr_parser ap_nlevent_get[] = { + { .type = NLSE_ATTR_SYSTEM, .off = _OUT(name), .cb = snl_attr_get_string }, + { .type = NLSE_ATTR_SUBSYSTEM, .off = _OUT(subsystem), .cb = snl_attr_get_string }, + { .type = NLSE_ATTR_TYPE, .off = _OUT(type), .cb = snl_attr_get_string }, + { .type = NLSE_ATTR_DATA, .off = _OUT(data), .cb = snl_attr_get_string }, +}; +#undef _OUT + +SNL_DECLARE_GENL_PARSER(nlevent_get_parser, ap_nlevent_get); + static void -acline_read(void) +acline_read(int rfds) { + if (acline_mode == ac_acpi_netlink) { + struct nlmsghdr *hdr; + struct nlevent ne; + char *ptr; + int notify; + + if (rfds == 0) + return; + hdr = snl_read_message(&ss); + if (hdr != NULL && hdr->nlmsg_type != NLMSG_ERROR) { + memset(&ne, 0, sizeof(ne)); + if (!snl_parse_nlmsg(&ss, hdr, &nlevent_get_parser, &ne)) + return; + if (strcmp(ne.subsystem, "ACAD") != 0) + return; + if ((ptr = strstr(ne.data, "notify=")) != NULL && + sscanf(ptr, "notify=%x", ¬ify) == 1) + acline_status = (notify ? SRC_AC : SRC_BATTERY); + } + return; + + } if (acline_mode == ac_acpi_devd) { char buf[DEVCTL_MAXBUF], *ptr; ssize_t rlen; @@ -383,10 +435,20 @@ acline_read(void) #else if (acline_mode == ac_sysctl && (acline_mode_user == ac_none || - acline_mode_user == ac_acpi_devd)) { + acline_mode_user == ac_acpi_devd || + acline_mode_user == ac_acpi_netlink)) { #endif struct timeval now; + if (acline_mode_user != ac_acpi_devd && try_netlink) { + try_netlink = false; /* only try once */ + if (netlink_init()) { + if (vflag) + warnx("using netlink for AC line status"); + acline_mode = ac_acpi_netlink; + } + return; + } gettimeofday(&now, NULL); if (now.tv_sec > tried_devd.tv_sec + DEVD_RETRY_INTERVAL) { if (devd_init() >= 0) { @@ -399,6 +461,38 @@ acline_read(void) } } +bool +netlink_init(void) +{ + struct _getfamily_attrs attrs; + + if (modfind("nlsysevent") < 0) + kldload("nlsysevent"); + if (modfind("nlsysevent") < 0) + return (false); + + if (!snl_init(&ss, NETLINK_GENERIC)) + return (false); + + if (!snl_get_genl_family_info(&ss, "nlsysevent", &attrs)) + return (false); + + for (unsigned int i = 0; i < attrs.mcast_groups.num_groups; i++) { + if (strcmp(attrs.mcast_groups.groups[i]->mcast_grp_name, + "ACPI") == 0) { + if (setsockopt(ss.fd, SOL_NETLINK, + NETLINK_ADD_MEMBERSHIP, + &attrs.mcast_groups.groups[i]->mcast_grp_id, + sizeof(attrs.mcast_groups.groups[i]->mcast_grp_id)) + == -1) { + warnx("Cannot subscribe to \"ACPI\""); + return (false); + } + } + } + return (true); +} + static int devd_init(void) { @@ -460,6 +554,8 @@ parse_acline_mode(char *arg, int ch) else if (strcmp(arg, "apm") == 0) acline_mode_user = ac_apm; #endif + else if (strcmp(arg, "netlink") == 0) + acline_mode_user = ac_acpi_netlink; else errx(1, "bad option: -%c %s", (char)ch, optarg); } @@ -485,7 +581,7 @@ main(int argc, char * argv[]) { struct timeval timeout; fd_set fdset; - int nfds; + int nfds, rfds; struct pidfh *pfh = NULL; const char *pidfile = NULL; int freq, curfreq, initfreq, *freqs, i, j, *mwatts, numfreqs, load; @@ -638,7 +734,7 @@ main(int argc, char * argv[]) * If we are in adaptive mode and the current frequency is outside the * user-defined range, adjust it to be within the user-defined range. */ - acline_read(); + acline_read(0); if (acline_status > SRC_UNKNOWN) errx(1, "invalid AC line status %d", acline_status); if ((acline_status == SRC_AC && @@ -683,6 +779,9 @@ main(int argc, char * argv[]) if (devd_pipe >= 0) { FD_SET(devd_pipe, &fdset); nfds = devd_pipe + 1; + } else if (acline_mode == ac_acpi_netlink) { + FD_SET(ss.fd, &fdset); + nfds = ss.fd + 1; } else { nfds = 0; } @@ -694,7 +793,7 @@ main(int argc, char * argv[]) to = poll_ival * 4; timeout.tv_sec = to / 1000000; timeout.tv_usec = to % 1000000; - select(nfds, &fdset, NULL, &fdset, &timeout); + rfds = select(nfds, &fdset, NULL, &fdset, &timeout); /* If the user requested we quit, print some statistics. */ if (exit_requested) { @@ -706,7 +805,7 @@ main(int argc, char * argv[]) } /* Read the current AC status and record the mode. */ - acline_read(); + acline_read(rfds); switch (acline_status) { case SRC_AC: mode = mode_ac; From nobody Tue Oct 8 06:50:42 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XN69G3g2zz5Z3nF; Tue, 08 Oct 2024 06:50: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XN69G383Lz40kR; Tue, 8 Oct 2024 06:50:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728370242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3GuYwGmRjE0gj9I0yI/sfIbHys7rrruzdxXDEmMXpJ4=; b=pKjnoec0It3SNDLmECmOBQFU4JVrlFZLt7e3LmqoY+tjgi4J2xb9S1AvRriQOa0DWc9NWI SKt9QcEDPBbQt33cL/vIF/r+e8FSq7MVmo5RAJ9BXkHoW1gcnUa+v47Qp7ZOvtV9uMeaAO JYg8RVWlPVsGefAzFJFe/YnYST5RSzHHxewdVj7YE9gzUCPGjl0AV9hh0OSeBc8xGgx/d6 5oDJgmIjfmu+gcZKelhn14QWpFe9qMukJCWv1Ld7QvntqBcy8lVvKSVVzO4vqdCm7KNKA9 tOQgOr4Sm7vUXGQ2SbqdZXhNOTmHwfJ1CYgTDDVet4gAItrrENf6T9HfTGf+wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728370242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3GuYwGmRjE0gj9I0yI/sfIbHys7rrruzdxXDEmMXpJ4=; b=N5GBNLcV9EjsxRKXZTCP6rWdgTrTpjfPAAULS/NVFYl7c2OKWaE0UHJANOkk+mPTAWncDk j3NvhgWt7BtKkMekPoeO6atKsqrGOyh63l6T9eT1+aX+j6KV0xxqk2R8Kicq7grLzs+j9r 3rlOj4p9vfcnWTrDUUhg9qcolE20eLrirSAOYX2vd54CI9f/bVBYPmncxkPw6ojiTFDZwX muw/49EzAeVE6usubfVVbqsQRcUZhFByOSzX8QYMW65OHg0uXKsnlgett7BChDaG5+taUE iMFMGBfY3TUwPe5uR/qPYuTSFpcGh5wb/xxSOATi48zjvNa3sdmK3j9a1T2WPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728370242; a=rsa-sha256; cv=none; b=Vnkuf6H7vu47+XU253l4Qy/Prer+rFqDoywOYuPxmipEbH83scK96DR/cjrE/oKO7kFOfJ ZumQ8nTW5ve2nuCylCF+BGYlRlReXa591jeBoaKWlxC0wsJWXkblJ79BUPgIOvyqfGD+vm rqwI0NIe0YWjCDEd+U59Botdf2H3Q4UVGBlJubkRMHpH7Ia6das2a6mtdvdpbJ4ItHkPXQ jIV2ligFgc6YgPitnLuQGfzt/GoaFIn/ctGU7oeW6P2VMaND6MEa4DJ3jrWuzjUmHb6a0B wQHqDkeuEHe4XlpP+phwkB9ELzehbObOfS5S+EACzDsS7FBTk7X2Nvk0rR/J1g== 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 4XN69G2dPtzKCN; Tue, 8 Oct 2024 06:50:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4986ogna026505; Tue, 8 Oct 2024 06:50:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4986ognB026502; Tue, 8 Oct 2024 06:50:42 GMT (envelope-from git) Date: Tue, 8 Oct 2024 06:50:42 GMT Message-Id: <202410080650.4986ognB026502@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 409c2fa385aa - main - kinfo_vmentry: report max protection List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 409c2fa385aa34baf7dd86bed2e86fbff16ad86d Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=409c2fa385aa34baf7dd86bed2e86fbff16ad86d commit 409c2fa385aa34baf7dd86bed2e86fbff16ad86d Author: Konstantin Belousov AuthorDate: 2024-10-07 07:49:43 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-08 06:50:17 +0000 kinfo_vmentry: report max protection Reviewed by: brooks, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46971 --- sys/kern/kern_proc.c | 6 ++++++ sys/sys/user.h | 3 +++ 2 files changed, 9 insertions(+) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 02d3b9fd69cd..422873ee14c2 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -2678,6 +2678,12 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) kve->kve_protection |= KVME_PROT_WRITE; if (entry->protection & VM_PROT_EXECUTE) kve->kve_protection |= KVME_PROT_EXEC; + if (entry->max_protection & VM_PROT_READ) + kve->kve_protection |= KVME_MAX_PROT_READ; + if (entry->max_protection & VM_PROT_WRITE) + kve->kve_protection |= KVME_MAX_PROT_WRITE; + if (entry->max_protection & VM_PROT_EXECUTE) + kve->kve_protection |= KVME_MAX_PROT_EXEC; if (entry->eflags & MAP_ENTRY_COW) kve->kve_flags |= KVME_FLAG_COW; diff --git a/sys/sys/user.h b/sys/sys/user.h index 1fd802b03a42..2025dc5cb47b 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -506,6 +506,9 @@ struct kinfo_lockf { #define KVME_PROT_READ 0x00000001 #define KVME_PROT_WRITE 0x00000002 #define KVME_PROT_EXEC 0x00000004 +#define KVME_MAX_PROT_READ 0x00010000 +#define KVME_MAX_PROT_WRITE 0x00020000 +#define KVME_MAX_PROT_EXEC 0x00040000 #define KVME_FLAG_COW 0x00000001 #define KVME_FLAG_NEEDS_COPY 0x00000002 From nobody Tue Oct 8 06:50:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XN69H6Jz5z5Z3fl; Tue, 08 Oct 2024 06:50: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XN69H4Prvz40pL; Tue, 8 Oct 2024 06:50:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728370243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fSLiEUJQRK3GFcdnsSbPzixUpAj8D265DvbM7S6yi2E=; b=VZuU3co6xXIZV1zlLuqUK6yos2fRIMcTQOk6snSLKlaYbfvEq/3Z8OLyaGGfeIQOxQHtWn PjsQ94TH6Pqap7isQfnm/viH4mfLx53bZ2ouBKeEUd5t3twQ7LK2fHeV2SMnuxzuTzNCc7 pRQdCBjnWcmp2eOGI98hu+jIGmvaYRBya/zofKBmjJKCEuCGlsl0qJO+bK9Sw+8yfFFETU oTUPjKulLF2D7g65HGh/wi62TXu5GNu8WI0enKjL58fH1zF3tXfUtZ3M342jWzkX+AQcWJ 4m5wE8m57t1oA/ZOy4ddL4+nIl5jbHwSIXR0L0r+aM1BpDT3zbhkOLY24RSHTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728370243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fSLiEUJQRK3GFcdnsSbPzixUpAj8D265DvbM7S6yi2E=; b=pAhB58X4gFM8BUq+pfIm4uMHWjp5wApOvb/6CCCUuPE1TR/20FL6O7hdvA9dA6nDrlJSk5 PGjC7fSVdQLzZVLKc22CyU+0ITD8nx/asMn1KaX8oSW7yniLB0Zh2SodhfQCsOHct+tk95 be/gxCyijzQ18pLF2Y38Hf56LDN6scPA/jC0OyGLhRLnOTMNzCfrQ6S0rNUDCrQq56uGck yHxm/uxcaQcRPyeg4D98J8/AsIz5/e14oLlgsIj29L7i6I3VQdOZyYHhJXO8pKfV1ZH8U4 uEebylbNziJioiUJdEPEETZl/JMsnJrBHUwRvVyxOulMk5/8xCDbcuTmKSyvFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728370243; a=rsa-sha256; cv=none; b=LOyeNIHNmchzKG+UteEWyA9JCifMWBzs3h0ntGse0jfCVeakRyzkS2zA4eY/eXi40RT1px UMbMFNH7kb4RRbd8x7EIkpaH4NFc8ylN1KyRorW63a5yJIRSGBIC8X33nOe0yyPLuw4nte 2b+cQos6qQ2nfRXdVHsC/JBgmY9Gf8bbctHcfWqDJrkXbeEbODMBAW3KW14rfg0uREgmDm 2H/YPk5zP3/85FJIGYvWjORZnt/zthncH43TInImXkjo0b/LMK1pw+JPSL9C+ku9uf4m9k /6Ah7wUA4xBFB18c/dXWaFc76Qhz+sVshk0dbSNYYv2at6j4CuuSSinXHQWHPA== 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 4XN69H3tH2zKLN; Tue, 8 Oct 2024 06:50:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4986ohjQ026544; Tue, 8 Oct 2024 06:50:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4986ohNV026541; Tue, 8 Oct 2024 06:50:43 GMT (envelope-from git) Date: Tue, 8 Oct 2024 06:50:43 GMT Message-Id: <202410080650.4986ohNV026541@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e90b2b7d6c17 - main - ptrace(PT_VM_ENTRY): report max protection List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e90b2b7d6c173e27dccdb894bb4e34ad30273e22 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e90b2b7d6c173e27dccdb894bb4e34ad30273e22 commit e90b2b7d6c173e27dccdb894bb4e34ad30273e22 Author: Konstantin Belousov AuthorDate: 2024-10-07 07:53:18 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-08 06:50:17 +0000 ptrace(PT_VM_ENTRY): report max protection Reviewed by: brooks, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46971 --- sys/kern/sys_process.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 8ce4ea01fe6f..a3a7a22f4cd3 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -505,7 +506,8 @@ ptrace_vm_entry(struct thread *td, struct proc *p, struct ptrace_vm_entry *pve) pve->pve_start = entry->start; pve->pve_end = entry->end - 1; pve->pve_offset = entry->offset; - pve->pve_prot = entry->protection; + pve->pve_prot = entry->protection | + PROT_MAX(entry->max_protection); /* Backing object's path needed? */ if (pve->pve_pathlen == 0) From nobody Tue Oct 8 07:10:37 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XN6cF6HByz5Z521; Tue, 08 Oct 2024 07:10: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XN6cF5zYPz45F6; Tue, 8 Oct 2024 07:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728371437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1cEgAKMHUpTCozc2pQ0tbDKc8dvUotuBNZgxAHBFhno=; b=pEVpPJUNuOOiwaBMQ7ZZDddva3LR4l5YrSaJxP5VZWrYwvuLo1LLvNC1xc5Vd+wQbfvTct ohdFvRwaL3nGR1bqE8ry3IotFIlqZ8DtRvpS4GIOGeX3t/53TN2esx9597kAP5Qjjt9/F8 xL/gy+l6E5lG4/aRt6fK2GD+jJiuIAswyz7qnrwPduFdJUW2RyDFKso9GGnPXDuldXKgO+ kd0reDl+nNyJC5/vt9LRGySSnsWy9zXDT/QFoeFMKHtwM6MQcO0S7uJSixPXPMxNckZjcR O9/Pz+VYddGG2Ml1/BRWq2yh2Ia+nNaCoF/0ljFuw528AW/HGMq2wzA80QVoYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728371437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1cEgAKMHUpTCozc2pQ0tbDKc8dvUotuBNZgxAHBFhno=; b=JDAJrWDa74R1HNmqCnSqBAYgiGTISWVYphqWK2urWAII5FEn7MAGhnyiA3GQjljguHOIMn apBdJbYqBPK5gKsjpWq5Q8O+ItVQcYBJzbETyA/Py90C8mlIJf1WZf7PEcXWxV4mMIf6h4 0I7bDsaaerhxR2buIDlrjXuiVuXWO3dtaEtQ5a8aM6p1uEUDqz++7H5rHaASz03PVlidHU r8PpS7KVWMFZQhO70E18cmOJX0Yfh4yM5SovX7w4vBGjbQu2Irlu6O+cHEtticaUBxUtF6 vZ46SChjDjHbc2M7QQGK9WRLZhiSoyBt1VL6g69KhCNDt2RpzehstFUoY+kGuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728371437; a=rsa-sha256; cv=none; b=PHcQc0+UcuXZXousHl1X0lxC1FVxAWKJHkjFtN7ZG3b0j9iR0pYdn+HgtXcJTcpwr0BPDr vSW+ptAWMLPnaoBK9AVbUMaIXuuhmFF2M5ojOfC2iaHJS5PBXx91e7IkhonrA0aGOUkGGp loev5iu/t1pz8Mpg9uHwfBSPeGNNb5sE+gaJjtvOP9nWDhRe1LNMYcgkZReCUHw1ecXTa6 xMdvF0tIQGNNX3fXl9ThAQPIWpUTifWkEWiRHVd9Vr6NzzGmimljb/nqo9eUPUwcn2f87Y Gr9BMrQupDNQGfBtG8PbPknfKg+fMQuqQOg6vuK3YYhprUZUfKofTGo/LLrw/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 4XN6cF5TgxzLf2; Tue, 8 Oct 2024 07:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4987AbCC060755; Tue, 8 Oct 2024 07:10:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4987AbIH060752; Tue, 8 Oct 2024 07:10:37 GMT (envelope-from git) Date: Tue, 8 Oct 2024 07:10:37 GMT Message-Id: <202410080710.4987AbIH060752@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 8bfd7d5f507a - main - pci_vendors: update to 2024-09-20 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8bfd7d5f507a1ee3d2836bf0a0502b218cd788c1 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8bfd7d5f507a1ee3d2836bf0a0502b218cd788c1 commit 8bfd7d5f507a1ee3d2836bf0a0502b218cd788c1 Author: Baptiste Daroussin AuthorDate: 2024-10-08 07:06:13 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-08 07:06:13 +0000 pci_vendors: update to 2024-09-20 --- share/misc/pci_vendors | 412 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 346 insertions(+), 66 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index f168678909c8..968338dd1099 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2024.06.23 -# Date: 2024-06-23 03:15:02 +# Version: 2024.09.20 +# Date: 2024-09-20 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -138,6 +138,10 @@ 1702 IS64PH ISDN Adapter 1703 ISDN Adapter (PCI Bus, DV, W) 1704 ISDN Adapter (PCI Bus, D, C) +0709 LJMicro Co., Ltd + 0101 GP101 + 0102 GP102 + 0201 GP201 0721 Sapphire, Inc. 0731 Jingjia Microelectronics Co Ltd 7200 JM7200 Series GPU @@ -183,6 +187,7 @@ 6666 MediaPress (MPEG2 encoder board) 07d1 D-Link System Inc 0824 T1042 [Freescale] +0911 Hantick 0925 VIA Technologies, Inc. (Wrong ID) 0a89 BREA Technologies Inc 0b0b Rhino Equipment Corp. @@ -1228,6 +1233,7 @@ 131b Kaveri [Radeon R4 Graphics] 131c Kaveri [Radeon R7 Graphics] 131d Kaveri [Radeon R6 Graphics] + 13c0 Granite Ridge [Radeon Graphics] 13e9 Ariel/Navi10Lite 13f9 Oberon/Navi12Lite 13fe Cyan Skillfish [BC-250] @@ -1237,6 +1243,7 @@ 1478 Navi 10 XL Upstream Port of PCI Express Switch 1479 Navi 10 XL Downstream Port of PCI Express Switch 1506 Mendocino + 150e Strix [Radeon 880M / 890M] 154c Kryptos [Radeon RX 350] 1462 7c28 MS-7C28 Motherboard 154e Garfield @@ -3963,6 +3970,7 @@ 1458 231d Radeon RX 5600 XT/REV 2.0 [Windforce 6GB OC] 148c 2398 AXRX 5700 XT 8GBD6-3DHE/OC [PowerColor Red Devil Radeon RX 5700 XT] 1682 5701 RX 5700 XT RAW II + 1849 5102 RX5700 CLD 8GO [ASRock Challenger D RX 5700 OC] 1849 5120 Radeon RX 5600 XT 1da2 e409 Sapphire Technology Limited Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT] 1da2 e410 Sapphire NITRO+ RX 5700 XT @@ -4022,6 +4030,8 @@ 73e4 Navi 23 USB 73ef Navi 23 [Radeon RX 6650 XT / 6700S / 6800S] 1458 2405 Navi 23 [Radeon RX 6650 XT] +# This is the refreshed MSI MECH series card equipped with the same Navi 23 GPU as ID 5021 + 1462 5027 RX 6650XT MECH 2X 1849 5236 RX 6650 XT Challenger D OC 73f0 Navi 33 [Radeon RX 7600M XT] 73ff Navi 23 [Radeon RX 6600/6600 XT/6600M] @@ -4041,8 +4051,9 @@ 1da2 e457 PULSE AMD Radeon RX 6500 XT 7446 Navi 31 USB 7448 Navi 31 [Radeon Pro W7900] - 744c Navi 31 [Radeon RX 7900 XT/7900 XTX/7900M] - 1002 0e3b RX 7900 GRE [XFX] + 744a Navi 31 [Radeon Pro W7900 Dual Slot] + 744c Navi 31 [Radeon RX 7900 XT/7900 XTX/7900 GRE/7900M] + 1002 0e3b RX 7900 XTX / RX 7900 GRE [XFX] 1043 0506 TUF Gaming Radeon RX 7900 XTX OC 1849 5304 Radeon RX 7900 XTX 1da2 471e PULSE RX 7900 XTX @@ -4050,15 +4061,21 @@ 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] 745e Navi 31 [Radeon Pro W7800] - 7460 7460 Navi32 GL-XL [AMD Radeon PRO V710] + 7460 Navi32 GL-XL [AMD Radeon PRO V710] + 7461 Navi 32 [AMD Radeon PRO V710] 7470 Navi 32 [Radeon PRO W7700] 747e Navi 32 [Radeon RX 7700 XT / 7800 XT] 7480 Navi 33 [Radeon RX 7600/7600 XT/7600M XT/7600S/7700S / PRO W7600] 1849 5313 RX 7600 Challenger OC + 7481 Navi 33 [Radeon Graphics] 7483 Navi 33 [Radeon RX 7600M/7600M XT] + 7487 Navi 33 [Radeon Graphics] 7489 Navi 33 [Radeon Pro W7500] + 748b Navi 33 [Radeon Graphics] + 7499 Navi 33 [Radeon RX 7400/7300/Pro W7400] 74a0 Aqua Vanjaram [Instinct MI300A] 74a1 Aqua Vanjaram [Instinct MI300X] + 74b5 Aqua Vanjaram [Instinct MI300X VF] 7833 RS350 Host Bridge 7834 RS350 [Radeon 9100 PRO/XT IGP] 7835 RS350M [Mobility Radeon 9000 IGP] @@ -5177,6 +5194,12 @@ 1537 Kabini/Mullins PSP-Platform Security Processor 1538 Family 16h Processor Function 0 1539 Kabini P2P Bridge for PCIe Ports[4:0] +# AMD EPYC Turin CPU + 153a Family 1Ah (Models 00h-0Fh) Root Complex +# AMD EPYC Turin CPU + 153b Family 1Ah (Models 00h-0Fh) IOMMU +# AMD EPYC Turin CPU + 153d Family 1Ah (Models 00h-0Fh) PCIe Dummy Host Bridge 1540 Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky HT Configuration 1541 Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky Address Maps 1542 Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky DRAM Configuration @@ -5193,6 +5216,10 @@ 154f Anubis Audio Processor 1550 Garfield+/Arlene/Pooky/Anubis SPLL Configuration 1553 Arlene/Pooky P2P Bridge for PCIE (3:0) +# AMD EPYC Turin CPU + 1555 Family 1Ah (Models 00h-0Fh) Internal PCIe GPP Bridge +# AMD EPYC Turin CPU + 1556 Family 1Ah (Models 00h-0Fh) PCIe Dummy Function 155b Anubis Root Complex 155c Anubis IOMMU 155d Anubis UMI PCIe Dummy Bridge @@ -8597,6 +8624,7 @@ 1093 72f7 PXIe-6535 1093 72f8 PXIe-6536 1093 72f9 PXIe-6537 + 1093 730a PXIe-5142 1093 7326 PCIe-6509 1093 736c PXIe-4140 1093 738b PXIe-5622 @@ -8666,6 +8694,7 @@ 1093 762e PXIe-5606 1093 7644 PXIe-4841 1093 764a PCIe-8237R-S + 1093 7652 PXIe-4080 1093 7658 PXIe-5162 (4CH) 1093 76ab PXIe-4322 1093 76ad PXIe-4112 @@ -8682,6 +8711,8 @@ 1093 76ce CVS-1459 1093 76d0 PXIe-5160 (2CH) 1093 76d1 PXIe-5160 (4CH) + 1093 76d8 PXIe-4081 + 1093 76d9 PXIe-4082 1093 76dc PXIe-4610 1093 76ec PXIe-2524 1093 76ed PXIe-2525 @@ -8719,6 +8750,8 @@ 1093 7790 PXIe-5170R (4CH) 1093 7791 PXIe-5170R (8CH) 1093 7793 PXIe-5171R (8CH) + 1093 7794 PXIe-5172 (4CH - 325T) + 1093 7795 PXIe-5172 (8CH - 410T) 1093 77a5 PXIe-6345 1093 77a6 PXIe-6355 1093 77a7 PXIe-6365 @@ -8742,18 +8775,44 @@ 1093 7802 PXIe-4302 1093 7803 PXIe-4303 1093 7805 PXIe-4305 + 1093 781e PXIe-4135 + 1093 7820 PXIe-5164 + 1093 783d PXIe-6570 + 1093 7851 PXIe-5172 (8CH - 325T) 1093 786f PXIe-4163 + 1093 7881 PXIe-5163 1093 788e PXIe-4304 + 1093 78d5 PXIe-5413 (1CH) + 1093 78d6 PXIe-5413 (2CH) + 1093 78d7 PXIe-5423 (1CH) + 1093 78d8 PXIe-5423 (2CH) + 1093 78d9 PXIe-5433 (1CH) + 1093 78da NI PXIe-5433 (2CH) 1093 78f8 NI FlexRIO Module (KU035) 1093 78f9 NI FlexRIO Module (KU040) 1093 78fa NI FlexRIO Module (KU060) 1093 78ff PXIe-4162 + 1093 792f PXIe-4190 + 1093 7935 PXIe-5111 + 1093 7936 PXIe-5110 1093 7995 PXIe-7911R 1093 7996 PXIe-7912R 1093 7997 PXIe-7915R + 1093 79cd PXIe-5113 1093 79d3 NI FlexRIO PCIe Module (KU035) 1093 79d4 NI FlexRIO PCIe Module (KU040) 1093 79d5 NI FlexRIO PCIe Module (KU060) + 1093 79f8 PXIe-6571 + 1093 7a16 PXIe-4147 + 1093 7a9a PXIe-4137 (40W) + 1093 7aa4 PXIe-4135 (40W) + 1093 7aca PXIe-4051 + 1093 7acb PXIe-4150 + 1093 7acc PXIe-4151 + 1093 7ae0 PXIe-4163 (10 pA) + 1093 7ae1 PXIe-4162 (10 pA) + 1093 7aef PXIe-4190 (500 kHz) + 1093 7b1f PXIe-6571 (8CH) c801 PCI-GPIB c811 PCI-GPIB+ c821 PXI-GPIB @@ -12950,7 +13009,7 @@ 2182 TU116 [GeForce GTX 1660 Ti] 2183 TU116 2184 TU116 [GeForce GTX 1660] - 2187 TU116 [GeForce GTX 1650 SUPER] + 2187 TU116 [GeForce GTX 1660 SUPER] 2188 TU116 [GeForce GTX 1650] 2189 TU116 [CMP 30HX] 2191 TU116M [GeForce GTX 1660 Ti Mobile] @@ -12993,6 +13052,7 @@ 22ba AD102 High Definition Audio Controller 22bc AD104 High Definition Audio Controller 22bd AD106M High Definition Audio Controller + 22be AD107 High Definition Audio Controller 2302 GH100 2313 GH100 [H100 CNX] 2321 GH100 [H100L 94GB] @@ -13007,6 +13067,7 @@ 2338 GH100 [H100 SXM5 96GB] 2339 GH100 [H100 SXM5 94GB] 233a GH100 [H800L 94GB] + 233b GH100 [H200 NVL] 233d GH100 [H100 96GB] 2342 GH100 [GH200 120GB / 480GB] 2343 GH100 @@ -13131,7 +13192,7 @@ 2709 AD103 [GeForce RTX 4070] 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] 2730 AD103GLM [RTX 5000 Ada Generation Laptop GPU] - 2757 GN21-X11 + 2757 GN21-X11 [GeForce RTX 4090 Laptop GPU] 2770 AD103GLM [RTX 5000 Ada Generation Embedded GPU] 2782 AD104 [GeForce RTX 4070 Ti] 2783 AD104 [GeForce RTX 4070 SUPER] @@ -13154,6 +13215,7 @@ 2805 AD106 [GeForce RTX 4060 Ti 16GB] 2808 AD106 [GeForce RTX 4060] 2820 AD106M [GeForce RTX 4070 Max-Q / Mobile] + 2822 AD106M [GeForce RTX 3050 A Laptop GPU] 2838 AD106GLM [RTX 3000 Ada Generation Laptop GPU] 2860 AD106M [GeForce RTX 4070 Max-Q / Mobile] 2878 AD106GLM [RTX 3000 Ada Generation Embedded GPU] @@ -13168,6 +13230,8 @@ 28e0 AD107M [GeForce RTX 4060 Max-Q / Mobile] 28e1 AD107M [GeForce RTX 4050 Max-Q / Mobile] 28f8 AD107GLM [RTX 2000 Ada Generation Embedded GPU] + 2900 GB100 + 2940 GB100 10df Emulex Corporation 0720 OneConnect NIC (Skyhawk) 103c 1934 FlexFabric 20Gb 2-port 650M Adapter @@ -13525,7 +13589,7 @@ 1043 16d5 U6V/U31J laptop 1043 81aa P5B 1043 82c6 M3A78 Series Motherboard - 1043 83a3 M4A785/P7P55 Motherboard + 1043 83a3 M4A785/P7P55/AT3IONT-I Motherboard 1043 8432 P8P67 and other motherboards 1043 8505 P8 series motherboard 1043 8554 H81M-C Motherboard @@ -13608,6 +13672,7 @@ 8821 RTL8821AE 802.11ac PCIe Wireless Network Adapter 8852 RTL8852AE 802.11ax PCIe Wireless Network Adapter a85a RTL8852AE WiFi 6 802.11ax PCIe Adapter + b520 RTL8852BE-VT PCIe 802.11ax Wireless Network Controller b723 RTL8723BE PCIe Wireless Network Adapter 10ec 8739 Dell Wireless 1801 17aa b736 Z50-75 @@ -13644,11 +13709,16 @@ 3fc5 RME Hammerfall DSP 3fc6 RME Hammerfall DSP MADI 5000 Alveo U200 XDMA Platform + 10ee 000e Alveo card 5004 Alveo U250 XDMA Platform + 10ee 000e Alveo card 5005 Alveo U250 500c Alveo U280 XDMA Platform + 10ee 000e Alveo card 5020 Alveo U50 XMDA Platform + 10ee 000e Alveo card 505c Alveo U55C + 10ee 000e Alveo card 5074 Alveo X3522, Quad Port, 10/25GbE Adaptable Accelerator Card 5084 Alveo X3522, Quad Port, 10/25GbE Low Latency Network Adapter 6987 SmartSSD @@ -13664,9 +13734,13 @@ 9234 SmartSSD 9434 SmartSSD d000 Alveo U200 Golden Image + 10ee 000e Alveo card d004 Alveo U250 Golden Image + 10ee 000e Alveo card d00c Alveo U280 Golden Image + 10ee 000e Alveo card d020 Alveo U50 Golden Image + 10ee 000e Alveo card d154 Copley Controls CAN card (PCI-CAN-02) # SED is assigned Xilinx PCI device IDs ebf0 through ebff ebf0 SED Systems Modulator/Demodulator @@ -15208,6 +15282,21 @@ 1137 021a VIC 1487 MLOM Ethernet NIC 1137 024a VIC 1495 PCIe Ethernet NIC 1137 024b VIC 1497 MLOM Ethernet NIC + 1137 02af VIC 1467 MLOM Ethernet NIC + 1137 02b0 VIC 1477 MLOM Ethernet NIC + 1137 02cf VIC 14425 MLOM Ethernet NIC + 1137 02d0 VIC 14825 Mezzanine Ethernet NIC + 1137 02db VIC 15231 MLOM Ethernet NIC + 1137 02dc VIC 15411 MLOM Ethernet NIC + 1137 02dd VIC 15428 MLOM Ethernet NIC + 1137 02de VIC 15420 MLOM Ethernet NIC + 1137 02df VIC 15230 MLOM Ethernet NIC + 1137 02e0 VIC 15427 MLOM Ethernet NIC + 1137 02e1 VIC 15422 Mezzanine Ethernet NIC + 1137 02e4 VIC 15235 PCIe Ethernet NIC + 1137 02e8 VIC 15238 MLOM Ethernet NIC + 1137 02f2 VIC 15425 PCIe Ethernet NIC + 1137 02f3 VIC 15237 MLOM Ethernet NIC 0044 VIC Ethernet NIC Dynamic 1137 0047 VIC P81E PCIe Ethernet NIC Dynamic 1137 0048 VIC M81KR Mezzanine Ethernet NIC Dynamic @@ -15254,6 +15343,7 @@ 1137 012e VIC 1227 PCIe Userspace NIC 1137 0137 VIC 1380 Mezzanine Userspace NIC 023e 1GigE I350 LOM + 02b7 VIC SR-IOV Ethernet VF 1138 Ziatech Corporation 8905 8905 [STD 32 Bridge] 1139 Dynamic Pictures, Inc @@ -15630,6 +15720,8 @@ 1170 Inventec Corporation 1171 Loughborough Sound Images Plc 1172 Altera Corporation +# Unknown card with Altera ACE EP1K50TC144-2 as the PCI interface and has 4 BNC inputs connected to 4 TL3016 Comparators and one TRS output connected to two LTC1650 DACs + 0004 PF5102 board 00a7 Stratix V 0530 Stratix IV 646c KT-500/KT-521 board @@ -16579,6 +16671,12 @@ 11f2 Picture Tel Japan K.K. 11f3 Keithley Metrabyte 0011 KPCI-PIO24 + 4200 42x0-SMU + 4205 4205-VPU + 4215 4200-VPU + 4216 422x-PxU + 4220 4200-CVU + 4221 4210-CVU 11f4 Kinetic Systems Corporation 2915 CAMAC controller 11f5 Computing Devices International @@ -17053,6 +17151,8 @@ 125d 1999 Allegro-1 AudioDrive 1989 ESS Modem 125d 1989 ESS Modem + 1990 ES1990S Canyon3D 2LE + 1992 ES1992S Canyon3D 2 1998 ES1983S Maestro-3i PCI Audio Accelerator 1028 00b1 Latitude C600 1028 00e5 Latitude C810 @@ -18552,6 +18652,7 @@ 0254 XR17V254 Quad UART PCI controller 0258 XR17V258 Octal UART PCI controller 0352 XR17V3521 Dual PCIe UART + 4c52 9252 LRUS9252H 2-Port RS232 Serial Adapter 13a9 Siemens Medical Systems, Ultrasound Group 13aa Broadband Networks Inc 13ab Arcom Control Systems Ltd @@ -20084,6 +20185,8 @@ f436 AVerTV Hybrid+FM 1462 Micro-Star International Co., Ltd. [MSI] 3483 MSI USB 3.0 (VIA VL80x-based xHCI USB Controller) +# This is MSI refreshed variant of their MECH series Navi 23 GPU card (73EF) + 5027 RX 6650XT MECH 2X 7c56 Realtek Ethernet controller RTL8111H aaf0 Radeon RX 580 Gaming X 8G 1463 Fast Corporation @@ -20877,7 +20980,7 @@ 14e4 d124 NetXtreme-E P2100D BCM57508 2x100G QSFP PCIE 14e4 d324 NetXtreme-E N2100D BCM57508 2x100G QSFP OCP3.0 Ethernet 14e4 df24 NetXtreme-E NGM2100D BCM57508 2x100G KR Mezz Ethernet - 1751 BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet + 1751 BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb Ethernet 1028 09d4 PowerEdge XR11/XR12 LOM 1028 0b1b PowerEdge XR5610 LOM 14e4 4250 NetXtreme-E Quad-port 25G SFP28 Ethernet PCIe4.0 x16 Adapter (BCM957504-P425G) @@ -21933,6 +22036,8 @@ 0223 CX8 PCIe Switch Family [ConnectX-8 PCIe Switch Secure Flash Recovery-RMA] 0224 CX9 Family [ConnectX-9 Flash Recovery] 0225 CX9 Family [ConnectX-9 Secure Flash Recovery-RMA] + 0226 CX10 Family [ConnectX-10 Flash Recovery] + 0227 CX10 Family [ConnectX-10 Secure Flash Recovery-RMA] 024e MT53100 [Spectrum-2, Flash recovery mode] 024f MT53100 [Spectrum-2, Secure Flash recovery mode] 0250 Spectrum-3, Flash recovery mode @@ -21953,12 +22058,13 @@ 0263 MT27710 [ConnectX-4 Lx Programmable Virtual Function] EN 0264 Innova-2 Flex Burn image 0270 Spectrum-5 in Flash Recovery Mode - 0271 Spectrum-4L, RMA + 0271 Spectrum-5 RMA 0274 Spectrum-6 in Flash Recovery Mode - 0275 Spectrum-4C RMA + 0275 Spectrum-6 RMA 0277 Spectrum-4TOR RMA 0278 Quantum-4 in Flash Recovery Mode 0279 Quantum-4 RMA + 027a Eros Chiplet 0281 NPS-600 Flash Recovery 0282 ArcusE Flash recovery 0283 ArcusE RMA @@ -22071,6 +22177,7 @@ 1023 CX8 Family [ConnectX-8] 1024 CX8 PCIe Switch Family [ConnectX-8 PCIe Switch] 1025 CX9 Family [ConnectX-9] + 1027 CX10 Family [ConnectX-10] 1974 MT28800 Family [ConnectX-5 PCIe Bridge] 1975 MT416842 Family [BlueField SoC PCIe Bridge] 1976 MT28908 Family [ConnectX-6 PCIe Bridge] @@ -22082,6 +22189,7 @@ 197c ConnectX/BlueField Family mlx5Gen PCIe Bridge [PCIe Bridge] 197d CX8 Family [ConnectX-8 PCIe Bridge] 197e CX9 Family [ConnectX-9 PCIe Bridge] + 197f CX10 Family [ConnectX-10 PCIe Bridge] 2020 MT2892 Family [ConnectX-6 Dx Emulated PCIe Bridge] 2021 MT42822 Family [BlueField-2 SoC Emulated PCIe Bridge] 2023 MT2910 Family [ConnectX-7 Emulated PCIe Bridge] @@ -22172,8 +22280,8 @@ cf6c MT53100 [Spectrum-2] cf70 Spectrum-3 cf80 Spectrum-4 - cf82 Spectrum-4L - cf84 Spectrum-4C + cf82 Spectrum-5 + cf84 Spectrum-6 d2f0 Quantum HDR (200Gbps) switch d2f2 Quantum-2 NDR (400Gbps) switch d2f4 Quantum-3 @@ -23616,6 +23724,7 @@ 0404 DOMINO Melody 0407 DOMINO Symphony 0408 DOMINO Symphony PCIe + 0814 Coaxlink Quad CXP-12 1809 Lumanate, Inc. 180c IEI Integration Corp 1813 Ambient Technologies Inc @@ -23913,6 +24022,7 @@ 01e5 NT100A01 Network Adapter 0215 NT400D11 Network Adapter 0225 NT40A11 Network Adapter + 0295 NT400D13 Network Adapter 18f6 NextIO 1000 [Nexsis] Switch Virtual P2P PCIe Bridge 1001 [Texsis] Switch Virtual P2P PCIe Bridge @@ -23966,7 +24076,8 @@ 2031 SC92031 PCI Fast Ethernet Adapter 8139 RTL8139D [Realtek] PCI 10/100BaseTX ethernet adaptor 1905 Micronas USA, Inc. -1912 Renesas Technology Corp. +# since the merger with NEC Electronics in 2010 +1912 Renesas Electronics Corp. 0002 SH7780 PCI Controller (PCIC) 0011 SH7757 PCIe End-Point [PBI] 0012 SH7757 PCIe-PCI Bridge [PPB] @@ -24460,12 +24571,17 @@ 19e5 d148 Hi1822 SP527 (2*16G FC) 19e5 d301 Hi1822 SP520 (2*16G FC) 19e5 d305 Hi1822 SP525 (2*16G FC) + 0204 Hi1822 Family (4*10GE) 0205 Hi1822 Family (2*100GE) 19e5 df27 Hi1822 MZ731 MEZZ (2*100GE) 0206 Hi1822 Family (2*25GE) 19e5 d138 Hi1822 SP582 (2*25GE) 19e5 d13a Hi1822 SC381 (2*25GE) 19e5 d145 Hi1822 SP586 (2*25GE) + 0208 Hi1822 Family (2*100GE) + 020b Hi1822 Family (4*25GE) + 020c Hi1822 Family (4*32G FC) + 020d Hi1822 Family (2*40GE) 0210 Hi1822 Family (4*25GE) 19e5 df2e Hi1822 MZ532 MEZZ (4*25GE) 0211 Hi1822 Family (4*25GE) @@ -24499,10 +24615,21 @@ 19e5 6213 NVMe SSD ES3500P V6 3840GB 2.5" U.2 19e5 6214 NVMe SSD ES3500P V6 7680GB 2.5" U.2 19e5 6215 NVMe SSD ES3500P V6 15360GB 2.5" U.2 + 3758 SP686C RAID Controller Card + 19e5 0185 RAID SP686C-M-16i 2G + 19e5 01a1 RAID SP686C-M-40i 2G + 19e5 01a4 RAID SP686C-M-16i 4G + 19e5 01a8 RAID SP686C-MH-32i 4G + 19e5 01ad RAID SP686C-M-40i 4G 375e Hi1822 Family Virtual Function 375f Hi1822 Family Virtual Function 379e Hi1822 Family Virtual Function 379f Hi1822 Family Virtual Function + 3858 SP186 HBA Controller Card + 19e5 0120 HBA SP186-M-32i + 19e5 0125 HBA SP186-M-40i + 19e5 0180 HBA SP186-M-16i + 19e5 0188 HBA SP186-M-8i a120 HiSilicon PCIe Root Port with Gen4 a121 HiSilicon PCI-PCI Bridge a122 HiSilicon Embedded DMA Engine @@ -24596,6 +24723,7 @@ 1a32 Quanta Microsystems, Inc 1a3b AzureWave 1112 AR9285 Wireless Network Adapter (PCI-Express) +1a3e Micro-Research Finland Oy 1a41 Tilera Corp. 0001 TILE64 processor 0002 TILEPro processor @@ -24963,7 +25091,7 @@ 1028 2151 BOSS-N1 Modular ET 1028 2196 ROR-N1 1028 2286 BOSS-N1 DC-MHS - 1028 2287 BOSS-N1 Modular + 1028 2287 BOSS-N1 Modular DC-MHS 1b4b 2241 Santa Cruz NVMe Host Adapter 1b96 4000 WD_BLACK AN1500 NVMe SSD 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit @@ -25202,7 +25330,7 @@ 5012 FireCuda/IronWolf 510 SSD 5013 BarraCuda Q5 NVMe SSD (DRAM-less) 5016 FireCuda 520/IronWolf 525 SSD - 5018 FireCuda 530 SSD + 5018 E18 PCIe SSD 5019 BarraCuda PCIe SSD (DRAM-less) # 2TB 5021 FireCuda 520 SSD @@ -25254,7 +25382,7 @@ 1201 NG3 Series ARINC 429 Interface 1202 NG3 Series Avionics Discrete & Serial Interface 1203 NG3 Series Avionics Discrete Interface -1bd4 Inspur Electronic Information Industry Co., Ltd. +1bd4 IEIT SYSTEMS Co., Ltd 0911 Arria10_PCIe_F10A1150 1000 NS8600G1U160 NVME SSD 1001 NS8600G1U320 NVME SSD @@ -25328,6 +25456,7 @@ 0021 FD722 0022 FD788 0023 FD722-M2 + 0024 FD722 with bypass 1c28 Lite-On IT Corp. / Plextor 0122 M6e PCI Express SSD [Marvell 88SS9183] # previously Fiberblaze @@ -25437,7 +25566,39 @@ 284a PE8110 Series NVMe Solid State Drive 2a49 PE9110 Series NVMe Solid State Drive 2a59 PE9010 Series NVMe Solid State Drives - 2b59 PS10x0 Series NVMe Solid State Drives + 2b59 Px10x0 Series NVMe Solid State Drives + 1028 2295 NVMe ISE PS1010 RI U.2 1.92TB + 1028 2296 NVMe ISE PS1010 RI U.2 3.84TB + 1028 2297 NVMe ISE PS1010 RI U.2 7.68TB + 1028 2298 NVMe ISE PS1010 RI U.2 15.36TB + 1028 2299 NVMe ISE PS1030 MU U.2 1.6TB + 1028 229a NVMe ISE PS1030 MU U.2 3.2TB + 1028 229b NVMe ISE PS1030 MU U.2 6.4TB + 1028 229c NVMe ISE PS1030 MU U.2 12.8TB + 1028 22a7 NVMe ISE PS1010 RI E3.S 1.92TB + 1028 22a8 NVMe ISE PS1010 RI E3.S 3.84TB + 1028 22a9 NVMe ISE PS1010 RI E3.S 7.68TB + 1028 22aa NVMe ISE PS1010 RI E3.S 15.36TB + 1028 22ab NVMe ISE PS1030 MU E3.S 1.6TB + 1028 22ac NVMe ISE PS1030 MU E3.S 3.2TB + 1028 22ad NVMe ISE PS1030 MU E3.S 6.4TB + 1028 22ae NVMe ISE PS1030 MU E3.S 12.8TB + 1028 22dc NVMe FIPS PS1010 RI E3.S 1.92TB + 1028 22dd NVMe FIPS PS1010 RI E3.S 3.84TB + 1028 22de NVMe FIPS PS1010 RI E3.S 7.68TB + 1028 22df NVMe FIPS PS1010 RI E3.S 15.36TB + 1028 22e0 NVMe FIPS PS1030 MU E3.S 1.6TB + 1028 22e1 NVMe FIPS PS1030 MU E3.S 3.2TB + 1028 22e2 NVMe FIPS PS1030 MU E3.S 6.4TB + 1028 22e3 NVMe FIPS PS1030 MU E3.S 12.8TB + 1028 22f8 NVMe ISE PE1010 RI E3.S 1.92TB + 1028 22f9 NVMe ISE PE1010 RI E3.S 3.84TB + 1028 22fa NVMe ISE PE1010 RI E3.S 7.68TB + 1028 22fb NVMe ISE PE1010 RI E3.S 15.36TB + 1028 22fc NVMe ISE PE1030 MU E3.S 1.6TB + 1028 22fd NVMe ISE PE1030 MU E3.S 3.2TB + 1028 22fe NVMe ISE PE1030 MU E3.S 6.4TB + 1028 22ff NVMe ISE PE1030 MU E3.S 12.8TB 1c5f Beijing Memblaze Technology Co. Ltd. 000d PBlaze5 520/526 1c5f 0220 NVMe SSD PBlaze5 520 1920G AIC @@ -25676,7 +25837,7 @@ 0250 RMS-250 U.2 NVMe SSD 1ccf Zoom Corporation 0001 TAC-2 Thunderbolt Audio Converter -1cd2 SesKion GmbH +1cd2 Seskion GmbH 0301 Simulyzer-RT CompactPCI Serial DIO-1 card 0302 Simulyzer-RT CompactPCI Serial PSI5-ECU-1 card 0303 Simulyzer-RT CompactPCI Serial PSI5-SIM-1 card @@ -25685,6 +25846,9 @@ # supports 8x CAN (-FD) interfaces 0306 Simulyzer-RT CompactPCI Serial CAN-2 card (CAN-FD) 0307 Simulyzer-RT CompactPCI Serial DIO-2 card [Xilinx Zynq UltraScale+] + 0308 Simulyzer-RT CompactPCI Serial SENT-DIO-2 card +# 8-Channel ADC + 0309 Simulyzer-RT CompactPCI Serial SN-ADC card 1cd7 Nanjing Magewell Electronics Co., Ltd. 0002 Pro Capture AIO 0010 Pro Capture Endpoint @@ -25715,7 +25879,9 @@ 1cfd Mangstor 6300 MX6300 series PCIe x8 NVMe SSD 1d00 Pure Storage -1d05 Tongfang Hongkong Limited +1d05 AIstone Global Limited + 6027 B760-N2D5 motherboard + 7001 H610-N2 motherboard 1d0f Amazon.com, Inc. 7064 NeuronDevice (Inferentia) 7164 NeuronDevice (Trainium) @@ -25861,13 +26027,17 @@ 1d62 Nebbiolo Technologies 1d65 Imagine Communications Corp. 04de Taurus/McKinley -1d69 Celeno Communications +# nee Celeno Communications +1d69 Renesas Electronics Corp. 2432 CL2432 2440 CL2440 + 8000 CL80x0 Wireless Network Adapter + 8046 CL8046 Wireless Network Adapter 1d6a Aquantia Corp. 0001 AQC107 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion] 4c52 6880 LREC6880BT Single-port 10Gb Ethernet Network Adapter 00b1 AQtion AQC100 NBase-T/IEEE 802.3an Ethernet Controller [Atlantic 10G] + 1043 874a XG-C100F 10GbE SFP+ Ethernet Adapter 00c0 Antigua NBase-T/IEEE 802.3an Ethernet Controller - Engineering Sample 04c0 AQtion AQC113 NBase-T/IEEE 802.3an Ethernet Controller [Antigua 10G] 4c52 1053 LRES1053PT Quad-port 10Gb Ethernet Network Adapter @@ -25935,6 +26105,7 @@ 1027 AR-P2P-DBG [P2P Debug Function] 1028 AR-P2P-ATR [P2P Actor Function] 1029 AR-P2P-UTL [P2P Utility Function] + 102a AR-TK242-FX2 [4x100GbE Gen5 Packet Capture-Replay Device] 4200 A5PL-E1-10GETI [10 GbE Ethernet Traffic Instrument] 1d72 Xiaomi 1d78 DERA Storage @@ -25996,6 +26167,14 @@ 1d78 7108 D7436 U.2 15mm 7.68TB NVMe SSD 1d78 7109 D7456 U.2 15mm 12.8TB NVMe SSD 1d78 710a D7436 U.2 15mm 15.36TB NVMe SSD + 1d78 7143 D7556 U.2 15mm 1.6TB dual port NVMe SSD + 1d78 7144 D7536 U.2 15mm 1.92TB dual port NVMe SSD + 1d78 7145 D7556 U.2 15mm 3.2TB dual port NVMe SSD + 1d78 7146 D7536 U.2 15mm 3.84TB dual port NVMe SSD + 1d78 7147 D7556 U.2 15mm 6.4TB dual port NVMe SSD + 1d78 7148 D7536 U.2 15mm 7.68TB dual port NVMe SSD + 1d78 7149 D7556 U.2 15mm 12.8TB dual port NVMe SSD + 1d78 714a D7536 U.2 15mm 15.36TB dual port NVMe SSD 1d78 7202 Aliflash V2 U.2 15mm 1.92TB NVMe SSD 1d78 7204 Aliflash V2 U.2 15mm 3.84TB NVMe SSD 1d78 7208 Aliflash V2 U.2 15mm 7.68TB NVMe SSD @@ -26023,7 +26202,7 @@ 3588 RK3588 1d89 YEESTOR Microelectronics Co., Ltd 0280 PCIe NVMe SSD -1d8f Enyx +1d8f Exegy 1d92 Abaco Systems Inc. 1d93 YADRO 1d94 Chengdu Haiguang IC Design Co., Ltd. @@ -26075,8 +26254,10 @@ 1d9b Meta Platforms, Inc. 0010 Networking DOM Engine 0011 IO Bridge + 0013 Host Network Interface 1da1 Teko Telecom S.r.l. 1da2 Sapphire Technology Limited + 475d Radeon RX 7800 XT [PULSE] e26a Radeon R7 250 e445 Sapphire Radeon RX 6700 1da3 Habana Labs Ltd. @@ -26144,7 +26325,14 @@ 1dbe 3001 Donghu-Z2 DC ZNS SSD U.2 4000GB 1dbe 3002 Donghu-Z2 DC ZNS SSD U.2 8000GB 5666 NVMe SSD Controller IG5666 - 5668 NVMe SSD Controller IG5668 + 5668 NVMe PCIe 5.0 DC SSD + 1dbe 5003 Dongting-N3 DC SSD U.2 3200GB + 1dbe 5004 Dongting-N3 DC SSD U.2 3840GB + 1dbe 5005 Dongting-N3 DC SSD U.2 6400GB + 1dbe 5006 Dongting-N3 DC SSD U.2 7680GB + 1dbe 5007 Dongting-N3 DC SSD U.2 12800GB + 1dbe 5008 Dongting-N3 DC SSD U.2 15360GB + 1dbe 5009 Dongting-N3 DC SSD U.2 25600GB 5669 NVMe SSD Controller IG5669 [Tacoma] 1dbf Guizhou Huaxintong Semiconductor Technology Co., Ltd 0401 StarDragon4800 PCI Express Root Port @@ -26407,7 +26595,17 @@ 1dee Biwin Storage Technology Co., Ltd. 2262 HP EX950 NVMe SSD 2263 HP EX900 NVMe SSD (DRAM-less) + 4121 PCIe 4.0 SP406/416 NVMe SSD + 1dee 0000 NVMe SSD SP416 800G 2.5" U.2 + 1dee 0001 NVMe SSD SP416 1.6T 2.5" U.2 + 1dee 0002 NVMe SSD SP416 3.2T 2.5" U.2 + 1dee 0003 NVMe SSD SP416 6.4T 2.5" U.2 + 1dee 0010 NVMe SSD SP406 960G 2.5" U.2 + 1dee 0011 NVMe SSD SP406 1.92T 2.5" U.2 + 1dee 0012 NVMe SSD SP406 3.84T 2.5" U.2 + 1dee 0013 NVMe SSD SP406 7.68T 2.5" U.2 5216 KingSpec NX series NVMe SSD (DRAM-less) + 7700 BIWIN NVMe SSD SP50Y/SP51Y 1def Ampere Computing, LLC e005 eMAG PCI Express Root Port 0 e006 eMAG PCI Express Root Port 1 @@ -26649,7 +26847,7 @@ 2263 270PM6, 270PM7 series NVMe SSD 1e3b DapuStor Corporation 0600 NVMe SSD Controller DP600 - 1e3b 0006 Enterprise NVMe SSD U.2 ODP 7.68TB (J5001) + 1e3b 0006 Enterprise NVMe SSD U.2 7.68TB (J5000) 1e3b 0010 Enterprise NVMe SSD U.2 3.84TB (R5102) 1e3b 0013 Enterprise NVMe SSD U.2 3.20TB (R5302) 1e3b 0030 Enterprise NVMe SSD U.2 3.84TB (J5100) @@ -26684,32 +26882,32 @@ 1e3b 0069 Enterprise NVMe SSD U.2 3.20TB (R5301D) 1e3b 006c Enterprise NVMe SSD U.2 1.92TB (R5101) 1e3b 006d Enterprise NVMe SSD U.2 1.60TB (J5301) - 1e3b 00b9 Enterprise NVMe SSD U.2 ODP 25.60TB (R5301)/(J5301) - 1e3b 00be Enterprise NVMe SSD U.2 ODP 30.72TB (R5101)/(J5101) - 1e3b 00c1 Enterprise NVMe SSD U.2 ODP 25.60TB (R5301D)/(J5301D) - 1e3b 00c4 Enterprise NVMe SSD U.2 ODP 30.72TB (R5101D)/(J5101D) - 1e3b 00c7 Enterprise NVMe SSD U.2 ODP 25.60TB (J5300) - 1e3b 00c8 Enterprise NVMe SSD U.2 ODP 30.72TB (J5100) - 1e3b 00c9 Enterprise NVMe SSD U.2 ODP 15.36TB (J5001) - 1e3b 00ca Enterprise NVMe SSD U.2 ODP 3.84TB (J5102) - 1e3b 00cb Enterprise NVMe SSD U.2 ODP 7.68TB (J5102) - 1e3b 00cc Enterprise NVMe SSD U.2 QDP 3.84TB (J5101) - 1e3b 00cd Enterprise NVMe SSD U.2 ODP 7.68TB (J5101) - 1e3b 00ce Enterprise NVMe SSD U.2 QDP 3.84TB (J5101D) - 1e3b 00cf Enterprise NVMe SSD U.2 ODP 7.68TB (J5101D) - 1e3b 00dc Enterprise NVMe SSD U.2 ODP 30.72TB with SAMSUNG 32GB DRAM (J5001) - 1e3b 00dd Enterprise NVMe SSD U.2 ODP 30.72TB with MT 32GB DRAM(J5001) - 1e3b 00de Enterprise NVMe SSD U.2 ODP 15.36TB with SK 16GB DRAM(J5001D) - 1e3b 00df Enterprise NVMe SSD U.2 ODP 30.72TB with SAMSUNG 32GB DRAM(J5001) - 1e3b 00e7 Enterprise NVMe SSD U.2 ODP 30.72TB with MT 32GB DRAM(J5001D) - 1e3b 00e8 Enterprise NVMe SSD U.2 QDP 3.20TB (J5301) - 1e3b 00e9 Enterprise NVMe SSD U.2 ODP 6.40TB (J5301) - 1e3b 00ea Enterprise NVMe SSD U.2 QDP 3.20TB (J5301D) - 1e3b 00eb Enterprise NVMe SSD U.2 ODP 6.40TB (J5301D) - 1e3b 00ec Enterprise NVMe SSD U.2 ODP 30.72TB with MT 32GB DRAM(J5101) - 1e3b 00ed Enterprise NVMe SSD U.2 ODP 30.72TB with MT 32GB DRAM(R5101) - 1e3b 00ee Enterprise NVMe SSD U.2 ODP 15.36B with SK 16GB DRAM(J5101) - 1e3b 00ef Enterprise NVMe SSD U.2 ODP 12.80TB with SK 16GB DRAM(J5301) + 1e3b 00b9 Enterprise NVMe SSD U.2 25.60TB + 1e3b 00be Enterprise NVMe SSD U.2 30.72TB + 1e3b 00c1 Enterprise NVMe SSD U.2 25.60TB + 1e3b 00c4 Enterprise NVMe SSD U.2 30.72TB + 1e3b 00c7 Enterprise NVMe SSD U.2 25.60TB (J5301) + 1e3b 00c8 Enterprise NVMe SSD U.2 30.72TB (J5000) + 1e3b 00c9 Enterprise NVMe SSD U.2 15.36TB (J5000) + 1e3b 00ca Enterprise NVMe SSD U.2 3.84TB (J5102) + 1e3b 00cb Enterprise NVMe SSD U.2 7.68TB (J5102) + 1e3b 00cc Enterprise NVMe SSD U.2 3.84TB (J5101) + 1e3b 00cd Enterprise NVMe SSD U.2 7.68TB (J5101) + 1e3b 00ce Enterprise NVMe SSD U.2 3.84TB (J5101D) + 1e3b 00cf Enterprise NVMe SSD U.2 7.68TB (J5101D) + 1e3b 00dc Enterprise NVMe SSD U.2 30.72TB (J5000) + 1e3b 00dd Enterprise NVMe SSD U.2 30.72TB(J5000) + 1e3b 00de Enterprise NVMe SSD U.2 15.36TB (J5000D) + 1e3b 00df Enterprise NVMe SSD U.2 30.72TB (J5000) + 1e3b 00e7 Enterprise NVMe SSD U.2 30.72TB (J5000D) + 1e3b 00e8 Enterprise NVMe SSD U.2 3.20TB (J5301) + 1e3b 00e9 Enterprise NVMe SSD U.2 6.40TB (J5301) + 1e3b 00ea Enterprise NVMe SSD U.2 3.20TB (J5301D) + 1e3b 00eb Enterprise NVMe SSD U.2 6.40TB (J5301D) + 1e3b 00ec Enterprise NVMe SSD U.2 30.72TB (J5101) + 1e3b 00ed NVMe SSD U.2 30.72TB (R5101) + 1e3b 00ee Enterprise NVMe SSD U.2 15.36B (J5101) + 1e3b 00ef Enterprise NVMe SSD U.2 12.80TB (J5301) 1e3b 00f0 Enterprise NVMe SSD U.2 0.40TB (X2900) 1e3b 00f1 Enterprise NVMe SSD U.2 0.80TB (X2900) 1e3b 00f2 Enterprise NVMe SSD U.2 1.60TB (X2900) @@ -26717,16 +26915,17 @@ 1e3b 00f5 Enterprise NVMe SSD U.2 0.40TB (X2900P) 1e3b 00f6 Enterprise NVMe SSD U.2 0.80TB (X2900P) 0800 DP800 - 1e3b 0001 Enterprise NVMe SSD U.2 QDP 3.84TB(R6100) - 1e3b 0007 Enterprise NVMe SSD U.2 ODP 15.36TB (R6100) + 1e3b 0001 Enterprise NVMe SSD U.2 3.84TB(R6100) + 1e3b 0007 Enterprise NVMe SSD U.2 15.36TB (R6100) 1e3b 000a Enterprise NVMe SSD U.2 3.20TB (R6300) 1e3b 000d Enterprise NVMe SSD U.2 6.40TB (R6300) 1e3b 0010 Enterprise NVMe SSD U.2 12.80TB (R6300) - 1e3b 0018 Enterprise NVMe SSD U.2 QDP 3.84TB (R6100C) - 1e3b 0019 Enterprise NVMe SSD U.2 ODP 7.68TB (R6100C) + 1e3b 0018 Enterprise NVMe SSD U.2 3.84TB (R6100C) + 1e3b 0019 Enterprise NVMe SSD U.2 7.68TB (R6100C) 1e3b 001a Enterprise NVMe SSD U.2 3.20TB (R6300C) 1e3b 001b Enterprise NVMe SSD U.2 6.40TB (R6300C) - 1e3b 001c Enterprise NVMe SSD U.2 ODP 7.68TB (R6100) + 1e3b 001c Enterprise NVMe SSD U.2 7.68TB (R6100) + 1e3b 001d Enterprise NVMe SSD U.2 3.84TB (R6101) 1098 Haishen3 NVMe SSD 1e3b 0001 Enterprise NVMe SSD U.2 0.8TB (H2100) 1e3b 0002 Enterprise NVMe SSD U.2 0.96TB (H2200) @@ -26793,6 +26992,7 @@ 1e4c GSI Technology 0010 Associative Processing Unit [Leda] 1e4c 0120 SE120 + 0020 Associative Processing Unit [Leda-2] 1e50 IP3 Tech (HK) Limited 1e52 Tenstorrent Inc 401e Wormhole @@ -26815,6 +27015,7 @@ 2864 Hailo-8 AI Processor 1e67 Untether AI 0002 runAI200 AI Inference Accelerator + 0004 speedAI240 AI Inference Accelerator 1e68 Jiangsu Xinsheng Intelligent Technology Co., Ltd 8111 EP2000Pro PCIe 3 NVMe SSD (DRAM-less) 1e6b Axiado Corp. @@ -26867,6 +27068,7 @@ 2a18 Video Transcode Controller 2a20 Cloud Intelligent Inference and Training Controller 2a22 Cloud Intelligent Inference Controller + 2a30 Cloud Video Transcode Controller 1ea7 Intelliprop, Inc 223a Typhon+ PCIe to Gen-Z Bridge 224a IPA-PE224A CXL to Gen-Z Bridge [Sphinx] @@ -26877,6 +27079,8 @@ 1001 EM120R-GL LTE Modem 1002 EM160R-GL LTE Modem 1eae XFX Limited +1eb0 Shenzhen Electrical Appliances CO. + 1901 NVMe SSD Controller (DRAM-less) 1eb1 VeriSilicon Inc 1001 Video Accelerator 1eb4 Quantum Nebula Microelectronics Technology Co.,Ltd. @@ -26928,10 +27132,7 @@ 2283 Patriot P300 NVMe SSD (DRAM-less) 1ed2 FuriosaAI, Inc. 0000 Warboy - 1111 RNGD - 0000 1111 RNGD-S - 0000 2222 RNGD VF - 0000 3333 RNGD-S VF + 0001 RNGD 2222 RNGD-S 1ed3 Yeston 1ed5 Moore Threads Technology Co.,Ltd @@ -26954,12 +27155,16 @@ 0222 MTT S3000 1ed5 0001 C3150 0223 G2S4 + 0225 MTT S3000E + 1ed5 0001 C3150 0251 G2N10 02ff MTT HDMI/DP Audio 0300 MTT S90 Engineering Sample 0301 MTT S90 + 0313 MTT X500 0323 MTT S4000 0327 MTT S4000 + 0328 MTT S4000 03ff MTT HDMI/DP Audio 1ed8 Digiteq Automotive 0101 FG4 PCIe Frame Grabber (T100) @@ -26972,7 +27177,26 @@ 1ee1 000b Airglow A430 NVMe SSD U.2 4.8TB 1ee1 0012 Airglow Z400 NVMe ZNS SSD U.2 5.76TB 1ee4 PETAIO INC - 1180 P8118 U.2 Single Port SSD + 1180 P8118 NVMe SSD Series + 1ee4 0015 NVMe SSD U.2 1.92TB (P8118E) + 1ee4 0016 NVMe SSD U.2 3.84TB (P8118E) + 1ee4 0017 NVMe SSD U.2 7.68TB (P8118E) + 1ee4 0025 NVMe SSD U.2 1.6TB (P8118E) + 1ee4 0026 NVMe SSD U.2 3.2TB (P8118E) + 1ee4 0027 NVMe SSD U.2 6.4TB (P8118E) + 1ee4 0115 NVMe SSD U.2 1.92TB (P8118Z) + 1ee4 0116 NVMe SSD U.2 3.84TB (P8118Z) + 1ee4 0117 NVMe SSD U.2 7.68TB (P8118Z) + 1ee4 0125 NVMe SSD U.2 1.6TB (P8118Z) + 1ee4 0126 NVMe SSD U.2 3.2TB (P8118Z) + 1ee4 0127 NVMe SSD U.2 6.4TB (P8118Z) + 1ee4 0215 NVMe SSD U.2 1.92TB (P8118X) + 1ee4 0216 NVMe SSD U.2 3.84TB (P8118X) + 1ee4 0217 NVMe SSD U.2 7.68TB (P8118X) + 1ee4 0225 NVMe SSD U.2 1.6TB (P8118X) + 1ee4 0226 NVMe SSD U.2 3.2TB (P8118X) + 1ee4 0227 NVMe SSD U.2 6.4TB (P8118X) + 1ee4 abcd NVMe SSD U.2 1ee9 SUSE LLC 1eec Viscore Technologies Ltd 0102 VSE250231S Dual-port 10Gb/25Gb Ethernet PCIe @@ -27028,6 +27252,8 @@ 5636 IG5636-Based NVMe SSD 1f0a Motorcomm Microelectronics. 6801 YT6801 Gigabit Ethernet Controller +1f0d DeGirum Corp. + 0100 AI Accelerator [ORCA] 1f0f NebulaMatrix Technology 1041 D1055AS vDPA Ethernet Controller 1f0f 0001 D1055AS vDPA Ethernet Controller @@ -27068,6 +27294,8 @@ # XConn XC50256 CXL2.0/PCIe5.0 switch c500 XC50256 1f17 Zettastone Technology +1f1c Sophgo Technologies Inc. + 1686 BM1684X [Sophon Series Deep Learning Accelerator] 1f24 xFusion Digital Technologies Co., Ltd. 1058 EP500/EP600 NVMe SSD 1f24 1114 EP500 NVMe SSD(RI) @@ -27151,9 +27379,18 @@ 1112 metaScale SmartNIC Virtual Function 1151 metaVisor DPU Physical Function 1152 metaVisor DPU Virtual Function +1f73 Shenzhen Quanxing Tech Co., Ltd. +1f7a Efinix, Inc. + 0100 Default ID for Titanium FPGA PCIe Interface (AXI) +1f99 Shenzhen Techwinsemi Technology Co., Ltd. +1f9d Axelera AI + 1100 Metis AIPU (rev 02) + 11aa Metis AIPU (rev 01) 1faa Hexaflake (Shanghai) Information Technology Co., Ltd. 0c10 Compass C10 PF 0c11 Compass C10 VF + 0c80 Compass2 C80 PF + 0c81 Compass2 C80 VF 1fab Unifabrix Ltd. 0000 Nexus Alpha IVPU 0100 NoX Gamma @@ -27260,6 +27497,7 @@ 1010 AWM 1 2000 AWM 2 2010 AWM 2-M +1fe1 Beijing Eswin Computing Technology Co., Ltd. 1fe4 HippStor Technology 1600 HP600 Series NVMe SSD 1fe4 0075 Enterprise NVMe SSD U.2 3.84TB(HP610) @@ -27304,9 +27542,20 @@ 5818 A5818 2036 Netforward Microelectronics Co., Ltd. 1618 NF1618 PCI Express Ethernet Controller + 2036 0860 NF1618 Family NX860 (2*25GE) + 2036 0861 NF1618 Family NX861 (4*25GE) + 2036 0862 NF1618 Family NX862 (2*50GE) + 2036 0863 NF1618 Family NX863 (2*100GE) + 2036 0864 NF1618 Family NX864 (1*200GE) 1619 NF1618 Family Virtual Function 2046 GXMICRO Technology (Shanghai) Co., Ltd. 2048 Beijing SpaceControl Technology Co.Ltd +2061 Unis Flash Memory + 4000 E4000 controller + 4100 E4100 controller +2063 Hubei Yangtze Mason Semiconductor Technology Co., Ltd. + 1406 ME7000 NVMe SSD +206d GigaIO Networks, Inc. 20f4 TRENDnet 2116 ZyDAS Technology Corp. 21b4 Hunan Goke Microelectronics Co., Ltd @@ -27317,6 +27566,7 @@ 1200 NVMe Streamer EP ERD 2304 Colorgraphic Communications Corp. 2321 Bruker AXS Inc. + 0002 Hi-Star PCI Interface 2348 Racore *** 187 LINES SKIPPED *** From nobody Tue Oct 8 07:30:01 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XN72d2sPMz5Z5wN; Tue, 08 Oct 2024 07:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XN72d2BjYz46Y9; Tue, 8 Oct 2024 07:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728372601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wLYkDqnBkNsUAo4Ny8Mmn0/OKXtWPR3x9IYdSkGYAK8=; b=DUS2YOLVNLboRzJupkOsfMruNbtuLW8RU2W4ze1iWfRTcCeX81VrJ3kMNYEXCh5KV4+hDj ntZjBPBoF/TKI9f0EVvYf2iiMfbfgncHFz9pkJ1LY1v+D4VWaD9mXOwHat3PzupyYHMjeO x6NXGSZTB+owtJde2pkiyMJ9zlXjQ5pXnFLRiU4/cutLT7sYqp8zqW4MHZEsL9tYugBI5Z u9zst2U32Z7HRGufElh0P2IPXp70+F1jPRy0QnU5wB4JyZNi7iQm61FY8VwNUzvc4fgiD4 Ju8BkWuJHnj56ij2SF4AwMO7VNWSLxcH533oNvq0KcfKmsO59iMIlVvW2V8RZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728372601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wLYkDqnBkNsUAo4Ny8Mmn0/OKXtWPR3x9IYdSkGYAK8=; b=HPLdYMawXqcQfb0Y9n8zhfSbKFF2PldPx+oLOd+ApomAVxJb+pfTJpNyuNbLH2uU1yKcyq WQ1Kt93hiJlVFF+2pv8REmygZWNHdggiNHp40jRpSns5/LBUZuWQoQt7gN4O7Zem3JZAdJ nzgN7uUqPQl5lMMGuhg6yRiysMXlIXvq7rijQp+CIwz5WWxj6OgE7g1lR2dLFtB3hnCTiD 6LRN56SlapZqmsXrbkMH/bxzjULF6igwWv62+iOfIjTrDXtellOqRAUdsbqtxOo5TXwNzD jL6UxqR5B10Uy5BN7ojRHf3cUz2km11siXcXIBZpjq7bis0/A53i3NIxSJZoCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728372601; a=rsa-sha256; cv=none; b=Pu0O28LsYO9ax+GqVbyfjN9t+nkfJ0w3z3IzJm0kH94kXzstLKpgFh/xvDMqeRKyUE/Pvm 8rpTBqbDinU/ba7wmMEkLuloI2CuGHliXhQgxn49QuTu5lvzK9Ec7T/z/IXjHRUfJJld5A D7YKRndkswAofh77Gekk8UKaDUeaABVbvyvt1rfEUg3uwOpP8KVwsIPjeiBAPw1JIT1UnX VNuXgwfDwRpRq73GZk0c0NKIfqZc+A9E4fMiR1GVIeypXOj7QGy2ag3a0LmQ7WD4qNuhsS HdHYmpftxKMgQ1hNIXzywClvKOW/EHWN5HiwcLmVvAwxqdQN8dKkRPPfn6uDYA== 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 4XN72d1ggbzLl0; Tue, 8 Oct 2024 07:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4987U1Km087912; Tue, 8 Oct 2024 07:30:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4987U1LB087907; Tue, 8 Oct 2024 07:30:01 GMT (envelope-from git) Date: Tue, 8 Oct 2024 07:30:01 GMT Message-Id: <202410080730.4987U1LB087907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: e7fe85643735 - main - xen/blk{front,back}: fix usage of sector sizes different than 512b List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7fe85643735ffdcf18ebef81343eaac9b8d2584 Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=e7fe85643735ffdcf18ebef81343eaac9b8d2584 commit e7fe85643735ffdcf18ebef81343eaac9b8d2584 Author: Roger Pau Monné AuthorDate: 2024-08-26 11:57:36 +0000 Commit: Roger Pau Monné CommitDate: 2024-10-08 07:29:13 +0000 xen/blk{front,back}: fix usage of sector sizes different than 512b The units of the size reported in the 'sectors' xenbus node is always 512b, regardless of the value of the 'sector-size' node. The sector offsets in the ring requests are also always based on 512b sectors, regardless of the 'sector-size' reported in xenbus. Fix both blkfront and blkback to assume 512b sectors in the required fields. The blkif.h public header has been recently updated in upstream Xen repository to fix the regressions in the specification introduced by later modifications, and clarify the base units of xenstore and shared ring fields. PR: 280884 Reported by: Christian Kujau MFC after: 1 week Sponsored by: Cloud Software Group Reviewed by: markj Differential revision: https://reviews.freebsd.org/D46756 --- sys/dev/xen/blkback/blkback.c | 22 ++++++++++++++------- sys/dev/xen/blkfront/blkfront.c | 43 ++++++++++++++++++++++++++++++----------- 2 files changed, 47 insertions(+), 18 deletions(-) diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c index 3717264256f3..c6cba729b991 100644 --- a/sys/dev/xen/blkback/blkback.c +++ b/sys/dev/xen/blkback/blkback.c @@ -145,6 +145,8 @@ static MALLOC_DEFINE(M_XENBLOCKBACK, "xbbd", "Xen Block Back Driver Data"); */ #define XBB_MAX_SEGMENTS_PER_REQLIST XBB_MAX_SEGMENTS_PER_REQUEST +#define XBD_SECTOR_SHFT 9 + /*--------------------------- Forward Declarations ---------------------------*/ struct xbb_softc; struct xbb_xen_req; @@ -1150,7 +1152,9 @@ xbb_get_resources(struct xbb_softc *xbb, struct xbb_xen_reqlist **reqlist, if (*reqlist == NULL) { *reqlist = nreqlist; nreqlist->operation = ring_req->operation; - nreqlist->starting_sector_number = ring_req->sector_number; + nreqlist->starting_sector_number = + (ring_req->sector_number << XBD_SECTOR_SHFT) >> + xbb->sector_size_shift; STAILQ_INSERT_TAIL(&xbb->reqlist_pending_stailq, nreqlist, links); } @@ -2476,13 +2480,13 @@ xbb_open_file(struct xbb_softc *xbb) xbb->sector_size = 512; /* - * Sanity check. The media size has to be at least one - * sector long. + * Sanity check. The media size must be a multiple of the sector + * size. */ - if (xbb->media_size < xbb->sector_size) { + if ((xbb->media_size % xbb->sector_size) != 0) { error = EINVAL; xenbus_dev_fatal(xbb->dev, error, - "file %s size %ju < block size %u", + "file %s size %ju not multiple of block size %u", xbb->dev_name, (uintmax_t)xbb->media_size, xbb->sector_size); @@ -3086,9 +3090,13 @@ xbb_publish_backend_info(struct xbb_softc *xbb) return (error); } + /* + * The 'sectors' node is special and always contains the size + * in units of 512b, regardless of the value in 'sector-size'. + */ leaf = "sectors"; - error = xs_printf(xst, our_path, leaf, - "%"PRIu64, xbb->media_num_sectors); + error = xs_printf(xst, our_path, leaf, "%ju", + (uintmax_t)(xbb->media_size >> XBD_SECTOR_SHFT)); if (error != 0) break; diff --git a/sys/dev/xen/blkfront/blkfront.c b/sys/dev/xen/blkfront/blkfront.c index b11972295a4b..6bb4e32f1328 100644 --- a/sys/dev/xen/blkfront/blkfront.c +++ b/sys/dev/xen/blkfront/blkfront.c @@ -158,7 +158,8 @@ xbd_free_command(struct xbd_command *cm) static void xbd_mksegarray(bus_dma_segment_t *segs, int nsegs, grant_ref_t * gref_head, int otherend_id, int readonly, - grant_ref_t * sg_ref, struct blkif_request_segment *sg) + grant_ref_t * sg_ref, struct blkif_request_segment *sg, + unsigned int sector_size) { struct blkif_request_segment *last_block_sg = sg + nsegs; vm_paddr_t buffer_ma; @@ -166,9 +167,9 @@ xbd_mksegarray(bus_dma_segment_t *segs, int nsegs, int ref; while (sg < last_block_sg) { - KASSERT(segs->ds_addr % (1 << XBD_SECTOR_SHFT) == 0, + KASSERT((segs->ds_addr & (sector_size - 1)) == 0, ("XEN disk driver I/O must be sector aligned")); - KASSERT(segs->ds_len % (1 << XBD_SECTOR_SHFT) == 0, + KASSERT((segs->ds_len & (sector_size - 1)) == 0, ("XEN disk driver I/Os must be a multiple of " "the sector length")); buffer_ma = segs->ds_addr; @@ -241,7 +242,8 @@ xbd_queue_cb(void *arg, bus_dma_segment_t *segs, int nsegs, int error) xbd_mksegarray(segs, nsegs, &cm->cm_gref_head, xenbus_get_otherend_id(sc->xbd_dev), cm->cm_operation == BLKIF_OP_WRITE, - cm->cm_sg_refs, ring_req->seg); + cm->cm_sg_refs, ring_req->seg, + sc->xbd_disk->d_sectorsize); } else { blkif_request_indirect_t *ring_req; @@ -259,7 +261,8 @@ xbd_queue_cb(void *arg, bus_dma_segment_t *segs, int nsegs, int error) xbd_mksegarray(segs, nsegs, &cm->cm_gref_head, xenbus_get_otherend_id(sc->xbd_dev), cm->cm_operation == BLKIF_OP_WRITE, - cm->cm_sg_refs, cm->cm_indirectionpages); + cm->cm_sg_refs, cm->cm_indirectionpages, + sc->xbd_disk->d_sectorsize); memcpy(ring_req->indirect_grefs, &cm->cm_indirectionrefs, sizeof(grant_ref_t) * sc->xbd_max_request_indirectpages); } @@ -359,7 +362,9 @@ xbd_bio_command(struct xbd_softc *sc) } cm->cm_bp = bp; - cm->cm_sector_number = (blkif_sector_t)bp->bio_pblkno; + cm->cm_sector_number = + ((blkif_sector_t)bp->bio_pblkno * sc->xbd_disk->d_sectorsize) >> + XBD_SECTOR_SHFT; switch (bp->bio_cmd) { case BIO_READ: @@ -631,7 +636,7 @@ xbd_dump(void *arg, void *virtual, off_t offset, size_t length) cm->cm_data = virtual; cm->cm_datalen = chunk; cm->cm_operation = BLKIF_OP_WRITE; - cm->cm_sector_number = offset / dp->d_sectorsize; + cm->cm_sector_number = offset >> XBD_SECTOR_SHFT; cm->cm_complete = xbd_dump_complete; xbd_enqueue_cm(cm, XBD_Q_READY); @@ -1025,7 +1030,19 @@ xbd_instance_create(struct xbd_softc *sc, blkif_sector_t sectors, sc->xbd_disk->d_stripesize = phys_sector_size; sc->xbd_disk->d_stripeoffset = 0; - sc->xbd_disk->d_mediasize = sectors * sector_size; + /* + * The 'sectors' xenbus node is always in units of 512b, regardless of + * the 'sector-size' xenbus node value. + */ + sc->xbd_disk->d_mediasize = sectors << XBD_SECTOR_SHFT; + if ((sc->xbd_disk->d_mediasize % sc->xbd_disk->d_sectorsize) != 0) { + error = EINVAL; + xenbus_dev_fatal(sc->xbd_dev, error, + "Disk size (%ju) not a multiple of sector size (%ju)", + (uintmax_t)sc->xbd_disk->d_mediasize, + (uintmax_t)sc->xbd_disk->d_sectorsize); + return (error); + } sc->xbd_disk->d_maxsize = sc->xbd_max_request_size; sc->xbd_disk->d_flags = DISKFLAG_UNMAPPED_BIO; if ((sc->xbd_flags & (XBDF_FLUSH|XBDF_BARRIER)) != 0) { @@ -1310,7 +1327,7 @@ xbd_connect(struct xbd_softc *sc) /* Allocate datastructures based on negotiated values. */ err = bus_dma_tag_create( bus_get_dma_tag(sc->xbd_dev), /* parent */ - 512, PAGE_SIZE, /* algnmnt, boundary */ + sector_size, PAGE_SIZE, /* algnmnt, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ @@ -1380,13 +1397,17 @@ xbd_connect(struct xbd_softc *sc) if (sc->xbd_disk == NULL) { device_printf(dev, "%juMB <%s> at %s", - (uintmax_t) sectors / (1048576 / sector_size), + (uintmax_t)((sectors << XBD_SECTOR_SHFT) / 1048576), device_get_desc(dev), xenbus_get_node(dev)); bus_print_child_footer(device_get_parent(dev), dev); - xbd_instance_create(sc, sectors, sc->xbd_vdevice, binfo, + err = xbd_instance_create(sc, sectors, sc->xbd_vdevice, binfo, sector_size, phys_sector_size); + if (err != 0) { + xenbus_dev_fatal(dev, err, "Unable to create instance"); + return; + } } (void)xenbus_set_state(dev, XenbusStateConnected); From nobody Tue Oct 8 07:36:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XN7BQ30n7z5Z6P6; Tue, 08 Oct 2024 07:36:46 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XN7BQ2V5qz47qs; Tue, 8 Oct 2024 07:36:46 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728373006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=+kiXMNEoUXWRtALlzQLm174qMD7JIsAO1RsS+1363U8=; b=m2WOvVrEe6J2rF/nZQoOgGTlkjsTM49V341xFht4O1GGrJzCgdv3NiXh70yxOMHmKhRusR fay1wPDslwkUi43KRODSeIZ4LkbFWhHP+tRLnqy7nY/I1N2QZcHLqCxcRHHYho8+LT37oW X+T/DxFnW9gbpaT3dKBZ6A6mg9lH9b3Nzn1tkSQ6m8hvmz2AVtr/ru3hGUL8j8qUQAHKBJ +49Z0BcTc3zLmAgBZ6Q0PD08m9PThbJz4KNVW6Mvpbrje2Jr1qqvV95fkXrhIARanYulBu jAfZSTFb6awkXx/HxACzuNfZDlGIDEhl7Qgj5Hohbzd0U6fyoW4MJFaibh46/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728373006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=+kiXMNEoUXWRtALlzQLm174qMD7JIsAO1RsS+1363U8=; b=qsfh8Q1d9LfyzmBUHPmpMHZEIQ7kDFGzousi8iSWMr3TZGFgK+W5n+6VUA6r2Y8ZUi1ZfE /f4qh9ZEjJkdCIq7daOH6w9WFUVtnX9SkuPSZ3mLnJ2jDawVEaFM3siTtYCqhVL8OwyWKc Xaj/EEFj3SksPMLL6zTaOUwH5W+QFokfBvk6q1PTnfwe1c2Km5Xjl5tn+mI8XlwPWb/pUw 3aCJWzo7BwxtnssN8Mcnh/bN2SC7akaRoCtaRg66TVFm5dO77CQ39xTCO7JLzguF0THzrb xeZDDNi0nNR0BxWzlhuf2O38XscqyYCb3wqyCeEyNxXkHewrnRjpeyZR/JHTPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728373006; a=rsa-sha256; cv=none; b=pGc+lhRDt1Feu7dso8SmipcT+EIvD77qcfmqIbShYymGnFh+fiK4ebraD3ultSwlsqpIoY RgB6jmgPzdmeL0KKwTQNgQLvYuUMpXRFllH56U7wxiFYAOq+zFJA9KNp464lunXbgyRB2i ABgVTT+c+Au1OEUshdZzFLKzNwGYmmru+h/innJNc97433OLoZV7sBB+VoQSCi3EhujWw1 tPmIZXedEcm7xoDYjaGGIj6n9xOqRYvB3p6f8KicY6R+KulvV9zF99iJVlpfa6N92Ug4cS 5eCOZbU9b3pqjYGFLuA365iLy2uyWe96okGTTQycfNKSwMsngfPJFRJFpLQNHA== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::1]) (using TLSv1.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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XN7BQ1MYPzGPj; Tue, 8 Oct 2024 07:36:46 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 37F5AB0C99; Tue, 8 Oct 2024 09:36:43 +0200 (CEST) Date: Tue, 8 Oct 2024 09:36:43 +0200 From: Baptiste Daroussin To: Ka Ho Ng Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2c7d84795628 - main - libkldelf: add elf_lookup_symbol function Message-ID: References: <202410080429.4984TYtp079688@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202410080429.4984TYtp079688@gitrepo.freebsd.org> On Tue 08 Oct 04:29, Ka Ho Ng wrote: > The branch main has been updated by khng: > > URL: https://cgit.FreeBSD.org/src/commit/?id=2c7d84795628cb9c7a266718b99b6bca68e0a135 > > commit 2c7d84795628cb9c7a266718b99b6bca68e0a135 > Author: Ka Ho Ng > AuthorDate: 2024-10-08 04:24:37 +0000 > Commit: Ka Ho Ng > CommitDate: 2024-10-08 04:29:10 +0000 > > libkldelf: add elf_lookup_symbol function > > The elf_lookup_symbol function looks up the symbol with a given symbol > name. A pointer to the GElf_Sym of the symbol is returned if the symbol > exists in the opened ELF file. > > Sponsored by: Juniper Networks, Inc. > Reviewed by: markj > Differential Revision: https://reviews.freebsd.org/D46764 Taking this mail, but I am not sure this is the commit which causes the issue. Since this set of commits, incremental building of packages fail! It seems the linker.hints if not produces anymore: pkg: Unable to access file /home/pkgbuild/obj/home/pkgbuild/worktrees/main/amd64.amd64/kernelstage/kernel.MINIMAL/boot/kernel.MINIMAL/linker.hints:No such file or directory I can see the kldxref command being run earlier: Best regards, Bapt From nobody Tue Oct 8 08:33:14 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XN8RZ6CdPz5Z90G; Tue, 08 Oct 2024 08: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XN8RZ5dpKz4FGL; Tue, 8 Oct 2024 08: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=1728376394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xBvmcOFWHdN0whwsqAL0FNwmZcrgboXQ03iZzQ0aCfk=; b=dEu7Jbimavq39yYtyBo+0xdcPi9G86pxOFKEK9L2JClhkiQvQLaZ2PHA4uIwFTTnhVzCK1 x8QisDDTT5s4wtOk2Je9sxfsfix3aj86mEHrCn+RLS8EKSrohpoQPpYPE7L+xu+ECKddI0 uIw04Oo706tg7a6XbQrcz+cX6RgkXVyP91jcd3/MdIuO82Uhr8VtdpxTN+JlKMRptU6ibc 8ctucKl1Bm9BFOkyZ4hxqSKl4TVux7WFjgmKlEpxTnFFvFc3weH2OUboHtn/phSE++kS/z iPd2UDxloYg/CqHtwTF89agcRpHaHEZQPsPG7ssx2Q4979q2B8Nq6BP9q7xQmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728376394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xBvmcOFWHdN0whwsqAL0FNwmZcrgboXQ03iZzQ0aCfk=; b=FobCiOOWYkrQVQr6gbb5QklYDTPNeMq6xFT0gpvVrNPc6TCr8fz6l60x7Sb4bh1ihkMfZQ 5a4FEvM6Afh7GIb75AXDU64Rc9eYcQc9VPIwCf+uzfDiNJVrjKqNHQaZh69CLNfdic//1h bpAC8LN4H3cfQk9ja9djXNTlBuiEa5JRfEHJ2+kk1vi+NAOhxFOBNe5tNJ01WICy/OnnNY KTw5yEUb7WCN9IJTIYsL4HjgoC/N/Eunv7Uo2cujkMgD0R9VtTdhhmO4eaDXQNTqm28aY6 X/lRgVzotXsHtOI4TNL41+sKebYRozn3Rvxjo0zxXBSd9gyVrpHTng18GcuZeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728376394; a=rsa-sha256; cv=none; b=IH+Xw0jlOZwtDbySEa4uI+notGtxDrTCvaqxFB4FCsUVZabvsx2BTJ9Cw8uaadIyQLdyew o+kQo/xmsaf7ndwmz0p4/XZqzpbI0xOXGOdkbBT8W8GoEUo7nQjUG7HJ3ElrLhBZjYIl5c Hl4oOOIQG8qTaAGb0LTYCd2Id9GqkprCV20CAfZQTRe7IgmR0ZafKgWFVmzrNCoyEr1I8B oCLKbWbDpr+9ZY088qdcpJ3t05FHzicKjE7lN0tWEY4j62jwUSQIaNFhJFVbvtwc6Bzl+s eeaNQ/RiU++jD0v7PdkuggW+f4eGnIuKH4SALGtgSYY18M9V/RX4BPQLakgz3g== 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 4XN8RZ4wRJzMfj; Tue, 8 Oct 2024 08:33:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4988XE5l003730; Tue, 8 Oct 2024 08:33:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4988XEGo003727; Tue, 8 Oct 2024 08:33:14 GMT (envelope-from git) Date: Tue, 8 Oct 2024 08:33:14 GMT Message-Id: <202410080833.4988XEGo003727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: d0b225d16418 - main - swap_pager: use iterators in swp_pager_meta_build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0b225d16418e224b5d30d13f45515aa70ad47a3 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=d0b225d16418e224b5d30d13f45515aa70ad47a3 commit d0b225d16418e224b5d30d13f45515aa70ad47a3 Author: Doug Moore AuthorDate: 2024-10-08 08:31:16 +0000 Commit: Doug Moore CommitDate: 2024-10-08 08:31:16 +0000 swap_pager: use iterators in swp_pager_meta_build Add a method to use an iterator for pctrie insertion; this should improve performance when the last search ended near the place where the new item will be inserted. Add an iterator argument to swp_pager_meta_build, so that the lookups and insertions it does can be faster in the common case when keys are bunched close together, or appear in sequence. Reviewed by: alc Differential Revision: https://reviews.freebsd.org/D46848 --- sys/kern/subr_pctrie.c | 36 +++++++++++++++++ sys/sys/pctrie.h | 20 +++++++++ sys/vm/swap_pager.c | 107 ++++++++++++++++++++++++++++++++----------------- 3 files changed, 126 insertions(+), 37 deletions(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index a7b487166054..50216287845f 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -594,6 +594,42 @@ pctrie_iter_lookup(struct pctrie_iter *it, uint64_t index) return (_pctrie_iter_lookup(it, index, NULL, PCTRIE_LOCKED)); } +/* + * Insert the val in the trie, starting search with iterator. Return a pointer + * to indicate where a new node must be allocated to complete insertion. + * Assumes access is externally synchronized by a lock. + */ +void * +pctrie_iter_insert_lookup(struct pctrie_iter *it, uint64_t *val) +{ + struct pctrie_node *node; + + it->index = *val; + node = _pctrie_iter_lookup_node(it, *val, NULL, PCTRIE_LOCKED); + if (node == PCTRIE_NULL) { + if (it->top == 0) + pctrie_root_store(it->ptree, + pctrie_toleaf(val), PCTRIE_LOCKED); + else + pctrie_addnode(it->path[it->top - 1], it->index, + pctrie_toleaf(val), PCTRIE_LOCKED); + return (NULL); + } + if (__predict_false(pctrie_match_value(node, it->index) != NULL)) + panic("%s: key %jx is already present", __func__, + (uintmax_t)it->index); + + /* + * 'node' must be replaced in the tree with a new branch node, with + * children 'node' and 'val'. Return the place that points to 'node' + * now, and will point to to the new branching node later. + */ + if (it->top == 0) + return ((smr_pctnode_t *)&it->ptree->pt_root); + node = it->path[it->top - 1]; + return (&node->pn_child[pctrie_slot(node, it->index)]); +} + /* * Returns the value stored at a fixed offset from the current index value, * possibly NULL. diff --git a/sys/sys/pctrie.h b/sys/sys/pctrie.h index 4d5450c25079..d71290c8cf23 100644 --- a/sys/sys/pctrie.h +++ b/sys/sys/pctrie.h @@ -239,6 +239,24 @@ name##_PCTRIE_RECLAIM_CALLBACK(struct pctrie *ptree, \ freefn(ptree, freenode); \ } \ \ +static __inline __unused int \ +name##_PCTRIE_ITER_INSERT(struct pctrie_iter *it, struct type *ptr) \ +{ \ + struct pctrie_node *parent; \ + void *parentp; \ + uint64_t *val = name##_PCTRIE_PTR2VAL(ptr); \ + \ + parentp = pctrie_iter_insert_lookup(it, val); \ + if (parentp == NULL) \ + return (0); \ + parent = allocfn(it->ptree); \ + if (__predict_false(parent == NULL)) \ + return (ENOMEM); \ + pctrie_insert_node(parentp, parent, val); \ + it->path[it->top++] = parent; \ + return (0); \ +} \ + \ static __inline __unused struct type * \ name##_PCTRIE_ITER_LOOKUP(struct pctrie_iter *it, uint64_t index) \ { \ @@ -369,6 +387,8 @@ uint64_t *pctrie_iter_lookup(struct pctrie_iter *it, uint64_t index); uint64_t *pctrie_iter_stride(struct pctrie_iter *it, int stride); uint64_t *pctrie_iter_next(struct pctrie_iter *it); uint64_t *pctrie_iter_prev(struct pctrie_iter *it); +void *pctrie_iter_insert_lookup(struct pctrie_iter *it, + uint64_t *val); uint64_t *pctrie_lookup_ge(struct pctrie *ptree, uint64_t key); uint64_t *pctrie_subtree_lookup_gt(struct pctrie_node *node, uint64_t key); diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 807215647a93..f4db46a32dee 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -486,8 +486,8 @@ static daddr_t swp_pager_getswapspace(int *npages); /* * Metadata functions */ -static daddr_t swp_pager_meta_build(vm_object_t, vm_pindex_t, daddr_t, - bool); +static daddr_t swp_pager_meta_build(struct pctrie_iter *, vm_object_t object, + vm_pindex_t, daddr_t, bool); static void swp_pager_meta_free(vm_object_t, vm_pindex_t, vm_pindex_t, vm_size_t *); static void swp_pager_meta_transfer(vm_object_t src, vm_object_t dst, @@ -551,29 +551,39 @@ swblk_lookup_remove(vm_object_t object, struct swblk *sb) SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, sb->p); } -static int -swblk_lookup_insert(vm_object_t object, struct swblk *sb) -{ - return (SWAP_PCTRIE_INSERT(&object->un_pager.swp.swp_blks, sb)); -} - static bool swblk_is_empty(vm_object_t object) { return (pctrie_is_empty(&object->un_pager.swp.swp_blks)); } -static struct swblk * -swblk_iter_init(struct pctrie_iter *blks, vm_object_t object, - vm_pindex_t pindex) +static void +swblk_iter_init_only(struct pctrie_iter *blks, vm_object_t object) { VM_OBJECT_ASSERT_LOCKED(object); MPASS((object->flags & OBJ_SWAP) != 0); pctrie_iter_init(blks, &object->un_pager.swp.swp_blks); +} + + +static struct swblk * +swblk_iter_init(struct pctrie_iter *blks, vm_object_t object, + vm_pindex_t pindex) +{ + swblk_iter_init_only(blks, object); return (SWAP_PCTRIE_ITER_LOOKUP_GE(blks, rounddown(pindex, SWAP_META_PAGES))); } +static struct swblk * +swblk_iter_reinit(struct pctrie_iter *blks, vm_object_t object, + vm_pindex_t pindex) +{ + swblk_iter_init_only(blks, object); + return (SWAP_PCTRIE_ITER_LOOKUP(blks, + rounddown(pindex, SWAP_META_PAGES))); +} + static struct swblk * swblk_iter_limit_init(struct pctrie_iter *blks, vm_object_t object, vm_pindex_t pindex, vm_pindex_t limit) @@ -591,6 +601,19 @@ swblk_iter_next(struct pctrie_iter *blks) return (SWAP_PCTRIE_ITER_JUMP_GE(blks, SWAP_META_PAGES)); } +static struct swblk * +swblk_iter_lookup(struct pctrie_iter *blks, vm_pindex_t pindex) +{ + return (SWAP_PCTRIE_ITER_LOOKUP(blks, + rounddown(pindex, SWAP_META_PAGES))); +} + +static int +swblk_iter_insert(struct pctrie_iter *blks, struct swblk *sb) +{ + return (SWAP_PCTRIE_ITER_INSERT(blks, sb)); +} + static void swblk_iter_remove(struct pctrie_iter *blks) { @@ -1081,6 +1104,7 @@ swap_pager_freespace_pgo(vm_object_t object, vm_pindex_t start, vm_size_t size) int swap_pager_reserve(vm_object_t object, vm_pindex_t start, vm_pindex_t size) { + struct pctrie_iter blks; struct page_range range; daddr_t addr, blk; vm_pindex_t i, j; @@ -1088,6 +1112,7 @@ swap_pager_reserve(vm_object_t object, vm_pindex_t start, vm_pindex_t size) swp_pager_init_freerange(&range); VM_OBJECT_WLOCK(object); + swblk_iter_init_only(&blks, object); for (i = 0; i < size; i += n) { n = MIN(size - i, INT_MAX); blk = swp_pager_getswapspace(&n); @@ -1097,7 +1122,7 @@ swap_pager_reserve(vm_object_t object, vm_pindex_t start, vm_pindex_t size) return (-1); } for (j = 0; j < n; ++j) { - addr = swp_pager_meta_build(object, + addr = swp_pager_meta_build(&blks, object, start + i + j, blk + j, false); if (addr != SWAPBLK_NONE) swp_pager_update_freerange(&range, addr); @@ -1535,6 +1560,7 @@ static void swap_pager_putpages(vm_object_t object, vm_page_t *ma, int count, int flags, int *rtvals) { + struct pctrie_iter blks; struct page_range range; struct buf *bp; daddr_t addr, blk; @@ -1580,11 +1606,15 @@ swap_pager_putpages(vm_object_t object, vm_page_t *ma, int count, continue; } VM_OBJECT_WLOCK(object); + swblk_iter_init_only(&blks, object); for (j = 0; j < n; ++j) { mreq = ma[i + j]; vm_page_aflag_clear(mreq, PGA_SWAP_FREE); - addr = swp_pager_meta_build(mreq->object, mreq->pindex, - blk + j, false); + KASSERT(mreq->object == object, + ("%s: object mismatch %p/%p", + __func__, mreq->object, object)); + addr = swp_pager_meta_build(&blks, object, + mreq->pindex, blk + j, false); if (addr != SWAPBLK_NONE) swp_pager_update_freerange(&range, addr); MPASS(mreq->dirty == VM_PAGE_BITS_ALL); @@ -2102,19 +2132,18 @@ swp_pager_free_empty_swblk(vm_object_t object, struct swblk *sb) * any. */ static daddr_t -swp_pager_meta_build(vm_object_t object, vm_pindex_t pindex, daddr_t swapblk, - bool nowait_noreplace) +swp_pager_meta_build(struct pctrie_iter *blks, vm_object_t object, + vm_pindex_t pindex, daddr_t swapblk, bool nowait_noreplace) { static volatile int swblk_zone_exhausted, swpctrie_zone_exhausted; struct swblk *sb, *sb1; - vm_pindex_t modpi, rdpi; + vm_pindex_t modpi; daddr_t prev_swapblk; int error, i; VM_OBJECT_ASSERT_WLOCKED(object); - rdpi = rounddown(pindex, SWAP_META_PAGES); - sb = swblk_lookup(object, rdpi); + sb = swblk_iter_lookup(blks, pindex); if (sb == NULL) { if (swapblk == SWAPBLK_NONE) return (SWAPBLK_NONE); @@ -2122,7 +2151,7 @@ swp_pager_meta_build(vm_object_t object, vm_pindex_t pindex, daddr_t swapblk, sb = uma_zalloc(swblk_zone, M_NOWAIT | (curproc == pageproc ? M_USE_RESERVE : 0)); if (sb != NULL) { - sb->p = rdpi; + sb->p = rounddown(pindex, SWAP_META_PAGES); for (i = 0; i < SWAP_META_PAGES; i++) sb->d[i] = SWAPBLK_NONE; if (atomic_cmpset_int(&swblk_zone_exhausted, @@ -2143,17 +2172,17 @@ swp_pager_meta_build(vm_object_t object, vm_pindex_t pindex, daddr_t swapblk, } else uma_zwait(swblk_zone); VM_OBJECT_WLOCK(object); - sb = swblk_lookup(object, rdpi); + sb = swblk_iter_reinit(blks, object, pindex); if (sb != NULL) /* * Somebody swapped out a nearby page, - * allocating swblk at the rdpi index, + * allocating swblk at the pindex index, * while we dropped the object lock. */ goto allocated; } for (;;) { - error = swblk_lookup_insert(object, sb); + error = swblk_iter_insert(blks, sb); if (error == 0) { if (atomic_cmpset_int(&swpctrie_zone_exhausted, 1, 0)) @@ -2175,7 +2204,7 @@ swp_pager_meta_build(vm_object_t object, vm_pindex_t pindex, daddr_t swapblk, } else uma_zwait(swpctrie_zone); VM_OBJECT_WLOCK(object); - sb1 = swblk_lookup(object, rdpi); + sb1 = swblk_iter_reinit(blks, object, pindex); if (sb1 != NULL) { uma_zfree(swblk_zone, sb); sb = sb1; @@ -2184,7 +2213,7 @@ swp_pager_meta_build(vm_object_t object, vm_pindex_t pindex, daddr_t swapblk, } } allocated: - MPASS(sb->p == rdpi); + MPASS(sb->p == rounddown(pindex, SWAP_META_PAGES)); modpi = pindex % SWAP_META_PAGES; /* Return prior contents of metadata. */ @@ -2196,8 +2225,11 @@ allocated: /* * Free the swblk if we end up with the empty page run. */ - if (swapblk == SWAPBLK_NONE) - swp_pager_free_empty_swblk(object, sb); + if (swapblk == SWAPBLK_NONE && + swp_pager_swblk_empty(sb, 0, SWAP_META_PAGES)) { + swblk_iter_remove(blks); + uma_zfree(swblk_zone, sb); + } } return (prev_swapblk); } @@ -2213,7 +2245,7 @@ static void swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, vm_pindex_t pindex, vm_pindex_t count) { - struct pctrie_iter blks; + struct pctrie_iter dstblks, srcblks; struct page_range range; struct swblk *sb; daddr_t blk, d[SWAP_META_PAGES]; @@ -2231,15 +2263,16 @@ swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, swp_pager_init_freerange(&range); d_mask = 0; last = pindex + count; - for (sb = swblk_iter_limit_init(&blks, srcobject, pindex, last), + swblk_iter_init_only(&dstblks, dstobject); + for (sb = swblk_iter_limit_init(&srcblks, srcobject, pindex, last), start = swblk_start(sb, pindex); - sb != NULL; sb = swblk_iter_next(&blks), start = 0) { - limit = MIN(last - blks.index, SWAP_META_PAGES); + sb != NULL; sb = swblk_iter_next(&srcblks), start = 0) { + limit = MIN(last - srcblks.index, SWAP_META_PAGES); for (i = start; i < limit; i++) { if (sb->d[i] == SWAPBLK_NONE) continue; - blk = swp_pager_meta_build(dstobject, - blks.index + i - pindex, sb->d[i], true); + blk = swp_pager_meta_build(&dstblks, dstobject, + srcblks.index + i - pindex, sb->d[i], true); if (blk == sb->d[i]) { /* * Failed memory allocation stopped transfer; @@ -2256,7 +2289,7 @@ swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, } if (swp_pager_swblk_empty(sb, 0, start) && swp_pager_swblk_empty(sb, limit, SWAP_META_PAGES)) { - swblk_iter_remove(&blks); + swblk_iter_remove(&srcblks); uma_zfree(swblk_zone, sb); } if (d_mask != 0) { @@ -2264,8 +2297,8 @@ swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, VM_OBJECT_WUNLOCK(srcobject); do { i = ffs(d_mask) - 1; - swp_pager_meta_build(dstobject, - blks.index + i - pindex, d[i], false); + swp_pager_meta_build(&dstblks, dstobject, + srcblks.index + i - pindex, d[i], false); d_mask &= ~(1 << i); } while (d_mask != 0); VM_OBJECT_WLOCK(srcobject); @@ -2274,7 +2307,7 @@ swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, * While the lock was not held, the iterator path could * have become stale, so discard it. */ - pctrie_iter_reset(&blks); + pctrie_iter_reset(&srcblks); } } swp_pager_freeswapspace(&range); From nobody Tue Oct 8 12:39:22 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNFvZ3ppQz5ZNck; Tue, 08 Oct 2024 12:39: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNFvZ3GPMz4bgb; Tue, 8 Oct 2024 12:39:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728391162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YJ8vS3tnLAu5KuV4aBsR1gikYu3zJk8CQY6/+qeEQK8=; b=bFgdgk3eOxe0H10N0UkMTpVhWsJAZMfGAcGb/9wnDFJk1QruRAomhBlllkjPY9cwi/QxTM JvfI6oGqfsUHyrGxYf9vudE7taG/SyPeeDZXFuUz8C7+dUlw511iXQ2DQy26xBP1Te3WTN VFsaiSYOmaOWef1mU0ZaMwoKnNw/a6HYRHRrPwtb44U0Ba5mSzJShBtNR4dVgQIlZI2E9t VtIqRzP3zJY9fHUQwigmLEgscCid7uNP+pTRLsO1nfP0yb1syFiyNEX6IxzmU0mTjd+E2L kHzy8EsA/aMjtFQVeOkTCm5J9b+A5V0fk4FmJuH95Zzaeq+j534sAlmsRCpMfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728391162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YJ8vS3tnLAu5KuV4aBsR1gikYu3zJk8CQY6/+qeEQK8=; b=E4JvkpFHpJFRkA7LpAnC3P5SRMQryySlZIha49AjaErPzE0DzVWhWLDcSqu2kgqaSN5+XU LUKRmJ+AQhDF/+lPA/iHp6K9ukLsslkNa7E06xOcohBA+722xMriJH1aQ/KGadbHuEbWSh +LdibhmtWj/mJq2H7jpMLd0EWOIP4BBoCcZac3i753cNMsZAE+wbmoeS5Xj7PnZcJLyXzm 8jqrvP9vVp3/LwVcUmFffrfMsqca9RLB0XsyDhwwTX9ZvtU/lXTH2CtqnG29qh/MT5sUKu 2wrRpYOEyAqJ698dh63fxmm+3sPA/exc7VbWgcVJ6pEc4J4siLIZDU9lR88V0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728391162; a=rsa-sha256; cv=none; b=Kk2SI3VHYWYZ1RJj7sv+z/aMF9qj7SXJQFdVDxe2Na/loVAWiNYhRntiPOjobJNBV1wmZY uADJMW0CYjy7HvKrTuaGdbihydr1/KbcFIDLwMNHcItfNZeaVihNSfx92ou9UdRNMijlGB bQ+XDX8Uan1U+fxRIby6kcuArmQVdTNczZ6ivGnZTVQTvEsLCvgDdel0YADqHJij7lDdz1 YZ7VjIrNMOC5BUS8mVnmQLPOlBCsut0NdC0rgEOZLh64cDSnyNWJ1VhBXTQZKxOmm5Ep19 NLTjhMArwO/qRS2qFkYE7sijDNCtXUGqZ00BNHnjCnROGFTRx47SdpBBzTbLMA== 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 4XNFvZ2jCyzVJG; Tue, 8 Oct 2024 12:39:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498CdMOQ012838; Tue, 8 Oct 2024 12:39:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498CdMn0012835; Tue, 8 Oct 2024 12:39:22 GMT (envelope-from git) Date: Tue, 8 Oct 2024 12:39:22 GMT Message-Id: <202410081239.498CdMn0012835@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 71a66883b58f - main - kinfo_{vmobject,vmentry}: move copy of pathes into the vnode handling scope List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71a66883b58f796baf2bf79a43a91c16a71673b3 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=71a66883b58f796baf2bf79a43a91c16a71673b3 commit 71a66883b58f796baf2bf79a43a91c16a71673b3 Author: Konstantin Belousov AuthorDate: 2024-10-07 07:36:51 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-08 12:37:47 +0000 kinfo_{vmobject,vmentry}: move copy of pathes into the vnode handling scope Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46970 --- sys/kern/kern_proc.c | 7 +++---- sys/vm/vm_object.c | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 422873ee14c2..7dc58b1e9bc9 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -2740,6 +2740,9 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) kve->kve_status = KF_ATTR_VALID; } vput(vp); + strlcpy(kve->kve_path, fullpath, sizeof( + kve->kve_path)); + free(freepath, M_TEMP); } } else { kve->kve_type = guard ? KVME_TYPE_GUARD : @@ -2748,10 +2751,6 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) kve->kve_shadow_count = 0; } - strlcpy(kve->kve_path, fullpath, sizeof(kve->kve_path)); - if (freepath != NULL) - free(freepath, M_TEMP); - /* Pack record size down */ if ((flags & KERN_VMMAP_PACK_KINFO) != 0) kve->kve_structsize = diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 85fc27d169d6..6b9f89790ccd 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2611,11 +2611,10 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) /* truncate */ } vput(vp); + strlcpy(kvo->kvo_path, fullpath, sizeof(kvo->kvo_path)); + free(freepath, M_TEMP); } - strlcpy(kvo->kvo_path, fullpath, sizeof(kvo->kvo_path)); - free(freepath, M_TEMP); - /* Pack record size down */ kvo->kvo_structsize = offsetof(struct kinfo_vmobject, kvo_path) + strlen(kvo->kvo_path) + 1; From nobody Tue Oct 8 12:39:23 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNFvb6SQLz5ZNZn; Tue, 08 Oct 2024 12: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNFvb4RD6z4bb5; Tue, 8 Oct 2024 12: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=1728391163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MZPOsX7V5UPy6zfu/zy+PpstDYryBy/PcV0kH197eDw=; b=KvHPiz/ItMSn5yrgHb+xaGYGyaSP6Exh+mQ88I1Du9veS84EYi4bxBCpL+mPQS6TciTtso lC7ZsA3s+ml4ZbUwb+3nuqsrzyBHgarhRDIJtQJusqg8K+mG5jjoe7pWXGnoezK5YBzRte nVNNbDaLwdkylUgm/osjSO0qk2DB8eRMDk3QJmg9y0OvAru/ouhqb3pIEHVVfGlBoTwMZf nZBcLlEtm1RomUYih9ok2OsxjhigFr7NBpo21parNtCFd2aSTQn6hm649ElJhP76z0nQcl XuNG/Qyz5g6Aq+Rc/Gw/wEtEumJGHyQWCVznC6Ya4Zs1h6hWOXcE5CLtbizToA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728391163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MZPOsX7V5UPy6zfu/zy+PpstDYryBy/PcV0kH197eDw=; b=fEPnd9TiRUv1/dm+GonVE6j+vGIoj4aYKKqjy2d+TUk5Sxr6QqFOWAtkwVgQUMs/yMuZZz zmDO/CyYibbiz8QvOhkBwfL/4MSMPG19vTbJREa3FyrZTH7Ada1EojexNbgFdN9mkLubHj WnSBlCtxcCF1bzg9m97ydeQz1V5dpkowmRTeaeeXk0UcSX+ZyVMaeYINBG/BMe34+EE/KQ 23hjY1QFy7L9uNjaaQRNVfUW3N1kukyG7QzwzDXINQWNRjhVXzR7glXhtH9vNrPO331aUp 4y6o3TlLcKkBgfKpWnNFWk8ig+KaleFQ+Yc1ZOe42LUdgzjBxxjXO3xFbJ3hGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728391163; a=rsa-sha256; cv=none; b=rGsKePlWllp2KycGASWv64X/hpqQK3dP6+bp0BJ1uT41Ph6cHMYSbipla0m/StX6RFoIGS 3vAQGS05YrvcfoHcLwY3/h2+KqPaRuyXs1MHDRqNLwNKNmIYnA01gh0PQOPH2r5cp4ng61 w3tlv1Exi29cNHu1JH53VRC5vhwcBEnvzLiHbc5wswI4yBIZiyUUGCK3G32CeNsO32LZNj 6dSMBJ2uXDy+ISOhNe4XJoBKgFQZB8UgsC+Hsl6BBHMGYj/4VmkCnpndGo3Yplsj4rLR1Y o+0/wOQ2ywcCoj4LDnJ08S7bEwQLOdOsIrx0TSYy+1/htY2v+PoW59YzxT9TVg== 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 4XNFvb3S9lzWvF; Tue, 8 Oct 2024 12:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498CdNiV012895; Tue, 8 Oct 2024 12:39:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498CdNTo012892; Tue, 8 Oct 2024 12:39:23 GMT (envelope-from git) Date: Tue, 8 Oct 2024 12:39:23 GMT Message-Id: <202410081239.498CdNTo012892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: a10870ecea81 - main - posix shm: mark backing objects with SHM_POSIXSHM flag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a10870ecea813042db7c41e906e1a5c5693f8a34 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a10870ecea813042db7c41e906e1a5c5693f8a34 commit a10870ecea813042db7c41e906e1a5c5693f8a34 Author: Konstantin Belousov AuthorDate: 2024-10-07 01:26:38 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-08 12:37:57 +0000 posix shm: mark backing objects with SHM_POSIXSHM flag and consistently store the pointer to shmfd into pager priv data space. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46970 --- sys/kern/uipc_shm.c | 16 +++++++++++----- sys/vm/vm_object.h | 2 ++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index a5b2e62c568e..cf98e1410074 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -945,15 +945,20 @@ shm_alloc(struct ucred *ucred, mode_t mode, bool largepage) shmfd->shm_gid = ucred->cr_gid; shmfd->shm_mode = mode; if (largepage) { - shmfd->shm_object = phys_pager_allocate(NULL, + obj = shmfd->shm_object = phys_pager_allocate(NULL, &shm_largepage_phys_ops, NULL, shmfd->shm_size, VM_PROT_DEFAULT, 0, ucred); + VM_OBJECT_WLOCK(shmfd->shm_object); + obj->un_pager.phys.phys_priv = shmfd; + vm_object_set_flag(obj, OBJ_POSIXSHM); + VM_OBJECT_WUNLOCK(shmfd->shm_object); shmfd->shm_lp_alloc_policy = SHM_LARGEPAGE_ALLOC_DEFAULT; } else { obj = vm_pager_allocate(shmfd_pager_type, NULL, shmfd->shm_size, VM_PROT_DEFAULT, 0, ucred); VM_OBJECT_WLOCK(obj); obj->un_pager.swp.swp_priv = shmfd; + vm_object_set_flag(obj, OBJ_POSIXSHM); VM_OBJECT_WUNLOCK(obj); shmfd->shm_object = obj; } @@ -993,11 +998,12 @@ shm_drop(struct shmfd *shmfd) rangelock_destroy(&shmfd->shm_rl); mtx_destroy(&shmfd->shm_mtx); obj = shmfd->shm_object; - if (!shm_largepage(shmfd)) { - VM_OBJECT_WLOCK(obj); + VM_OBJECT_WLOCK(obj); + if (shm_largepage(shmfd)) + obj->un_pager.phys.phys_priv = NULL; + else obj->un_pager.swp.swp_priv = NULL; - VM_OBJECT_WUNLOCK(obj); - } + VM_OBJECT_WUNLOCK(obj); vm_object_deallocate(obj); free(shmfd, M_SHMFD); } diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index 73284fddd2a6..c7f0dd0943ba 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -172,6 +172,7 @@ struct vm_object { void *data_ptr; uintptr_t data_val; }; + void *phys_priv; } phys; } un_pager; struct ucred *cred; @@ -202,6 +203,7 @@ struct vm_object { #define OBJ_PAGERPRIV1 0x00004000 /* Pager private */ #define OBJ_PAGERPRIV2 0x00008000 /* Pager private */ #define OBJ_SYSVSHM 0x00010000 /* SysV SHM */ +#define OBJ_POSIXSHM 0x00020000 /* Posix SHM */ /* * Helpers to perform conversion between vm_object page indexes and offsets. From nobody Tue Oct 8 12:39:24 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNFvc5zKGz5ZNcl; Tue, 08 Oct 2024 12: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNFvc4pMdz4bXT; Tue, 8 Oct 2024 12: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=1728391164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ic5+2CibBVcIvVPUUoPONll1i6kh58EG6Re0p1vG9jw=; b=CCq98ANd90lKOB16jy/uLfQm1X0Jz3GCumQAxgCS7NPNxTQISWKnIz0hZ7N0SO5vRy6dfe ggllzxpL0UzUhyYmGIoy7TAkrtg1tqo/q7v77yEX0Q62nm5nylhgYYsv4zswWvzKquDiDg Hj82R4VDqqkIKZWAjazNUlaw9c+87x0KrcvGSYREm6zGei/SmKzbAfvD2g6NC4rZR0nBu6 I6wjjFIoW7Ar4kvL5W597gmJz+ZLkJxmaLGyoKMLMMkkn1RY03xDzBjYVj8ohb46qziAGd puxaes3HXHpq3KOD8ylbVBWuTmVtjPxD4mK1VVd+8p1P+XqRuHUutMhqTh0Huw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728391164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ic5+2CibBVcIvVPUUoPONll1i6kh58EG6Re0p1vG9jw=; b=IZOTsFZZSapNZBHXWpxBX7Omuho0PsUdi6SVMX/zZ9ORsCqOJePtoXat5GxFJxDseMOQE+ KDX1k5g/OpHlFWmf69n0aoNCQuPMOsVTK7kVw9bNEu08pLQvc8ayZd4DYnDJ75w2p29Eus q5vMcGdJ1d5ZJm1CV3B5DF0/IpVy8XQZ40tZkN9Efg9SNrl+qKNVZoIJFr90a5d4BSVW01 odWG6XV0mWP/4m+WINBfb7S8vuD8bJQcVgr3OQbPBP85qT38iC93beWnCWN9Ruj+fJrw/h vxWbltNdnRTwBYPENV0Y+AlAX4E2tqMqyASXkL1meM9tnfegrML7pGhOO56vVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728391164; a=rsa-sha256; cv=none; b=wvMPPv9/ynl7UYRfO0tb0LbWzEHYzfygK6nVeaMXRZpY6e2017MjWUWab2Sp9d+zufjTu3 seSREt7LW4iWbR8dgrGeZFPhMxNBCYbe++1FjHOcLUBh3EeC28ylnoUMf02oqZtoyyWyvW 9+MLwqldNmi1625LqqwuH8RtJdhXAg8DDlQKq1/GlHZxOZ2jOW1oJN1HK+9paeg2HkpHZJ YJnqwnd2Vx0Z/eGDk+fiV8cegRgeUCy5CJXbeZrku5ZUOh8oKfdZO4RdoR4LP5uhxy0Je6 VeMR9RA0zunF+k+JUeLFfmLtrhmnrlM7kqAt2/WbCpo0VX7XFZkBEod7MP08jA== 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 4XNFvc4Q7dzWS1; Tue, 8 Oct 2024 12:39:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498CdO5G012935; Tue, 8 Oct 2024 12:39:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498CdOoV012932; Tue, 8 Oct 2024 12:39:24 GMT (envelope-from git) Date: Tue, 8 Oct 2024 12:39:24 GMT Message-Id: <202410081239.498CdOoV012932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: bda73e441f25 - main - posix shm: add shm_get_path(9) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bda73e441f2576de5ad00856d758354c299a3f75 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bda73e441f2576de5ad00856d758354c299a3f75 commit bda73e441f2576de5ad00856d758354c299a3f75 Author: Konstantin Belousov AuthorDate: 2024-10-07 01:44:49 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-08 12:38:03 +0000 posix shm: add shm_get_path(9) to calculate the posix shm path from the vm_object backing shm segment. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46970 --- sys/kern/uipc_shm.c | 31 +++++++++++++++++++++++++++++++ sys/sys/mman.h | 1 + 2 files changed, 32 insertions(+) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index cf98e1410074..f6861a3278ff 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -2208,3 +2208,34 @@ sys_shm_open2(struct thread *td, struct shm_open2_args *uap) return (kern_shm_open2(td, uap->path, uap->flags, uap->mode, uap->shmflags, NULL, uap->name)); } + +int +shm_get_path(struct vm_object *obj, char *path, size_t sz) +{ + struct shmfd *shmfd; + int error; + + error = 0; + shmfd = NULL; + sx_slock(&shm_dict_lock); + VM_OBJECT_RLOCK(obj); + if ((obj->flags & OBJ_POSIXSHM) == 0) { + error = EINVAL; + } else { + if (obj->type == shmfd_pager_type) + shmfd = obj->un_pager.swp.swp_priv; + else if (obj->type == OBJT_PHYS) + shmfd = obj->un_pager.phys.phys_priv; + if (shmfd == NULL) { + error = ENXIO; + } else { + strlcpy(path, shmfd->shm_path == NULL ? "anon" : + shmfd->shm_path, sz); + } + } + if (error != 0) + path[0] = '\0'; + VM_OBJECT_RUNLOCK(obj); + sx_sunlock(&shm_dict_lock); + return (error); +} diff --git a/sys/sys/mman.h b/sys/sys/mman.h index 6ee2d5562db1..d2c7bdf1f022 100644 --- a/sys/sys/mman.h +++ b/sys/sys/mman.h @@ -310,6 +310,7 @@ void shm_drop(struct shmfd *shmfd); int shm_dotruncate(struct shmfd *shmfd, off_t length); bool shm_largepage(struct shmfd *shmfd); void shm_remove_prison(struct prison *pr); +int shm_get_path(struct vm_object *obj, char *path, size_t sz); extern struct fileops shm_ops; From nobody Tue Oct 8 12:39:25 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNFvf0f1Xz5ZNcm; Tue, 08 Oct 2024 12: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNFvd6Df0z4bbJ; Tue, 8 Oct 2024 12: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=1728391165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OH7qx0B+Ym05vCWNoGr6v+7B0Otw1CI34ojjUIBfeUA=; b=FBv0F+n79pXDUqBORyKoqSz0HtSCvFT8k3dq1z25Iqj4eblfsGB9ynA53y6/6CySF3U69G O19ZnTn2zYcJu+FQ7Cpagj7qrnMGQ4OtHHww189r31PaTnsrEBxSKYB6KaE6TOVUuKm/7z xtoxHN/MGqNNcDjSSCRozZWXyoUWFzrVte8TEVYZNPP5fROBN7f0t3DU59v3PsIqDebWik hm4ZFp3sC6S5mxmAOW8Rsi71bTcxaYlP27PhKuWkp4T68HHKtqFfesZgeXqBPpXnQ2pZhT Mi3zDuh1JCrAZpV22oN4MTt6e+0dt8fJmC1gwRMRcb5VbbMs3BsZp01+G80qUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728391165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OH7qx0B+Ym05vCWNoGr6v+7B0Otw1CI34ojjUIBfeUA=; b=FAc1SeoauArgzTG0zPSspc8yJ2ReobbP4eXT9SJp1Q4z8nn+Ne5k1B89sseLgncCYqIGAL SYqTpYJv+fd0Cs5vroPbqZpye+XM5IOtX8W9diIaFsfiQjHtzYQcmtW2NJW5vaLTd9Ozpq gOAApfso9qKuaqSA9GYEwK17/oWV6G8VBkBhknn08pKEhbafRsHa1IHwSn8axYCHiPO6Vl Ro253PfI/c6k69AF7NtnDQbpsXxCjse2+wFL1JZlUojE0soxTZGshU8p0IS0a1DQQvdu3/ HsV5lpEtgFOcvzWApqencuxCZa0Ya5ep2mcre81654AE7oMI+Oy/YlD8BP3Ufg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728391165; a=rsa-sha256; cv=none; b=TcMhkOKj5jwUHH1MHUlH6wpa8RjULn7sotXM+1+HN5YAz109BTHQ/IrkMu1Uv73bOoLSt1 Tap6zWcRJOIQzqbqDibv3QlZvWf6Z/c29quH9B0hBqriK7BfUpMfBb29BRdcPl84/s6nK3 d38Xkfbqcl9KpO4hhB2TR7xJVt6EiBRkqUp7lphLWEhcyScjBNMuJqs3u/z3QaoWC7pv0r U2SWVGsNd05NmbWBKlwp22xN9rUOHhb6CtSlgrZFQskvyiUnCVgDif1gcc1lcqKZVrbNaX sr9fF/X1EzUSCous3jy/cp5NtRe9j9p2bdNtdZz2z0ZV38hgRDoDqtWwP2q5mQ== 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 4XNFvd51mZzWPk; Tue, 8 Oct 2024 12:39:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498CdPfG012977; Tue, 8 Oct 2024 12:39:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498CdPoG012974; Tue, 8 Oct 2024 12:39:25 GMT (envelope-from git) Date: Tue, 8 Oct 2024 12:39:25 GMT Message-Id: <202410081239.498CdPoG012974@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: a8c641bbcba7 - main - sys/user.h: report posix shm mappings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8c641bbcba7badad2d00206245cbfaf73a762b7 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a8c641bbcba7badad2d00206245cbfaf73a762b7 commit a8c641bbcba7badad2d00206245cbfaf73a762b7 Author: Konstantin Belousov AuthorDate: 2024-10-07 01:49:51 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-08 12:38:09 +0000 sys/user.h: report posix shm mappings Add flag KVME_FLAG_POSIXSHM. Fill kve_path with the path of the segment. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46970 --- sys/kern/kern_proc.c | 5 +++++ sys/sys/user.h | 1 + 2 files changed, 6 insertions(+) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 7dc58b1e9bc9..1e90116f1cb0 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -2721,6 +2721,11 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) kve->kve_vn_fileid = key; kve->kve_vn_fsid_freebsd11 = seq; } + if ((lobj->flags & OBJ_POSIXSHM) != 0) { + kve->kve_flags |= KVME_FLAG_POSIXSHM; + shm_get_path(lobj, kve->kve_path, + sizeof(kve->kve_path)); + } if (vp != NULL) { vn_fullpath(vp, &fullpath, &freepath); kve->kve_vn_type = vntype_to_kinfo(vp->v_type); diff --git a/sys/sys/user.h b/sys/sys/user.h index 2025dc5cb47b..5703dababbe3 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -518,6 +518,7 @@ struct kinfo_lockf { #define KVME_FLAG_GROWS_DOWN 0x00000020 #define KVME_FLAG_USER_WIRED 0x00000040 #define KVME_FLAG_SYSVSHM 0x00000080 +#define KVME_FLAG_POSIXSHM 0x00000100 #if defined(__amd64__) #define KINFO_OVMENTRY_SIZE 1168 From nobody Tue Oct 8 12:39:26 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNFvg2rGpz5ZNP4; Tue, 08 Oct 2024 12: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNFvf6Qgrz4bry; Tue, 8 Oct 2024 12: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=1728391166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ti0SmXWF2IsRVIWXqCaO6xy+wZ+Eyc8ZGOTt8k199HA=; b=orm86XZa2M5RiFHwPzNBtEe9RBlQ4z5yek5K6uKf6n49GfMRURem2TrsUTgDAE7aRzWW4m 6rE48+cNI6tyhmqYZF3XsUVWi/5FAF7/LGS6b/UOzJfKKdBcTwSaG7Q1sTS81bOhlvCe5W skrreI/MNj2zd+EaH3zEL6ObBb/KLGu/lPLvg8lKju+BvQRjhaeUtqy2YV830uVGz4dWwn UcrPYujPhSKMCFPUwYKlK3GYt20mQSvQiN66Cvg9YuY1Sp/3JZTfpV1jRaoz3ZnL+SQjG1 yKTbid9L+mnOFzk/10IkbzQwbO/PuOzF+qDM/+sFyIaYWQ34qugSoGimdPPnPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728391166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ti0SmXWF2IsRVIWXqCaO6xy+wZ+Eyc8ZGOTt8k199HA=; b=R0aq7SaqDaijy53Aa+RPIpae2JsUwYET+lyfKL86NAiORp25xQINDw/4NqXU8dRxurTfds msavkdVR/gJWGTYkXqKACT8LV3caIODkuylVT6i8skxzJ3HDjOgJ2wR3eo/0fUhZmX4VWs m+QtUWv6eDcGX8VjGnZMQ/Nv97i6S4zunrljET6pIWs4CFcYCu0Jb5lp8ghrPKNm5DuY1G IR8O34pxQIo1NiIfs0SwujKdoZTZlRc4cmT2FOytVP6R2lXhirJtN0pmbrOdzymNjKAZzK P7OF3KMq3dy9GCBFYrG9mFRP9Cte5/0g6BEzipqT83zFF2tNvF8ZCkJP99+7xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728391166; a=rsa-sha256; cv=none; b=pPHMeHqhBv9OXl5iKiymWeF88rSeIbpC23jiIVKfjnG8HchtdLuGvI75l9COMQJ2dGXuws cDpNrjPk0SQ4XH+2YxQXHkz4TEAPV71nW8snNxQaxKMyrjCuYAsQT2EnPCfhMOOZd2WqtA ci9tUfqrUNAUZnO+istd1cj8lvv5U17/c3GYSM7pHPJ7hX3P6bNZWroPUv09S+p2vrbCb0 8qBvbeUGu5okDcamovJRM5+f+Vg8GUUXyI6SVXLD1dvLStgl3+Okig8SsaLNUsQfWrd28h DwTQZY9ATipTGqdhNrnvSs19jBwhUjNitgBebAa+ScSvlOhIU/YLwXOUTwAHsA== 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 4XNFvf60fpzWPl; Tue, 8 Oct 2024 12:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498CdQ1A013028; Tue, 8 Oct 2024 12:39:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498CdQMf013025; Tue, 8 Oct 2024 12:39:26 GMT (envelope-from git) Date: Tue, 8 Oct 2024 12:39:26 GMT Message-Id: <202410081239.498CdQMf013025@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: b0b18b57a55b - main - sysctl vm.objects: report objects backing posix shm segments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0b18b57a55b429cf3f625883da5dcb541b14960 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b0b18b57a55b429cf3f625883da5dcb541b14960 commit b0b18b57a55b429cf3f625883da5dcb541b14960 Author: Konstantin Belousov AuthorDate: 2024-10-07 01:55:16 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-08 12:38:15 +0000 sysctl vm.objects: report objects backing posix shm segments Add the KVMO_FLAG_POSIXSHM flag. Fill the path. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46970 --- sys/sys/user.h | 1 + sys/vm/vm_object.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/sys/sys/user.h b/sys/sys/user.h index 5703dababbe3..8f42cfa36476 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -582,6 +582,7 @@ struct kinfo_vmentry { #define kve_obj kve_type_spec._kve_obj #define KVMO_FLAG_SYSVSHM 0x0001 +#define KVMO_FLAG_POSIXSHM 0x0002 /* * The "vm.objects" sysctl provides a list of all VM objects in the system diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 6b9f89790ccd..0b9a8af2ccb1 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2601,6 +2601,11 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) kvo->kvo_vn_fileid = key; kvo->kvo_vn_fsid_freebsd11 = seq; } + if ((obj->flags & OBJ_POSIXSHM) != 0) { + kvo->kvo_flags |= KVMO_FLAG_POSIXSHM; + shm_get_path(obj, kvo->kvo_path, + sizeof(kvo->kvo_path)); + } if (vp != NULL) { vn_fullpath(vp, &fullpath, &freepath); vn_lock(vp, LK_SHARED | LK_RETRY); From nobody Tue Oct 8 12:39:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNFvh3Km8z5ZNcr; Tue, 08 Oct 2024 12:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNFvh0jTJz4bYM; Tue, 8 Oct 2024 12: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=1728391168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BykxymFCMb8hKxgoZqdgYNLDWm0EZjB72nksd0OAg4U=; b=XROX3JpRuDZGHtWKLiTmDpJsfh+WoAqkVP2wX4G8mY0a3/uCNOWNCRzK8gSJDOGOFe9RAE 28HOC+SqAZUogXHTzNM72qSerReR/XqAClcvlgodsb9IIqO3ifTsilBf1om9HYtujQ+DSy XOgrgC5hQqxOFYnqWGaLC8R6jXtzu+kE9L/y+p7IQJp0DgCPskupbmfQZY0LBfF9f282TQ htSoTBtTqOo7v+IvEyxgGQUOF2s3GHzMTccVEKeUbKacdoRemU4HhTQAMX/1mBhngOq7BS AmiMe18EgN4O7QVLhczOIb5Ot0b9Yd2XlSQgPWgcuD+Kg2b8dpX41Hcw+QOIQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728391168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BykxymFCMb8hKxgoZqdgYNLDWm0EZjB72nksd0OAg4U=; b=c3FAlRMZkG92NnJ7TDGrUOD+yPhoq2iduzmXtTjraWi63x608ZHBBFVkV6Rh46sPHxnIEd bm4dwNnvpV0htIb+iZ1gUOeiDyYIj5mGJwp5Yas7fBw/SVxXPYOIfDLbv6sLrNsblyJgh8 kgA9NznsSdI4aqBK1Co9mQQpYz65CSiT/YBWhqIDkFbUcUY96VhGDU3/sMj//vQNMgaq0M FJ93LD5VO57BjUKuYy4zlYzhfYvFeJw3WS6T+TqTcCDVyZWxPbMekbS4NzT7wyTizOI0JN nCqaMaLZnYkoEeLVw795CO+L4KWhl+aDChzF9zp4PlJqb+tlAplQgsmhfDG8LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728391168; a=rsa-sha256; cv=none; b=msH+Kf/IUP8Rfb6XQ09MzzX9s9FEBAQvdSFVNAlv7+XorixigGwzRfq/eE8tME//AvxSFW fCh4dlaz0/wA1xMk36ghuqmPEechZCMZaXhiCeMq4dxPhSUEZVfm2DMzOO2fq02uhYIf7V 9JGi9WmTkgrXtn+XKZrxdV4nh3U/C92/agre8zTUy1HOIERXOtRqS5+E9PNamt2x/LRyb6 Yuizx3YcxqV7DjSZQki02W4TTuaos5ihuR8RzkctHHTTiOi2J2PWqSdYuFwRLT6J1cCFfm 3o80WpUeBN4KtNk5aWy+11oG4goDt13haV0r8yWGfKy3zmVIlzT2b0rSsE0YPA== 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 4XNFvg6jcHzWM8; Tue, 8 Oct 2024 12:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498CdRca013076; Tue, 8 Oct 2024 12:39:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498CdR1e013073; Tue, 8 Oct 2024 12:39:27 GMT (envelope-from git) Date: Tue, 8 Oct 2024 12:39:27 GMT Message-Id: <202410081239.498CdR1e013073@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: a1258191d5e2 - main - procstat vm: report posix shm segment mapping List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1258191d5e21736e25010c85eb01b5f995cc1d2 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a1258191d5e21736e25010c85eb01b5f995cc1d2 commit a1258191d5e21736e25010c85eb01b5f995cc1d2 Author: Konstantin Belousov AuthorDate: 2024-10-07 01:59:53 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-08 12:38:23 +0000 procstat vm: report posix shm segment mapping Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46970 --- usr.bin/procstat/procstat_vm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/procstat/procstat_vm.c b/usr.bin/procstat/procstat_vm.c index e899b365a9d1..78c1e70971d7 100644 --- a/usr.bin/procstat/procstat_vm.c +++ b/usr.bin/procstat/procstat_vm.c @@ -170,6 +170,8 @@ procstat_vm(struct procstat *procstat, struct kinfo_proc *kipp) xo_emit(" {:sysvipc:/sysvshm(%ju:%u)/%ju:%u}", (uintmax_t)kve->kve_vn_fileid, kve->kve_vn_fsid_freebsd11); + if ((kve->kve_flags & KVME_FLAG_POSIXSHM) != 0) + xo_emit(" {:posixshm:/posixshm@/posixshm}"); xo_emit("{:kve_path/%-s/%s}\n", kve->kve_path); xo_close_instance("vm"); } From nobody Tue Oct 8 12:39:29 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNFvj36Lkz5ZN9W; Tue, 08 Oct 2024 12: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNFvj1LFvz4bvC; Tue, 8 Oct 2024 12:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728391169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=50Q89qdvf0kNWLLhuxYiPPUTe6WGd9McY/n5c5ExE7A=; b=WSlNitx9ByOklfLHSLoRy6SGapm6LXuQ8tsJgbOMGgcQan8LX1ngyVtX4vIm/russYcn2W vLgIJJ28mSgHDW3B9tAz95IpwndF2rQY7SuhU/EfFJiRnpBWUzV43rfTMPwfAZ9WX0ylxZ p3++5zc+f4ilM032BvxU7spkQCGVb3q9fRJ0ovxCT8nrAoBcsqwGdmFfQ+AHiFD1/ye7Ua ChVvCG4vWw3Kn/J9URI4eoha+QOfGgVnB8/XwhHTHrQXFWEJgGtRWNeA2vlGnr7kCkifE2 n5jTdbWLiNhBmilUnOPE8IaDLr4iIBa10KJGVh4cXaGmn1N1yySzVkTM38lXGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728391169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=50Q89qdvf0kNWLLhuxYiPPUTe6WGd9McY/n5c5ExE7A=; b=J61xxKuFxnipDvRitsNmCoKO3i1khyxpVm8wfpwVqUGBj8e38gReHBLqYBkcv/xAKV+bCs Mo3ZWh0ODWcX3BOq84tLTFAQYUy16XnDJHZEzgCG9cbxGVA82x2/z14E0zem7d1TCy4Pzz 6qsA9DGf/jOrzEdxwM/vAri8Ms5VQ72qFkOIJDMiOb1pjQtDkvMhT4IdqZIaOjlEx8BVme CpVE5uOCDDyq7ITmtw21yDrTdwsVVAheWsoqSM1pIpPtareN6iVDWJOEkm/8PcNQ2RYsy0 7IzJITtDq5Dygyem22IPlflw+nwjjvqyNHdS1nR5nG5UHKQVWRylidylmvOcbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728391169; a=rsa-sha256; cv=none; b=vaRXlrbfIa3VhwdF4w3y7ePVgDvGsCbWEc8pjiOMFV+YpjtiCJnNzBI7yuXOgnfYAkXJgT QNjvl3jfZEnjbAXwN077rNV7qXozUfUA0ineftnM69hr+6Yc6ZLOPzpgRPjeRnkWMVYp7m ZswJGB7Q2iDEB5GNvmk18RGTuErUijPKW0Ef3+IbbWtx32WbfXemM4DfATz2vvEqqMjbgx VP9HBfX76LodnG7dtbbegjlpR2l4X9ZBoy1+Z1wGfGa98UJed1410GUteWwCQplmSEH38W afljNvv+C+lhSHb1STlq3vd4w0PYvxltF3raVX26p8xo79WDvYaumx3bEtxFnw== 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 4XNFvj0xnMzW22; Tue, 8 Oct 2024 12:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498CdTSM013129; Tue, 8 Oct 2024 12:39:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498CdTKs013126; Tue, 8 Oct 2024 12:39:29 GMT (envelope-from git) Date: Tue, 8 Oct 2024 12:39:29 GMT Message-Id: <202410081239.498CdTKs013126@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ba40b2b89962 - main - vmstat -o: report objects backing posix shm segments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba40b2b89962b799ade3b92cdd710e36cccc8810 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ba40b2b89962b799ade3b92cdd710e36cccc8810 commit ba40b2b89962b799ade3b92cdd710e36cccc8810 Author: Konstantin Belousov AuthorDate: 2024-10-07 02:01:48 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-08 12:38:29 +0000 vmstat -o: report objects backing posix shm segments Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D46970 --- usr.bin/vmstat/vmstat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 8d6c40a4d2fd..862cc4809fbe 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1546,6 +1546,8 @@ display_object(struct kinfo_vmobject *kvo) if ((kvo->kvo_flags & KVMO_FLAG_SYSVSHM) != 0) xo_emit("{:sysvshm/sysvshm(%ju:%u)} ", (uintmax_t)kvo->kvo_vn_fileid, kvo->kvo_vn_fsid_freebsd11); + if ((kvo->kvo_flags & KVMO_FLAG_POSIXSHM) != 0) + xo_emit("{:posixshm/posixshm@/posixshm}"); xo_emit("{:path/%-s}\n", kvo->kvo_path); xo_close_instance("object"); } From nobody Tue Oct 8 15:25:46 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNKbZ5fsfz5ZWv0; Tue, 08 Oct 2024 15:25: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNKbZ4XZbz4r2x; Tue, 8 Oct 2024 15:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728401146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7NT9xHEDOSxnZIQqL+Oz94ss0KNwtmq5PZrLO3y6hQE=; b=dO3Ptw74xp4L/hysIpkdNxdO5bAcztv8dk46ingWk9y8s8Vg8/I3rZFBr1UOzgSQ7oPOlN yw3EMrTKHCJUPYDqXtilua2MvYBZtOgdzmssoq3QlkkL9CJYbpjOomnm6bSRiJ+SbmD13f F6zUft85c8J22XBFXpvnEuZcQ0Xgg2KhilaH0U2eV4CripptjKDrAovjdkjo/DcSTLNrYZ hT3p155gZwka2SEGBrzy0oxlMbDKREU+GwlZRqo7n9P8L+bHiOVcmY68EeeynFCafCwlPV u1Q+PKG8Ra9RxLdJVi1R8uOMEj2ttEsUIHMgO+TLC1N8Yn+GmQNCgI4zvsGZSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728401146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7NT9xHEDOSxnZIQqL+Oz94ss0KNwtmq5PZrLO3y6hQE=; b=t3uyosDncMLnbH5+HkUEUkzTV0LotwLWaP45yqVox9iTqIasZL6cMyL7Pepha4rPw9BeW4 dj5wL7+VIY3POO9CygwoiCqj00n7O3zjpGcVcD9rP2bTL3tfeszLOpZkhdGr7eXa6tjVw5 qUFkRLKZvS0KRsIH3hRVAt7Qy9eejUIBMWPS3bCsYCD+gjGtUy+gCye0J6ttH1fJnpx85U UMGOhG9jFKEO9TiSAl+ECjakzJeopyq8GdKZ7OlFdY5eFmqnBHOuCkWUOP4neNrVKSUo0c ueIpEgsGBQTodhtrySuneCx0Bwce6wNHXae2Gqbu6HHVlUyhwi5phlqH9nD75A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728401146; a=rsa-sha256; cv=none; b=kKAcOcbrAcIGS1QovU3qHtBZ9MZr3lSZKlEX/eMCD8rdNuxYbBvEZdrdo9GmbInXHi/34g Z5ONvT8VeoCYxQHWlmipFbrzCbWiaOaesN5ButFt6FF5yMzqsATNg/BQz+PefehkNbwfdS o1DEvb5/l7ciPFKbBfOC27b5wGBpvdg9Z8gjhtt/DMU84LFMv2gulNZ+rxiEvXjP1A2L6t Bbu30R6/2iffETx1goMT/OXx0VxuNikj3BDhurZ7JRn3USQAvqGPKNP4ab6qgqqwXTvJrz RYW1+dh0/eBumz7OVRgA5R+qqpUB4LkNQ4CvsZqWM5Ao8s08pzzKVKmvTpfdPA== 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 4XNKbZ3pmbzZt2; Tue, 8 Oct 2024 15:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498FPk16003254; Tue, 8 Oct 2024 15:25:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498FPklg003251; Tue, 8 Oct 2024 15:25:46 GMT (envelope-from git) Date: Tue, 8 Oct 2024 15:25:46 GMT Message-Id: <202410081525.498FPklg003251@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 9cf2efbaa0e1 - main - committers-src: Add myself (0mp) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9cf2efbaa0e15dd5c843a1154e6eb0f78b8b6927 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=9cf2efbaa0e15dd5c843a1154e6eb0f78b8b6927 commit 9cf2efbaa0e15dd5c843a1154e6eb0f78b8b6927 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-10-08 09:41:22 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-08 15:24:53 +0000 committers-src: Add myself (0mp) Approved by: bnovkov (mentor), christos (mentor), markj (mentor) Differential Revision: https://reviews.freebsd.org/D47007 --- share/misc/committers-src.dot | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 52da2f3bcc25..230d17293774 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -98,6 +98,7 @@ node [color=lightblue2, style=filled, bgcolor=black]; # Current src committers go here. Try to keep things sorted. +"0mp" [label="Mateusz Piotrowski\n0mp@FreeBSD.org\n2024/10/07"] ache [label="Andrey Chernov\nache@FreeBSD.org\n1993/10/31"] achim [label="Achim Leubner\nachim@FreeBSD.org\n2013/01/23"] adrian [label="Adrian Chadd\nadrian@FreeBSD.org\n2000/07/03"] @@ -468,6 +469,8 @@ bms -> dhartmei bms -> mlaier bms -> thompsa +bnovkov -> "0mp" + brian -> joe brooks -> bushman @@ -481,6 +484,8 @@ bz -> jamie bz -> syrinx bz -> dsl +christos -> "0mp" + cognet -> br cognet -> jceel cognet -> kevlo @@ -758,6 +763,7 @@ marcel -> marius marcel -> nwhitehorn marcel -> sjg +markj -> "0mp" markj -> bnovkov markj -> cem markj -> christos From nobody Tue Oct 8 15:25:47 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNKbc3pr6z5ZWxS; Tue, 08 Oct 2024 15:25: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNKbb66kcz4r4m; Tue, 8 Oct 2024 15: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=1728401147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1RymWdpscAaR0PrEXLRoN1dj9ZOcTs3C7y7Sk7PLsp0=; b=V3ZZ73nveiBQYnIIWMK8OI+iADpG2g0qT3+qGjfTWk+4DThdWDS87tYB25ENcMr7dpcE6H +LoSGdPahZZZteQlj4sYQINatZX1J9TUh6gCu7wTnp5Hs3Fk9BJCLV/x1WoTS3P6nP3UtT LelWZPYYwznzv8t4rcIrAYm71+4px5lscNU0tBRlXm88FThx757q1Bxauall/mGVJz+s3N UfBNi2+DVJqaP8oGVrxqTfEYG+ebyfqYiyCxygsEdvslE19xWG+kCpI3LFbXnY4g7tKQrT SBkAIK7DDutqAC/jWIpb2OybLLMBtB7ug1Z4A4EvhSCX7s5q3WZhMbbrv8L6Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728401147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1RymWdpscAaR0PrEXLRoN1dj9ZOcTs3C7y7Sk7PLsp0=; b=RUC3Fq+jvScWjpzGHnmndQ2Zk7mJ+mvd2IYzmxxMlzGWijrq1NRXiwxjTBO5v3Qz32XLPC l0ntuB+2YqtVRyvpXrBPvrAFTwuD6uprUuEHXwq7NFvaKlU70BuYydIyMh4qPSjgtmFhZX KwM0tZbzgQ33XNIEEk8jl3MXS4rKIKtSLJzoQEw60r7Zb1z1Kfe8NnkKjKcIzCmTQIbL8u QsZXRs1ZFiz8eYrdW380swTpwj2UUo4Mer+zEOAcsw63hwPSfmP9Kc7eKrBGNdsQ2zQ+KR VRew/XxjrwVGqSiIo5rOe2EJnx+kvNL9HlyjxewF/U9ctovO/viqo73tHOk6Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728401147; a=rsa-sha256; cv=none; b=PfdQVVv4z65SsT4qetUzcZxxicAvKjaPddt6wkJL8RMn9Ra39b+o+UMhjk4a+1tfCwn+4c FEuQXHUdbpwYIjLRwD5j94/KoDSDRzFjDB/rHgnYkgTjVvL5bSOcwcHZxPjrTCeOBWyIFp 5hGLhXaKLhNNO0Daf8RuVy4VSzUfr48tjKTd0bxvmheInN3oqXedAczJiuWuMkI9MIIhZi +rTlIed/EdXsuNwFBaaHibDvhX5BOMz7se3Fs6xbWWvSuCF1SUSc0Ez50VxsTe/9ObIjcb /+qb2Bcbiuw6I8PvyExInQe+csjMA/ySmIdcbrAYOAzVGZFL8tK1kXVe0clVQg== 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 4XNKbb54tXzbQc; Tue, 8 Oct 2024 15:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498FPllG003299; Tue, 8 Oct 2024 15:25:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498FPlJl003296; Tue, 8 Oct 2024 15:25:47 GMT (envelope-from git) Date: Tue, 8 Oct 2024 15:25:47 GMT Message-Id: <202410081525.498FPlJl003296@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 72f5e9833f16 - main - committers-*.dot: Fix typos List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72f5e9833f16aed43a8de81ef7c2d02f922157f5 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=72f5e9833f16aed43a8de81ef7c2d02f922157f5 commit 72f5e9833f16aed43a8de81ef7c2d02f922157f5 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-10-08 13:11:52 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-08 15:24:53 +0000 committers-*.dot: Fix typos --- share/misc/committers-doc.dot | 8 ++++---- share/misc/committers-src.dot | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot index 9cc963360f4d..81bf766a2fe9 100644 --- a/share/misc/committers-doc.dot +++ b/share/misc/committers-doc.dot @@ -29,7 +29,7 @@ node [color=grey62, style=filled, bgcolor=black]; # Alumni go here. Try to keep things sorted. ache [label="Andrey Chernov\nache@FreeBSD.org\n1997/06/13\n2010/12/11"] -bhd [label="Björn Heidotting\nbhd@FreeBSD.org\n2014/10/14\202209/16"] +bhd [label="Björn Heidotting\nbhd@FreeBSD.org\n2014/10/14\n2022/09/16"] bmah [label="Bruce A. Mah\nbmah@FreeBSD.org\n2000/08/22\n2009/09/13"] bvs [label="Vitaly Bogdanov\nbvs@FreeBSD.org\n2005/10/03\n2010/12/11"] chinsan [label="Chinsan Huang\nchinsan@FreeBSD.org\n2006/09/20\n2014/03/02"] @@ -37,7 +37,7 @@ crees [label="Chris Rees\ncrees@FreeBSD.org\n2013/05/27\n2022/11/08"] den [label="Denis Peplin\nden@FreeBSD.org\n2003/09/13\n2009/07/09"] dexter [label="Michael Dexter\ndexter@FreeBSD.org\n2016/11/15\n2019/04/02"] dru [label="Dru Lavigne\ndru@FreeBSD.org\n2013/01/22\n2020/05/05"] -eadler [label="Eitan Adler\neadler@FreeBSD.org\n2012/10/15\2022/09/15"] +eadler [label="Eitan Adler\neadler@FreeBSD.org\n2012/10/15\n2022/09/15"] gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2007/02/02\n2021/09/21"] garys [label="Gary W. Swearingen\ngarys@FreeBSD.org\n2005/08/21\n2008/03/02"] gavin [label="Gavin Atkinson\ngavin@FreeBSD.org\n2011/07/18\n2021/10/24"] @@ -45,11 +45,11 @@ grahamperrin [label="Graham Perrin\ngrahamperrin@FreeBSD.org\n2022/06/01\n2023/0 issyl0 [label="Isabell Long\nissyl0@FreeBSD.org\n2012/04/25\n2017/08/25"] jcamou [label="Jesus R. Camou\njcamou@FreeBSD.org\n2005/03/02\n2008/12/20"] jesusr [label="Jesus Rodriguez Cuesta\njesusr@FreeBSD.org\n1998/12/10\n2010/12/11"] -jim [label="Jim Mock\njim@FreeBSD.org\n1999/08/11\n2003/12/15\n???"] +jim [label="Jim Mock\njim@FreeBSD.org\n1999/08/11\n2003/12/15"] jkois [label="Johann Kois\njkois@FreeBSD.org\n2004/11/11\n2021/01/16"] josef [label="Josef El-Rayes\njosef@FreeBSD.org\n2004/01/15\n2008/03/29"] keramida [label="Giorgos Keramidas\nkeramida@FreeBSD.org\n2001/10/12"] -linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2004/03/31\2022/03/31"] +linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2004/03/31\n2022/03/31"] manolis [label="Manolis Kiagias\nmanolis@FreeBSD.org\n2008/05/24\n2019/05/09"] marcel [label="Marcel Moolenaar\nmarcel@FreeBSD.org\n1999/07/03\n2012/04/25"] mheinen [label="Martin Heinen\nmheinen@FreeBSD.org\n2002/10/04\n2006/04/26"] diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 230d17293774..500dc3b0687d 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -308,7 +308,7 @@ philip [label="Philip Paeps\nphilip@FreeBSD.org\n2004/01/21"] phk [label="Poul-Henning Kamp\nphk@FreeBSD.org\n1994/02/21"] pho [label="Peter Holm\npho@FreeBSD.org\n2008/11/16"] pjd [label="Pawel Jakub Dawidek\npjd@FreeBSD.org\n2004/02/02"] -pkelsey [label="Patrick Kelsey\pkelsey@FreeBSD.org\n2014/05/29"] +pkelsey [label="Patrick Kelsey\npkelsey@FreeBSD.org\n2014/05/29"] pluknet [label="Sergey Kandaurov\npluknet@FreeBSD.org\n2010/10/05"] ps [label="Paul Saab\nps@FreeBSD.org\n2000/02/23"] qingli [label="Qing Li\nqingli@FreeBSD.org\n2005/04/13"] From nobody Tue Oct 8 16:58:23 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNMfR4qnzz5XfBl; Tue, 08 Oct 2024 16:58: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNMfR3zm1z45wT; Tue, 8 Oct 2024 16:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728406703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GUREvM6ivI8qse+aRl7klQS6L/doUkvpN9vOjEobBlw=; b=bDc+BRosxa9Vg8CdmUztGV8iEOiqiTKzfVZ5lnDXVd8lF16hxPKsln1iVhWagsi+VWslpZ l8ofvbtQTp68uGE8SEY7M13nytsS9L16trGhU5fgxJ8eJWZae2Yd29UqinxbwLUuJuWbYj 1HoitpshlnkdUSgDIBMPM6p+3hBshBDFqcXeGBr3MR9yhUuuwJTQfaBRlpcrCCqlNDUXU5 vfU++95v82F/kRfAPVzNje2eIqPZpbr+gVEm1uBebQd/HdvZVxJQ8JE6rrrQyAE6ZNVxvf v/zJ17zEVuvraE1m6J7dNPKyCPT9U/rf3pbrZNX3NHdz5WebNFCvKDZGuCAVGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728406703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GUREvM6ivI8qse+aRl7klQS6L/doUkvpN9vOjEobBlw=; b=arrDVxPX6G9pkP0lTn+EW7axdCpop8JUc7NIuq4bTLmrqeN+BPJ1ems3z4fAYYetLmW6ME 5iWft3ao7CCIxmiWM+JL8oSd6UFwTfEkHzgoJVDSm0VBjim2y6DelkNHNg+nPOwdNrKK2g sRqIYeJHWP26hcwReWMf0Ek+XXy8IsXa00jj8i5+gp3X7OBn/j45LibntTbxzhE9/O+v9E xw7mmbGb4R01xM8PYJ/bCgFe8jpfNNGTJcty+Yiwd6QbMl3sTyX1YKi9KywMkmRCDBBxzS ywPf6f1aNfHvueGT5BtXFfADUCMRhDmgDs0xV1jFu2dTYDEmGx55BKTg0TAO6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728406703; a=rsa-sha256; cv=none; b=xZlfwwzS70N5kx13VdgnEsm22pAslVjdaLBWFZuVF0sQmBVWZP8IBHRwfjJG/TQ/3YwvLO ou1Mi8t1qoSfZnTnYA2rHN4bmkHzrUFIEnMjbOocI/pQLCabTfsVzQ3iwHnisMj76WbtQL UaFLirs0E9HkHE2uRYv92xTHwWxyLRCFwaWAoNoW8Am+5A+dIIZfgl52apJ/r0y9e3bffM yXuzPuvFFl8zcGgNIT5OdJyGzFsp/GvuPhgewKFYHOyptLRzHKSSDHuc//4RFriryqBzPt U3sTUKRPZ5npKIbkSWya4HU6l4XfgFRgOKIA68KM+PddZfldrZr3YW4w2Qg1gA== 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 4XNMfR3RrQzf2M; Tue, 8 Oct 2024 16:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498GwN2u055090; Tue, 8 Oct 2024 16:58:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498GwNEC055087; Tue, 8 Oct 2024 16:58:23 GMT (envelope-from git) Date: Tue, 8 Oct 2024 16:58:23 GMT Message-Id: <202410081658.498GwNEC055087@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Popov Subject: git: e3ebc5f534ee - main - procctl(2): Clarify the ESRCH error code case List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3ebc5f534ee988d98c32b5e256ff08f71931225 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/src/commit/?id=e3ebc5f534ee988d98c32b5e256ff08f71931225 commit e3ebc5f534ee988d98c32b5e256ff08f71931225 Author: Gleb Popov AuthorDate: 2024-10-08 12:27:40 +0000 Commit: Gleb Popov CommitDate: 2024-10-08 16:58:17 +0000 procctl(2): Clarify the ESRCH error code case Approved by: kib Differential Revision: https://reviews.freebsd.org/D47010 --- lib/libsys/procctl.2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libsys/procctl.2 b/lib/libsys/procctl.2 index df8119799c6d..efb1812b284c 100644 --- a/lib/libsys/procctl.2 +++ b/lib/libsys/procctl.2 @@ -755,6 +755,10 @@ No processes matched the requested .Fa idtype and .Fa id . +.It Bq Er ESRCH +No descendant processes can be found matching criteria specified in the +.Dv PROC_REAP_KILL +request. .It Bq Er EINVAL An invalid operation or flag was passed in .Fa data From nobody Tue Oct 8 17:02:19 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNMl00XVhz5Xfd7; Tue, 08 Oct 2024 17:02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNMkz75nDz46FL; Tue, 8 Oct 2024 17:02:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728406940; h=from:from:reply-to:subject:subject: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/RYHC7+06xXRDLy7a7429NGhEnSn2z8gb1MaIVCkWQ=; b=MIbBNj6N1ASEdk9KlPF7m+SizPiFKikvSIJ3+33ve8fX+USYZcLtHx2mxHiioPH0e/JPYY /uoK2k3OayOr3C3Jh2vmd/Bw0ArL7WSyoBo/853ODDDvPkS036h/F4OgR+pRuQXfBHkRQS yefaZ/ridVK6gbgE3yzLlCLbtIu+vNis1+7r7w4MP8tuf8kToNOLKv0NF1eiV7KY4ZixAi 3/QmaTOo1Uh4z2WGbMreCqnpAJPtOVop0wScKlurlXNij5kQryY3u70AHhqJv/dZiqU/ct InN99joa+benFpwxu/AN8t5sylLMAsJMftv27hwvNhAiYkQ4GAjMWMTNSvW3ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728406940; h=from:from:reply-to:subject:subject: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/RYHC7+06xXRDLy7a7429NGhEnSn2z8gb1MaIVCkWQ=; b=jn8T3V6hrTmnyqLFxEDjLm2eQn3Ahr3Fgo086TFwXxsGI+XNoy6ZXn+vYAbdGPyOhFF2Eq yY1dgO45fOXFPdL5uYvv/HBdXHBm7fUU32c/c7OHLrDcJMPkLzuPY7FT4gybtV1dDM02uI cB1Jswe52O2Fspn1iHgqG5EqHef1mBJm9E+oHpBgCSySKBby0v0qDs/RY3MaiOXnBczJeA qh864KxMlM+xYlMWq+NqOoMtvxBYAq+DCwAgj1esmrmU8hp/IbIzx3HXEdt5LoOhtlVNWP gOOQaukSQrPqcP40fP8tCy4mJr6zNu8U7ufwt1xeyetM2QMv+Ky8u5nKS3HwHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728406940; a=rsa-sha256; cv=none; b=ElHWyLHhAatac+yJpK3cXuKixmZGHvqum/0PnWQ8olusje6pTVy3INWVChU689mqoOebXi TPEwBD2Zi+bBUWJk/NZxyLmCM1CyHILm9V6TQCV4hGYdwZHrefI8ugBpUrqPhK55UNjSfC +SknkgX63LMhcwwWiCt3Ln60giEsa1i92N5fjmSTE/06dG1Zf1vqWi1A9jvBcrCvhOt2M8 AcQuLyCoxi4YfaQouiXFBdT2crQ9ibpl1iALICNQgOtxJdBd7+GGFnlLA4f29xcSQZi7wa NlKzU2ggFGvLcqKE3F0e9Gy1pfXU/OkUGJHkNDNTJGkKkoKt5KtNivNAQ3Nf8A== 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 4XNMkz6jPTzfFK; Tue, 8 Oct 2024 17:02:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498H2Jk0071967; Tue, 8 Oct 2024 17:02:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498H2JuD071964; Tue, 8 Oct 2024 17:02:19 GMT (envelope-from git) Date: Tue, 8 Oct 2024 17:02:19 GMT Message-Id: <202410081702.498H2JuD071964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 6f6166e49c78 - main - env: Add an option to change the directory. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 6f6166e49c78f6460732c02bbbba6fcc218221cf Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6f6166e49c78f6460732c02bbbba6fcc218221cf commit 6f6166e49c78f6460732c02bbbba6fcc218221cf Author: Dag-Erling Smørgrav AuthorDate: 2024-10-08 17:01:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-08 17:01:32 +0000 env: Add an option to change the directory. This mirrors the equivalent option in GNU coreutils env, but does not add support for long options. MFC after: 3 days Relnotes: yes Sponsored by: Klara, Inc. Reviewed by: 0mp, bcr Differential Revision: https://reviews.freebsd.org/D47008 --- usr.bin/env/env.1 | 15 +++++++++++++-- usr.bin/env/env.c | 22 +++++++++++++++++----- usr.bin/env/tests/env_test.sh | 25 ++++++++++++++++++++++++- 3 files changed, 54 insertions(+), 8 deletions(-) diff --git a/usr.bin/env/env.1 b/usr.bin/env/env.1 index 5581d3838a7b..bdf920eabb42 100644 --- a/usr.bin/env/env.1 +++ b/usr.bin/env/env.1 @@ -28,7 +28,7 @@ .\" SUCH DAMAGE. .\" From FreeBSD: src/usr.bin/printenv/printenv.1,v 1.17 2002/11/26 17:33:35 ru Exp .\" -.Dd October 7, 2024 +.Dd October 8, 2024 .Dt ENV 1 .Os .Sh NAME @@ -42,6 +42,7 @@ .Op Ar name Ns = Ns Ar value ... .Nm .Op Fl iv +.Op Fl C Ar altwd .Op Fl L Ns | Ns Fl U Ar user Ns Op / Ns Ar class .Op Fl P Ar altpath .Op Fl S Ar string @@ -79,6 +80,12 @@ The environment inherited by .Nm is ignored completely. +.\" -C +.It Fl C Ar altwd +Change to the specified alternate working directory before executing +the specified +.Ar utility +program. .\" -L | -U .It Fl L | Fl U Ar user Ns Op / Ns Ar class Add the environment variable definitions from @@ -506,7 +513,7 @@ The utility conforms to .St -p1003.1-2001 . The -.Fl 0 , L , P , S , U , u +.Fl 0 , C , L , P , S , U , u and .Fl v options are non-standard extensions supported by @@ -529,6 +536,10 @@ and .Fl U options were added in .Fx 13.0 . +The +.Fl C +option was added in +.Fx 14.2 . .Sh BUGS The .Nm diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c index 762c5dc4d551..bb83baee114f 100644 --- a/usr.bin/env/env.c +++ b/usr.bin/env/env.c @@ -59,7 +59,7 @@ static void usage(void) __dead2; int main(int argc, char **argv) { - char *altpath, **ep, *p, **parg, term; + char *altpath, *altwd, **ep, *p, **parg, term; char *cleanenv[1]; char *login_class, *login_name; struct passwd *pw; @@ -70,6 +70,7 @@ main(int argc, char **argv) int rtrn; altpath = NULL; + altwd = NULL; login_class = NULL; login_name = NULL; pw = NULL; @@ -77,7 +78,7 @@ main(int argc, char **argv) login_as_user = false; want_clear = 0; term = '\n'; - while ((ch = getopt(argc, argv, "-0iL:P:S:U:u:v")) != -1) + while ((ch = getopt(argc, argv, "-0C:iL:P:S:U:u:v")) != -1) switch(ch) { case '-': case 'i': @@ -86,6 +87,9 @@ main(int argc, char **argv) case '0': term = '\0'; break; + case 'C': + altwd = optarg; + break; case 'U': login_as_user = true; /* FALLTHROUGH */ @@ -93,7 +97,7 @@ main(int argc, char **argv) login_name = optarg; break; case 'P': - altpath = strdup(optarg); + altpath = optarg; break; case 'S': /* @@ -186,6 +190,9 @@ main(int argc, char **argv) if (*argv) { if (term == '\0') errx(EXIT_CANCELED, "cannot specify command with -0"); + if (altwd && chdir(altwd) != 0) + err(EXIT_CANCELED, "cannot change directory to '%s'", + altwd); if (altpath) search_paths(altpath, argv); if (env_verbosity) { @@ -199,6 +206,11 @@ main(int argc, char **argv) execvp(*argv, argv); err(errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE, "%s", *argv); + } else { + if (altwd) + errx(EXIT_CANCELED, "must specify command with -C"); + if (altpath) + errx(EXIT_CANCELED, "must specify command with -P"); } for (ep = environ; *ep; ep++) (void)printf("%s%c", *ep, term); @@ -209,7 +221,7 @@ static void usage(void) { (void)fprintf(stderr, - "usage: env [-0iv] [-L|-U user[/class]] [-P utilpath] [-S string] [-u name]\n" - " [name=value ...] [utility [argument ...]]\n"); + "usage: env [-0iv] [-C workdir] [-L|-U user[/class]] [-P utilpath] [-S string]\n" + " [-u name] [name=value ...] [utility [argument ...]]\n"); exit(1); } diff --git a/usr.bin/env/tests/env_test.sh b/usr.bin/env/tests/env_test.sh index da238caaf7fa..d49765a04f9a 100644 --- a/usr.bin/env/tests/env_test.sh +++ b/usr.bin/env/tests/env_test.sh @@ -83,6 +83,8 @@ altpath_body() { echo "echo ${magic_words}" >magic_words chmod 0755 magic_words + atf_check -s exit:125 -e match:"must specify command" \ + env -P "${PWD}" atf_check -s exit:127 -e match:"No such file" \ env magic_words atf_check -o inline:"${magic_words}\n" \ @@ -100,7 +102,7 @@ equal_body() chmod 0755 "magic=words" atf_check -o match:"^${PWD}/magic=words$" \ env "${PWD}/magic=words" - atf_check -o match:"^magic=words$" \ + atf_check -s exit:125 -e match:"must specify command" \ env -P "${PATH}:${PWD}" "magic=words" atf_check -o inline:"${magic_words}\n" \ env command "${PWD}/magic=words" @@ -108,6 +110,26 @@ equal_body() env PATH="${PATH}:${PWD}" command "magic=words" } +atf_test_case chdir +chdir_head() +{ + atf_set "descr" "Change working directory" +} +chdir_body() +{ + local subdir="dir.$$" + atf_check -o inline:"${PWD}\n" \ + env pwd + atf_check -s exit:125 -e match:"must specify command" \ + env -C "${subdir}" + atf_check -s exit:125 \ + -e match:"cannot change directory to '${subdir}':" \ + env -C "${subdir}" pwd + atf_check mkdir "${subdir}" + atf_check -o inline:"${PWD}/${subdir}\n" \ + env -C "${subdir}" pwd +} + atf_init_test_cases() { atf_add_test_case basic @@ -117,4 +139,5 @@ atf_init_test_cases() atf_add_test_case false atf_add_test_case altpath atf_add_test_case equal + atf_add_test_case chdir } From nobody Tue Oct 8 17:02:20 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNMl11QC9z5XfJY; Tue, 08 Oct 2024 17:02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNMl10Zk4z46L4; Tue, 8 Oct 2024 17:02:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728406941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kbVmSdKvIGVobmqnx+agIrYFarhtkwI2YPxhgw0RCiQ=; b=hyN3n8u3bQYSIZ1zDXMV5joJZ9OVhp/RgvH3R/ZMV5Cdsu0ZTmt+Tox3cNXxZ4Xk9hEP/p YY/oAMyUd2QvOAUekUrBPfrbxYyyyz7j+hEw64Bzii+iLTnFdaRgxSA2vrfgbhGtYEoAE3 Stew+e/ugzl5SKMiYxrrWxgCCwleDMYsItx19+/JbRBh9nawq9QiwOFTH3vJN7EVFdqD4+ QHdUD86TNjX/btrH9/c9DMgR3OuHD3Qy5L5/7vPvjgSPGZnXEFbaKETKTFwTIEuESg6e7p joGQpZdSg2yCQhIsRATfw9MOoxrIUBIXwZkpE/kxaOklX/5J1QApN3tGmhpmog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728406941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kbVmSdKvIGVobmqnx+agIrYFarhtkwI2YPxhgw0RCiQ=; b=Ak2DiJZXLscdTfp3r7JIZdyVQ4PVp8I7PsR/jwrJsv2DOX8HWsR7MfaHHqdO9o01jat+Bb gRW+XaRwsZAdNmQHLQL4UT5WPTdWqHV2tcQDf4O8asQT+7QY9HoJrIzOClgvxiqafKE5Vz bQz5jLn9FVIMRWVNCdKXtSfntSCBO886IRedqPCe0xgVutCdPv7aqqusCO0StMR3aZDTM3 CYUc1D4feJeE+tUKYI3pstgoFoBei/4IBieWX6e9yj7WXae/DxSwPiuEI6G6iktIYHH6eA yn0AdDfP+abF11a9Y2vwT8yNi3n1/pgh9xubF5nJz1g71JnQtKi4x2uHVbiKMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728406941; a=rsa-sha256; cv=none; b=scr3IrvnghwAu6VfksDS2lpaw08qzHOsNoH8l22QcyUijLxSXiavkV+YwIvWS3nS+UNW3I mQPdvZou2NrgvOsMGQUl+0pj42EDzhfT+JtB7liSmvWaCDOklu2sO+qmm53MKfxy53SuoY 7GqWhBTH+J790I201UHgscoJx+UF8tdosmweGaUUcb940a7Jbkma0eo59QRTBhT24XnoSv afjbK6ljn0QnTKfQK6+GVS0FaFSZiOrGlptk6Ry7P/ryA2jJjomoBmutq1mn1XjvUsG1Lj O+uk2axbkwKTWg5MMlj/GAY02OQmnBg1Hwo0F8yFIJtDDQAplP17YD9hWzstAw== 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 4XNMl109ZBzfFM; Tue, 8 Oct 2024 17:02:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498H2Km8072015; Tue, 8 Oct 2024 17:02:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498H2KIP072012; Tue, 8 Oct 2024 17:02:20 GMT (envelope-from git) Date: Tue, 8 Oct 2024 17:02:20 GMT Message-Id: <202410081702.498H2KIP072012@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c2d93a803ace - main - env: Check the status of stdout. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c2d93a803acef634bd0eede6673aeea59e90c277 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c2d93a803acef634bd0eede6673aeea59e90c277 commit c2d93a803acef634bd0eede6673aeea59e90c277 Author: Dag-Erling Smørgrav AuthorDate: 2024-10-08 17:01:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-08 17:01:46 +0000 env: Check the status of stdout. MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D47009 --- usr.bin/env/env.c | 2 ++ usr.bin/env/tests/env_test.sh | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c index bb83baee114f..10e333602ee8 100644 --- a/usr.bin/env/env.c +++ b/usr.bin/env/env.c @@ -214,6 +214,8 @@ main(int argc, char **argv) } for (ep = environ; *ep; ep++) (void)printf("%s%c", *ep, term); + if (fflush(stdout) != 0) + err(1, "stdout"); exit(0); } diff --git a/usr.bin/env/tests/env_test.sh b/usr.bin/env/tests/env_test.sh index d49765a04f9a..2dc8f1a4c911 100644 --- a/usr.bin/env/tests/env_test.sh +++ b/usr.bin/env/tests/env_test.sh @@ -130,6 +130,22 @@ chdir_body() env -C "${subdir}" pwd } +atf_test_case stdout +stdout_head() +{ + atf_set descr "Failure to write to stdout" +} +stdout_body() +{ + ( + trap "" PIPE + env 2>stderr + echo $? >result + ) | true + atf_check -o inline:"1\n" cat result + atf_check -o match:"stdout" cat stderr +} + atf_init_test_cases() { atf_add_test_case basic @@ -140,4 +156,5 @@ atf_init_test_cases() atf_add_test_case altpath atf_add_test_case equal atf_add_test_case chdir + atf_add_test_case stdout } From nobody Tue Oct 8 17:41:20 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNNcM3S9Xz5Xhhw; Tue, 08 Oct 2024 17:41:39 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.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 mx1.freebsd.org (Postfix) with ESMTPS id 4XNNcL1GxRz4BvC; Tue, 8 Oct 2024 17:41:38 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 498HfKYs072042; Tue, 8 Oct 2024 20:41:23 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 498HfKYs072042 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 498HfKJE072041; Tue, 8 Oct 2024 20:41:20 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 8 Oct 2024 20:41:20 +0300 From: Konstantin Belousov To: Dag-Erling =?utf-8?B?U23DuHJncmF2?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c2d93a803ace - main - env: Check the status of stdout. Message-ID: References: <202410081702.498H2KIP072012@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <202410081702.498H2KIP072012@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4XNNcL1GxRz4BvC X-Spamd-Bar: ---- On Tue, Oct 08, 2024 at 05:02:20PM +0000, Dag-Erling Smørgrav wrote: > The branch main has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id=c2d93a803acef634bd0eede6673aeea59e90c277 > > commit c2d93a803acef634bd0eede6673aeea59e90c277 > Author: Dag-Erling Smørgrav > AuthorDate: 2024-10-08 17:01:46 +0000 > Commit: Dag-Erling Smørgrav > CommitDate: 2024-10-08 17:01:46 +0000 > > env: Check the status of stdout. > > MFC after: 3 days > Sponsored by: Klara, Inc. > Reviewed by: markj > Differential Revision: https://reviews.freebsd.org/D47009 > --- > usr.bin/env/env.c | 2 ++ > usr.bin/env/tests/env_test.sh | 17 +++++++++++++++++ > 2 files changed, 19 insertions(+) > > diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c > index bb83baee114f..10e333602ee8 100644 > --- a/usr.bin/env/env.c > +++ b/usr.bin/env/env.c > @@ -214,6 +214,8 @@ main(int argc, char **argv) > } > for (ep = environ; *ep; ep++) > (void)printf("%s%c", *ep, term); > + if (fflush(stdout) != 0) > + err(1, "stdout"); > exit(0); Why is this check needed? Or, put it differently, why is it needed for env(1) but not any other program that writes to stdout? From nobody Tue Oct 8 18:40:45 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNPwb21Dpz5XlWW; Tue, 08 Oct 2024 18:40:47 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNPwb1ZL2z4GGd; Tue, 8 Oct 2024 18:40:47 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728412847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+qE2o+dyDSd/3zgGGWaev/y5GzIWA61b2EkCxIgKq7Y=; b=buhi9lPVJeR0wGTfYGa/qIP4rGrR6zm8+X/WEaMo5xsh8RNHLVkzbRB+zZn+sArao6eeju pT2+Trdy+zU9/xqqsGstqLwG3/kzWrRYCGR4WBQIlzig8ROxD/5K87QKmNjUF+1stlHI+K 5KwFStyA3H9mkYRCB0FUCnmn12eVuRz5zsvjDKfrIfp1IsdrDaNB9v4kWcTZXM21lpuHC1 6yd1XHmQQn5g1DyCupGIRDfdyxl7pOF2mU8vBIDCMWc00WwLJiNgIqzANaVD1XM9X+9ESF e5+quEAUP2KcOqqk/hkO/+kxWfVbC1lLMWBkAmcC7E7PqJQRkRbH1l8c/tuGdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728412847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+qE2o+dyDSd/3zgGGWaev/y5GzIWA61b2EkCxIgKq7Y=; b=T34B/YUBEA/P/JWNEeZgJVZ0Mx24/cv8kCOiOigiLtlV2Qm7gFn+bHTG2kiSQsqeIs0HxM B4LERPXlz2nurCybEYq69tuwUbMB0vXRbDQHJjmX+20a0kYMZZxTzOuvtqxfqgbcSwUJUj IWciZ36uUovRA5esQDZzAAUMHWmPz8srGoO/PT3GJfahT4xBtaaMWFDBRBZEv/iu0s4xDN ZryL/7jjfRLQdFysEhokOsl78sBVV4Pbe5m9zi569vsSuGmKVFV9FH3m/MuV076dPf0N4Z MD/TRYBJ6R5ewkh9JLkNzoL0BU5exzEwE2MB/n3wD5/gRqalB6b1nzzK0zaPBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728412847; a=rsa-sha256; cv=none; b=dIGV6n1drMup8/owB+pR87ft1CKdmIAbdlSOeZeHAnt/bEta7GjsgD3O2GPu53p89FN5zf ukrd0VqPEr46dqz45qoIAK/oB4jXdgEc8akzWs59+mU3wlgMzAiTuy1ioIvNJukA8mDs0/ hi/eH6a0oBaqIz1WodbAzV2dGEq2zSH75zVTt8jmHduz9HyDzAyMqfa0sQobhBRgzXC6Zs AOIsHS/HeSqpgnEYOj1lPE4ZJoMKTi4bl/FllQ2S3siw8xm3bF7A62bWagHi42BHStEAj8 KACiMO8sp9oF72iop9ZUiDTip1pjQEmztVexnED4arGZnpFGRvqhtYqlSONwcA== Received: from ltc.des.dev (unknown [IPv6:2a01:e0a:386:9c20:922e:16ff:fef1:acef]) (using TLSv1.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) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XNPwb0c1jzVdv; Tue, 8 Oct 2024 18:40:47 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id B74CCBF440; Tue, 08 Oct 2024 20:40:45 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c2d93a803ace - main - env: Check the status of stdout. In-Reply-To: (Konstantin Belousov's message of "Tue, 8 Oct 2024 20:41:20 +0300") References: <202410081702.498H2KIP072012@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Tue, 08 Oct 2024 20:40:45 +0200 Message-ID: <86iku2v3o2.fsf@ltc.des.dev> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Konstantin Belousov writes: > Dag-Erling Sm=C3=B8rgrav writes: > > + if (fflush(stdout) !=3D 0) > > + err(1, "stdout"); > Why is this check needed? POSIX requires it. > Or, put it differently, why is it needed for env(1) but not any other > program that writes to stdout? You mean like these? % git -P grep -l 'err\(1, "stdout"\)' bin/cat/cat.c bin/date/date.c sbin/md5/md5.c usr.bin/asa/asa.c usr.bin/comm/comm.c usr.bin/ctags/ctags.c usr.bin/du/du.c usr.bin/env/env.c usr.bin/head/head.c usr.bin/join/join.c usr.bin/lastcomm/lastcomm.c usr.bin/locate/code/locate.code.c usr.bin/ncal/ncal.c usr.bin/sed/main.c usr.bin/tail/misc.c usr.bin/tsort/tsort.c usr.bin/w/w.c usr.bin/yes/yes.c or these? https://reviews.freebsd.org/D41390 https://reviews.freebsd.org/D41408 https://reviews.freebsd.org/D41413 https://reviews.freebsd.org/D41414 https://reviews.freebsd.org/D41417 https://reviews.freebsd.org/D41418 https://reviews.freebsd.org/D41422 https://reviews.freebsd.org/D41423 https://reviews.freebsd.org/D41424 https://reviews.freebsd.org/D41427 https://reviews.freebsd.org/D41428 https://reviews.freebsd.org/D41432 DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Tue Oct 8 19:17:41 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNQlB1ryGz5XnXJ; Tue, 08 Oct 2024 19:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNQlB1DKVz4JxL; Tue, 8 Oct 2024 19:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728415062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4oEGX/8MgB6fiQ6lOlrA2lV8Kdlj3P/Z0EM8wFLbbcs=; b=fiz4TwuR75IrDb4yRntnKqqcn8PdM61rNIti5gjSQNbI+zx7R+1duYxLM/yiaeFbTHwjty pMoY6qMyfTUTjLYpiDKzFQvz5X/apo+Uu5rnSFJoeu/n1ROiVx3W4TGvnuLFb7tMW2qJoG UJzOoUEtaf75gsUh+ricJgHhj/0NSFmvl9hrgtU+jYybhSHwwoURqwXBXuNI7Wvcq3B7IK ld74uNxT1sH2d+TJIw4+jFBDtBBRIxZ9bpP1FqqKsrh5bYBPrk2m//ArI8Ebc+jvpwz1xB qrNNShrsx6/LwFhDrAA5jYFNJOcDim+pDl4g5Olk/l8XavEhOJoZSk99RCFNow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728415062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4oEGX/8MgB6fiQ6lOlrA2lV8Kdlj3P/Z0EM8wFLbbcs=; b=Tx62UXDYfpJOoiu5jKs3j5/5NqOr8fc6R8mT8m8TvTCobYyvgJnCZPwqSZ12ZVhOidEQzM UMew0bI5Ecmz2umNZcV4Xr9jJw+Wbdxxd+Lu8kj/SCTc+sIhKqerw3y88AP0r5CYjG2kyg zj+B0p4ImsFia5YujW6wILgG63Djc4FwEUFmuHU2+UP5PRPkcEi75ymKjXGjBCnX+slWnh RzyZMfUeKkur9ccEVZ3plVt9fbZoZKjvZhOiiaouPh26XNYbxnETO0eE32v5RiPNNcnbEr pxt7H+qZINe0jMRa0C+rbfEd8B1rtjxGiE90xX71GzmjZIXQ+qpAhLQNXTB68w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728415062; a=rsa-sha256; cv=none; b=T0zsKClm6XiWE+xRg1KJjqNPRfSmtyllYR1agQ7wn4W40t5KKaxGye63AWsPgg3ppDrAHE uj4rvXv3lgaWniHzr9CsqbT5YTKV858sNIkESScUfKJ3tbRe9XnceBTUqDNk6GG3xW0teX Dvh/yBDsevMPrCYRiE7b+lQZ2n6BA5E65WFgo4alCQwuvbjeueq/z0lxa3sfjv01TQx+Lp rEt3eUWsTunDHUq29aMkAxr510mpS5a/hfjRTS9uzmPzlaxn/T3Fu2NLPnYXcB+6gX+94R C+LvEEFc12s7hzvx+EwZHdTBhKE83L955YpOUW+V1nbZ1dGeyfzsrVB9vyHq4A== 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 4XNQlB0jWdzjj3; Tue, 8 Oct 2024 19:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498JHfc4093180; Tue, 8 Oct 2024 19:17:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498JHf5K093177; Tue, 8 Oct 2024 19:17:41 GMT (envelope-from git) Date: Tue, 8 Oct 2024 19:17:41 GMT Message-Id: <202410081917.498JHf5K093177@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 8b92fa1ceb95 - main - manuals: Misc syntax fixes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b92fa1ceb95bbe80b473fc35d4276146201e802 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=8b92fa1ceb95bbe80b473fc35d4276146201e802 commit 8b92fa1ceb95bbe80b473fc35d4276146201e802 Author: Graham Percival AuthorDate: 2024-10-07 21:17:31 +0000 Commit: Mitchell Horne CommitDate: 2024-10-08 19:13:39 +0000 manuals: Misc syntax fixes These were reported by `mandoc -T lint ...` as errors. Signed-off-by: Graham Percival Reviewed by: mhorne MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1453 --- lib/librss/librss.3 | 4 ++-- share/man/man4/bpf.4 | 2 +- share/man/man7/orders.7 | 4 ++-- share/man/man8/rc.subr.8 | 2 +- share/man/man9/cdefs.9 | 2 +- share/man/man9/zone.9 | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/librss/librss.3 b/lib/librss/librss.3 index 655e5ca17984..3964aa36891b 100644 --- a/lib/librss/librss.3 +++ b/lib/librss/librss.3 @@ -109,8 +109,8 @@ socket. The .Fn rss_sock_set_recvrss function enables or disables receiving RSS related information -as socket options in. -.2 recvmsg +as socket options in +.Xr recvmsg 2 calls. .Pp When enabled, UDP datagrams will have a message with the diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4 index 4a40f4947dfd..8082f6eac39a 100644 --- a/share/man/man4/bpf.4 +++ b/share/man/man4/bpf.4 @@ -665,7 +665,7 @@ Set the VLAN PCP bits to the supplied value. now supports several standard .Xr ioctl 2 Ns 's which allow the user to do async and/or non-blocking I/O to an open -.I bpf +.Em bpf file descriptor. .Bl -tag -width SIOCGIFADDR .It Dv FIONREAD diff --git a/share/man/man7/orders.7 b/share/man/man7/orders.7 index aef44adde125..c1c2c1200e42 100644 --- a/share/man/man7/orders.7 +++ b/share/man/man7/orders.7 @@ -47,8 +47,8 @@ The following table lists common multiples of bytes. .It Zettabyte Ta ZB Ta 2^70 Ta 10^21 .It Yottabyte Ta YB Ta 2^80 Ta 10^24 .It Ronnabyte Ta RB Ta 2^90 Ta 10^27 -.It Quettabyte Ta QB Ta 2^100 Ta 10^30. -El +.It Quettabyte Ta QB Ta 2^100 Ta 10^30 +.El .Pp The following table lists common bit rates as a power of ten. .Bl -column -offset 2n \ diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index b37d25e78840..7dda3e8dae3f 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -73,7 +73,7 @@ .It .Ic rc_log Ar message .It -.It rc_trace Ar level Ar message +.Ic rc_trace Ar level Ar message .It .Ic rc_usage Ar command ... .It diff --git a/share/man/man9/cdefs.9 b/share/man/man9/cdefs.9 index dd45e3f61a9f..acfaf7b23991 100644 --- a/share/man/man9/cdefs.9 +++ b/share/man/man9/cdefs.9 @@ -368,7 +368,7 @@ which C environment is used. However, when C11 dialect is selected with .St -p1003.1-2008 , definitions for -.St -isoC-11 +.St -isoC-2011 are included. .Ss Header Visibility Macros These macros are set by diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9 index a6b8d2dfedbe..9f13cf0e504a 100644 --- a/share/man/man9/zone.9 +++ b/share/man/man9/zone.9 @@ -341,7 +341,7 @@ Create a zone whose items will be synchronized using the .Xr smr 9 mechanism. Upon creation the zone will have an associated -.Dt smr_t +.Ft smr_t structure which can be fetched using .Fn uma_zone_get_smr . .El From nobody Tue Oct 8 19:17:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNQlC2zxsz5Xn6b; Tue, 08 Oct 2024 19:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNQlC2PbNz4JV8; Tue, 8 Oct 2024 19:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728415063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=34fzZjNJF/x2slh78KLxGL1ep18J1uZaDPbrHBg8Yu0=; b=FavRCTHpvlMw8WGcx50Oc8AGltxq9Aklhd1W1k5vC/avKzJ4GGDL4BO78lrMgqdb4YJOdG Jb7WDRy4gQ6ZbqaUtWSnMFAdEO7KglZjIYxTsi31w5wvMTP6W6oykO8IsbcdpxzaV8cm+/ gZwm6ghD/nZTmjHyO8xpqA3ss9ibjJmJlbwIKvTcONbob1kQDYO3T6DHpL1+ts/37iB6sg Sinazjh8UtNl0qRfL75HYED8aR/dM6QOcXk4w/MmvtbCfV/G6CPebdMiMmgpF7KpxTJrmu O04I6nePewwf5NRYSaju3aUcgUBbLoA2WU/HdyUsV8efO+Y1/kdp6/bKJlQQ9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728415063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=34fzZjNJF/x2slh78KLxGL1ep18J1uZaDPbrHBg8Yu0=; b=Ujb8ueXOalh7gCpquEIaI6WaHgWtSZ/8PYPGrmdhKIXw+Qvb/NqTQfUM4Ns/agYbhc3TwL jzqr/1btAP7qoh1KZZyODMY36EgHQ42+qjCtHiAcwFWao+n+iZLrbr4GIFQjkNDvUbyoIl editOBBDddkn9+tzdM/QWKXBkGM2ZcpzAseBU2tqlI4KOSujUH1whnJNj9TNiNkkMc+zwH FXI7Z4P13HUfFZFAAOcnK7DBqKnLoA/ZDBZM6ugRqIvXQwuoc+qMa/c/9SA1T3hAzSnweq mdxo1DHcUH5xLc0iqMxSZh6Ow/9ApBmHsTzFx3Py64a4Y5lilKS/Z2M/n5Rcag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728415063; a=rsa-sha256; cv=none; b=dKzDV0KpipRJlLnbj1wLNIFZG+Z030j75+nC/eDaExY2oyNknGBiFyfd2d/SzQ/gzmeGFJ NS75ImcFJTs/Wr5jFLLrN7vlFWMWKhsU3laCrjsQhXBPyRg3eEPui9idlD5iJQG5+K9GCL OI9LZUuZNkwEVzg5t/MQRPMO1ysQh5CYIOKPG4BFZwoxSCAtSi6cvI8xPfXCxusf1dSi5W 3R6EyfKHCruFPIFipfnUeHr+iUO5LNmCWw7lOrLxZn0yBM7v2EuAQnr+yI3HallhyjfSEj mq/S100CJ1k9HBlT0zt1TGAJZqjKXaJIja5qcguFozsXr5zybWdmpfZtC2cq1w== 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 4XNQlC1jQXzj2q; Tue, 8 Oct 2024 19:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498JHhMj093229; Tue, 8 Oct 2024 19:17:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498JHhSC093226; Tue, 8 Oct 2024 19:17:43 GMT (envelope-from git) Date: Tue, 8 Oct 2024 19:17:43 GMT Message-Id: <202410081917.498JHhSC093226@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 643fc698203b - main - manuals: Fix "missing end of block" errors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 643fc698203b9b0ed386b0583c2200c428135c9d Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=643fc698203b9b0ed386b0583c2200c428135c9d commit 643fc698203b9b0ed386b0583c2200c428135c9d Author: Graham Percival AuthorDate: 2024-10-08 01:37:45 +0000 Commit: Mitchell Horne CommitDate: 2024-10-08 19:14:49 +0000 manuals: Fix "missing end of block" errors These were reported by `mandoc -T lint ...` as errors. The rendered output (in ascii and html) is not affected by this commit. Signed-off-by: Graham Percival Reviewed by: mhorne, Alexander Ziaee MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1454 --- share/man/man9/cdefs.9 | 1 + stand/man/loader_lua.8 | 1 + stand/man/loader_simp.8 | 2 ++ usr.bin/bintrans/bintrans.1 | 1 + 4 files changed, 5 insertions(+) diff --git a/share/man/man9/cdefs.9 b/share/man/man9/cdefs.9 index acfaf7b23991..d949c67b8f9a 100644 --- a/share/man/man9/cdefs.9 +++ b/share/man/man9/cdefs.9 @@ -402,6 +402,7 @@ extensions are visible, 0 otherwise. .St -isoC-2011 Appendix K 3.7.4.1 extensions are visible, 0 otherwise. +.El .Sh Supported C++ Environments .Fx supports C++11 and newer standards fully. diff --git a/stand/man/loader_lua.8 b/stand/man/loader_lua.8 index 1ba0939e60bd..0aa467237266 100644 --- a/stand/man/loader_lua.8 +++ b/stand/man/loader_lua.8 @@ -197,6 +197,7 @@ Loader init .Nm configuration files, as described in .Xr loader.conf 5 . +.El .Sh EXAMPLES Boot in single user mode: .Pp diff --git a/stand/man/loader_simp.8 b/stand/man/loader_simp.8 index 6eac6bf6a102..49214e78b494 100644 --- a/stand/man/loader_simp.8 +++ b/stand/man/loader_simp.8 @@ -659,6 +659,7 @@ command line by booting unconditionally in .Pa loader.rc . In order for this to be effective, one should also configure the firmware (BIOS or UEFI) to prevent booting from unauthorized devices. +.El .Sh FILES .Bl -tag -width /boot/loader_simp -compact .It Pa /boot/loader_simp @@ -668,6 +669,7 @@ itself. The script run by .Nm on startup. +.El .Sh EXAMPLES Boot in single user mode: .Pp diff --git a/usr.bin/bintrans/bintrans.1 b/usr.bin/bintrans/bintrans.1 index 16ae66aa21d1..beeae1207d9a 100644 --- a/usr.bin/bintrans/bintrans.1 +++ b/usr.bin/bintrans/bintrans.1 @@ -236,6 +236,7 @@ Decode. Output to .Ar output_file instead of standard output. +.El .Sh EXAMPLES The following example packages up a source tree, compresses it, uuencodes it and mails it to a user on another system. From nobody Tue Oct 8 19:17:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNQlD3w72z5Xnfq; Tue, 08 Oct 2024 19:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNQlD39H8z4JjW; Tue, 8 Oct 2024 19:17:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728415064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xIGsXMStQ9OPAhfrcBRYB+P0OPIujI5NqLbCfMs+RpY=; b=d6cKHIbljY2QMiMeco0b6jk4iR9nAgifYD9AnOuYB+2xFjZflQTZPbbzyDcvgk5ITFrFcp zQ4/HRpQQUeuSwrInIEAaFqOLAtvMH8wHB+76xWCRwC3UPRe2Ic7wgxIbjbAAR+C3ERIEv TLT5Fb1t9DuEBUpKoTyJ7Rrjv80u0ITP8K5EynNdwcvELavUYZT1WGlI3X9d6B6ZJAfCXd HbR54Fd4ZR0mURa6EYCsXDVgH9R5x2ItraSuZDCI4sylNSeOgV9TnyrjH6h28720wtY91z BNRH+L5rpQPZ273wuQ6jbK7N6bXu9m6omb4QiAn7UoHc4zqkOWL7WNMY1dtFEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728415064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xIGsXMStQ9OPAhfrcBRYB+P0OPIujI5NqLbCfMs+RpY=; b=Ijng0g0S1PgWhyLLwLAW7MqC9BifnDN9NzxZiB3eq2sm+U1UKe+GcR4nH4KdEtgY44AJBx 7OQN5Sp0DdypYw0DNYOd3wB5+JETnUIa+5UtdkoXRgh0XFGHajfJw2cPVc3swAPKKVxhFI erYohwg3CZWW5nnTqjOl/e77SeztU33U6fZ0+8ePDBFX2NcHelabeMZal5d5rXx6aLDIlN eDr7rzFLIkMztTFTe4cvJfm0/1wFpJaB9Tf/esoH2ssr+VJ3HKZUVPlYDEQ39RDwsGYbtf x/eczc2zxPmrxTcPDjvR9YFjZgnosbk7JiwcC1vyyzh/ez0/DV7AX+tteHwm2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728415064; a=rsa-sha256; cv=none; b=OU/qwJorXbZ54gH7Z3vJxTLQ1ky+y6UaZ3931upfM41YiUokSE6NOnd86C9dB65ARJZ3TW pbt0mFfEe+OBDFTlvE+Q2w1Y0fDkQNLpMz1V+9eZrjbv/DiaN038dctMNrNdAUnE2LL8Ta Nx0o7VS7EN3hm4yPOn/Nt7WJicodonqrugWPtK1PFLwiEYkLLJfLk8L+wNy9FvErJpxZIM 4yUpoqmtnfj92zuKoLZ2dUXLCNn2I1/5H8qCod9DbPtvGXkzh4JhXxXVfXIjfj108f564w KUFZ2DH6sI2lwrEDBo3iRhbcoYMMAWtYX0TMlixOv5H2dYv18MFYtJtR6H+6Dg== 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 4XNQlD2lKdzjk6; Tue, 8 Oct 2024 19:17:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498JHiYQ093280; Tue, 8 Oct 2024 19:17:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498JHiCO093277; Tue, 8 Oct 2024 19:17:44 GMT (envelope-from git) Date: Tue, 8 Oct 2024 19:17:44 GMT Message-Id: <202410081917.498JHiCO093277@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 9fd66e40cac0 - main - manuals: Fix syntax of list width List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fd66e40cac02691d36386cf275d23367e34fc43 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9fd66e40cac02691d36386cf275d23367e34fc43 commit 9fd66e40cac02691d36386cf275d23367e34fc43 Author: Graham Percival AuthorDate: 2024-10-08 01:39:51 +0000 Commit: Mitchell Horne CommitDate: 2024-10-08 19:16:26 +0000 manuals: Fix syntax of list width Signed-off-by: Graham Percival Reviewed by: mhorne MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1455 --- share/man/man9/mbuf.9 | 2 +- share/man/man9/vmem.9 | 2 +- usr.bin/bintrans/bintrans.1 | 8 ++++---- usr.bin/genl/genl.1 | 2 +- usr.sbin/dconschat/dconschat.8 | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9 index 0b03d697b8bf..0262c598ed18 100644 --- a/share/man/man9/mbuf.9 +++ b/share/man/man9/mbuf.9 @@ -1212,7 +1212,7 @@ the following various failure/extreme cases for testing of network drivers and other parts of the kernel that rely on .Vt mbufs . -.Bl -tag -width ident +.Bl -tag -width indent .It Va net.inet.ip.mbuf_frag_size Causes .Fn ip_output diff --git a/share/man/man9/vmem.9 b/share/man/man9/vmem.9 index 1dc74e951cb2..31a82be88fd0 100644 --- a/share/man/man9/vmem.9 +++ b/share/man/man9/vmem.9 @@ -159,7 +159,7 @@ A bitwise OR of an allocation strategy and a .Xr malloc 9 wait flag. The allocation strategy is one of: -.Bl -tag width indent +.Bl -tag -width indent .It Dv M_FIRSTFIT Prefer allocation performance. .It Dv M_BESTFIT diff --git a/usr.bin/bintrans/bintrans.1 b/usr.bin/bintrans/bintrans.1 index beeae1207d9a..3376ecd332ed 100644 --- a/usr.bin/bintrans/bintrans.1 +++ b/usr.bin/bintrans/bintrans.1 @@ -154,7 +154,7 @@ utility ignores any leading and trailing lines. .Pp The following options are available for .Nm uuencode : -.Bl -tag -width ident +.Bl -tag -width indent .It Fl m Use the Base64 method of encoding, rather than the traditional .Nm uuencode @@ -169,7 +169,7 @@ instead of standard output. .Pp The following options are available for .Nm uudecode : -.Bl -tag -width ident +.Bl -tag -width indent .It Fl c Decode more than one uuencoded file from .Ar file @@ -214,7 +214,7 @@ reasons. Additionally, .Nm b64encode accepts the following option: -.Bl -tag -width ident +.Bl -tag -width indent .It Fl w Ar column Wrap encoded output after .Ar column . @@ -229,7 +229,7 @@ through a dedicated program: .Nm qp is a quoted-printable converter and accepts the following options: -.Bl -tag -width ident +.Bl -tag -width indent .It Fl u Decode. .It Fl o Ar output_file diff --git a/usr.bin/genl/genl.1 b/usr.bin/genl/genl.1 index 9837744fa8e3..af0c6360ad83 100644 --- a/usr.bin/genl/genl.1 +++ b/usr.bin/genl/genl.1 @@ -44,7 +44,7 @@ utility is design to provide access to the user to generic netlink protocols. .Pp The following commands are available: -.Bl -tag -ident +.Bl -tag -width indent .It Cm list Po default Pc Lists all available generic netlink protocols, and presents its details: .Bl -tag -width "multicast groups" diff --git a/usr.sbin/dconschat/dconschat.8 b/usr.sbin/dconschat/dconschat.8 index 1f93e6d5a235..e2348410a04c 100644 --- a/usr.sbin/dconschat/dconschat.8 +++ b/usr.sbin/dconschat/dconschat.8 @@ -110,7 +110,7 @@ A escape character (the default is .Ql ~ ) appearing as the first character of a line is an escape signal; the following are recognized: -.Bl -tag -width ident +.Bl -tag -width indent .It Ic ~. Drop the connection and exit. .It Ic ~^G From nobody Tue Oct 8 19:40:29 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNRFT40cWz5YK5T; Tue, 08 Oct 2024 19:40: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNRFT3SFQz4LpN; Tue, 8 Oct 2024 19:40:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728416429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9D1gzoJoCuKC3wcvYMdhGUx8NIwUNi0sladC7C9v0nA=; b=jFeEHZo5ovjhIS47A04wY2CVDBYbCGZWBz/4DpyKt4TpJo/mzUrjld0VDcjHQHpSjYAQ5c MkJS/CSdFsIWdPboVi/+W4begaJlYts5rM9/bJ7iwo9+re7+ztKtVkm8KAHW0YPX5kQCww xtMlZtXsNhkRva7sOJrolqThgrEjwike8qdHij7T8X0WqPtmSEslcAgJczba3SsGLtM9MZ Az6VYDGMc2t4ymROPA0N5OFSZzR9arzGKFc7zWCM/JH39iPOM13Jwr2lTe86LqmGvDrdTW ejLwXL4KgCUjPsYoURKlFE2hqJzIZLX/vOG91TP7Rm4YoP9HmQ/oZ8N+ZJLTew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728416429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9D1gzoJoCuKC3wcvYMdhGUx8NIwUNi0sladC7C9v0nA=; b=DwaqXzH2oXoCLDxiyXHY4KiEvKlpyMuT01jP/cjpfYM0mS9WWguowNrP6/HDlTPJGF7QKR 8t/6wDPiTbih3xGGBFGqr47Sv4Yni4pjLzcTaizb1wXZZ7UfDrrm/xS3MbeWBzMmQd4FPU q2PQzjxPHhl9TN2+9WjOBNyA948UpdLdR1kR3SO6y/vXmZFbDCWNTRgOwCqUDHP1ERXBgD CdreWQQCEyDO1ilc1m9onO9xNQwbAiqdlvyaAC+070jVsb0nbiaR+oVz2SaABZzea7PwIz 3qIVeQl/br1gmx+LyM57pfsNFiAZ1NZRGKjuPv3LTPQJNWodZ7ZnbeLMTOJwzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728416429; a=rsa-sha256; cv=none; b=CQeU7jmhQokDlwjMXVWCnci0dvlFlXjgJhspeUVDfILq6ERNdtMwu8pqX+ZPCCouw4wEmv QQdwdDf+G4l599Irl5p9xCKDLS9jIhz4AC+rqQEFOwObwZWhAcYGycF05KlmSqm1jm6tvA L5zM93VbjnJmEcqh0az6bDjUfLZH0o7VFIiPSo5tw990+04JRPBhrlZ+99WP2p8lLv49Wd 19KMA8OcmGjbB0AbZAjJWQ/nHFYZdZME0Th3DjTW7c3V7GEh4HHxB7JD1jKS276hA7VzhJ Yx/g/lslvxlyNbUd8NuyX3JcKRKyypiIuu+oW9G+8VvKO9wfkSL/jesb70nW6w== 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 4XNRFT2wjnzjDQ; Tue, 8 Oct 2024 19:40:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498JeTJd035853; Tue, 8 Oct 2024 19:40:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498JeTaM035850; Tue, 8 Oct 2024 19:40:29 GMT (envelope-from git) Date: Tue, 8 Oct 2024 19:40:29 GMT Message-Id: <202410081940.498JeTaM035850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: 6df3a2d1bfed - main - Revert "libkldelf: use warnx instead of printf" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6df3a2d1bfed791a29fcd403d525f46112235b89 Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=6df3a2d1bfed791a29fcd403d525f46112235b89 commit 6df3a2d1bfed791a29fcd403d525f46112235b89 Author: Ka Ho Ng AuthorDate: 2024-10-08 19:39:36 +0000 Commit: Ka Ho Ng CommitDate: 2024-10-08 19:39:36 +0000 Revert "libkldelf: use warnx instead of printf" This reverts commit 550ee2d03c5b88bc5d74b257ffcb3ed2c06a60bb. --- lib/libkldelf/ef_obj.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libkldelf/ef_obj.c b/lib/libkldelf/ef_obj.c index 30e0d7886995..32a7c17127ed 100644 --- a/lib/libkldelf/ef_obj.c +++ b/lib/libkldelf/ef_obj.c @@ -345,20 +345,20 @@ ef_obj_open(struct elf_file *efile, int verbose) if ((ef->nprogtab != 0 && ef->progtab == NULL) || (ef->nrel != 0 && ef->reltab == NULL) || (ef->nrela != 0 && ef->relatab == NULL)) { - warnx("malloc failed"); + printf("malloc failed\n"); error = ENOMEM; goto out; } if (elf_read_symbols(efile, symtabindex, &ef->ddbsymcnt, &ef->ddbsymtab) != 0) { - warnx("elf_read_symbols failed"); + printf("elf_read_symbols failed\n"); goto out; } if (elf_read_string_table(efile, &shdr[symstrindex], &ef->ddbstrcnt, &ef->ddbstrtab) != 0) { - warnx("elf_read_string_table failed"); + printf("elf_read_string_table failed\n"); goto out; } @@ -367,7 +367,7 @@ ef_obj_open(struct elf_file *efile, int verbose) shdr[hdr->e_shstrndx].sh_type == SHT_STRTAB) { if (elf_read_string_table(efile, &shdr[hdr->e_shstrndx], &ef->shstrcnt, &ef->shstrtab) != 0) { - warnx("elf_read_string_table failed"); + printf("elf_read_string_table failed\n"); goto out; } } @@ -413,7 +413,7 @@ ef_obj_open(struct elf_file *efile, int verbose) ef->reltab[rl].sec = shdr[i].sh_info; if (elf_read_rel(efile, i, &ef->reltab[rl].nrel, &ef->reltab[rl].rel) != 0) { - warnx("elf_read_rel failed"); + printf("elf_read_rel failed\n"); goto out; } rl++; @@ -422,7 +422,7 @@ ef_obj_open(struct elf_file *efile, int verbose) ef->relatab[ra].sec = shdr[i].sh_info; if (elf_read_rela(efile, i, &ef->relatab[ra].nrela, &ef->relatab[ra].rela) != 0) { - warnx("elf_read_rela failed"); + printf("elf_read_rela failed\n"); goto out; } ra++; From nobody Tue Oct 8 19:40:30 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNRFV5kjzz5YK3G; Tue, 08 Oct 2024 19:40: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNRFV416Tz4LpP; Tue, 8 Oct 2024 19:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728416430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bkmkttOH2+67Cm8yC7oFZmIbq/YN0Y8dH2nhCga1CUY=; b=DKfMchM4lqWr7+NcMhH1ywLSXde5ozw0rsheUSvgSOMGhsLovjvMLjRrH8jagTYFbxnh4G EoiN6Pu9dH84CNDMft1fLukoqkXAqxDxfFs2Tm/8I7r2W+50cekKG6vxuZQtC9XuYRBdCH nHmGzOkDN8Ro80EZ2xN1dlDVbu/W+w2OBJvkhFuwgCn+eL8MlCenvKc0nxI9omvzwz7m07 6YCcx6hYTdB+0eAA6vimVmXmm1tU7S3vilpkPim0qq7ngc24FvIkzlIoaNFyFk3U5pUziy y+XV2A1XASya6nF003Sr495Ulh19OjrG1h9mG1AdNp4iC8KHCHPpUv28tGp1dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728416430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bkmkttOH2+67Cm8yC7oFZmIbq/YN0Y8dH2nhCga1CUY=; b=g5blDVq/Wg72DHhrwEwOte7euoPX0FOZUNQ4BAM5nBfWsLU2NMTiPkNpgfHMbkF0/1LXf4 6RKYJN0BcmeWPVZCiMZY40TCoCWAVVu3GeKa5viwVpeit5/hJA8K9AS+xtDqOapb+c3cEA FS+3PYyOgvbqQrmyqdxkOM3ImnhnTJf/BsgCTNRUUAJFBKaexMmVkAHKzoYkSQBUsT69H4 m+lgjBkE4+71Uxri9LSJRcvIxlchOSekcoV2i1sPZTCfeO2ntEC3LXyX/kZipF/WSswzTg 91peSuJPb/f6ML7JA65A9iKwGsWA+uGZdhVDPUgUtA/MXbgryahjILvCzxE0YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728416430; a=rsa-sha256; cv=none; b=uQ1dUHJbw7NXBF4/CWy+cwhjBYcfzlmZ2Q4iSORl761X958zb5+f97zN/DKMOPIqS6RlXS 2XxzKJsM7H/cwdC1Z34mmY6ijxo5Eoux5uBigCAY9u4SMvNyMPuT6Qk+ITLJlYEIANppoQ Lrc6NQV3JE28k23yjJN97377UDZc9oKg4aJewHv1F/yI8pckhYie+Rh5gdfDxtu4uzlghn HvyMs1aBYupUTsfu2j+KjDIlM5RtkxTO+iLub+sX0Kr+ECc4WlOVitt47NkPsPo3acZDO5 u9u/nVpOwJn+Y5EOAHtuEKvcoZwDi/hnC4tTWtymgYDHaAfVdomvXtwqscyAaA== 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 4XNRFV3dMvzjY8; Tue, 8 Oct 2024 19:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498JeUxg035898; Tue, 8 Oct 2024 19:40:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498JeU1W035895; Tue, 8 Oct 2024 19:40:30 GMT (envelope-from git) Date: Tue, 8 Oct 2024 19:40:30 GMT Message-Id: <202410081940.498JeU1W035895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: 7007de7d1095 - main - Revert "libkldelf: add elf_lookup_symbol function" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7007de7d1095e2bc45111756b3e5d3bc6f446a9d Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=7007de7d1095e2bc45111756b3e5d3bc6f446a9d commit 7007de7d1095e2bc45111756b3e5d3bc6f446a9d Author: Ka Ho Ng AuthorDate: 2024-10-08 19:40:13 +0000 Commit: Ka Ho Ng CommitDate: 2024-10-08 19:40:13 +0000 Revert "libkldelf: add elf_lookup_symbol function" This reverts commit 2c7d84795628cb9c7a266718b99b6bca68e0a135. --- lib/libkldelf/ef.c | 1 - lib/libkldelf/ef_obj.c | 1 - lib/libkldelf/elf.c | 6 ------ lib/libkldelf/kldelf.h | 13 ------------- 4 files changed, 21 deletions(-) diff --git a/lib/libkldelf/ef.c b/lib/libkldelf/ef.c index dcd87fe2bf83..052798ee31e4 100644 --- a/lib/libkldelf/ef.c +++ b/lib/libkldelf/ef.c @@ -89,7 +89,6 @@ static struct elf_file_ops ef_file_ops = { .seg_read_string = ef_seg_read_string, .symaddr = ef_symaddr, .lookup_set = ef_lookup_set, - .lookup_symbol = ef_lookup_symbol, }; static void diff --git a/lib/libkldelf/ef_obj.c b/lib/libkldelf/ef_obj.c index 32a7c17127ed..e09bd036b71e 100644 --- a/lib/libkldelf/ef_obj.c +++ b/lib/libkldelf/ef_obj.c @@ -109,7 +109,6 @@ static struct elf_file_ops ef_obj_file_ops = { .seg_read_string = ef_obj_seg_read_string, .symaddr = ef_obj_symaddr, .lookup_set = ef_obj_lookup_set, - .lookup_symbol = ef_obj_lookup_symbol, }; static GElf_Off diff --git a/lib/libkldelf/elf.c b/lib/libkldelf/elf.c index 8af02622de13..da319ffc6c98 100644 --- a/lib/libkldelf/elf.c +++ b/lib/libkldelf/elf.c @@ -686,9 +686,3 @@ elf_reloc(struct elf_file *efile, const void *reldata, Elf_Type reltype, return (efile->ef_reloc(efile, reldata, reltype, relbase, dataoff, len, dest)); } - -int -elf_lookup_symbol(struct elf_file *efile, const char *name, GElf_Sym **sym) -{ - return (EF_LOOKUP_SYMBOL(efile, name, sym)); -} diff --git a/lib/libkldelf/kldelf.h b/lib/libkldelf/kldelf.h index 71de31a94291..e0a8cc627ff2 100644 --- a/lib/libkldelf/kldelf.h +++ b/lib/libkldelf/kldelf.h @@ -48,8 +48,6 @@ (ef)->ef_ops->symaddr((ef)->ef_ef, symidx) #define EF_LOOKUP_SET(ef, name, startp, stopp, countp) \ (ef)->ef_ops->lookup_set((ef)->ef_ef, name, startp, stopp, countp) -#define EF_LOOKUP_SYMBOL(ef, name, sym) \ - (ef)->ef_ops->lookup_symbol((ef)->ef_ef, name, sym) /* XXX, should have a different name. */ typedef struct ef_file *elf_file_t; @@ -69,7 +67,6 @@ struct elf_file_ops { GElf_Addr (*symaddr)(elf_file_t ef, GElf_Size symidx); int (*lookup_set)(elf_file_t ef, const char *name, GElf_Addr *startp, GElf_Addr *stopp, long *countp); - int (*lookup_symbol)(elf_file_t ef, const char *name, GElf_Sym **sym); }; typedef int (elf_reloc_t)(struct elf_file *ef, const void *reldata, @@ -313,16 +310,6 @@ int elf_read_mod_pnp_match_info(struct elf_file *efile, GElf_Addr addr, int elf_reloc(struct elf_file *ef, const void *reldata, Elf_Type reltype, GElf_Addr relbase, GElf_Addr dataoff, size_t len, void *dest); -/* - * Find the symbol with the specified symbol name 'name' within the given - * 'efile'. 0 is returned when such a symbol is found, otherwise ENOENT is - * returned. - * - * XXX: This only return the first symbol being found when traversing symtab. - */ -int elf_lookup_symbol(struct elf_file *efile, const char *name, - GElf_Sym **sym); - __END_DECLS #endif /* _KLDELF_H_*/ From nobody Tue Oct 8 19:40:31 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNRFW6Rsbz5YJvB; Tue, 08 Oct 2024 19:40: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNRFW4y5Cz4LpX; Tue, 8 Oct 2024 19:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728416431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/xpAuH32Xr1vKN1V2v0A9B0It8vMmymf83g1oS27bAI=; b=OpAmkdXRtLETmya+vMCXAMlxomtUTcBFytsaVLWdakl0i4q0kwNHQk7k4P1AxQwXQnY4p/ LdiergjmTEUT6LZkdybJj/SfvkGEeiG0G/WfQ4fsIoByUXmLFJ5W678IDMaiB22r5n7IGN bcHlrziFnHuO8UH3h5DKIZw6G/QAJ+MhYZoDD4oGIhO/X9BFZ+37N++/BIdKKEEXrNEnHM m3qbtxLK5dNKEL3boSjIy2rOe5eEe0MznW/4QBwlr7oKDTc85AVQOIx4+r1cjwQcJTMdmK +6fk38I3z17+tqz5Qrm/etwzDL1oWPYmqCzHJo5vK9CnTiCZJsfDEYCbOznWOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728416431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/xpAuH32Xr1vKN1V2v0A9B0It8vMmymf83g1oS27bAI=; b=iux810M0ZW6hyDXjL/VoB/LmWoG59ZQbynEbz2yyJdCtoXcIx+GWNdyUExNEtFhaTodU3I NVTpYk7UHh3WThcThtQBxPjFcVXx2LuEKKAVHrYdMVj8Art7t8BLjMuIm0mwTjVqBRypeL i/tAmQRF2wBVAQNU53eLUpEfHNbP6ZnY155B+m6//hpj8d7EtlprAyEfT+EjAX4C0RfdV0 z1NNhyrFc3Jjii4BRDBkLDNf/prR5D23KbFLfGedri+XHufzyPw8j9hWWJKBoOrse5g68j pSUQCINHbew+8tw8V7PQJmi2E3B4bPWVbhhUFPcNlvgMiteYVOa9zd08ie5wsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728416431; a=rsa-sha256; cv=none; b=f8aWLA3MTcwEo35esA87LJ5tbNaM8FprYMMBHWZ1QmUzdDoCao9ZLGYh81mh/w8FcGxnQr 5dGzCb5oWObg+HTGmQvk6V84HlgsKwVybNj97fJMibtOFmDTWSv+g7GQwqhDCQwKrB4OaN ocM1K+Ea1cbfEfswB3Q93WDZ8AxLN464XvC5hacaw7/e4ix4+45peDFWgf20svarNjqCk7 FNabwv5RqSm6QS+oQ+D1Uyuao4VfPKAn887I5MDq2owoczT9lRrr2sGTYP8KDyZdcC+oSp kZAJdjOSxMF5AWKSUb1VfJUYHnKkkzdRU0Q6ul0UIrtS4BtahBLken+PR2ILcA== 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 4XNRFW4VNGzjpB; Tue, 8 Oct 2024 19:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498JeVHS035962; Tue, 8 Oct 2024 19:40:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498JeV5t035958; Tue, 8 Oct 2024 19:40:31 GMT (envelope-from git) Date: Tue, 8 Oct 2024 19:40:31 GMT Message-Id: <202410081940.498JeV5t035958@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: 50c64df2a173 - main - Revert "libkldelf: add a private library for kernel/kld-related ELF parsing" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50c64df2a1739dca84c0e3bc795b70e5991b7010 Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=50c64df2a1739dca84c0e3bc795b70e5991b7010 commit 50c64df2a1739dca84c0e3bc795b70e5991b7010 Author: Ka Ho Ng AuthorDate: 2024-10-08 19:40:20 +0000 Commit: Ka Ho Ng CommitDate: 2024-10-08 19:40:20 +0000 Revert "libkldelf: add a private library for kernel/kld-related ELF parsing" This reverts commit 0a2cfd653e86ac41c4e6e32a449d133c0ee6d677. --- Makefile.inc1 | 11 ++--------- lib/Makefile | 1 - lib/libkldelf/Makefile | 21 --------------------- lib/libkldelf/Makefile.depend | 16 ---------------- share/mk/src.libnames.mk | 2 -- usr.sbin/kldxref/Makefile | 13 +++++++++---- {lib/libkldelf => usr.sbin/kldxref}/ef.c | 2 +- lib/libkldelf/kldelf.h => usr.sbin/kldxref/ef.h | 6 +++--- {lib/libkldelf => usr.sbin/kldxref}/ef_aarch64.c | 2 +- {lib/libkldelf => usr.sbin/kldxref}/ef_amd64.c | 2 +- {lib/libkldelf => usr.sbin/kldxref}/ef_arm.c | 2 +- {lib/libkldelf => usr.sbin/kldxref}/ef_i386.c | 2 +- {lib/libkldelf => usr.sbin/kldxref}/ef_mips.c | 2 +- {lib/libkldelf => usr.sbin/kldxref}/ef_obj.c | 2 +- {lib/libkldelf => usr.sbin/kldxref}/ef_powerpc.c | 2 +- {lib/libkldelf => usr.sbin/kldxref}/ef_riscv.c | 2 +- {lib/libkldelf => usr.sbin/kldxref}/elf.c | 2 +- usr.sbin/kldxref/kldxref.c | 2 +- 18 files changed, 25 insertions(+), 67 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 118e864b69b8..557bbc825625 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2509,12 +2509,8 @@ ${_bt}-lib/libdwarf: ${_bt_m4_depend} _bt_libelf_depend=${_bt}-lib/libelf .endif -_libkldelf= lib/libkldelf -${_bt}-lib/libkldelf: ${_bt_libelf_depend} -_bt_libkldelf_depend=${_bt}-lib/libkldelf - _kldxref= usr.sbin/kldxref -${_bt}-usr.sbin/kldxref: ${_bt_libelf_depend} ${_bt_libkldelf_depend} +${_bt}-usr.sbin/kldxref: ${_bt_libelf_depend} # flua is required to regenerate syscall files. It first appeared during the # 13.0-CURRENT cycle, thus needs to be built on -older releases and stable @@ -2777,7 +2773,6 @@ bootstrap-tools: ${_bt}-links .PHONY ${_cat} \ ${_kbdcontrol} \ ${_elftoolchain_libs} \ - ${_libkldelf} \ ${_kldxref} \ lib/libopenbsd \ usr.bin/mandoc \ @@ -3221,8 +3216,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ lib/libfigpar \ ${_lib_libgssapi} \ lib/libjail \ - lib/libkiconv lib/libkldelf lib/libkvm \ - lib/liblzma lib/libmd lib/libnv \ + lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \ lib/libzstd \ ${_lib_casper} \ lib/ncurses/tinfo \ @@ -3257,7 +3251,6 @@ _prebuild_libs+= lib/libregex .endif lib/libgeom__L: lib/libexpat__L lib/libsbuf__L -lib/libkldelf__L: lib/libelf__L lib/libkvm__L: lib/libelf__L .if ${MK_RADIUS_SUPPORT} != "no" diff --git a/lib/Makefile b/lib/Makefile index e4a4aa95a1ef..221eac74ee26 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -66,7 +66,6 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ libiscsiutil \ libjail \ libkiconv \ - libkldelf \ libkvm \ liblua \ liblzma \ diff --git a/lib/libkldelf/Makefile b/lib/libkldelf/Makefile deleted file mode 100644 index 0d1716f17fca..000000000000 --- a/lib/libkldelf/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -.include - -PACKAGE= runtime -LIB= kldelf -PRIVATELIB= yes - -SRCS= ef.c \ - ef_obj.c \ - elf.c \ - ef_aarch64.c \ - ef_arm.c \ - ef_amd64.c \ - ef_i386.c \ - ef_mips.c \ - ef_powerpc.c \ - ef_riscv.c -WARNS?= 2 - -LIBADD= elf - -.include diff --git a/lib/libkldelf/Makefile.depend b/lib/libkldelf/Makefile.depend deleted file mode 100644 index b0aa274151ad..000000000000 --- a/lib/libkldelf/Makefile.depend +++ /dev/null @@ -1,16 +0,0 @@ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - include \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - lib/libelf \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 092e1b444beb..1e0a04e83fe3 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -27,7 +27,6 @@ _PRIVATELIBS= \ gtest_main \ heimipcc \ heimipcs \ - kldelf \ ldns \ sqlite3 \ ssh \ @@ -313,7 +312,6 @@ _DP_bsnmp= crypto .endif _DP_geom= bsdxml sbuf _DP_cam= sbuf -_DP_kldelf= elf _DP_kvm= elf _DP_casper= nv _DP_cap_dns= nv diff --git a/usr.sbin/kldxref/Makefile b/usr.sbin/kldxref/Makefile index c41517a78904..fc9b0b4215fc 100644 --- a/usr.sbin/kldxref/Makefile +++ b/usr.sbin/kldxref/Makefile @@ -1,12 +1,17 @@ PACKAGE= runtime PROG= kldxref MAN= kldxref.8 -SRCS= kldxref.c - -CFLAGS+=-I${SRCTOP}/lib/libkldelf +SRCS= kldxref.c ef.c ef_obj.c elf.c +SRCS+= ef_aarch64.c \ + ef_arm.c \ + ef_amd64.c \ + ef_i386.c \ + ef_mips.c \ + ef_powerpc.c \ + ef_riscv.c WARNS?= 2 -LIBADD= elf kldelf +LIBADD= elf .include diff --git a/lib/libkldelf/ef.c b/usr.sbin/kldxref/ef.c similarity index 99% rename from lib/libkldelf/ef.c rename to usr.sbin/kldxref/ef.c index 052798ee31e4..975626e46046 100644 --- a/lib/libkldelf/ef.c +++ b/usr.sbin/kldxref/ef.c @@ -41,7 +41,7 @@ #include #include -#include "kldelf.h" +#include "ef.h" #define MAXSEGS 16 struct ef_file { diff --git a/lib/libkldelf/kldelf.h b/usr.sbin/kldxref/ef.h similarity index 99% rename from lib/libkldelf/kldelf.h rename to usr.sbin/kldxref/ef.h index e0a8cc627ff2..9d3dc1b1b435 100644 --- a/lib/libkldelf/kldelf.h +++ b/usr.sbin/kldxref/ef.h @@ -32,8 +32,8 @@ * SUCH DAMAGE. */ -#ifndef _KLDELF_H_ -#define _KLDELF_H_ +#ifndef _EF_H_ +#define _EF_H_ #include #include @@ -312,4 +312,4 @@ int elf_reloc(struct elf_file *ef, const void *reldata, Elf_Type reltype, __END_DECLS -#endif /* _KLDELF_H_*/ +#endif /* _EF_H_*/ diff --git a/lib/libkldelf/ef_aarch64.c b/usr.sbin/kldxref/ef_aarch64.c similarity index 99% rename from lib/libkldelf/ef_aarch64.c rename to usr.sbin/kldxref/ef_aarch64.c index d2db29f22891..b61de3b032ab 100644 --- a/lib/libkldelf/ef_aarch64.c +++ b/usr.sbin/kldxref/ef_aarch64.c @@ -31,7 +31,7 @@ #include #include -#include "kldelf.h" +#include "ef.h" /* * Apply relocations to the values obtained from the file. `relbase' is the diff --git a/lib/libkldelf/ef_amd64.c b/usr.sbin/kldxref/ef_amd64.c similarity index 99% rename from lib/libkldelf/ef_amd64.c rename to usr.sbin/kldxref/ef_amd64.c index 7295835f75b3..fde032dcabc2 100644 --- a/lib/libkldelf/ef_amd64.c +++ b/usr.sbin/kldxref/ef_amd64.c @@ -33,7 +33,7 @@ #include #include -#include "kldelf.h" +#include "ef.h" /* * Apply relocations to the values obtained from the file. `relbase' is the diff --git a/lib/libkldelf/ef_arm.c b/usr.sbin/kldxref/ef_arm.c similarity index 99% rename from lib/libkldelf/ef_arm.c rename to usr.sbin/kldxref/ef_arm.c index 657294dc9fb0..cc5e265f821e 100644 --- a/lib/libkldelf/ef_arm.c +++ b/usr.sbin/kldxref/ef_arm.c @@ -34,7 +34,7 @@ #include #include -#include "kldelf.h" +#include "ef.h" /* * Apply relocations to the values obtained from the file. `relbase' is the diff --git a/lib/libkldelf/ef_i386.c b/usr.sbin/kldxref/ef_i386.c similarity index 99% rename from lib/libkldelf/ef_i386.c rename to usr.sbin/kldxref/ef_i386.c index ae571e2d50f2..962ed2bc0664 100644 --- a/lib/libkldelf/ef_i386.c +++ b/usr.sbin/kldxref/ef_i386.c @@ -33,7 +33,7 @@ #include #include -#include "kldelf.h" +#include "ef.h" /* * Apply relocations to the values obtained from the file. `relbase' is the diff --git a/lib/libkldelf/ef_mips.c b/usr.sbin/kldxref/ef_mips.c similarity index 99% rename from lib/libkldelf/ef_mips.c rename to usr.sbin/kldxref/ef_mips.c index 99790e11a9c3..e4aeedb5c08b 100644 --- a/lib/libkldelf/ef_mips.c +++ b/usr.sbin/kldxref/ef_mips.c @@ -36,7 +36,7 @@ #include #include -#include "kldelf.h" +#include "ef.h" /* * Apply relocations to the values obtained from the file. `relbase' is the diff --git a/lib/libkldelf/ef_obj.c b/usr.sbin/kldxref/ef_obj.c similarity index 99% rename from lib/libkldelf/ef_obj.c rename to usr.sbin/kldxref/ef_obj.c index e09bd036b71e..ac83137cd394 100644 --- a/lib/libkldelf/ef_obj.c +++ b/usr.sbin/kldxref/ef_obj.c @@ -43,7 +43,7 @@ #include #include -#include "kldelf.h" +#include "ef.h" typedef struct { GElf_Addr addr; diff --git a/lib/libkldelf/ef_powerpc.c b/usr.sbin/kldxref/ef_powerpc.c similarity index 99% rename from lib/libkldelf/ef_powerpc.c rename to usr.sbin/kldxref/ef_powerpc.c index 33f09c0d69ef..f72cc1d85e20 100644 --- a/lib/libkldelf/ef_powerpc.c +++ b/usr.sbin/kldxref/ef_powerpc.c @@ -33,7 +33,7 @@ #include #include -#include "kldelf.h" +#include "ef.h" /* * Apply relocations to the values obtained from the file. `relbase' is the diff --git a/lib/libkldelf/ef_riscv.c b/usr.sbin/kldxref/ef_riscv.c similarity index 99% rename from lib/libkldelf/ef_riscv.c rename to usr.sbin/kldxref/ef_riscv.c index bda04bb2c39a..46b9b66bee58 100644 --- a/lib/libkldelf/ef_riscv.c +++ b/usr.sbin/kldxref/ef_riscv.c @@ -36,7 +36,7 @@ #include #include -#include "kldelf.h" +#include "ef.h" /* * Apply relocations to the values obtained from the file. `relbase' is the diff --git a/lib/libkldelf/elf.c b/usr.sbin/kldxref/elf.c similarity index 99% rename from lib/libkldelf/elf.c rename to usr.sbin/kldxref/elf.c index da319ffc6c98..f98c39b69c0b 100644 --- a/lib/libkldelf/elf.c +++ b/usr.sbin/kldxref/elf.c @@ -44,7 +44,7 @@ #include #include -#include "kldelf.h" +#include "ef.h" SET_DECLARE(elf_reloc, struct elf_reloc_data); diff --git a/usr.sbin/kldxref/kldxref.c b/usr.sbin/kldxref/kldxref.c index eed754e1e730..6bb0469a9ff5 100644 --- a/usr.sbin/kldxref/kldxref.c +++ b/usr.sbin/kldxref/kldxref.c @@ -51,7 +51,7 @@ #include #include -#include +#include "ef.h" #define MAXRECSIZE (64 << 10) /* 64k */ #define check(val) if ((error = (val)) != 0) break From nobody Tue Oct 8 19:48:54 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNRRF0bZnz5YKLv for ; Tue, 08 Oct 2024 19:48:57 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNRRD625yz4NKJ for ; Tue, 8 Oct 2024 19:48:56 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-io1-xd29.google.com with SMTP id ca18e2360f4ac-82aa7c3b3dbso260266139f.2 for ; Tue, 08 Oct 2024 12:48:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1728416936; x=1729021736; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=5g18nNnf7RHbWmPuIDLLDI66/whq75NpoBa60YmtniI=; b=cM/UfoESqWyQw7+PIKLa0/nYWaTg5ZtR2p5TvfuL0y9ZZhWRXWYJBm+LjmVHjhboMQ Zp0v59fn686adC2JU8XtPMrvOM0XUQupbpVEUkMp8uddaTyXz4cGtkXWV22gEk/AUokA bCyy7WVHcOK9YRHnEk5FeTtU9cTeIJUoHbYlbbLXvjOTfwwZlF2LeeGnKRMpZIAqReDU ICbyAagxPzaAcPnJqKOj8TyVsMjYwKnjdOY3qSItMF3AUKocX8xszMw+O8sPTsfq+Zug Qi62IQWL1x2GWhMiq8hS4pxI04jSq6HFS5qsZQgUEEW8Mj/o7tOB0XdeWNjPnzSNlu07 wc/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728416936; x=1729021736; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=5g18nNnf7RHbWmPuIDLLDI66/whq75NpoBa60YmtniI=; b=oKwij296g/SqpxnjalC8SFDrXgcfLAeegmF4MTggNGhrBCPohLsEGdoA/hgFcZKOWU d2YeEkKR1xVg0QM3i3ocQgVAkEhFmrXykICTs7IXFP0Kge16ZS1ZGQ+WK9ZIH1eaRQZ8 79PaUfbRh2yXBrpl9VkK8nRO8sBkV2SDB2f4yc0x3qGeB6gRDPxF5G4eigJ/JLUbRJky /B5rjM5FxCnb+rHL73KAPOQ0RiEHTJoHXJKLA1igVlZqZ2Gmj40TitmFNdBm58+Dde+I QLGSLK4g7y6tejEUjMqL9ioiAoc43xh0oLIIRBe1x31f7GUlq+scUDIu0RRS2ByqmhjN rziw== X-Forwarded-Encrypted: i=1; AJvYcCVjwDlaCUL+rFCbwrZG1UIiad20MSG5erxVNJa/RFBs57jsbys6ozRrTU6FUTwXyQnIpKhtnV5ujNEASgoKXOjpfH1u5g==@freebsd.org X-Gm-Message-State: AOJu0YwY1pJF9yUPK9AZmAH3C8y858BG9jVQHr6gb8oDVvb2mapExiMq wK4HN68RAq8pvip3G7UyP9g3zzU2J5hBKBcrRU/g3YMbIGsJrZZGxQMCRGINns8= X-Google-Smtp-Source: AGHT+IHPiVpb8Htd/dxupUkmqQCYsBoWBEMM895P620RwJXhCO44vi3Bglfrwi1G8mpZnrbNwLvBcA== X-Received: by 2002:a05:6602:48c:b0:82a:2053:e715 with SMTP id ca18e2360f4ac-8353d5190afmr14706339f.14.1728416935681; Tue, 08 Oct 2024 12:48:55 -0700 (PDT) Received: from mutt-hbsd ([184.99.62.3]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-83503a942e8sm187281939f.22.2024.10.08.12.48.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2024 12:48:54 -0700 (PDT) Date: Tue, 8 Oct 2024 19:48:54 +0000 From: Shawn Webb To: Ka Ho Ng Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 50c64df2a173 - main - Revert "libkldelf: add a private library for kernel/kld-related ELF parsing" Message-ID: X-Operating-System: FreeBSD mutt-hbsd 15.0-CURRENT-HBSD FreeBSD 15.0-CURRENT-HBSD X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <202410081940.498JeV5t035958@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="kombxekuai5kqc6x" Content-Disposition: inline In-Reply-To: <202410081940.498JeV5t035958@gitrepo.freebsd.org> X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4XNRRD625yz4NKJ X-Spamd-Bar: ---- --kombxekuai5kqc6x Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 08, 2024 at 07:40:31PM UTC, Ka Ho Ng wrote: > The branch main has been updated by khng: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D50c64df2a1739dca84c0e3bc79= 5b70e5991b7010 >=20 > commit 50c64df2a1739dca84c0e3bc795b70e5991b7010 > Author: Ka Ho Ng > AuthorDate: 2024-10-08 19:40:20 +0000 > Commit: Ka Ho Ng > CommitDate: 2024-10-08 19:40:20 +0000 >=20 > Revert "libkldelf: add a private library for kernel/kld-related ELF p= arsing" > =20 > This reverts commit 0a2cfd653e86ac41c4e6e32a449d133c0ee6d677. Could you please explain why? Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Tor-ified Signal: +1 303-901-1600 / shawn_webb_opsec.50 https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --kombxekuai5kqc6x Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmcFjJ4ACgkQ/y5nonf4 4fr4IxAAlT8q7tlebNK56N1vKixrfuWUnRUaWzqzzso48cv/AvwGMke8EHatJVjx 1G5ZUxicCneZvAYy4y2EfWpIq14sbdHLeJVkEkSobrfkfEWNLuTMi85r7capaw6U kSIzchzLI1XqxfMSLXIIRP6agvG3AyeDf5GrOwZuKGvctjDZ0GWW/6n+1D6iIFdP nZdGK7reKjc97M+K+wSgmjCmncAtBzWELgEF+02q22eI8dAF0RwIbaSciB0CLhfj hB3XaNH5vltYUuTOekkfCcubdSYW6A0JEXHlZriytDe0igOGMmHvvw+vsp0EWS9N FM0/83E6piRx3XR1eKemKXueN5oiw7CUz/XeN+pVNqFDqjhocV6JpJz/TcClWMm9 8lZ90yjjtUQwtni3LnX0/tXBo0yMSgSf4JXB1bNBDox6EMJRfuv/CdSKP0SqlZiI 13QBIAjxiuJW4y8ZzG128+A0gpxSqU1YNOfpA9MSKfC7QvvPO76xL4P5vOk+HjoT uh8EfOffR4JYfqJXp7EGC4tz27R0Q8IWmXrNz8qh9RLg/Ntifj1mmg+peMxZ7hHG N6JFXbw0K7Kv0XuL++AywlxX8+s95EvtARJJMLXgY2VB9WRVkCWfZgiTzoll9SKs f1u5E8c4PiOs/t+9CpynQxkFFuVU20O6pbfr+MRXOVa9Wv4coAc= =lHKl -----END PGP SIGNATURE----- --kombxekuai5kqc6x-- From nobody Tue Oct 8 19:51:23 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNRVG0rXFz5YKMm; Tue, 08 Oct 2024 19:51:34 +0000 (UTC) (envelope-from marck@rinet.ru) Received: from wzl.woozle.net (wzl.woozle.net [195.54.192.66]) by mx1.freebsd.org (Postfix) with ESMTP id 4XNRVF3vPgz4Nx2; Tue, 8 Oct 2024 19:51:33 +0000 (UTC) (envelope-from marck@rinet.ru) Authentication-Results: mx1.freebsd.org; none Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68]) by wzl.woozle.net (Postfix) with ESMTP id 0DA151A7; Tue, 08 Oct 2024 22:51:26 +0300 (MSK) Received: from localhost (woozle.rinet.ru [195.54.192.68]) by woozle.rinet.ru (8.14.5/8.14.5) with ESMTP id 498JpN7E096120; Tue, 8 Oct 2024 22:51:25 +0300 (MSK) (envelope-from marck@rinet.ru) Date: Tue, 8 Oct 2024 22:51:23 +0300 (MSK) From: Dmitry Morozovsky To: Shawn Webb cc: Ka Ho Ng , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 50c64df2a173 - main - Revert "libkldelf: add a private library for kernel/kld-related ELF parsing" In-Reply-To: Message-ID: References: <202410081940.498JeV5t035958@gitrepo.freebsd.org> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) X-OpenPGP-Key-ID: 6B691B03 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (woozle.rinet.ru [195.54.192.68]); Tue, 08 Oct 2024 22:51:25 +0300 (MSK) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:8331, ipnet:195.54.192.0/19, country:RU] X-Rspamd-Queue-Id: 4XNRVF3vPgz4Nx2 X-Spamd-Bar: ---- On Tue, 8 Oct 2024, Shawn Webb wrote: > On Tue, Oct 08, 2024 at 07:40:31PM UTC, Ka Ho Ng wrote: > > The branch main has been updated by khng: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=50c64df2a1739dca84c0e3bc795b70e5991b7010 > > > > commit 50c64df2a1739dca84c0e3bc795b70e5991b7010 > > Author: Ka Ho Ng > > AuthorDate: 2024-10-08 19:40:20 +0000 > > Commit: Ka Ho Ng > > CommitDate: 2024-10-08 19:40:20 +0000 > > > > Revert "libkldelf: add a private library for kernel/kld-related ELF parsing" > > > > This reverts commit 0a2cfd653e86ac41c4e6e32a449d133c0ee6d677. > > Could you please explain why? bapt@: Since this set of commits, incremental building of packages fail! -- Sincerely, D.Marck [MCK-RIPE] [ FreeBSD committer: marck@FreeBSD.org ] --------------------------------------------------------------------------- *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- woozle@woozle.net *** --------------------------------------------------------------------------- From nobody Tue Oct 8 20:16:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNS325tkBz5YLVK; Tue, 08 Oct 2024 20:16:30 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNS323lHDz4Qcm; Tue, 8 Oct 2024 20:16:30 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id yAarsCyEUMArNyGdBsVQtT; Tue, 08 Oct 2024 20:16:29 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id yGd9scAnK2M9qyGdAswzRb; Tue, 08 Oct 2024 20:16:29 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=ce5xrWDM c=1 sm=1 tr=0 ts=6705931d a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=DAUX931o1VcA:10 a=4-q2EoJHAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=lTIPzDDAo5Cb8M7DZ3IA:9 a=CjuIK1q_8ugA:10 a=fpfIJvRr2csibeS0vtzw:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 5357C3B3; Tue, 08 Oct 2024 13:16:27 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 4EE5719D; Tue, 08 Oct 2024 13:16:27 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Dmitry Morozovsky cc: Shawn Webb , Ka Ho Ng , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 50c64df2a173 - main - Revert "libkldelf: add a private library for kernel/kld-related ELF parsing" In-reply-to: References: <202410081940.498JeV5t035958@gitrepo.freebsd.org> Comments: In-reply-to Dmitry Morozovsky message dated "Tue, 08 Oct 2024 22:51:23 +0300." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 08 Oct 2024 13:16:27 -0700 Message-Id: <20241008201627.4EE5719D@slippy.cwsent.com> X-CMAE-Envelope: MS4xfGWVQkMDQUYtz3QgHKtL/3j/znCYc0tm/64eNcKDo0IqahbTWuuWskOjgum6RmH88iF5yC7NQHKodFIB21Isj+oSh7cqNzvqN/SsRi24ml5u09GmsuwJ wXXkzA3vslDlA15opozQJh6zxGlHKZVoM/82QFvGy/Lmb9GB1jWl6QiiLmenIQyI2pNQ1JRZaf7KLsmpfryzzRHT0zjd8n7yUmrNuVDUykEP2mPQgOfy6y1u orDOX9mtBhhjX6r62tTrAPenil8oSKI2WI1a1Yep27Lx33v726kvu6zQ7qeLjP4CAJK89e6tmuGEpf31ZLSqUTV3wdLARZsY9KcY90yhSqdbtBzGymALLG9B CLnLqQlJZffQm20L94uhSS8b0PgOUV2sLclbQ5cOSh1AZSzkmas= X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4XNS323lHDz4Qcm X-Spamd-Bar: ---- In message , Dmitry Morozo vsky writes: > On Tue, 8 Oct 2024, Shawn Webb wrote: > > > On Tue, Oct 08, 2024 at 07:40:31PM UTC, Ka Ho Ng wrote: > > > The branch main has been updated by khng: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=50c64df2a1739dca84c0e3bc795b > 70e5991b7010 > > > > > > commit 50c64df2a1739dca84c0e3bc795b70e5991b7010 > > > Author: Ka Ho Ng > > > AuthorDate: 2024-10-08 19:40:20 +0000 > > > Commit: Ka Ho Ng > > > CommitDate: 2024-10-08 19:40:20 +0000 > > > > > > Revert "libkldelf: add a private library for kernel/kld-related ELF p > arsing" > > > > > > This reverts commit 0a2cfd653e86ac41c4e6e32a449d133c0ee6d677. > > > > Could you please explain why? > > bapt@: Since this set of commits, incremental building of packages fail! Hmm. I didn't experience this in my poudriere here. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Tue Oct 8 22:16:13 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNVjP4YNlz5YSsZ; Tue, 08 Oct 2024 22:16:25 +0000 (UTC) (envelope-from khng300@gmail.com) Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNVjP2pQmz4Zxl; Tue, 8 Oct 2024 22:16:25 +0000 (UTC) (envelope-from khng300@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-20b0b2528d8so70067065ad.2; Tue, 08 Oct 2024 15:16:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728425784; x=1729030584; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=QNGqdIMmKLrHWq3oY09ady2wsDxJTn1BD7Uyen9BkLw=; b=BegDpD/RuzvvHTEL6jmJUiLzMr01jlo8lyMvDrNvLef3nIF2EVSgijGqzWdCbLhvjc lGQYejKRi15jBgIwGrMX/e3bkYR4YLr0CI+pqiFySjoHIyS64gZmgstGKpil0z9XKjG1 9LYrm7XCTldY9+zHmEXOM98aKeF1QIqAd0FakMEoA7dZUaPAqgql1Ki73QFvgAdOrI8a 1YHmWbzrpIO56crqxtMjz2gBU6Jme0Y8mI7YuiKoJanDBdrbePXjvHJ/TqUbeKhW4bgZ D3mCNEvdbEnhprhPoZYmCa0K/u67d6oeAku+ia0gH9UYPbRF+bbSCJQIdSYdZ9AP+N/H VDPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728425784; x=1729030584; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QNGqdIMmKLrHWq3oY09ady2wsDxJTn1BD7Uyen9BkLw=; b=vMLmThShbjctYgLH89y0oWqKsVThNIevsGpCA4gUih/jqMZAP7x2N3ndTGdfVRIGt6 voImQPfQq7Adh1ItOYqW7qIBNfxmG/A5FXEJusmpX0iR3aO5Dz4lzCm2KEGNCWWxeXqW jGtmZJlRKFSV7N85yutPNgWd+BON8Uuc25MYGa3HqWCX+SPmC1Z/PodQ7CRTDNdZDl5e IQi3Y9czOX8/Ykr2cOikBvw/aWBTtMABuG3dGBpD8Nc/N8HxQZT0Fyp6bMEQ1ODd/Fc+ ErLP8iCURA/QC7PCCymrYU/cGzxmJzTnzEH+o3oBOXt/Xpf9aOmtm5uQAuPC3qNZqExY pfEw== X-Forwarded-Encrypted: i=1; AJvYcCUUXcql79KOvm3i6VV0QVl69TleBsE8iGlDgPCnuLZ7mCQNkVN0bnJlzTHuEpf5N6SpBso4tny7jw0TiF67T/Q=@freebsd.org, AJvYcCVBscRxzfCzBO1gftjyGIgmV9ui6uTxYGXvkoZ6el7Shku/f2WQ5Nad3feGyPBXpMrsfUZxuHkcZstw6MuiIeNFs3B/@freebsd.org, AJvYcCWXkvc+I5PG5Ib9Pycv/FYtZbRE8/WAq+DrpYfie0SMubJDGYp59A+jvhFtaNEpy/OEUwjblg==@freebsd.org, AJvYcCWx5wSHHK6PNlafneNK7bBv6ImJ5G0b0IZuFP880/BT+Zsp7TpVDMZfe86LZcgzIADaOWzH8f5AHAKynT5FlN5m90wiZXM=@freebsd.org X-Gm-Message-State: AOJu0YysFTxOnwJ/hQ2JpU7/qhhkusmQif2achLp5Vxa4Rdk38ZbQr/s roAfUPOaNrbmE7tDOUMYw0EY/iA+1HT5818pgBqv86CjO/Qvx6C1VA5QUerO0HYdmUYrkg5ra/1 3GviIKrzZqBIUG22Q0Fvmj534QwyH0E0fu7o= X-Google-Smtp-Source: AGHT+IESgh4GtDuvabbtu9oTUhvzhNVnINK39YwV3U+rzWzrgABpFkDFEz3QOamW0tr0WwrQul/JjwpePz6keFX6yHg= X-Received: by 2002:a17:903:32ca:b0:20c:5cdd:a9e with SMTP id d9443c01a7336-20c6373f6f4mr7115985ad.28.1728425783959; Tue, 08 Oct 2024 15:16:23 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202410081940.498JeV5t035958@gitrepo.freebsd.org> <20241008201627.4EE5719D@slippy.cwsent.com> In-Reply-To: <20241008201627.4EE5719D@slippy.cwsent.com> From: Ka Ho Ng Date: Tue, 8 Oct 2024 18:16:13 -0400 Message-ID: Subject: Re: git: 50c64df2a173 - main - Revert "libkldelf: add a private library for kernel/kld-related ELF parsing" To: Cy Schubert Cc: Dmitry Morozovsky , Shawn Webb , Ka Ho Ng , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000dfab7d0623fe7cc9" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4XNVjP2pQmz4Zxl X-Spamd-Bar: ---- --000000000000dfab7d0623fe7cc9 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Oct 8, 2024 at 4:16=E2=80=AFPM Cy Schubert wrote: > In message , Dmitry > Morozo > vsky writes: > > On Tue, 8 Oct 2024, Shawn Webb wrote: > > > > > On Tue, Oct 08, 2024 at 07:40:31PM UTC, Ka Ho Ng wrote: > > > > The branch main has been updated by khng: > > > > > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D50c64df2a1739dca84c0e3bc795b > > 70e5991b7010 > > > > > > > > commit 50c64df2a1739dca84c0e3bc795b70e5991b7010 > > > > Author: Ka Ho Ng > > > > AuthorDate: 2024-10-08 19:40:20 +0000 > > > > Commit: Ka Ho Ng > > > > CommitDate: 2024-10-08 19:40:20 +0000 > > > > > > > > Revert "libkldelf: add a private library for kernel/kld-related > ELF p > > arsing" > > > > > > > > This reverts commit 0a2cfd653e86ac41c4e6e32a449d133c0ee6d677. > > > > > > Could you please explain why? > > > > bapt@: Since this set of commits, incremental building of packages > fail! > > Hmm. I didn't experience this in my poudriere here. > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=3D0 > > > It affects pkgbase users mainly, and the reason is rather due to the linkage issue between the separated privatelib and kldxref resulting in empty LINKER_SETs in the privatelib. I will recommit this once it's fixed. Ka Ho --000000000000dfab7d0623fe7cc9 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Tue, Oct 8, 2024 at 4:16= =E2=80=AFPM Cy Schubert <Cy= .Schubert@cschubert.com> wrote:
In message <alpine.BSF.2.00.2410082= 251130.15838@woozle.rinet.ru>, Dmitry
Morozo
vsky writes:
> On Tue, 8 Oct 2024, Shawn Webb wrote:
>
> > On Tue, Oct 08, 2024 at 07:40:31PM UTC, Ka Ho Ng wrote:
> > > The branch main has been updated by khng:
> > >
> > > URL: https://cg= it.FreeBSD.org/src/commit/?id=3D50c64df2a1739dca84c0e3bc795b
> 70e5991b7010
> > >
> > > commit 50c64df2a1739dca84c0e3bc795b70e5991b7010
> > > Author:=C2=A0 =C2=A0 =C2=A0Ka Ho Ng <khng@FreeBSD.org>=
> > > AuthorDate: 2024-10-08 19:40:20 +0000
> > > Commit:=C2=A0 =C2=A0 =C2=A0Ka Ho Ng <khng@FreeBSD.org>=
> > > CommitDate: 2024-10-08 19:40:20 +0000
> > >
> > >=C2=A0 =C2=A0 =C2=A0Revert "libkldelf: add a private lib= rary for kernel/kld-related ELF p
> arsing"
> > >=C2=A0 =C2=A0 =C2=A0
> > >=C2=A0 =C2=A0 =C2=A0This reverts commit 0a2cfd653e86ac41c4e6e= 32a449d133c0ee6d677.
> >
> > Could you please explain why?
>
> bapt@:=C2=A0 Since this set of commits, incremental building of packag= es fail!

Hmm. I didn't experience this in my poudriere here.


--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://FreeB= SD.org
NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<cy@nwtime.org>=C2=A0 =C2=A0 Web:=C2=A0 https://nwt= ime.org

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 e^(i*pi)+1=3D0


It affects pkgbase users mainly, and the reason is ra= ther due to the linkage issue between the separated privatelib and kldxref= =C2=A0resulting in empty LINKER_SETs in the privatelib. I will recommit thi= s once it's fixed.=C2=A0

Ka Ho
--000000000000dfab7d0623fe7cc9-- From nobody Wed Oct 9 00:33:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNYlh4p9Zz5YZsg; Wed, 09 Oct 2024 00:33:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNYlh3ngfz4kZp; Wed, 9 Oct 2024 00:33:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728434016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A+KKDvmuSOn85igF40zOSQQCly+I3FLYjvhUhXBQp0o=; b=UY8LreuRUAQrFopZaMgaSyKx9LObrYaRv+h3zr8yIqoNu5mSUx2+1rOLhT8R1LTDMRyi9c gvobxiR10b8Mqyl4K/XSLz9fsUJf5YotMmBYFKHrUFSKTsDx8mUJaiTLsbn32nFnroRhgA ShKz4fbKOBaOe5wK1ITUBpOJ2UHxTokddTMPmjlFcwblSz7xQYkS16nP3Sw5B/M7C8iphN KnZXf9KVBp5CZYxI5x5h6fHw1T5xtrSNSurJ9L7vJed35h5yDME6peqGx8cN6pMSCHJVjV TPg/hskgxqedu0rtnPsSnqXNDq9s641ULlwKdCs3R+VZSDcQcr0cBEoxDgqLcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728434016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A+KKDvmuSOn85igF40zOSQQCly+I3FLYjvhUhXBQp0o=; b=phm2THWeLpl0fGfyc9pDg2PXwWGKXZSJex05V/xIKMej7QO4GtYufmIojLF73n5I5zH0JZ TAs90/SAgzTonMkhc1YE+sTsIyqZb0HrUSpKVqq8vMEwhjORdbfponRdHPdbY9w9rTczWS 8Sjo71pkNgwCmitnWAcjBN5pzdgiX6wNr5aE+WkCPJ0myP+9yHUXQ7NTxTdo6BnQPhCmi8 dcZwQM3Q3i/eXs/QcbXMyeVwYqw0aZm/xv9divJGZbufJDpZdtarUAuSpuohsuqGAAJqwr N0D2Gi+vPp54SMk164uTBRhKjaF5Mi4NgXfgK+pQXHhNxsM8wHwUKBf9a2YpkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728434016; a=rsa-sha256; cv=none; b=AxXUQTF1DcwvVxoxkko3KVb+7vP9xkteMiaEAIrSufMHjW7ZF/p+XpTSfOL8OfwJUdHHq/ Sbu0IlOaW+8miNhBUNNnMEi3J1ZBqHYASnKEu7Kn4moQ7S991U9LVXyoiOUM7zvVJPRbIu wuDWZkVB7ABJMEScNmacd6bTwEpOQezsH58mChY9uA1Xt6wnEjib9WilcT7IqF9fWhSMNT e5g5VWFcnQLAjnvNvEaQkK1Atig6ZVenm6eg9wt6M2IeazMnVhDoUsxL+NohuE4/WotB0m jUytw58c99Pi4m8X+Z9jj2w5hznZY18g5399unI0OO53VYcj4lY7zKMnRGVLHQ== 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 4XNYlh3NhdzsVV; Wed, 9 Oct 2024 00:33:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4990XaRn033459; Wed, 9 Oct 2024 00:33:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4990XaTK033456; Wed, 9 Oct 2024 00:33:36 GMT (envelope-from git) Date: Wed, 9 Oct 2024 00:33:36 GMT Message-Id: <202410090033.4990XaTK033456@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 1d83090d850f - main - capsicum-test: skip SCTP tests if SCTP not available List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d83090d850f627b6d6ebe7837e807df5d29799f Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1d83090d850f627b6d6ebe7837e807df5d29799f commit 1d83090d850f627b6d6ebe7837e807df5d29799f Author: Ed Maste AuthorDate: 2024-10-07 20:04:05 +0000 Commit: Ed Maste CommitDate: 2024-10-09 00:32:45 +0000 capsicum-test: skip SCTP tests if SCTP not available Skip the test rather than failing if SCTP is not available (e.g., if sctp.ko is not loaded). Also submitted upstream as https://github.com/google/capsicum-test/pull/61 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46999 --- contrib/capsicum-test/sctp.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/capsicum-test/sctp.cc b/contrib/capsicum-test/sctp.cc index 5f0d169456a8..76302059fa19 100644 --- a/contrib/capsicum-test/sctp.cc +++ b/contrib/capsicum-test/sctp.cc @@ -61,6 +61,9 @@ static int SctpClient(int port, unsigned char byte) { TEST(Sctp, Socket) { int sock = socket(AF_INET, SOCK_SEQPACKET, IPPROTO_SCTP); + if (sock == -1 && errno == EPROTONOSUPPORT) { + GTEST_SKIP() << "socket(..., IPPROTO_SCTP) -> EPROTONOSUPPORT"; + } EXPECT_OK(sock); if (sock < 0) return; From nobody Wed Oct 9 00:35:39 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNYp32xDHz5YZt2; Wed, 09 Oct 2024 00:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNYp32DZtz4kpV; Wed, 9 Oct 2024 00:35:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728434139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HXbUR30z07vkyEHf13CNlanOrGwf9hEEAXAvj3JL+sE=; b=SOmd8dBXgm2xIB+bQrR6gaxvpy/u1jfB/OgpGKTh5/pPawx4riIYV05CGNt50JIpUDfUbf fd+5MnF7l5kdFt5W9y4BoC86fNZRWoLD4z6eNnaSzr8WhfTEWwvWwRyets3EoVNSkOiXR/ I/Re6XryoIYJ91Kxwa4oolDKxCu8ct+vH36voUJB9brHnCYTHAHsJJZHhvLiE2NMLU0Jhb Tk2ZUxi8vC4Cb7kLT5oxPHJb3+YLLRntL0xtTQVhgl1+DOu3X5MMy71X3F/oZNGPqe7vQ6 0eUvEZ4/a4K4TtjCmvv+tj7F5SPgk8kHROFzkoqaz8ciAEzSTmHe4/KXUEf5qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728434139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HXbUR30z07vkyEHf13CNlanOrGwf9hEEAXAvj3JL+sE=; b=Hy2vxwASfaRplY360jc36LyxkmnLAyWhH8JSOAUWGjnURdr+0MiwMbPjVNnH0+6J8tkZnM iMsH6ke2yV6E7gS4oEtMs45ZT60AIzFO1+RFhbq7fKMfm6pD9X2xhmHiMs15+orpLfXt0+ Rg72n/X+JO4AA1m6rni83AZZQlIb0nMyFi0maMvwGg8B8/rIFbhbvEuGm6TtBGdP73D/+o Fz+4U+v7HYhlInEjPiekhEWQVen20pantYtOyxj99mUIn+EY+DMcYDtxyLU5/kjGogxw0n /hj4KmB2eDv8EB0LaXYWYAXRnSc6m4BSkWPUlWmLTN5KlIi0uo+SYYTkFk6m+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728434139; a=rsa-sha256; cv=none; b=K+Xfrhe9EX6TDdfcziFLQoFLtXbfallTCVOSWtiAFqtyHLoMcjbg3XeCyl+xqa6+DLl04B Uvn2hJqAnQDjblemU7R71EmfGOazikk4O4krP0FJ+xft+8uRBgqh2zKRI8awlLAvgBe1rl sZhtDf218xKySVKc0Lu3dpDSGWFrCUWUlkejjjgRGbHYndvqydW0UX0DeWe3540yNAcw1C TN9WKHWHKtUrmoVKGJNmuRXx/Omyu89zxpr8vug0E5tWmd98OuAUAAtiRFDKLsRrt9q7Hh dT7/GqEzvmEurI51Bo9Tbp2xpdQm3k82BkjJcyjSjQSCvlBAntZ9fxBA+Jw/hg== 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 4XNYp31rNJzsbg; Wed, 9 Oct 2024 00:35:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4990Zd90033873; Wed, 9 Oct 2024 00:35:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4990ZdTD033870; Wed, 9 Oct 2024 00:35:39 GMT (envelope-from git) Date: Wed, 9 Oct 2024 00:35:39 GMT Message-Id: <202410090035.4990ZdTD033870@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e4550c9aa06a - main - capsicum-test: include SCTP tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4550c9aa06af54d066c794f1da14f7c91bb5bc0 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e4550c9aa06af54d066c794f1da14f7c91bb5bc0 commit e4550c9aa06af54d066c794f1da14f7c91bb5bc0 Author: Ed Maste AuthorDate: 2024-10-07 19:18:33 +0000 Commit: Ed Maste CommitDate: 2024-10-09 00:34:50 +0000 capsicum-test: include SCTP tests HAVE_SCTP is #defined in syscalls.h, so move the #ifdef after the inclusion of the header that #defines it. Issue https://github.com/google/capsicum-test/issues/60 is open upstream in case a slightly different version is needed for Linux. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46995 --- contrib/capsicum-test/sctp.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/capsicum-test/sctp.cc b/contrib/capsicum-test/sctp.cc index 76302059fa19..c8c642454a80 100644 --- a/contrib/capsicum-test/sctp.cc +++ b/contrib/capsicum-test/sctp.cc @@ -1,6 +1,5 @@ // Tests of SCTP functionality // Requires: libsctp-dev package on Debian Linux, CONFIG_IP_SCTP in kernel config -#ifdef HAVE_SCTP #include #include #include @@ -12,6 +11,7 @@ #include "capsicum.h" #include "capsicum-test.h" +#ifdef HAVE_SCTP static cap_rights_t r_ro; static cap_rights_t r_wo; static cap_rights_t r_rw; From nobody Wed Oct 9 00:37:21 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNYr13ptdz5YbF5; Wed, 09 Oct 2024 00:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNYr139wCz4l8k; Wed, 9 Oct 2024 00:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728434241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pjDUHN1hPepfmC6nGV6Yr1falyF6fFpt2IEPfapMARY=; b=tnrl9f7YpR9HUod62XmVexShiWwM+uu4uoxYGR6vWOGCWhAWbqtp/LA1vPnjIsNQLix8Xj vyYjdd93MJI/69zz0a/qHKkLDP8BkbdN/KNebpqJdTQOxPLYnOCQWspaLChbB6gYi2qc0g ygfd8THmszMgJ2nbIMlvKjAhNUwhVOI5/CcMcdQjCRXh0cQ1p+t6/xMs4boTs6A0FCgc/1 lmtylYri50GhEfd75WBIHMzt0o/qXESFO68KO8qjSCTjUJDayLlzk/Xo+s8rsou06rCl7X +IYANVLtEL0VK4U8mEwiZuRR10kBRfkAX180C/acYWrLLb52UuKaDBJ//K8beg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728434241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pjDUHN1hPepfmC6nGV6Yr1falyF6fFpt2IEPfapMARY=; b=u5t57d9yY5zB7QoWswefeRdH7oFdPtpqR4WC2E0bA3KkkSKJpldQhfsNM5atdzXJIQW4uL 7bSr9p241wR29Z7z7ehU15z4UZ71MqvWYSYZqjp8keWKNUbbnbzTOaHKLmZSoAUpdvwtel XA3ERTm0oPCeQnNyy6vgu86pOc2n1SEIQ8wfnLZncu5Zjjj5vlpvce0kj83mrDEoaNFzHX WlE/sQYpDFaZo0TYx+ZmiOk5tO9uFcobauZmVy3P2FLRg/eThuy+7O9tY+9f0NHh2pd+vr CtFPxEJYmO8gxKr6v+YtBOdlGfaey2Pptl6PRL/ZmFjvyYse6d+b2M58jMFA2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728434241; a=rsa-sha256; cv=none; b=EG2kcJEOoaVMCN+O/YWXNG+NXjTh/C7lEM3x4tyz4YjX9606ZAe4hVDEpJleTRLg5Y88Yj dEB3co4wui0SHjmJQjeT8+I2ioBmkVoA9dTsdbABw/KlK+Jh5EYGV2PgdrwJC+uIGiBaU0 aGA2su3jL0ZsiA2EtXCPCtIii7y4GZrq8odCVOx12aNha2FwmUDZOXiYGbZEDpMseXx2Ay Mqb76yhhTgX+anVkRbiSWZaj/yOajCNKxcfvIyHw5KG2BJfIGPICXNwUTThoeggASbrFK9 fUr+CEFQaFle+7BMSH/E3GYJ6h/whbDGqpnTGxHT4D/r6rkXfaKnBCLK8eB1BA== 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 4XNYr127XYzsbh; Wed, 9 Oct 2024 00:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4990bLKZ034234; Wed, 9 Oct 2024 00:37:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4990bLJ1034231; Wed, 9 Oct 2024 00:37:21 GMT (envelope-from git) Date: Wed, 9 Oct 2024 00:37:21 GMT Message-Id: <202410090037.4990bLJ1034231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 91a9e4e01dab - main - sctp: propagate cap rights on sctp_peeloff List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91a9e4e01dab7a740b8e3b7c39c59a537e71e5d2 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=91a9e4e01dab7a740b8e3b7c39c59a537e71e5d2 commit 91a9e4e01dab7a740b8e3b7c39c59a537e71e5d2 Author: Ed Maste AuthorDate: 2024-10-03 11:54:44 +0000 Commit: Ed Maste CommitDate: 2024-10-09 00:36:50 +0000 sctp: propagate cap rights on sctp_peeloff PR: 201052 Reviewed by: oshogbo, tuexen Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46884 --- sys/netinet/sctp_syscalls.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/netinet/sctp_syscalls.c b/sys/netinet/sctp_syscalls.c index d67e260b6f99..9d85576e2592 100644 --- a/sys/netinet/sctp_syscalls.c +++ b/sys/netinet/sctp_syscalls.c @@ -141,13 +141,14 @@ sys_sctp_peeloff(struct thread *td, struct sctp_peeloff_args *uap) { struct file *headfp, *nfp = NULL; struct socket *head, *so; + struct filecaps fcaps; cap_rights_t rights; u_int fflag; int error, fd; AUDIT_ARG_FD(uap->sd); - error = getsock(td, uap->sd, cap_rights_init_one(&rights, CAP_PEELOFF), - &headfp); + error = getsock_cap(td, uap->sd, + cap_rights_init_one(&rights, CAP_PEELOFF), &headfp, &fcaps); if (error != 0) goto done2; fflag = atomic_load_int(&headfp->f_flag); @@ -165,7 +166,7 @@ sys_sctp_peeloff(struct thread *td, struct sctp_peeloff_args *uap) * but that is ok. */ - error = falloc(td, &nfp, &fd, 0); + error = falloc_caps(td, &nfp, &fd, 0, &fcaps); if (error != 0) goto done; td->td_retval[0] = fd; From nobody Wed Oct 9 00:42:12 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNYxc5rtKz5YbLK; Wed, 09 Oct 2024 00: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNYxc3SvBz4lpb; Wed, 9 Oct 2024 00: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=1728434532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DHlEozt9GeFbuRIhjTEuk+YHwQgba4lcEarCKzyNYvQ=; b=P+6cE2W9XnS10ndnRUahVJLmHbjvi8BXDWWpp3LAkvrZwOY36rOGi6Y63/Z8radxoXuju4 D8UGP/91pVlaSZtgpi0fBq0Q1scOCfZTMSZUuYVBByafJAPc1wAT90o/knpJn2Eul8SdNF CHr8U3UZbta0+01IiCq3+hsKR39KkNu2xiKu2BRYjSL9B8qsx/r/Ue7F/aYYmrRM00j2hy lW36H0P/K1JpgRoLJqNX8n1nLha7zgxpPUqqgCht9hGq3QQg7/H0NiaHPoDbQnHwFhxSvU 4Hwaryq54QaBSyDJ0voVI2/c1p2wx5R2y2UKPmrQKi37NtKkH9N6nvfVQr1Oog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728434532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DHlEozt9GeFbuRIhjTEuk+YHwQgba4lcEarCKzyNYvQ=; b=uIj95B3/MRc2bXrKiNImgfcd5LHYrpecgu6Thgd3PwiLi4JN2xYJDQp31fofM0zIYIGs5Z dVb69jh+vwmQjhczjbCP8HOigDhd8dcGFqYRMQ5mABsxY3zoeK3MbbYBGR5gvBKAN2gy/Z N3CR68cLaiZ14XlGz0z2fjcwoJ0XqZps0VWv2iDWXWizTIve4gcOiiX4eDQ7CQ9V5TANd9 R98dRmvMjhlE89cMLKDfurEzaUZCvIauIRVilLlWG6t9FtHCutehInqzMdLD65+qQ8RWUS GALMi8raLq89KILNOl1fpEyRz4MvhTTN+MlggAEO65w8z7cOeueToWFMOi+dCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728434532; a=rsa-sha256; cv=none; b=WSslsLdBw3Sid7uAd/eUS5AcOoMxo3wN5eHGsaLWiuM5pFeGwX6nq1OySTV6y7JuQqfuHz syy9hDQ/8sbqWMWg38QVmN8DoCNMNu7hnEGIX9pcTQGb+f/UZTzQOmTifxhPCMays9axXH Ak1YSrp9hBarPMvh7R5IKRLg0ZTc8P0kdBLnfznIzcvE2yQWRTQb8ha42AEC38WuAoFklH L5nW007vML31639JDHPtBRKaqKxdNVb0CsUlgoTinqc62salaN24gC6dfB6Eiq9Zng6Hj/ j9Ul6C1vUDXXXGxSU7fxEwDJPl8JbgCD0KcqTgvfhsjYOWfcQRTnaJVyDv0JPg== 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 4XNYxc327YzsrD; Wed, 9 Oct 2024 00:42:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4990gC6I050231; Wed, 9 Oct 2024 00:42:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4990gCIW050228; Wed, 9 Oct 2024 00:42:12 GMT (envelope-from git) Date: Wed, 9 Oct 2024 00:42:12 GMT Message-Id: <202410090042.4990gCIW050228@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 38518fda66cd - main - capsicum-test: rights are propagated on sctp_peeloff(2) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38518fda66cda6c57af0aa655d19c1897c0ab15d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=38518fda66cda6c57af0aa655d19c1897c0ab15d commit 38518fda66cda6c57af0aa655d19c1897c0ab15d Author: Ed Maste AuthorDate: 2024-10-07 18:28:20 +0000 Commit: Ed Maste CommitDate: 2024-10-09 00:41:45 +0000 capsicum-test: rights are propagated on sctp_peeloff(2) As of commit 91a9e4e01dab ("capsicum: propagate rights on sctp_peeloff") a capability is generated from sctp_peeloff(cap_fd,...). Enable the corresponding test code. PR: 201052 Reviewed by: oshogbo, tuexen Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47000 --- contrib/capsicum-test/capsicum-freebsd.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/capsicum-test/capsicum-freebsd.h b/contrib/capsicum-test/capsicum-freebsd.h index da7bb38f073b..13fa24a0f722 100644 --- a/contrib/capsicum-test/capsicum-freebsd.h +++ b/contrib/capsicum-test/capsicum-freebsd.h @@ -62,10 +62,9 @@ typedef unsigned long cap_ioctl_t; // As of commit 85b0f9de11c3 ("capsicum: propagate rights on accept(2)") // FreeBSD generates a capability from accept(cap_fd,...). #define CAP_FROM_ACCEPT -// TODO(FreeBSD): uncomment if/when FreeBSD propagates rights on sctp_peeloff. -// FreeBSD does not generate a capability from sctp_peeloff(cap_fd,...). -// https://bugs.freebsd.org/201052 -// #define CAP_FROM_PEELOFF +// As of commit 91a9e4e01dab ("capsicum: propagate rights on sctp_peeloff") +// FreeBSD generates a capability from sctp_peeloff(cap_fd,...). +#define CAP_FROM_PEELOFF #endif /* __FreeBSD__ */ From nobody Wed Oct 9 11:42:35 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNrbb5xbsz5YRXV; Wed, 09 Oct 2024 11:42: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNrbb5Sdtz4S0W; Wed, 9 Oct 2024 11:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728474155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UAbpIb2DPcS5b/vjcSm5Ty4Ymmc7fv5u0fNuWBqx+68=; b=x3da38dAghYFymBBDWSKpDhoOinmSkeCq73T/BWIRyjUTcBhRxhD2IdRlkBB3OafZbxMbs GgcUFHwFFACTlcdreF8xPOczOLhrou+qGn49mLSprYML5elZ+HpcIuZJ7M8IYbdDJM7Fc1 DuQXpq8fXlOIX6WZ2w+SEq2wy7wbPSB/RtXxMWcYRLQpb75++UV4cbYnl0ktSFW4BhawlC b5pGieDDTymwZwQ6pGU7i/C13Hh/B+w5HPOHZraqKslAy1iUGEmfd8cfPp8zPyCLhafEdG JCYckscjPdS8JD0xPrkdoISFNsk8Wmun4v78vP2vdMcrqApKcsASJUiB2cMDrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728474155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UAbpIb2DPcS5b/vjcSm5Ty4Ymmc7fv5u0fNuWBqx+68=; b=m2EbmBK34nkJCYC4TEK31hHwN0Xlikwk0a4BnzYBSUuVTHh+D/z2aAcuO1iNFOtuDKul4b aMv8oa5Lr1qoEic8L+l7kG0FN/+KMn2yKut7mAhgqJxia2810Gl4QVmaH6UXgrV8nNV4mE vOC9Gn43tJr6qcGf8lozv5rrPAvx6yPYAU2NEh2gp3QD+J8EOmIayjIcJmauMvme1axPb3 XnALN3fdwf71maW2CHixMKJXdGiQqom0W9fLNFi/4FZmehINWW8RDiOgvwojW+SlBGBEKk qh2pMCChyMDj0L24kfgnta9NtDNbgkq9UHpTDmbc/UjQbdJonhSh98+VPKLpnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728474155; a=rsa-sha256; cv=none; b=gFFrTNYGMl6KfPPqNJQAcxhZXcNE2TLyXVSlzHKUfZ6qe+Uhm9tEd4KNrTbasIm6ZGzyS6 YpFGfKW5tKiuJVJIiaaHvSjMWkXMEgoxZJ2UMTHNr5GqhoGTdwWs5pMRZflEEu3EkWlH9F J69C07H33bStBespbCvpgRb3L1wgcvOicAPNLa8rHV1mrm5OrPh6IORhKt48lBsTrK1tUS cLh29me06zvehNTQDEFaYEQwlNbhkyhUnCPoPdPDNMeisPclZXjMQajP6ICy7z55A7oRHE I92Sq6+VSt0iwWQ7rAel433ctux6ELmp086bsLstyR/VUZetL/YH2qxeOiJ57w== 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 4XNrbb53rGz1C62; Wed, 9 Oct 2024 11:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 499BgZlU072534; Wed, 9 Oct 2024 11:42:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 499BgZIm072531; Wed, 9 Oct 2024 11:42:35 GMT (envelope-from git) Date: Wed, 9 Oct 2024 11:42:35 GMT Message-Id: <202410091142.499BgZIm072531@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e578fd853a25 - main - shm_alloc(): cleanup List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e578fd853a251c04d1eeb55c3aa499f8d0cb7480 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e578fd853a251c04d1eeb55c3aa499f8d0cb7480 commit e578fd853a251c04d1eeb55c3aa499f8d0cb7480 Author: Konstantin Belousov AuthorDate: 2024-10-08 17:43:38 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-09 11:28:12 +0000 shm_alloc(): cleanup Consistently use the shorter name 'obj' for the new object. Set OBJ_POSIXSHM flag outside if, it is set on both pathes. Suggested by: alc Reviewed by: alc, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D47018 --- sys/kern/uipc_shm.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index f6861a3278ff..141d386af396 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -945,24 +945,20 @@ shm_alloc(struct ucred *ucred, mode_t mode, bool largepage) shmfd->shm_gid = ucred->cr_gid; shmfd->shm_mode = mode; if (largepage) { - obj = shmfd->shm_object = phys_pager_allocate(NULL, - &shm_largepage_phys_ops, NULL, shmfd->shm_size, - VM_PROT_DEFAULT, 0, ucred); - VM_OBJECT_WLOCK(shmfd->shm_object); + obj = phys_pager_allocate(NULL, &shm_largepage_phys_ops, + NULL, shmfd->shm_size, VM_PROT_DEFAULT, 0, ucred); obj->un_pager.phys.phys_priv = shmfd; - vm_object_set_flag(obj, OBJ_POSIXSHM); - VM_OBJECT_WUNLOCK(shmfd->shm_object); shmfd->shm_lp_alloc_policy = SHM_LARGEPAGE_ALLOC_DEFAULT; } else { obj = vm_pager_allocate(shmfd_pager_type, NULL, shmfd->shm_size, VM_PROT_DEFAULT, 0, ucred); - VM_OBJECT_WLOCK(obj); obj->un_pager.swp.swp_priv = shmfd; - vm_object_set_flag(obj, OBJ_POSIXSHM); - VM_OBJECT_WUNLOCK(obj); - shmfd->shm_object = obj; } - KASSERT(shmfd->shm_object != NULL, ("shm_create: vm_pager_allocate")); + KASSERT(obj != NULL, ("shm_create: vm_pager_allocate")); + VM_OBJECT_WLOCK(obj); + vm_object_set_flag(obj, OBJ_POSIXSHM); + VM_OBJECT_WUNLOCK(obj); + shmfd->shm_object = obj; vfs_timestamp(&shmfd->shm_birthtime); shmfd->shm_atime = shmfd->shm_mtime = shmfd->shm_ctime = shmfd->shm_birthtime; From nobody Wed Oct 9 12:11:53 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNsFP4jmPz5YT5g; Wed, 09 Oct 2024 12:11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNsFP4H83z4VBj; Wed, 9 Oct 2024 12:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728475913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EYqisZto1P2PzsQ2iiwY6eQpHMjubhxC6Q0NseYC/sg=; b=ETpSSxHyzBQBVeMKxjHaFloDFvi980ceGnUlz1RwSL24194i2VX5nRvb9xhpeud6x+06JB Cdw0T1Cfrac6y8SOH/gl/A3wPz8RnCyqOGyfNP8w1zekHnfn7DbPePS8FCjiTDgOB4I93O e+UVFzlGJWd/j7ABmWr7bgpYDRy4Yz1aEdMilAcDNxONffw7Fbw+RW7C6DgQm26KUaMeIR 7bxFAdTO/sHd0NJirlFBP9doPdaNV1Tar0zpTu95Wm2l1a1JJj4N9R0Mgg37/KqHBlSUCu VipVUsKJtVKvb7QqnXntazjnRLW9BTXf3VJLSU80fhv9x6dsUlCFCTLQESHHDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728475913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EYqisZto1P2PzsQ2iiwY6eQpHMjubhxC6Q0NseYC/sg=; b=QirIKxNQIwm2B2k9DiMeN207FZZ8xTrQhLCqqVHh/oebhs/YTVSqgF+453H+DWsX2izB+z geGnXj3m2nySg+r47KNzEMqoEYPjxyaPlRnKYW228dXeSGisQmzxv2ZGz0D/F9PANJOoge hseAC3MxjCtwFHmmlNmY2OT0bjXM9wvugGD7dtWvWN+jcp6QDvV3+ytPLclgaBMDFJM7Lb Tv3H8BTGBnrs4z+r6YnW09PuHQoEwBaznrd0+RbkEIs2AhLIl1clPiV9nw1C2ori4XvmY1 8OL7LH+aVot4ws78bjw8ysffgx2gNcqox+oqgK01GCelJ2Y1lgD3hZlziH7OnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728475913; a=rsa-sha256; cv=none; b=XkNKgLwi3uVPmquXy5iLT9MwDFKq8SJP21Q1VFMThNHY/CsvqX3VG9LmL8Eyv3K1+yfkDo c4rYBqkjb4CDJ7HFacwz8LYQsi7hBJ2P4bzFZr65An8YuIroJGwwuCd3jXe3I+vSDf/xCg qbeH03YsaPlFByIPlrwuGn3tlWDLZoS2RSDepTxemsZrTTxDtZi3Fv+v+TYHBIsfc2QPmk 3+/D5PKeUSpIhpzs0IGZVrN5hr/y+LHInNlj3/W2QBcmM83QrVw9pNG+kmDZN7qw7uS3CR gmbqhtzdwUxN4xz5VmYcaaH3W5fbi0djPoo13xo/P9fjR3MwfwqJeIvD0vSOkQ== 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 4XNsFP3tRPz1CwQ; Wed, 9 Oct 2024 12:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 499CBrg2018376; Wed, 9 Oct 2024 12:11:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 499CBrw1018373; Wed, 9 Oct 2024 12:11:53 GMT (envelope-from git) Date: Wed, 9 Oct 2024 12:11:53 GMT Message-Id: <202410091211.499CBrw1018373@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: d350e8d795d5 - main - cmp: Style and type issues. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d350e8d795d53dbc58ea428f76355cf5e28f6116 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d350e8d795d53dbc58ea428f76355cf5e28f6116 commit d350e8d795d53dbc58ea428f76355cf5e28f6116 Author: Dag-Erling Smørgrav AuthorDate: 2024-10-09 12:08:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-09 12:11:42 +0000 cmp: Style and type issues. MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: 0mp, markj Differential Revision: https://reviews.freebsd.org/D47019 --- usr.bin/cmp/cmp.c | 4 ++-- usr.bin/cmp/link.c | 4 +++- usr.bin/cmp/regular.c | 1 + usr.bin/cmp/special.c | 1 + usr.bin/cmp/tests/cmp_test2.sh | 16 ++++++++-------- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c index c22e4d4121ac..01750aa66da7 100644 --- a/usr.bin/cmp/cmp.c +++ b/usr.bin/cmp/cmp.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -66,7 +67,6 @@ volatile sig_atomic_t info; static void siginfo(int signo) { - info = signo; } #endif @@ -244,7 +244,7 @@ main(int argc, char *argv[]) else { if (zflag && sb1.st_size != sb2.st_size) { if (!sflag) - (void) printf("%s %s differ: size\n", + (void)printf("%s %s differ: size\n", file1, file2); exit(DIFF_EXIT); } diff --git a/usr.bin/cmp/link.c b/usr.bin/cmp/link.c index 33b0fa46458c..a08f4dcf9973 100644 --- a/usr.bin/cmp/link.c +++ b/usr.bin/cmp/link.c @@ -27,6 +27,7 @@ */ #include + #include #include #include @@ -42,7 +43,8 @@ c_link(const char *file1, off_t skip1, const char *file2, off_t skip2, { char buf1[PATH_MAX], *p1; char buf2[PATH_MAX], *p2; - int dfound, len1, len2; + ssize_t len1, len2; + int dfound; off_t byte; u_char ch; diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c index 0b78b83968c7..9e1db2bd8772 100644 --- a/usr.bin/cmp/regular.c +++ b/usr.bin/cmp/regular.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c index f29d3b454f64..47082eb276ab 100644 --- a/usr.bin/cmp/special.c +++ b/usr.bin/cmp/special.c @@ -33,6 +33,7 @@ #include #include +#include #include #include diff --git a/usr.bin/cmp/tests/cmp_test2.sh b/usr.bin/cmp/tests/cmp_test2.sh index ca4f6d7cf848..80d2e663875f 100755 --- a/usr.bin/cmp/tests/cmp_test2.sh +++ b/usr.bin/cmp/tests/cmp_test2.sh @@ -31,12 +31,12 @@ special_head() { special_body() { echo 0123456789abcdef > a echo 0123456789abcdeg > b - atf_check -s exit:0 -o empty -e empty -x "cat a | cmp a -" - atf_check -s exit:0 -o empty -e empty -x "cat a | cmp - a" - atf_check -s exit:1 -o not-empty -e empty -x "cat b | cmp a -" - atf_check -s exit:1 -o not-empty -e empty -x "cat b | cmp - a" + atf_check -s exit:0 -o empty -e empty cmp a - To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 3c37828ee187 - main - cmp: Check the status of stdout. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3c37828ee1874754e1c5e96268016113c1e02ba2 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3c37828ee1874754e1c5e96268016113c1e02ba2 commit 3c37828ee1874754e1c5e96268016113c1e02ba2 Author: Dag-Erling Smørgrav AuthorDate: 2024-10-09 12:08:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-09 12:11:43 +0000 cmp: Check the status of stdout. POSIX requires us to print an error message and exit non-zero if writing to stdout fails. This can only happen if sflag is unset. MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D47020 --- usr.bin/cmp/cmp.c | 25 +++++++++++++++---------- usr.bin/cmp/extern.h | 6 +++--- usr.bin/cmp/link.c | 14 ++++++++------ usr.bin/cmp/misc.c | 10 +++------- usr.bin/cmp/regular.c | 35 +++++++++++++++++++---------------- usr.bin/cmp/special.c | 18 +++++++++++------- usr.bin/cmp/tests/cmp_test2.sh | 30 ++++++++++++++++++++++++++++++ 7 files changed, 89 insertions(+), 49 deletions(-) diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c index 01750aa66da7..746616c0c20b 100644 --- a/usr.bin/cmp/cmp.c +++ b/usr.bin/cmp/cmp.c @@ -100,8 +100,9 @@ main(int argc, char *argv[]) int ch, fd1, fd2, oflag; bool special; const char *file1, *file2; + int ret; - limit = skip1 = skip2 = 0; + limit = skip1 = skip2 = ret = 0; oflag = O_RDONLY; while ((ch = getopt_long(argc, argv, "+bhi:ln:sxz", long_opts, NULL)) != -1) switch (ch) { @@ -199,8 +200,8 @@ main(int argc, char *argv[]) if (fd1 == -1) { if (fd2 == -1) { - c_link(file1, skip1, file2, skip2, limit); - exit(0); + ret = c_link(file1, skip1, file2, skip2, limit); + goto end; } else if (!sflag) errx(ERR_EXIT, "%s: Not a symbolic link", file2); else @@ -239,19 +240,23 @@ main(int argc, char *argv[]) #ifdef SIGINFO (void)signal(SIGINFO, siginfo); #endif - if (special) - c_special(fd1, file1, skip1, fd2, file2, skip2, limit); - else { + if (special) { + ret = c_special(fd1, file1, skip1, fd2, file2, skip2, limit); + } else { if (zflag && sb1.st_size != sb2.st_size) { if (!sflag) (void)printf("%s %s differ: size\n", file1, file2); - exit(DIFF_EXIT); + ret = DIFF_EXIT; + } else { + ret = c_regular(fd1, file1, skip1, sb1.st_size, + fd2, file2, skip2, sb2.st_size, limit); } - c_regular(fd1, file1, skip1, sb1.st_size, - fd2, file2, skip2, sb2.st_size, limit); } - exit(0); +end: + if (!sflag && fflush(stdout) != 0) + err(ERR_EXIT, "stdout"); + exit(ret); } static void diff --git a/usr.bin/cmp/extern.h b/usr.bin/cmp/extern.h index a7cb1fe5330b..4671b34653fa 100644 --- a/usr.bin/cmp/extern.h +++ b/usr.bin/cmp/extern.h @@ -34,10 +34,10 @@ #define DIFF_EXIT 1 #define ERR_EXIT 2 /* error exit code */ -void c_link(const char *, off_t, const char *, off_t, off_t); -void c_regular(int, const char *, off_t, off_t, int, const char *, off_t, +int c_link(const char *, off_t, const char *, off_t, off_t); +int c_regular(int, const char *, off_t, off_t, int, const char *, off_t, off_t, off_t); -void c_special(int, const char *, off_t, int, const char *, off_t, off_t); +int c_special(int, const char *, off_t, int, const char *, off_t, off_t); void diffmsg(const char *, const char *, off_t, off_t, int, int); void eofmsg(const char *); diff --git a/usr.bin/cmp/link.c b/usr.bin/cmp/link.c index a08f4dcf9973..dfa2f957d829 100644 --- a/usr.bin/cmp/link.c +++ b/usr.bin/cmp/link.c @@ -37,7 +37,7 @@ #include "extern.h" -void +int c_link(const char *file1, off_t skip1, const char *file2, off_t skip2, off_t limit) { @@ -87,15 +87,17 @@ c_link(const char *file1, off_t skip1, const char *file2, off_t skip2, else (void)printf("%6lld %3o %3o\n", (long long)byte, ch, *p2); - } else + } else { diffmsg(file1, file2, byte, 1, ch, *p2); - /* NOTREACHED */ + return (DIFF_EXIT); + } } byte++; } - if (*p1 || *p2) + if (*p1 || *p2) { eofmsg (*p1 ? file2 : file1); - if (dfound) - exit(DIFF_EXIT); + return (DIFF_EXIT); + } + return (dfound ? DIFF_EXIT : 0); } diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c index 78b431b6f6a9..4abefff31cf9 100644 --- a/usr.bin/cmp/misc.c +++ b/usr.bin/cmp/misc.c @@ -43,17 +43,15 @@ eofmsg(const char *file) { if (!sflag) warnx("EOF on %s", file); - exit(DIFF_EXIT); } void diffmsg(const char *file1, const char *file2, off_t byte, off_t line, int b1, int b2) { - if (sflag) - goto out; - - if (bflag) { + if (sflag) { + /* nothing */ + } else if (bflag) { (void)printf("%s %s differ: char %lld, line %lld is %3o %c %3o %c\n", file1, file2, (long long)byte, (long long)line, b1, b1, b2, b2); @@ -61,6 +59,4 @@ diffmsg(const char *file1, const char *file2, off_t byte, off_t line, (void)printf("%s %s differ: char %lld, line %lld\n", file1, file2, (long long)byte, (long long)line); } -out: - exit(DIFF_EXIT); } diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c index 9e1db2bd8772..c4407f708e8a 100644 --- a/usr.bin/cmp/regular.c +++ b/usr.bin/cmp/regular.c @@ -50,7 +50,7 @@ static void segv_handler(int); #define ROUNDPAGE(i) ((i) & ~pagemask) -void +int c_regular(int fd1, const char *file1, off_t skip1, off_t len1, int fd2, const char *file2, off_t skip2, off_t len2, off_t limit) { @@ -62,15 +62,19 @@ c_regular(int fd1, const char *file1, off_t skip1, off_t len1, size_t pagesize; int dfound; - if (skip1 > len1) + if (skip1 > len1) { eofmsg(file1); + return (DIFF_EXIT); + } len1 -= skip1; - if (skip2 > len2) + if (skip2 > len2) { eofmsg(file2); + return (DIFF_EXIT); + } len2 -= skip2; if (sflag && len1 != len2) - exit(DIFF_EXIT); + return (DIFF_EXIT); pagesize = getpagesize(); pagemask = (off_t)pagesize - 1; @@ -82,14 +86,12 @@ c_regular(int fd1, const char *file1, off_t skip1, off_t len1, length = MIN(length, limit); if ((m1 = remmap(NULL, fd1, off1)) == NULL) { - c_special(fd1, file1, skip1, fd2, file2, skip2, limit); - return; + return (c_special(fd1, file1, skip1, fd2, file2, skip2, limit)); } if ((m2 = remmap(NULL, fd2, off2)) == NULL) { munmap(m1, MMAP_CHUNK); - c_special(fd1, file1, skip1, fd2, file2, skip2, limit); - return; + return (c_special(fd1, file1, skip1, fd2, file2, skip2, limit)); } if (caph_rights_limit(fd1, cap_rights_init(&rights, CAP_MMAP_R)) < 0) @@ -120,21 +122,21 @@ c_regular(int fd1, const char *file1, off_t skip1, off_t len1, } #endif if ((ch = *p1) != *p2) { + dfound = 1; if (xflag) { - dfound = 1; (void)printf("%08llx %02x %02x\n", (long long)byte - 1, ch, *p2); } else if (lflag) { - dfound = 1; if (bflag) (void)printf("%6lld %3o %c %3o %c\n", (long long)byte, ch, ch, *p2, *p2); else (void)printf("%6lld %3o %3o\n", (long long)byte, ch, *p2); - } else + } else { diffmsg(file1, file2, byte, line, ch, *p2); - /* NOTREACHED */ + return (DIFF_EXIT); + } } if (ch == '\n') ++line; @@ -161,10 +163,11 @@ c_regular(int fd1, const char *file1, off_t skip1, off_t len1, if (sigaction(SIGSEGV, &oact, NULL)) err(ERR_EXIT, "sigaction()"); - if (len1 != len2) - eofmsg (len1 > len2 ? file2 : file1); - if (dfound) - exit(DIFF_EXIT); + if (len1 != len2) { + eofmsg(len1 > len2 ? file2 : file1); + return (DIFF_EXIT); + } + return (dfound ? DIFF_EXIT : 0); } static u_char * diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c index 47082eb276ab..e25e82b17047 100644 --- a/usr.bin/cmp/special.c +++ b/usr.bin/cmp/special.c @@ -39,7 +39,7 @@ #include "extern.h" -void +int c_special(int fd1, const char *file1, off_t skip1, int fd2, const char *file2, off_t skip2, off_t limit) { @@ -98,7 +98,7 @@ c_special(int fd1, const char *file1, off_t skip1, (long long)byte, ch1, ch2); } else { diffmsg(file1, file2, byte, line, ch1, ch2); - /* NOTREACHED */ + return (DIFF_EXIT); } } if (ch1 == '\n') @@ -110,13 +110,17 @@ eof: if (ferror(fp1)) if (ferror(fp2)) err(ERR_EXIT, "%s", file2); if (feof(fp1)) { - if (!feof(fp2)) + if (!feof(fp2)) { eofmsg(file1); - } else - if (feof(fp2)) + return (DIFF_EXIT); + } + } else { + if (feof(fp2)) { eofmsg(file2); + return (DIFF_EXIT); + } + } fclose(fp2); fclose(fp1); - if (dfound) - exit(DIFF_EXIT); + return (dfound ? DIFF_EXIT : 0); } diff --git a/usr.bin/cmp/tests/cmp_test2.sh b/usr.bin/cmp/tests/cmp_test2.sh index 80d2e663875f..2ec6071851d3 100755 --- a/usr.bin/cmp/tests/cmp_test2.sh +++ b/usr.bin/cmp/tests/cmp_test2.sh @@ -133,6 +133,35 @@ bflag_body() cmp -bl a b } +# Helper for stdout test case +atf_check_stdout() +{ + ( + trap "" PIPE + cmp "$@" 2>stderr + echo $? >result + ) | true + atf_check -o inline:"2\n" cat result + atf_check -o match:"stdout" cat stderr +} + +atf_test_case stdout +stdout_head() +{ + atf_set descr "Failure to write to stdout" +} +stdout_body() +{ + echo a >a + echo b >b + atf_check_stdout a b + atf_check_stdout - b To: Dag-Erling =?utf-8?B?U23DuHJncmF2?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c2d93a803ace - main - env: Check the status of stdout. Message-ID: References: <202410081702.498H2KIP072012@gitrepo.freebsd.org> <86iku2v3o2.fsf@ltc.des.dev> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <86iku2v3o2.fsf@ltc.des.dev> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4XNsNm2wZ5z4Wf4 X-Spamd-Bar: ---- On Tue, Oct 08, 2024 at 08:40:45PM +0200, Dag-Erling Smørgrav wrote: > Konstantin Belousov writes: > > Dag-Erling Smørgrav writes: > > > + if (fflush(stdout) != 0) > > > + err(1, "stdout"); > > Why is this check needed? > > POSIX requires it. Could you please point me to the requirement? > > > Or, put it differently, why is it needed for env(1) but not any other > > program that writes to stdout? > > You mean like these? > > % git -P grep -l 'err\(1, "stdout"\)' > bin/cat/cat.c > bin/date/date.c > sbin/md5/md5.c > usr.bin/asa/asa.c > usr.bin/comm/comm.c > usr.bin/ctags/ctags.c > usr.bin/du/du.c > usr.bin/env/env.c > usr.bin/head/head.c > usr.bin/join/join.c > usr.bin/lastcomm/lastcomm.c > usr.bin/locate/code/locate.code.c > usr.bin/ncal/ncal.c > usr.bin/sed/main.c > usr.bin/tail/misc.c > usr.bin/tsort/tsort.c > usr.bin/w/w.c > usr.bin/yes/yes.c This is a mixed bag. Some programs do this 'err(1, "stdout")' call due to libxo error, which is not exactly due to stdout error state. Other do check individual fwrite/fputc operations. > > or these? > > https://reviews.freebsd.org/D41390 > https://reviews.freebsd.org/D41408 > https://reviews.freebsd.org/D41413 > https://reviews.freebsd.org/D41414 > https://reviews.freebsd.org/D41417 > https://reviews.freebsd.org/D41418 > https://reviews.freebsd.org/D41422 > https://reviews.freebsd.org/D41423 > https://reviews.freebsd.org/D41424 > https://reviews.freebsd.org/D41427 > https://reviews.freebsd.org/D41428 > https://reviews.freebsd.org/D41432 Again, it is mixed stuff, sometimes it is libxo etc. From nobody Wed Oct 9 12:40:18 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNstD65hlz5YVM9; Wed, 09 Oct 2024 12:40:20 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNstD4S9qz4YL8; Wed, 9 Oct 2024 12:40:20 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728477620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2OWSUyMg7DuebnTIJDSb9qfPq6OHAHXx3pjEG4zK2pE=; b=wUSCKqSrUtCiCq9V2QxSKki2JiowMNDKZ8TLBuCq7Wf/jXJUJdDdd2PyMg20VPRRCWKEWw x1K+eLiiJNVdt/oPZwLau5a4DvZn9Wis+gJfG3Ob0Tlp/G9NEfbi9CyvJ8bVNGKwP6nr/k SELjnLYYlzj/1moHui1OLMQreApeYE/ShfhzfE7Z9GO/LBPlc/VPtstAKzRegg2NzU/H0E Rd50gKiFRPgbwZzYomA7noVWggLBrK4Zo5fbXySHJ77EIPEPhTrX7vzyuZRYsEJLImYV9O pPJsjU0Cn9c68mELz0E277nl0fRYBOp7hybqBNFpi+kC8bBtslgN5Yux2o5Ddw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728477620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2OWSUyMg7DuebnTIJDSb9qfPq6OHAHXx3pjEG4zK2pE=; b=AGwIKLljcMKZk6qPYgXSEl4RZihbMUgNWR+qrJ63+jk64cxyu469lIFzdyXAXClSvPLA/q DLN0IwDbyji0zKiRmO3ZqgMqhyOzlgKt/pT9vyYyRFefv4qKJicoJY8qMnmdWaCBaZeLzw 3kC2VOhoMPc/Wtwa3vWmZfpys6jYUos60B5GKxPgrVNO9SsssVXep1tWH6653D5CL85uDt F3fH7210IXo+npwGsf9G6HFES0GfIzHo97Ke90rn2s4miGVt5R+l7VCuk7r/ZNlhtMXv34 XdjKzg0YtfptS1vG0gvYM1DfhzHAery4oNK+QStl0e+1kMbv2Bc82XuTPVlDeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728477620; a=rsa-sha256; cv=none; b=uELiKBb3MEKM4E4DKU1384jsFnxAVTRErxS8PBIFG2dwP7Gx5PhR9x7AsWvl+eKVRXrtXp c0VRMQPugqi0kCvEEFNyQDRrS8Ypql3qnjUyv1gV18CiIemlMGUoYjM5DMQSadA/Klyv1E uyr/L+fs8XgKC9onxXqAj3q999WyeAGI6tXoDXgg2iwi1U3ctwaiXiQmn2YssdFukHchED J/9Y1xv3VoNjCDO3YgCkFPKSLnNd15WjitjQl/zHdJpQv5AfmIUmq5/cs/O9K0a2mmWWep MNMXChS6AzKNLKvonDkF3dRD7Zi8YLBAi7TWHOSwHR4KyOg7fT3d3Gm4iu1eUQ== Received: from ltc.des.dev (unknown [IPv6:2a01:e0a:386:9c20:922e:16ff:fef1:acef]) (using TLSv1.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) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XNstD3G46z17Ff; Wed, 9 Oct 2024 12:40:20 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id A7F00BF8AF; Wed, 09 Oct 2024 14:40:18 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c2d93a803ace - main - env: Check the status of stdout. In-Reply-To: (Konstantin Belousov's message of "Wed, 9 Oct 2024 15:18:02 +0300") References: <202410081702.498H2KIP072012@gitrepo.freebsd.org> <86iku2v3o2.fsf@ltc.des.dev> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Wed, 09 Oct 2024 14:40:18 +0200 Message-ID: <86cyk9v499.fsf@ltc.des.dev> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Konstantin Belousov writes: > Dag-Erling Sm=C3=B8rgrav writes: > > Konstantin Belousov writes: > > > Why is this check needed? > > POSIX requires it. > Could you please point me to the requirement? General Assertion 39 in the Unix Conformance test suite. Not sure exactly which part of the standard it maps to. > Some programs do this 'err(1, "stdout")' call due to libxo error, > which is not exactly due to stdout error state. Yes, this is how we detect a write error on stdout when using libxo. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Wed Oct 9 13:32:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNv301PT6z5YYMB; Wed, 09 Oct 2024 13:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNv300rWbz4d5K; Wed, 9 Oct 2024 13:33:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728480780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zA2tCe2AVFMc7XClC/RkiUmYA5oQJUKsAgC5Q7JF9Zw=; b=kuPxJ4+jq5pxUnCbV9k3wc5TUloFumGoRFvjlN4NXRoBK1c4Fr155UYnRwVHHc+5B/skBF TBNsGYPQEUtQZhisZl4N8czVpKOWZBF3nKD+IDjuy9vQ6KeKQJqSg+U9DmF59XevX9r8Hm nWA92zb/IIPxY4bCSOA4RZLptJeZ3nQYfBdDR/nBwW5EV2Okv7yyhS8ee5o5P46yYy8SYR TPNw3scDHrV9Q9Uy2NCuwCt89DBl9il75zkksyWwJdtWeCh86Nkr7t+zLQTyXq6ALEA3yt ghnzTQYcnIiLWAfjGvnc+rAJVZm654zVlSgGZpJ6CtHmwAh79p5e0tEein6SYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728480780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zA2tCe2AVFMc7XClC/RkiUmYA5oQJUKsAgC5Q7JF9Zw=; b=Kejxh8G76npFTxpaESa9kprsyy7CVGSmJZkk8FIp874YFPO1BigOdqa3YZGe7fXiLqQdni /JSkDc9Wk3/lkfjFaUu2JAwp0OjgNKaCAy2V9xSzKNxPog+OH79cslTOaqajBepZaNQXyY JAktD44x6M1YSoHIPNjQtWr4YvpPqv4f83/hL/rePinkzQuQ0VvW14uDR9xa3TIqK74bNt Km3keGZhRbnkwuXvrarmw34Okx6dCKp9TquAnX+No4+iY+k1pjm90VhvfL7qe0T/QCTSoW 04+EmNriQHTTvo17YgDJ8y5rR6kbVqQXsj3l6A6lzuKNAdNGYjfglm9cmgqsIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728480780; a=rsa-sha256; cv=none; b=cT5q9lhHhVrcC+IaUKgWrLwgaGlnoTCHec+yfeGZhY+YmEQb5LIOcqwCzOtT07hQRD3r3I q1hCQ/Y+/OImtFIyiiwlS5Nkgxf39BjX2wM8KusxHY/RZf7L/Pb3Vo2Las4R1OTK+cqS5R 8ftiViO17+TMRgkFmrRY7QNtezSVzZRsOKSNs5cojHiC+2Pa+z0mm6SHjOJy6BUGIZRCJE qUilPubo0vJeLFXsm3pA7uUfr0Onqc3za3L/9DNvNVFOjv4barDKp9sW4ElLIevK9Msd/P f11eo+7/V3ZNl3l8jJSYTjf+wzdiC37/3zYpT+hm2z9DNvflAKSTPNVxLzV8Bw== 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 4XNv300SDmzGMs; Wed, 9 Oct 2024 13:33:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 499DWx9p059676; Wed, 9 Oct 2024 13:32:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 499DWxob059673; Wed, 9 Oct 2024 13:32:59 GMT (envelope-from git) Date: Wed, 9 Oct 2024 13:32:59 GMT Message-Id: <202410091332.499DWxob059673@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: 53bb5613a8a1 - main - ldd32: place in utilities-lib32 not utilities List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53bb5613a8a15363718b6e6de8d965bf9a2c5469 Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=53bb5613a8a15363718b6e6de8d965bf9a2c5469 commit 53bb5613a8a15363718b6e6de8d965bf9a2c5469 Author: Isaac Freund AuthorDate: 2024-10-09 13:24:06 +0000 Commit: Joseph Mingrone CommitDate: 2024-10-09 13:31:52 +0000 ldd32: place in utilities-lib32 not utilities The ldd32 binary is currently in the utilities package but belongs in utilities-lib32. This patch corrects the situation. PR: 249145 Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47023 --- usr.bin/ldd32/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/ldd32/Makefile b/usr.bin/ldd32/Makefile index 5b028560ba6b..993fa8f3ff5c 100644 --- a/usr.bin/ldd32/Makefile +++ b/usr.bin/ldd32/Makefile @@ -4,6 +4,7 @@ NEED_COMPAT= 32 PROG= ldd32 MAN= MLINKS= ldd.1 ldd32.1 +TAGS+= lib32 .PATH: ${SRCTOP}/usr.bin/ldd .include "${SRCTOP}/usr.bin/ldd/Makefile" From nobody Wed Oct 9 13:35:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNv5p2jydz5YYTx; Wed, 09 Oct 2024 13:35:26 +0000 (UTC) (envelope-from olce@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNv5p1tMXz4dDP; Wed, 9 Oct 2024 13:35:26 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728480926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=/XMw4Uzz5Hh6UTrS14I4szdWfRO8ObiP/38k6UJOKvE=; b=IuL2nOhOvkWIEFuUuX8qjhyZE/K2jJ+8EB+ZJbzYFyMwcM5YaSD5isRVbckb2yguPCcSxf yfHCV/c1JBf2F7SIaczI9jIgosa0iV6MoMHgoqC14uoo+I+QVjqUHFuyEGpniezJguxmhO n0L1gPUTgkkHedRYYdIfkoQJv/gAq/8pJtToARQLXxheQ3fwVez3YyyuHnOwEh1/TV2Xhw D0UcIGYNXknS28V3ROf0kz6BIClaeDuopaBnf1bGNJyktkUdPzdKUcHyVm+3O352EWO97o jAMbjmrn3gqFajl7jT8D/VVMVfhlznVEqW4BvC9KlaBzaPjjq2B7o19iRPJ0fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728480926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=/XMw4Uzz5Hh6UTrS14I4szdWfRO8ObiP/38k6UJOKvE=; b=OdPfk4hvea95WGE8JlHFVCSO7yHGylECGubajK7kC8mhFnaFiGlXONdKQGl8bt6718IDpg DSYvH9gXX3/h1/INkIOLjDFt/w/f8Eji21kO/8HiX1yhtgWYPwOamuJ159V9CshdLXMdQR vaelVHScxisUB1vcaq57eJBS+ibVItiuQ9HuTOt/GDURl9GEAwXaTGSWW6fDhltEq4IDUQ opyrK8TPMOOJ6hjt46Pm+LJudAgBja/tR7Vs1Hiy8dO9ATROpD/UgguzHnIi/N7i/3tJ1p RxyOJz5XhXEL1TJ8shdKrvSbMp5OKlukH0BDPZApCQN7xJoVgTYEetHLaeRRgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728480926; a=rsa-sha256; cv=none; b=HOeyiI3NANMDqG0XRYGPhG2aPgpB1OS6oMEMRh0UTtTzO+Q5nP6PAMPW6vKQZSQdYlJE8R SNQNij7LMJ2H0Pg3sR2p/Yvz3hmxubR0AJTPEdBLagvyYC5VLBD2LMcLVBe258j/c3VM3H TZm8yEgu4/adUfZkOmAGa9oAVDF2gzbIimgeIpy7hFBcJ+TtSK1njyGXs/6I69al1k+w34 5P9cbXsGkJj7qdkIGxK7L/Rb+YZZ1amcxZQaeuE+jvnKfARQJstAU9c0hcrlJQi1mMEBec 7RB0poLIcsaqU2IL3BMxs53O1IhPmO2XrPQUmKoYBCJPMlM5Ld5QTLCGIgmS2Q== Received: from ravel.localnet (aclermont-ferrand-653-1-222-123.w90-14.abo.wanadoo.fr [90.14.66.123]) (using TLSv1.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) (Authenticated sender: olce/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XNv5n4H4jz18Nw; Wed, 9 Oct 2024 13:35:25 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: Konstantin Belousov , Dag-Erling =?ISO-8859-1?Q?Sm=F8rgrav?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c2d93a803ace - main - env: Check the status of stdout. Date: Wed, 09 Oct 2024 15:35:17 +0200 Message-ID: <2444785.THHZn3L5Ee@ravel> In-Reply-To: <86cyk9v499.fsf@ltc.des.dev> References: <202410081702.498H2KIP072012@gitrepo.freebsd.org> <86cyk9v499.fsf@ltc.des.dev> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart4047274.kAAoriTUSa"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart4047274.kAAoriTUSa Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="UTF-8"; protected-headers="v1" From: Olivier Certner Date: Wed, 09 Oct 2024 15:35:17 +0200 Message-ID: <2444785.THHZn3L5Ee@ravel> In-Reply-To: <86cyk9v499.fsf@ltc.des.dev> MIME-Version: 1.0 Hi, > > Could you please point me to the requirement? > > General Assertion 39 in the Unix Conformance test suite. Not sure > exactly which part of the standard it maps to. While this requirement seems to make sense, I do not remember having ever read something like that in POSIX/SuS. Searching these documents quickly yesterday, I failed to find anything related to it. So I'm interested if any of you has pointers to offer, besides the UNIX conformance test suite. Thanks and regards. -- Olivier Certner --nextPart4047274.kAAoriTUSa Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmcGhpUACgkQjKEwQJce JieXCRAAtJ2qZjJNIKjFX8whEQSJ+WYvSt78b+bbL95tTyuEzdtDAIVbsJrGxhqs sNFIkU+5yJVrlArvpy6d4rmQAw6EPZlHvsJ0ry0XGmZFIVLJD/BwaO9Ob9SaHcNF TuLaW0NUEYNF5Wahv8H6cVdrwX8SqAs09qOKnMiTKaPBlM97UhipWbEUsE4npAVH xdipA2ig0v48Qey4nKA0AhDy6pc+NMrp1sPh5qWM9/dAInoVRrZy2auGVQuR2Qlv ni4aPpxFw5UCh53qyrZFTc39cwBnzcNJsw1ddEP7yY842BwYN71OH+Lap4HdtyGg ZFbCdAk1iK7T+l+sjkVXZfRHOkgZWRjDmAqNdKQMiYcVJ+2hnI69pCUmfyFWttPN UdAK0ulJ3nqPwOJC1cPCXpEr0+UlV5lOae8n/CxGC3VZQhV9CLEw45jZddX+V+Rq uCdPFUfXVI7QHpAdh1Tx1aNfc8uvq00kRUkjfiv6RfXFK96WMmOpE0o+BPr1aeGR EBc+6SeoH5SbGMKkj3mtor4ohj+i6oBC4odZPOTDDU7bmT1c3v04fLQ1ezuATEov lKm+y3itJSlxxF5rePxTJ7mwHaTa8x26wUVl4WBtssjEBYOQ3JMzaRQmc7TKy/rW 8aaQntH3unFA8fid8UEG6GXIjvQ9IIUHv7OJHWZtxjpew/sVa8Q= =6rUj -----END PGP SIGNATURE----- --nextPart4047274.kAAoriTUSa-- From nobody Wed Oct 9 13:36:14 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNv6m5vKbz5YY6y; Wed, 09 Oct 2024 13:36:16 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNv6m5Qdjz4dT1; Wed, 9 Oct 2024 13:36:16 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728480976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c/k6hoiHzVnvSh/AHOTM4Z0r/tzD2gytGqDkyP9/nR4=; b=ovqvzho4q2bAgyKLIlNb5c6Y0U0t6Zzgu86Ok6dX0IwSzi3Hmcy5d4JTKCy8VhxEXqa/Wx gZU/fewl7obtwNEK6S8VuEbAvqo1J/i+PRgO2ihnLHMUztTwuVj/fN74mD8SZCtYqLdDzX T+Z8/SS7MPlVBZqOIGqeyXS8pZeCIhAv8G0aFDUeoP9qcIc8cKoec7C+Ey4r26CTdGdg7D BYF9v+5V5P5J/pM0Ks5wpqcC2I4cjZdQ3QmZLJQPRvTEH3uqCd396VuJf4LNMX6f5vK7K1 nFlRmXputPWwcRykNLMaCvnNQam44UqWtjfrt/rZn2O/ZDpkCmORSyoFEz0o9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728480976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c/k6hoiHzVnvSh/AHOTM4Z0r/tzD2gytGqDkyP9/nR4=; b=Kb4N7J91tQ62QjlS3ORJNLflHup05P0APiC34lHltQhfKtnAAg+HUIIwIOiMLgWmMdxEsK EnE9t9f1yGU4gtZTB9sgYhdhxRybFqhfkW6ypp+L1eDxLMlJEO7dXV3b9D/OzRTAMgPpjQ /+6lBByQibv2Ev8jHXoTFDY6Thy6WIMCR8CDpzIgFSJPi+R8rdAT/SXnM9pUxDuArtFuIt Ly8rpAZl8Bk6hjbwCypbGUexqYrbSxUIVJIEqJIHvSFnx5835nfGCT7VuBcxwFqkEazMd1 1qyQQKfbdhroyMQzE4HCvTPzSZ/WHewdkubfdUmVTwDATaFkvLDc6jJmwN7i7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728480976; a=rsa-sha256; cv=none; b=Di8zkqgekOmb1k3J+YJ7pJMD1LyMbSy3QozTxpYWUdJLD+zfYwnzZYfkHEJ2kciIxDLeul WfWi1pKRTbMOfGjx/Z+Og07wa2FtX7LV2Bu5s5Anbg6aKkQ45hDf1yZs6f27zWflglKRts tHFH7GFFWAu4jvi7s8Wlt6iArmnjl21aXDqelTp1xUmDTBiPdX1xNAGtsnGIP0TzCoYCG8 IVUFHRCM0fMvghoKYf8HHdUTXQSSANXIo5FC7vOzXLMA8pOAWSukgk/iby3/m5x8SXfAWA mO8MBR04hxJ05n4GRuATuvfIcW0oSgYE/UtOhtyMf0nuqFxGCuV07Ok2RJFBmQ== Received: from [10.9.4.95] (unknown [209.182.120.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XNv6m1b49z18HR; Wed, 9 Oct 2024 13:36:16 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <91c60145-9f13-48a6-b7cd-4a1a9703e67c@FreeBSD.org> Date: Wed, 9 Oct 2024 08:36:14 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: c2d93a803ace - main - env: Check the status of stdout. To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, =?UTF-8?Q?Dag-Erling_Sm=C3=B8rgrav?= References: <202410081702.498H2KIP072012@gitrepo.freebsd.org> <86iku2v3o2.fsf@ltc.des.dev> Content-Language: en-US From: Kyle Evans In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 10/9/24 07:18, Konstantin Belousov wrote: > On Tue, Oct 08, 2024 at 08:40:45PM +0200, Dag-Erling Smørgrav wrote: >> Konstantin Belousov writes: >>> Dag-Erling Smørgrav writes: >>>> + if (fflush(stdout) != 0) >>>> + err(1, "stdout"); >>> Why is this check needed? >> >> POSIX requires it. > Could you please point me to the requirement? > Seconding the assertion that it's somewhere in there, but it's also just a reasonable thing to do. The implicit flush at exit of streams in libc has to ignore errors because it lacks the necessary context to be able to surface anything, so applications must do it on an individual basis to appropriately surface, e.g., output truncation issues that are otherwise hidden (and maybe not obvious) from the caller. The impression I had from talking to folks about this in the past is that it's practically expected that applications will flush-and-error at the end rather than check individual writes so that they can surface logic/execution errors at a higher priority than stdout errors, but stdout errors should still prevent a clean exit. Thanks, Kyle Evans From nobody Wed Oct 9 13:48:45 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNvPZ2rsmz5YYd6; Wed, 09 Oct 2024 13:49:06 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.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 mx1.freebsd.org (Postfix) with ESMTPS id 4XNvPY6dnDz4fV4; Wed, 9 Oct 2024 13:49:05 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 499DmkWm008509; Wed, 9 Oct 2024 16:48:49 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 499DmkWm008509 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 499DmjJP008508; Wed, 9 Oct 2024 16:48:45 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 9 Oct 2024 16:48:45 +0300 From: Konstantin Belousov To: Olivier Certner Cc: Dag-Erling =?utf-8?B?U23DuHJncmF2?= , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c2d93a803ace - main - env: Check the status of stdout. Message-ID: References: <202410081702.498H2KIP072012@gitrepo.freebsd.org> <86cyk9v499.fsf@ltc.des.dev> <2444785.THHZn3L5Ee@ravel> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <2444785.THHZn3L5Ee@ravel> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4XNvPY6dnDz4fV4 X-Spamd-Bar: ---- On Wed, Oct 09, 2024 at 03:35:17PM +0200, Olivier Certner wrote: > Hi, > > > > Could you please point me to the requirement? > > > > General Assertion 39 in the Unix Conformance test suite. Not sure > > exactly which part of the standard it maps to. > > While this requirement seems to make sense, I do not remember having ever read something like that in POSIX/SuS. Searching these documents quickly yesterday, I failed to find anything related to it. > > So I'm interested if any of you has pointers to offer, besides the UNIX conformance test suite. > The closest text I found so far is from IEEE Std 1003.1™-2024 XCU 1.4 Utility Description Defaults CONSEQUENCES OF ERRORS 79953 • When an unrecoverable error condition is encountered, the utility shall exit with 79954 an exit status that indicates an error occurred. 79955 • A diagnostic message shall be written to standard error whenever an error 79956 condition occurs. (the numbers are the total line numbers from the pdf instance of the standard). From nobody Wed Oct 9 13:50:38 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNvRM3YGWz5YZ5T; Wed, 09 Oct 2024 13:50: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNvRM1C5Fz4g0c; Wed, 9 Oct 2024 13:50:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728481839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=140svFh8CV3PQSU6WS/KRakOukn9g6dZqhE7I+iFQc0=; b=mJqc8pekIATJu9XPCI3bzsZ5+AaSSEweGBRKcO8doqkV5NZ0h9geRDqQxm+GoH58K+/fmv jsYj+p0hJL6iwKLGbH+JCi5tCigLD/kaLTqBSNwOgulwEBDLQGsoqKbnBa9ZhHgv0X9nNj FGIvf04sh6rHybb/oC3dapWoUxPkGn7nwKnIpr17/U9/koCq6rKUiCLSigXfe+arWlcfk9 O6indr6o8pc4ixrct3AyJFHRQJ2BbTRLMYxCZGtnLAlledLxL59cXO6w1TvtlktBtGstKo nOhqB8ENceHtQGT+MseOqUk3dy0alXZGvigSAp4869lAA82oGit8/j0MWVDttg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728481839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=140svFh8CV3PQSU6WS/KRakOukn9g6dZqhE7I+iFQc0=; b=iRJT1HANMej+EsqXE7J0C02yzuejQNXHnSxbIGAMVuHHj5qFsUp1GYiOSlJXnqcTjDe3+e PGLdCRBM4OlIaJYKxWAztB8yqfWEpi7uDeI2NFY6pBQvuBFczLIty5LfETapTksf1/IxBE aDPg8miqHR5Y+Jb4zhsxDs0iaSLydyxc3EMzczs7oRWrki5uNicRiVXlah4o2vI8XlFHYn WB7JfHK8Iei3DA+SV5gsXNMU5hpEumowoM0Sr+lXcEjDOIAdED6+SkNemh1iVFNn2vcnhH kJbzf5muSOhKkuH5Lk+OXNjySfzOkCfNwCphe5cNw4ZGkkWNp0xcAr1UN0drvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728481839; a=rsa-sha256; cv=none; b=mOAfUKroE57gc4xdfQm622HHB2xFzEuxSPqjDn46HMaF3P9QLBMPCyLwzCE4e96YjmGDbK uL5pOdQK9AGAUWrhIvAB4K0Yn7DyQhYvsTrpExJcX1k9mQIHT4s2BNP76S3v18S8FbZ/4l tGOJSBVkTiojISHfLjHuM+9EAtR1FXvQ0TA2/5FCCo109+GZgynbEyEHHod3QYVOb4TcO8 ly8iUHDZzhiozHFM2KVpVYENpqHuJoSQHXFEDKW5Pm6Wo7IswerIKIW7sQFXshWyoBeiBK 4Hvy9HQifu6eio6R9aqcQAMlE/e6xUdthWGq0Ggsop6mZGtKdM547Hd75w4mpQ== 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 4XNvRM0jfbzGT4; Wed, 9 Oct 2024 13:50:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 499Docbm086041; Wed, 9 Oct 2024 13:50:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 499DocIs086038; Wed, 9 Oct 2024 13:50:38 GMT (envelope-from git) Date: Wed, 9 Oct 2024 13:50:38 GMT Message-Id: <202410091350.499DocIs086038@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: b22be3bbb2de - main - release: basic-cloudinit disable rsa key List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b22be3bbb2de75157c97d8baa01ce6cd654caddf Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=b22be3bbb2de75157c97d8baa01ce6cd654caddf commit b22be3bbb2de75157c97d8baa01ce6cd654caddf Author: Baptiste Daroussin AuthorDate: 2024-10-09 13:49:44 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-09 13:50:25 +0000 release: basic-cloudinit disable rsa key --- release/tools/basic-cloudinit.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/tools/basic-cloudinit.conf b/release/tools/basic-cloudinit.conf index a03c11603ed6..2879f706a8de 100644 --- a/release/tools/basic-cloudinit.conf +++ b/release/tools/basic-cloudinit.conf @@ -19,6 +19,8 @@ vm_extra_pre_umount() { dumpdev="AUTO" ifconfig_DEFAULT="SYNCDHCP accept_rtadv" sshd_enable="YES" +# RSA host keys are obsolete and also very slow to generate +sshd_rsa_enable="NO" EOF cat << EOF >> ${DESTDIR}/boot/loader.conf From nobody Wed Oct 9 16:03:52 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNyP44xh8z5YjK9; Wed, 09 Oct 2024 16:03: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNyP44BXgz3wdZ; Wed, 9 Oct 2024 16:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728489832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xxYSLSwlOJuVtuhPUrKYbcIL5t6xc4RODLoBU5wUICM=; b=F3DwmnUq8pxw5INQDXFcWyNoXcmvoCG9ShH0gtJ0IY++j/hthFPX9eoryaivdN3oeDE8eX 72H901ng9stO3sSiskKxAB1pOm/aME+EHl2HE2ZWkSYNBEAFA+VTO7rB0lSeaT2h+RiLDo f9n8ElgUqTQ1oPtLavbCciP3sVRrCtYxoSrvHnoJI2Zg24dl4aGK8guF4pbvLyINj6HqBL EUX6ppZKmHJaVnydlaqhgq5dupeUZhaUcH4YyTaiOJDc6AVVTorxo2/HNHmKQ0B/I6E3aY +2o9mtjp51o0FlYNt0DDUF7ESjy/AbIyl+A/M/R0hwVPx2h494wJr9qyirurJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728489832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xxYSLSwlOJuVtuhPUrKYbcIL5t6xc4RODLoBU5wUICM=; b=dSJaPDh98meGmzcn6NpxD6ieWodnF73q4VMASuhaf+7UFUtXKXXhsJl8VRmHIxSHePzKqa G7jl1K4L053EZWBG5qxq7QfTARzHhtxM66GprNkQqoec+GGPlCUBw9JXPDdCQfdbxLbAYW 6P6dTsqH1crBS7rziPDv4vd2tJOblkwHwsMYOpyhOsXMpiah+4bgJf0Z+87rfhxLKOs66U FHBsrWEEmPSuUnWpBppVKqiDQftmrYNQXI4W9SdP21UVZd6UauaJ8Aaf1+t4c1xnnFIe21 CRHapfeR7Vrw/9Lfkeg3PDZ7OLwrB5cpzIyA3iOQchOQGnSDfvOj0al7KoVUfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728489832; a=rsa-sha256; cv=none; b=O5op442SBeuuJ6F0aDiKaSK+oVLyM+7Ebt2QRUJcjM93UlGIrjcE1ek3QNlgGmayQUHJRd 6xrJfYHx+FbD7I8WiII9pLDKrqLW+cnRj+JMw3+e6xsM3H99qwmdcxhy8+XqUwr2i0AZTU f6073gpPkAwNQuFAuzwfdTkgg8Uep3NrPbSRaYF9bQPhdgF0P/h+Kypfyqfm59yl/A+WMZ sx7n76H3mReVBoCK2MiNC7MPBdRpLRBGwX0FyDvvQ1ZVORt3rHJ/zFTgGdNaozHySrbw7N /uD1ZF227dPs4+g7etC47OxPd6wHMe+Crro8BlB9tpM1FakVY6kcDHpk1j5yUA== 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 4XNyP43nhfzL3w; Wed, 9 Oct 2024 16:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 499G3qRi014021; Wed, 9 Oct 2024 16:03:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 499G3q2v014018; Wed, 9 Oct 2024 16:03:52 GMT (envelope-from git) Date: Wed, 9 Oct 2024 16:03:52 GMT Message-Id: <202410091603.499G3q2v014018@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: d5e9faf1f329 - main - mk: honor TAGS for FILES in default group List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5e9faf1f3291d0af9dcdd53ccdaf0971e5d8f63 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d5e9faf1f3291d0af9dcdd53ccdaf0971e5d8f63 commit d5e9faf1f3291d0af9dcdd53ccdaf0971e5d8f63 Author: Isaac Freund AuthorDate: 2024-10-07 16:32:46 +0000 Commit: Ed Maste CommitDate: 2024-10-09 16:03:26 +0000 mk: honor TAGS for FILES in default group Currently the lib32 crt files (/usr/lib32/Scrt1.o etc.) are placed in the clibs-dev package rather than the clibs-dev-lib32 package. The /usr/lib32/dtrace/drti.o file is similarly placed in the dtrace package rather than the dtrace-lib32 package. Splitting shared libraries in /usr/lib32 into a -lib32 package is handled in bsd.lib.mk by adding "lib32" to TAGS. However bsd.files.mk ignores TAGS and only honors ${group}TAGS since 144c442. This patch changes the behavior of bsd.files.mk to honor TAGS if the default FILES group is used. This matches the handling of PACKAGE, which is also ignored unless the default FILES group is used. With this patch, both the clibs and dtrace package are split correctly. PR: 249145 Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46991 --- share/mk/bsd.files.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk index 517ecd44f2f3..a330a8dddbbd 100644 --- a/share/mk/bsd.files.mk +++ b/share/mk/bsd.files.mk @@ -39,6 +39,7 @@ STAGE_SETS+= ${group:C,[/*],_,g} .if ${group} == "FILES" FILESPACKAGE?= ${PACKAGE:Uutilities} +FILESTAGS+= ${TAGS} .endif .if defined(NO_ROOT) From nobody Wed Oct 9 19:29:23 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XP3cC0JwQz5YwMP; Wed, 09 Oct 2024 19:58:51 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Received: from sdaoden.eu (sdaoden.eu [217.144.132.164]) (using TLSv1.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 mx1.freebsd.org (Postfix) with ESMTPS id 4XP3cB4qsxz4Sy4; Wed, 9 Oct 2024 19:58:50 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sdaoden.eu; s=citron; t=1728503921; x=1729170587; h=date:author:from:to:cc:subject: message-id:in-reply-to:references:mail-followup-to:openpgp:blahblahblah: mime-version:content-type:content-transfer-encoding:author:from:subject: date:to:cc:resent-author:resent-date:resent-from:resent-sender:resent-to: resent-cc:resent-reply-to:resent-message-id:in-reply-to:references: mime-version:content-type:content-transfer-encoding:content-disposition: content-id:content-description:message-id:mail-followup-to:openpgp: blahblahblah; bh=7tWWpKKkeRydccHjBhxMKNGzA3meQ3M4davhQlW2GLQ=; b=Q+sqhYUEU+Su50y6VNtxbdPwxYHm2KwIZkiVnF/2QA+hr6FXk5vJEWLWkyidyivk6hGbcilH C9lHwzxGds6gNE0+ADfZhJ7/JksvMPcBMZ+tjhJARiPx82+tWT5dUoGvabJdKwztf4coB1AloP +FlNee5E4lro2rQUy1wOswRW0xGsfZySNNkupzHiBe/jp/6jeOD0HBnRp7uPSXRwnLSThEa2Sy BW+on2ZSXBOSHcaFPUY/kONJ/TnX5M3OhKrjj83MAnSy0Gd986ID9THOJN5n/dWh0rEFkQUanm lKRTXVZLV85tFSAgauiEVAyJk4/y9+HQKBU1mLEbW+wJCMqw== DKIM-Signature: v=1; a=adaed25519-sha256; c=relaxed/relaxed; d=sdaoden.eu; s=orange; t=1728503921; x=1729170587; h=date:author:from:to:cc:subject: message-id:in-reply-to:references:mail-followup-to:openpgp:blahblahblah: mime-version:content-type:content-transfer-encoding:author:from:subject: date:to:cc:resent-author:resent-date:resent-from:resent-sender:resent-to: resent-cc:resent-reply-to:resent-message-id:in-reply-to:references: mime-version:content-type:content-transfer-encoding:content-disposition: content-id:content-description:message-id:mail-followup-to:openpgp: blahblahblah; bh=7tWWpKKkeRydccHjBhxMKNGzA3meQ3M4davhQlW2GLQ=; b=hKahXJQcU3yhekazOFphSbXiQosjHcbxraLXEYcOi/rkdZdz+wvtiAV7mM24/+NfyDdEdn8B TvpPjrRRJ2nIAQ== Date: Wed, 09 Oct 2024 21:29:23 +0200 Author: Steffen Nurpmeso From: Steffen Nurpmeso To: Kyle Evans Cc: Konstantin Belousov , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: Re: git: c2d93a803ace - main - env: Check the status of stdout. Message-ID: <20241009192923.hYP_AEIt@steffen%sdaoden.eu> In-Reply-To: <91c60145-9f13-48a6-b7cd-4a1a9703e67c@FreeBSD.org> References: <202410081702.498H2KIP072012@gitrepo.freebsd.org> <86iku2v3o2.fsf@ltc.des.dev> <91c60145-9f13-48a6-b7cd-4a1a9703e67c@FreeBSD.org> Mail-Followup-To: Kyle Evans , Konstantin Belousov , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= User-Agent: s-nail v14.9.25-608-ge479530e8d OpenPGP: id=EE19E1C1F2F7054F8D3954D8308964B51883A0DD; url=https://ftp.sdaoden.eu/steffen.asc; preference=signencrypt BlahBlahBlah: Any stupid boy can crush a beetle. But all the professors in the world can make no bugs. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15987, ipnet:217.144.128.0/20, country:DE] X-Rspamd-Queue-Id: 4XP3cB4qsxz4Sy4 X-Spamd-Bar: ---- Kyle Evans wrote in <91c60145-9f13-48a6-b7cd-4a1a9703e67c@FreeBSD.org>: |On 10/9/24 07:18, Konstantin Belousov wrote: |> On Tue, Oct 08, 2024 at 08:40:45PM +0200, Dag-Erling Sm=C3=B8rgrav wrot= e: |>> Konstantin Belousov writes: |>>> Dag-Erling Sm=C3=B8rgrav writes: |>>>> + if (fflush(stdout) !=3D 0) |>>>> + err(1, "stdout"); |>>> Why is this check needed? |>> |>> POSIX requires it. |> Could you please point me to the requirement? |>=20 | |Seconding the assertion that it's somewhere in there, but it's also just= =20 |a reasonable thing to do. The implicit flush at exit of streams in libc= =20 |has to ignore errors because it lacks the necessary context to be able=20 |to surface anything, so applications must do it on an individual basis=20 |to appropriately surface, e.g., output truncation issues that are=20 |otherwise hidden (and maybe not obvious) from the caller. | |The impression I had from talking to folks about this in the past is=20 |that it's practically expected that applications will flush-and-error at= =20 |the end rather than check individual writes so that they can surface=20 |logic/execution errors at a higher priority than stdout errors, but=20 |stdout errors should still prevent a clean exit. The POSIX core developer Geoff Clare said on 2021-07-01, message 20210701104540.GA4023@localhost: ... |The standard says nothing about internal buffering; it just requires |pwd to write the directory to file descriptor 1. It also states that |exit status 0 means "successful completion". Together, these |requirements mean that a conforming pwd must not exit with status 0 |if it did not write the directory to fd 1. | |If an implementor chooses to buffer the output, then it is their |responsibility to check that the buffer is successfully flushed to |fd 1 before exiting with status 0. ... |As above, this is all irrelevant to what the standard requires. | |As far as implementation detail goes, obviously if pwd uses stdio |buffering then in order to conform to the standard it must explicitly |fflush(stdout) and check there was no write error before exiting. |I see from later in the thread that mksh has now been patched to do |exactly that. (Thanks Thorsten.) --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt) From nobody Thu Oct 10 06:49:23 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPL2q4BnXz5YVdt; Thu, 10 Oct 2024 06:49: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPL2q3kSpz4V77; Thu, 10 Oct 2024 06:49:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728542963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BOmrTB21NnWQ5dazv40eYvU059rV4gw2/kVcdw8pOTI=; b=TMRkMiu5Sonxoabo40d9JqMm75dqJZ/V7AUaaPF14UXTbioIaviSXXAXKRLJJyk4rPaSgX +NcvK3kO0jFsyTljZwpYxqjgwGwFGOSgFoKu97cQeF9rWXJBVd7wBR+0OEe6YWyRdhO4Hv B+7hrVcfdb/eziHcFsYHM30c8yxr8BOFmgwRTaLsStiteWXMNnIvRUlkE8LWlhgvLaCBmN 4su5+4bvtlrQu6stOa0ped1V00ECw7JepzK7Q3Yu7TdvEgOpROvR5qURIPH6+GkpEZyfAC U/zvs/Wl5+ggdfhyV3yiqMZwB+usq3qQ+Xf0M1c8q+XEMXoLv1SCoUxYLydcDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728542963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BOmrTB21NnWQ5dazv40eYvU059rV4gw2/kVcdw8pOTI=; b=Iy6NUuawP8f47h6jW6bRL5XGbIOjHqaZOXzE9Y6RzDG8i2MRXKVVZBFc+cKZhqpPWPHuqw ojNCFuCFdo46XXT9gYKxPZqOIKofXkXMlhVclppzUrbTLYxIKrjsI5ZpukoGZ7spnHnW0T l155DZXL400GSC/gs6W5IN2X/5kfJK+jmC22rCMEAxerZLVgWtYnwrKXmE62yR3cafvUfL XlsdFraDyFKpyOjUGWDfp60sSiSyND3LvWifaI7/OfAY4tQOQGVmlR08DL4yErvaEuCSYj uEPJfV0Ro064mtSK9WiXrujLYTGFD5gsbbh6Oxg6liTw9xD6i8Wb+Ca65z3EIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728542963; a=rsa-sha256; cv=none; b=blkoqEQeKe8ALZKZZtyBsqPNDm6/D+ESReKzMjme3Ahd43wcI7DyMR5gljIkhPIxgdXmlA MFgge7BN27lEMkZWBxgQyV9a1N/k1dv4Pr1qR5b3m4HD58rFudlHrdNd5fQ6FuUux+rUoQ KOz/GYgjGr+MPtey/cKHMTpr01z+axDey1Qo7PNClUdEE0SUEGqO4uecgvvUSA6JP27SjF CkjYs8QKK4sbGfpKIQGfeplPt9msxBBFb1RpE4pWPbrxf7RcHQ/0khDrZ88QVSt9RJLhvM p7J9lvARNLHcFRdN+2qKOyYD/9WZ5R0SxmJZ1pSI4gkI+Pt76EWFNJ7WFiVOlg== 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 4XPL2q3LtrznWG; Thu, 10 Oct 2024 06:49:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49A6nNkx008842; Thu, 10 Oct 2024 06:49:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49A6nNZk008839; Thu, 10 Oct 2024 06:49:23 GMT (envelope-from git) Date: Thu, 10 Oct 2024 06:49:23 GMT Message-Id: <202410100649.49A6nNZk008839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 458dc7f30310 - main - pkgbase: fix incremental generation of packages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 458dc7f30310394a571fd4f2f5368acd48684652 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=458dc7f30310394a571fd4f2f5368acd48684652 commit 458dc7f30310394a571fd4f2f5368acd48684652 Author: Baptiste Daroussin AuthorDate: 2024-10-08 06:53:45 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-10 06:48:28 +0000 pkgbase: fix incremental generation of packages Replace the regex trying to catch the branch name of the existing repository which was too naive with simpler glob matching. As a result the only case when we only use the new packages are: moving from alpha to beta moving from beta to rc moving from rc to release changing the major version number for the main git branch PR: 281393 Differential Revision: D46874 --- Makefile.inc1 | 46 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 557bbc825625..55d49d5760f2 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -571,28 +571,27 @@ VERSION= FreeBSD ${_REVISION}-${_BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDA .endif MAJOR_REVISION= ${_REVISION:R} -.if !defined(PKG_VERSION) _PKG_REVISION= ${_REVISION} _STRTIMENOW= %Y%m%d%H%M%S _TIMENOW= ${_STRTIMENOW:gmtime} BRANCH_EXT= .if ${_BRANCH:MCURRENT*} || ${_BRANCH:MSTABLE*} || ${_BRANCH:MPRERELEASE*} -_PKG_REVISION= ${MAJOR_REVISION} -BRANCH_EXT= snap -EXTRA_REVISION= .${BRANCH_EXT}${_TIMENOW} +_PKG_REVISION:= ${MAJOR_REVISION} +BRANCH_EXT= ${MAJOR_REVISION}.snap +EXTRA_REVISION= .snap${_TIMENOW} .elif ${_BRANCH:MALPHA*} -BRANCH_EXT= a${_BRANCH:C/ALPHA([0-9]+).*/\1/} -EXTRA_REVISION= .${BRANCH_EXT}.${_TIMENOW} +BRANCH_EXT= alpha +EXTRA_REVISION= .${_BRANCH:C/ALPHA([0-9]+).*/\1/}.${_TIMENOW} .elif ${_BRANCH:MBETA*} -BRANCH_EXT= b${_BRANCH:C/BETA([0-9]+).*/\1/} -EXTRA_REVISION= .${BRANCH_EXT}.${_TIMENOW} +BRANCH_EXT= beta +EXTRA_REVISION= .${_BRANCH:C/BETA([0-9]+).*/\1/}.${_TIMENOW} .elif ${_BRANCH:MRC*} -BRANCH_EXT= rc${_BRANCH:C/RC([0-9]+).*/\1/} -EXTRA_REVISION= .${BRANCH_EXT}.${_TIMENOW} +BRANCH_EXT= rc +EXTRA_REVISION= .rc${_BRANCH:C/RC([0-9]+).*/\1/}.${_TIMENOW} .elif ${_BRANCH:M*-p*} -BRANCH_EXT= p${_BRANCH:C/.*-p([0-9]+$)/\1/} -EXTRA_REVISION= ${BRANCH_EXT} +EXTRA_REVISION= p${_BRANCH:C/.*-p([0-9]+$)/\1/} .endif +.if !defined(PKG_VERSION) PKG_VERSION:= ${_PKG_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} .endif .endif # !defined(PKG_VERSION) @@ -2040,7 +2039,26 @@ PKG_EXT= pkg .if exists(${PKG_ABI_FILE}) && exists(${REPODIR}/${PKG_ABI}) PKG_VERSION_FROM!=/usr/bin/readlink ${REPODIR}/${PKG_ABI}/latest PKG_VERSION_FROM_DIR= ${REPODIR}/${PKG_ABI}/${PKG_VERSION_FROM} -BRANCH_EXT_FROM= ${PKG_VERSION_FROM:C/^[^[:alpha:]]+p?([[:alpha:]]*)[0-9]+$/\1/} +# Determine the name of the branch base on the version +# X.bY => beta +# X.aY => alpha +# X.rcY => rc +# X.snap => snap +# all others mean release +# +# This will be used when comparing to the branch that we are building +# to decide if we keep old packages or new packages when only their +# version differs +BRANCH_EXT_FROM= +.if ${PKG_VERSION_FROM:M*.snap*} +BRANCH_EXT_FROM= ${PKG_VERSION_FROM:C/.snap.*$//}.snap +.elif ${PKG_VERSION_FROM:M*.b*} +BRANCH_EXT_FROM= beta +.elif ${PKG_VERSION_FROM:M*.rc*} +BRANCH_EXT_FROM= rc +.elif ${PKG_VERSION_FROM:M*.a*} +BRANCH_EXT_FROM= alpha +.endif .else PKG_VERSION_FROM= PKG_VERSION_FROM_DIR= @@ -2081,7 +2099,7 @@ real-update-packages: stage-packages .PHONY continue; \ fi ; \ newsum=$$(pkg query -F ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} '%X') ; \ - if [ "${BRANCH_EXT_FROM}" == "${BRANCH_EXT:C/[0-9]+$//}" -a "$${oldsum}" == "$${newsum}" ]; then \ + if [ "${BRANCH_EXT_FROM}" = "${BRANCH_EXT}" -a "$${oldsum}" = "$${newsum}" ]; then \ echo "==> Keeping old ${PKG_NAME_PREFIX}-$${pkgname}-${PKG_VERSION_FROM}.${PKG_EXT}" ; \ rm ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} ; \ cp $${pkg} ${REPODIR}/${PKG_ABI}/${PKG_VERSION} ; \ From nobody Thu Oct 10 08:37:26 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPNRV6xvMz5Yfpj; Thu, 10 Oct 2024 08:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPNRV6HHfz4jQG; Thu, 10 Oct 2024 08:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728549446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zwcVtXTg4o2art004Hr14XQ+ThOOJyxWxjaq4WYRcnc=; b=JLnEIL8ZIsDes9y7hc/wyh2qo0zWG10VndSZ0KePCWoee2TVUAb5Z2Tqg0bmRZbb2WdS08 mlwvQ4KUYZ1GFxAhObT85NZywaPxGgK+CERt+zhybQLhTQEYgvE324JDyMCGHXcTYZdOBr 0xSXHdDGtDRDDMiLZfxU5ayndrM8BD9sJPGZQHkS46/h9FZ+ZWZ79ycbteWebS2Ho+iNac 4MJLKbWRK/WFGnc7DJ3tZkpOTxroiD+hpFghesMU/cUbaOJcFt6sRpBIIXjUI17NCzwDCl xk6/+TrMwSiyT0LAeIghB3964EtLCT/ieD0sNK8ZYvtmXzJY3PBUpdfFqK5KIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728549446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zwcVtXTg4o2art004Hr14XQ+ThOOJyxWxjaq4WYRcnc=; b=htkkDcJbD78StFla+oQdu0VUOM+9JfXL69VjvdfwMa7l6cY1AN45naf/Omnw6gH0/LdQ1O zUUI4BfzHdVJp8jYF5xLyL+VhAl6SF5dFuu2Eqwl1F0yfwGlT985ak1MCTxVVDzcI5+Sty bkk8jKQiKOLtpptlJ8XbEEa4MSPxgl0tpZ7lmp3B/CF6PuHUqN65xXsOkAmpY/SiLNOLGn 84nP8nf7WRtdDjrg+xuiJcDdimDPxMa3XlUMtm9+kDFLFwkkvgArd16PCYDEwNMsHBC1F4 n/y4cCrhz4nK2xdvJntRGibH0+5DUAeRItfefSJ7kC9rymlij20Z2P8XuQcbpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728549446; a=rsa-sha256; cv=none; b=R5mbZD8vzMvV1C1vtBY17mXDLc311JUXfVZY7Y34I1NU1w+ZF1GoDxgoKLI3g4JrXAmc48 MjCVvp8TzQ5/KgrNLXEh8a5egOzKGLMQ5VZzFpeoK4GaZ7SHQRf/2XBd4K8ylcZmc1xKvW 8gkiMA5vV8qqRECm62WzD/WN75ixMkNFP9y/6HaQFqIlaH/NcLRsBNnxq6KWru5sPNcSDh Ml9cfwVqm5YCDayqc/2QESFUigpbiye5AU4i8jPESZo4Io4ZyfQ8qmHGvqVKueDMvje+VZ zsuX1EfCIY1mFK2KHdIVJZ9pLzP7De/sCgXBL9NKNyfvR/2S0hQcaS0p4qg/6Q== 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 4XPNRV5cDczr5F; Thu, 10 Oct 2024 08:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49A8bQ5s098944; Thu, 10 Oct 2024 08:37:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49A8bQBW098941; Thu, 10 Oct 2024 08:37:26 GMT (envelope-from git) Date: Thu, 10 Oct 2024 08:37:26 GMT Message-Id: <202410100837.49A8bQBW098941@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 2e9761eb80f3 - main - sctp: cleanup sctp_delete_ifn List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2e9761eb80f3e58c116efc10c739ed0d8497c1d6 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2e9761eb80f3e58c116efc10c739ed0d8497c1d6 commit 2e9761eb80f3e58c116efc10c739ed0d8497c1d6 Author: Michael Tuexen AuthorDate: 2024-10-10 08:36:00 +0000 Commit: Michael Tuexen CommitDate: 2024-10-10 08:36:00 +0000 sctp: cleanup sctp_delete_ifn The address lock is always held, so no need for the second parameter. No functional change intended. MFC after: 3 days --- sys/netinet/sctp_pcb.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 340786e3484e..1c634933ed6e 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -277,25 +277,16 @@ sctp_free_ifa(struct sctp_ifa *sctp_ifap) } static void -sctp_delete_ifn(struct sctp_ifn *sctp_ifnp, int hold_addr_lock) +sctp_delete_ifn(struct sctp_ifn *sctp_ifnp) { - struct sctp_ifn *found; - found = sctp_find_ifn(sctp_ifnp->ifn_p, sctp_ifnp->ifn_index); - if (found == NULL) { + SCTP_IPI_ADDR_WLOCK_ASSERT(); + if (sctp_find_ifn(sctp_ifnp->ifn_p, sctp_ifnp->ifn_index) == NULL) { /* Not in the list.. sorry */ return; } - if (hold_addr_lock == 0) { - SCTP_IPI_ADDR_WLOCK(); - } else { - SCTP_IPI_ADDR_WLOCK_ASSERT(); - } LIST_REMOVE(sctp_ifnp, next_bucket); LIST_REMOVE(sctp_ifnp, next_ifn); - if (hold_addr_lock == 0) { - SCTP_IPI_ADDR_WUNLOCK(); - } /* Take away the reference, and possibly free it */ sctp_free_ifn(sctp_ifnp); } @@ -450,7 +441,7 @@ sctp_remove_ifa_from_ifn(struct sctp_ifa *sctp_ifap) if (LIST_EMPTY(&sctp_ifap->ifn_p->ifalist)) { /* remove the ifn, possibly freeing it */ - sctp_delete_ifn(sctp_ifap->ifn_p, SCTP_ADDR_LOCKED); + sctp_delete_ifn(sctp_ifap->ifn_p); } else { /* re-register address family type, if needed */ if ((sctp_ifap->ifn_p->num_v6 == 0) && @@ -555,7 +546,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, (void *)sctp_ifap); if (new_ifn_af) { /* Remove the created one that we don't want */ - sctp_delete_ifn(sctp_ifnp, SCTP_ADDR_LOCKED); + sctp_delete_ifn(sctp_ifnp); } if (sctp_ifap->localifa_flags & SCTP_BEING_DELETED) { /* easy to solve, just switch back to active */ From nobody Thu Oct 10 08:40:42 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPNWG2TJJz5Yg7h; Thu, 10 Oct 2024 08:40: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPNWG1vg3z4jdn; Thu, 10 Oct 2024 08:40:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728549642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FcEXvquua37mDylCRIq9EeUNEplxd5gC/iYe1QiOEkk=; b=S47mGJMHM9xVh5Cf0wlI8dHOFwn+YtjqtETbIF4ivD8smLJCOTXn9ysNKfqEyS4wPXj8Rn vz3L+rI2v6tK0YE6l054U2SjmiQ6NbuYJepgs0hxO9VIhxOgvnYlEj988QexCEuYe6Hitx c5KTffyP7HVXcmeUQvIeaDPcV14F89u9FMDFOomBk3pWSE43mSMzgMh06qQVYeIQy5DZaR Qcus2W9qYFrq2Eie4RHoRA6UzHrA2vWjd8rIhti5j+wxASBnSrEHsQQr+tvLaeSSwSHCXp 4Rrccsr3yqaFwhIX1VSOMvedrBXAH4SUtK9CLsUbx1Au0vt0D7O3Syue6n1GRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728549642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FcEXvquua37mDylCRIq9EeUNEplxd5gC/iYe1QiOEkk=; b=X9/VVBSiLb5u7ZrZdkD4jc4HQ5ffKXkmqcTg2o+w0m5naz2WKes33xD+OXcD53+q2m2j76 0ra1bdEfDDhbQR9Qt1zZtgnmRLhrdgNdPc1bH7Cc2DY2cKnZfIIk3o8DnhdDNfcEEaB3eU THeVdRNdrpEaMVI3+0ODJ1OxIsklFZ2is6+k1bYXkSMDilZFWM+p3jJeO3CSOg/F6rYyP9 UlJEweXow7qRaU5c3JuHIXQnmYGTfqcIiA7IdWRoVzdHteC7qOjkbECBFNL/ffwD8pkbJQ V4XHYlFLdjbXa9SfywESe0sdvPYUFEdgS78bT9sT41t45gh/K0cAuiZYGNNLuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728549642; a=rsa-sha256; cv=none; b=Gp1XNqtOyczGDBY1qkovlxdJj6TJfsGfpBECkakMXd5RzGwY1KOTtAZlNt84CCPHg2i7zQ p9niplolQeMXGDJfnpxzlb4mfjQTcgYPNlbO1dv4sHuFk3z+pLqXlIIaPktYBK6PYa6fvH x2fA7rokex6FoXNlM0yB2ENapELN1QZkVUP/qdUf7bCioVEd7TgyHm8bCopVNKOFkVwcg9 14LsfAr3LIw4NnvrXrx2ExwJEV8CdAEbCI9albJOKIqsTvtSX8ARQ/mzQQ8sIeYjpbxiii HWjU31Hxpvag94/pHXexGq+aCZR5n/0UqKepnFvJ6gBsOxIpPosUj3HUHJsmhw== 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 4XPNWG1Wg6zrHd; Thu, 10 Oct 2024 08:40:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49A8egg2009043; Thu, 10 Oct 2024 08:40:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49A8egNm009040; Thu, 10 Oct 2024 08:40:42 GMT (envelope-from git) Date: Thu, 10 Oct 2024 08:40:42 GMT Message-Id: <202410100840.49A8egNm009040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Toomas Soome Subject: git: fae4b97c1a6b - main - loader: reading from large dosfs fails List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fae4b97c1a6b762230824ac0ba169dff13fa006c Auto-Submitted: auto-generated The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=fae4b97c1a6b762230824ac0ba169dff13fa006c commit fae4b97c1a6b762230824ac0ba169dff13fa006c Author: Toomas Soome AuthorDate: 2024-07-17 06:47:56 +0000 Commit: Toomas Soome CommitDate: 2024-10-10 08:40:25 +0000 loader: reading from large dosfs fails With 8GB disk image and FAT32, our read offset calculation wraps over 32-bit integer and we end up reading garbage. The problem appears when disk image is filled with data and the block to bytes translations do not fit into 32-bit integers. illumos issue: https://www.illumos.org/issues/16666 Sponsored by: MNX Cloud, Inc. MFC after: 1 week --- stand/libsa/dosfs.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/stand/libsa/dosfs.c b/stand/libsa/dosfs.c index 2ee95bf2c601..123350263d09 100644 --- a/stand/libsa/dosfs.c +++ b/stand/libsa/dosfs.c @@ -1,6 +1,7 @@ /* * Copyright (c) 1996, 1998 Robert Nordier * All rights reserved. + * Copyright 2024 MNX Cloud, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -139,8 +140,8 @@ static DOS_DE dot[2] = { #define okclus(fs, c) ((c) >= LOCLUS && (c) <= (fs)->xclus) /* Get start cluster from directory entry */ -#define stclus(sz, de) ((sz) != 32 ? cv2((de)->clus) : \ - ((u_int)cv2((de)->dex.h_clus) << 16) | \ +#define stclus(sz, de) ((sz) != 32 ? (u_int)cv2((de)->clus) : \ + ((u_int)cv2((de)->dex.h_clus) << 16) | \ cv2((de)->clus)) static int parsebs(DOS_FS *, DOS_BS *); @@ -152,7 +153,7 @@ static off_t fsize(DOS_FS *, DOS_DE *); static int fatcnt(DOS_FS *, u_int); static int fatget(DOS_FS *, u_int *); static int fatend(u_int, u_int); -static int ioread(DOS_FS *, u_int, void *, size_t); +static int ioread(DOS_FS *, uint64_t, void *, size_t); static int ioget(struct open_file *, daddr_t, void *, size_t); static int @@ -364,7 +365,9 @@ static int dos_read(struct open_file *fd, void *buf, size_t nbyte, size_t *resid) { off_t size; - u_int nb, off, clus, c, cnt, n; + uint64_t off; + size_t nb; + u_int clus, c, cnt, n; DOS_FILE *f = (DOS_FILE *)fd->f_fsdata; int err = 0; @@ -375,7 +378,7 @@ dos_read(struct open_file *fd, void *buf, size_t nbyte, size_t *resid) * 4-5 sec. */ twiddle(4); - nb = (u_int)nbyte; + nb = nbyte; if ((size = fsize(f->fs, &f->de)) == -1) return (EINVAL); if (nb > (n = size - f->offset)) @@ -402,8 +405,12 @@ dos_read(struct open_file *fd, void *buf, size_t nbyte, size_t *resid) } if (!clus || (n = f->fs->bsize - off) > cnt) n = cnt; - if ((err = ioread(f->fs, (c ? blkoff(f->fs, c) : - secbyt(f->fs->lsndir)) + off, buf, n))) + if (c != 0) + off += blkoff(f->fs, (uint64_t)c); + else + off += secbyt(f->fs->lsndir); + err = ioread(f->fs, off, buf, n); + if (err != 0) goto out; f->offset += n; f->c = c; @@ -908,11 +915,12 @@ fatend(u_int sz, u_int c) * Offset-based I/O primitive */ static int -ioread(DOS_FS *fs, u_int offset, void *buf, size_t nbyte) +ioread(DOS_FS *fs, uint64_t offset, void *buf, size_t nbyte) { char *s; - u_int off, n; + size_t n; int err; + uint64_t off; u_char local_buf[SECSIZ]; s = buf; From nobody Thu Oct 10 08:43:37 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPNZf1W45z5YgKJ; Thu, 10 Oct 2024 08:43: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPNZf0PLcz4jrd; Thu, 10 Oct 2024 08:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728549818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kBqMfsQd987qjAVYn162vOh31G0LMCZtil1a/Z141D0=; b=ueha0+7OCdZLuqsWz1SJ8DP65CGyTYVRXTX/F+E3VcCTcHQcn9iG5cgKA6Jn+xwQ3kJXc2 l6BAvs+3Rz0RE7OPf1Y53O1iP3hLcvJkAN+VePRtD0Hx9xfcz1Z3EOKIqW6xVux+ks6vgp vJ6oAOWpZouYdv2Ml0A7M1ju3519/sk23zEcOPewVFCsv2PWBUjXTFAokUhCkMSRImeGbq c7ydgNS5URNchKPEGSZt+bbfbZ4MoB2OluCEZ8w6Q3QzXh1DGfsLIFNPAhO7JoP4mgT3Xt eOI7E/+kGorTLMqU1Eeh1gpNfA0Aw6K0fxBxGMhj6zrzbr5Wp++1S2d27X8mnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728549818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kBqMfsQd987qjAVYn162vOh31G0LMCZtil1a/Z141D0=; b=Uc1CByy7+p18vFZ2++6ZD8T15zkir+NdM3GHcxMI4FmIfE1jfgKCRM6Oawd1r4f42JyuiN up4YTBk+k1yDwQAUTiN04T/5AQ8gZSEjX4/3EQ1xiqpNaTRU5rQxzyGrto+3MaBAU6jYMn UyAE3M7LrPT4BvZJagx5/8SpfmitJksShYJgkfuzYVNSySV8odavYzKjHx5vmvi+qA+YSt gbyWUGUIgI7hIEH1ZeKSSD77mYxKNWibHVe3fbB3HEFcIJ3M/MsdCvVcdmqnwVL9n29XMK HaFc4z2HtZFJFCFz2zY+AOXzShEl2ydipYh2azNbmyE3x7p/RD3NnFjpAmLtPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728549818; a=rsa-sha256; cv=none; b=lbkJA90v51np7eMTTtyTQ8mY0L7DtS027GCoQ+mQ6VnGK7n3AOcwZQstkhF3GU9c3M7Fxz v4MqV5+WdsHcFbjY89J0wH2tgng1DUUuHPhL0QURrp+GZv9JyBlOh2gH39z2ilVBgmXiS5 YHOl+MDdMH/awrmHqayVDgr5XsHlxsIWYS56ZVTyKYfFO9gR7BL/wsfB0/wQTDpwEVp6j8 V2RJwu3WJzw+DKr6ffxyZlfpw/rDtUcKd8nXdyBIbZBwW9E76i1S4+x+/p85sYyl+mWrem cxwBTqONLpAShXBXrqr7ttlplnxfXljXLgcvKFKe8pBZAikBJvw/2vVKXLEhgw== 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 4XPNZf00twzrJP; Thu, 10 Oct 2024 08:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49A8hbMP015925; Thu, 10 Oct 2024 08:43:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49A8hbas015922; Thu, 10 Oct 2024 08:43:37 GMT (envelope-from git) Date: Thu, 10 Oct 2024 08:43:37 GMT Message-Id: <202410100843.49A8hbas015922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: e1a09d1e9df3 - main - sctp: make sctp_free_ifn() static List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e1a09d1e9df30347c279604191a04ce2ef20bf0c Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e1a09d1e9df30347c279604191a04ce2ef20bf0c commit e1a09d1e9df30347c279604191a04ce2ef20bf0c Author: Michael Tuexen AuthorDate: 2024-10-10 08:42:35 +0000 Commit: Michael Tuexen CommitDate: 2024-10-10 08:43:32 +0000 sctp: make sctp_free_ifn() static It is not used outside of the file. No functional change intended. MFC after: 3 days --- sys/netinet/sctp_pcb.c | 2 +- sys/netinet/sctp_pcb.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 1c634933ed6e..d9dfc4b32821 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -239,7 +239,7 @@ sctp_free_vrf(struct sctp_vrf *vrf) } } -void +static void sctp_free_ifn(struct sctp_ifn *sctp_ifnp) { if (SCTP_DECREMENT_AND_CHECK_REFCOUNT(&sctp_ifnp->refcount)) { diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index ade29fb3544d..ed6a1c34ccf7 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -508,7 +508,6 @@ sctp_add_addr_to_vrf(uint32_t vrfid, void sctp_update_ifn_mtu(uint32_t ifn_index, uint32_t mtu); -void sctp_free_ifn(struct sctp_ifn *sctp_ifnp); void sctp_free_ifa(struct sctp_ifa *sctp_ifap); void From nobody Thu Oct 10 09:08:11 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPP6z4YzPz5Yhp1; Thu, 10 Oct 2024 09:08: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPP6z3xYHz4m16; Thu, 10 Oct 2024 09:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728551291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wQGov3nWcsnMqZle6pnQewDKtdp0ssHsHF2cbRUv9Mo=; b=ObA8O9HvDctdHSi0j+22I4LdR8xsN2i/p3skigpFb/puws7wOIuBgbL0ifLoVzCc0/a79U +1eLpcOfKhrx9RTtIJxCqP9AqTooEMT9uYlHkWKmH8JJLuaIBTqed+RhREhncJw7+xC5te N8y0ojpBnLZj7psGaSFP5lRmSkqvE4NPYZfa0lNv0/zxp59F2QsbOQGHwdt/fWkGQEEbR1 WK2HhBNoTqLNPvbMwWnzsYlMUsXv9wDm4ihnh+4/JBXlVAiZfgR0vUyjcuasq0DjL9fZ3A AUyxjUWzrlRxS1V0okIjnaY51K5QTm4lX9HVwIhu8DeTglBJM27om/+tAU0K5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728551291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wQGov3nWcsnMqZle6pnQewDKtdp0ssHsHF2cbRUv9Mo=; b=UoLRi+5KTEe8VxV0Dgo1HKBz3DXCCCeTKJXAOMwZfQjsRlGWPUfYAie0iEt2SNg/GfFmoT 0DRBuxBkXjex4It2QEk/iJaOnrWe1/BcRnrn5plqLTCPFrq4tQ9PsaHG1y+kvkvrjYjfum 9jjPfes4w1oqjrw6WNGodjeZyikn8FJMLXeZG3msYBAKdF8hpdkxvESQ1i+Mbjk2Txpnia 1MOPOz/2QfFo7wHFyzynCLB8vbUxh6FOMItvN1CevMVxcD3qYa1q8BiMJO7nCHcpurJK1w 39kmozIlHpeKVh626GEYz7Ro2gy5bpYOKesJuHf23JfOKmSIs+wpExk3AQ703Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728551291; a=rsa-sha256; cv=none; b=oQDQKuLuM5ntiqJ4mclXV3QxjqRlhFwAkhYj8/Za6hFaaRH4Ccfrjxf9m6Xz+GMU5wa0S7 IiZXZ4W1hOUaprVgabU7yrvbl1oZuQeLL6PiyVzZmxDYgGT90/U5YA767HdBJMbS/+kv7q oJQ17/vGgl/UmiLNlzUa43TjrVPzcNFYYVpnfJWkbKXDJJfkH4MqlNbemrryr50DtmH08D pQME02nBZVYtoTs9t+BjYzHb1cGXQIUacvlK3U+QEuKCjKGkzNy22rLau9S1kvghQVjZim ZvWBaWog6Zco4oxcdR26x9JpzYhluP1NgLZXCJbdVpbi94Es/p89YdVaTuSKCg== 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 4XPP6z39FBzrYN; Thu, 10 Oct 2024 09:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49A98BgX051040; Thu, 10 Oct 2024 09:08:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49A98BFg051037; Thu, 10 Oct 2024 09:08:11 GMT (envelope-from git) Date: Thu, 10 Oct 2024 09:08:11 GMT Message-Id: <202410100908.49A98BFg051037@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: af4cd5e7b5b5 - main - vfs_subr: optimize inval_buf_range List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af4cd5e7b5b50502922b5d2bb42daa7fc66545bb Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=af4cd5e7b5b50502922b5d2bb42daa7fc66545bb commit af4cd5e7b5b50502922b5d2bb42daa7fc66545bb Author: Doug Moore AuthorDate: 2024-10-10 09:06:52 +0000 Commit: Doug Moore CommitDate: 2024-10-10 09:06:52 +0000 vfs_subr: optimize inval_buf_range Use a pctrie_lookup to avoid walking over low out-of-range buf list entries, and an early break to avoid the high out-of-range entries. Avoid writing almost identical loops for the dirty and clean lists. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D46963 --- sys/kern/vfs_subr.c | 49 +++++++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index f192c6798858..328507efd1fd 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -2616,17 +2616,24 @@ static int v_inval_buf_range_locked(struct vnode *vp, struct bufobj *bo, daddr_t startlbn, daddr_t endlbn) { + struct bufv *bv; struct buf *bp, *nbp; - bool anyfreed; + uint8_t anyfreed; + bool clean; ASSERT_VOP_LOCKED(vp, "v_inval_buf_range_locked"); ASSERT_BO_LOCKED(bo); + anyfreed = 1; + clean = true; do { - anyfreed = false; - TAILQ_FOREACH_SAFE(bp, &bo->bo_clean.bv_hd, b_bobufs, nbp) { - if (bp->b_lblkno < startlbn || bp->b_lblkno >= endlbn) - continue; + bv = clean ? &bo->bo_clean : &bo->bo_dirty; + bp = BUF_PCTRIE_LOOKUP_GE(&bv->bv_root, startlbn); + if (bp == NULL) + continue; + TAILQ_FOREACH_FROM_SAFE(bp, &bv->bv_hd, b_bobufs, nbp) { + if (bp->b_lblkno >= endlbn) + break; if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_SLEEPFAIL | LK_INTERLOCK, BO_LOCKPTR(bo)) == ENOLCK) { @@ -2638,39 +2645,17 @@ v_inval_buf_range_locked(struct vnode *vp, struct bufobj *bo, bp->b_flags |= B_INVAL | B_RELBUF; bp->b_flags &= ~B_ASYNC; brelse(bp); - anyfreed = true; + anyfreed = 2; BO_LOCK(bo); if (nbp != NULL && - (((nbp->b_xflags & BX_VNCLEAN) == 0) || + (((nbp->b_xflags & + (clean ? BX_VNCLEAN : BX_VNDIRTY)) == 0) || nbp->b_vp != vp || - (nbp->b_flags & B_DELWRI) != 0)) - return (EAGAIN); - } - - TAILQ_FOREACH_SAFE(bp, &bo->bo_dirty.bv_hd, b_bobufs, nbp) { - if (bp->b_lblkno < startlbn || bp->b_lblkno >= endlbn) - continue; - if (BUF_LOCK(bp, - LK_EXCLUSIVE | LK_SLEEPFAIL | LK_INTERLOCK, - BO_LOCKPTR(bo)) == ENOLCK) { - BO_LOCK(bo); - return (EAGAIN); - } - bremfree(bp); - bp->b_flags |= B_INVAL | B_RELBUF; - bp->b_flags &= ~B_ASYNC; - brelse(bp); - anyfreed = true; - - BO_LOCK(bo); - if (nbp != NULL && - (((nbp->b_xflags & BX_VNDIRTY) == 0) || - (nbp->b_vp != vp) || - (nbp->b_flags & B_DELWRI) == 0)) + (nbp->b_flags & B_DELWRI) == (clean? B_DELWRI: 0))) return (EAGAIN); } - } while (anyfreed); + } while (clean = !clean, anyfreed-- > 0); return (0); } From nobody Thu Oct 10 10:00:07 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPQGv5kpkz5YmPW; Thu, 10 Oct 2024 10:00: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPQGv5C9sz4s5y; Thu, 10 Oct 2024 10:00:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728554407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t1AFXqUYk8MLNVJsbmb3c1Ft7IWELiVVRz4j6iA5pi0=; b=aO8f/Q0dFW0BTdjmAQj4G9MB/VpzYPJBmSQWW83XMHVAupImRG+0Zg46DXEdC4tEKk72SC QK8fupYX70If55ytdtLLiY/z7e9C7iqHJShsIeUXy4E2UqTlt0A1/O/7AlIX06LQkdadtT c5ZDDpAOF9BfVROoubjSpOQOwjaAEeLjipVRQyip4H4yJ403QkXVkDKicR9J8r9XYuP9Aw c2MJZd7SB5FSfHYvFzNexTWQXe7G0jtqFV06shMdLakI4NPBwJ6vJUB0sNyF20VCrYzqxk SqQPXC7YIirzjDsoMXudyUccKL3ht8bboRfKlwXMAPcoYv/6WBTNEfv03w6byg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728554407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t1AFXqUYk8MLNVJsbmb3c1Ft7IWELiVVRz4j6iA5pi0=; b=NRFSzRktiy0IZF/skytdOK1tGY5k1YB2Le6bNd6fGz5n6crEHIaSt4MUXXz80yUCLzHyuc Znr+3bwUu3rmcfyXwThWxY9KAmic4MPrHYLrB8J1knVqX9nRJoJW2xGH9i3PfD9cb3q2j8 ITdcf2ZS9TqEodPG5v/iIOxyhbocTjyPY4Anl57OVpwD62ouAYbQHuLVh/xwLGx6Br3vpC eTl6EVeUW2W0R43JnUyNggCYiBmQwv3vkqeo+qC577Ne+sWQxBM7FzB4xa8Jyb44FBL7qo EAC3Mlnr1KNtLyzmGyISpckVhCCqV3irT31/NN/P91gusuzfSbVDUyTJAp8Qyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728554407; a=rsa-sha256; cv=none; b=UZ8yikqNHg/1+seIDOC+jGWS3UMa1Wi6Q1OLo7xWlM37uJB5fEmJ+bXPwxz+sqyf6FZLAQ lz1gYYcxsyCAVhHbUR7fUJuyYhzQy0XXO8rz5jkRHMIgBeO7fWltONqf5cDb3wjyCLQY6M HpFJCH93CqXLizIhg8Kio9StOPE27DyFFxkm/7h/rTZJy09RTsNMPzgqPs6glIn2Q8Bkep zlMFS3htIt7ExDE2WtLnQGr0EE9A8SLajbg3i5jozw4BBw0KsTuuYvhrzT8M7VGXkwpjif WAVTy71bslPY6uU9SFf6/aliTlaMIRnE9vg73Xj5Dn09oKSDXtdcoh5Tum3m+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 4XPQGv4mGrzsdJ; Thu, 10 Oct 2024 10:00:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49AA07Mx039877; Thu, 10 Oct 2024 10:00:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49AA07wh039872; Thu, 10 Oct 2024 10:00:07 GMT (envelope-from git) Date: Thu, 10 Oct 2024 10:00:07 GMT Message-Id: <202410101000.49AA07wh039872@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2851aafe96c1 - main - mlx5 ipsec_offload: ensure that driver does not dereference dead sahindex List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2851aafe96c1e357971f2b331fff837ead20522b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2851aafe96c1e357971f2b331fff837ead20522b commit 2851aafe96c1e357971f2b331fff837ead20522b Author: Konstantin Belousov AuthorDate: 2024-09-28 23:17:05 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-10 09:55:45 +0000 mlx5 ipsec_offload: ensure that driver does not dereference dead sahindex Take the sahtree rlock and check for the DEAD SA state before validating and filling the SA xfrm attributes. Sponsored by: NVidia networking --- sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c b/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c index a25ed4c1c51f..95afec40d4f6 100644 --- a/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c +++ b/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -257,6 +258,8 @@ static int mlx5e_xfrm_validate_state(struct mlx5_core_dev *mdev, mlx5_core_err(mdev, "FULL offload is not supported\n"); return (EINVAL); } + if (savp->state == SADB_SASTATE_DEAD) + return (EINVAL); if (savp->alg_enc == SADB_EALG_NONE) { mlx5_core_err(mdev, "Cannot offload authenticated xfrm states\n"); return (EINVAL); @@ -325,6 +328,7 @@ mlx5e_if_sa_newkey_onedir(struct ifnet *ifp, void *sav, int dir, u_int drv_spi, struct mlx5e_ipsec_sa_entry **privp, struct mlx5e_ipsec_priv_bothdir *pb, struct ifnet *ifpo) { + struct rm_priotracker tracker; struct mlx5e_ipsec_sa_entry *sa_entry = NULL; struct mlx5e_priv *priv = if_getsoftc(ifp); struct mlx5_core_dev *mdev = priv->mdev; @@ -338,7 +342,9 @@ mlx5e_if_sa_newkey_onedir(struct ifnet *ifp, void *sav, int dir, u_int drv_spi, if (if_gettype(ifpo) == IFT_L2VLAN) VLAN_TAG(ifpo, &vid); + ipsec_sahtree_rlock(&tracker); err = mlx5e_xfrm_validate_state(mdev, sav); + ipsec_sahtree_runlock(&tracker); if (err) return err; @@ -353,7 +359,14 @@ mlx5e_if_sa_newkey_onedir(struct ifnet *ifp, void *sav, int dir, u_int drv_spi, sa_entry->ipsec = ipsec; sa_entry->vid = vid; + ipsec_sahtree_rlock(&tracker); + err = mlx5e_xfrm_validate_state(mdev, sav); + if (err != 0) { + ipsec_sahtree_runlock(&tracker); + goto err_xfrm; + } mlx5e_ipsec_build_accel_xfrm_attrs(sa_entry, &sa_entry->attrs, dir); + ipsec_sahtree_runlock(&tracker); err = mlx5e_ipsec_create_dwork(sa_entry, pb); if (err) From nobody Thu Oct 10 10:46:05 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPRHy0QFYz5YqTq; Thu, 10 Oct 2024 10:46: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPRHx6f6Tz41nV; Thu, 10 Oct 2024 10:46:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728557165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1WU01Kifeucip1D2DcYYkLzqrteJR5lCtZKONs/7iWU=; b=PrJAGKy/+vN598nB8nNbRKi72Kmt5W20yvWsZMmYQ+/LMomzY2z33SQF+5aUOEKx3wc4m2 wGJJih6nQ3ekRirdxskbXyYDlp0DTWW8l2OzNc8gvy/k58KMo/hWbPusd564SaCuqD3q+3 ToKB5H+3HgW+/3WTc1JLs+aiIvaY9Uk8zUdS1ygB0iXEZYmLjzlQit0qwNCYc8ghYONZzI DvjmQt00+pJPdPD6X+O10sWVLMmNvBWNi91PagTuQY326QIAanal3GwCPjY5LGaV7epHnI 82LjWnbxvPk3s7onme6WaAsd83NrLnssvTD6ZLZvhJQDLfXyrFPzplVZwMFzbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728557165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1WU01Kifeucip1D2DcYYkLzqrteJR5lCtZKONs/7iWU=; b=olOzzmrWFVRl7MXthVMDWLtMw6gOy4pgwOvf7kqhpKPjalwWO3Lx8E4KRRD0c1J6C45CYj Xlic1OXFoaXSJvcWLpa6YLzzvbJYzMnMp+BFB/8U+AP9K0afuDPVcaBdVpsfQ1ylEUKz1p /rIXJtj81LWFh0IkkPdDBSKmLyijY7fJRK7LZ61xv73q4X77ImRffBM3zXFkB4ZfeXwEQO MAHi/jprZdPrn5Mru4NeovUx6Kcgpup4a9o58E5REfXnxPY0LAf4ySsh58g+W75TLIpz0i lY0SjM8WN3xdQ0OPJFe29sRtbu576/gtEW4sSZEggD846gZIA+iD61MuVk/vkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728557165; a=rsa-sha256; cv=none; b=UXQIAq9WhFQtZH3u0vEi+a0YM28EIzP+eRpM61lPOTrAmLd9JxCjBkmQIc3LVhSSVipP8n 8QlIYO20G4UjwRGFv1kOEr+1dX+xh0ysIsX1EYoAfVUwt6R+nDz3uWGASzRA9Bn1+i37+2 GL0dmBp8FK5FIoi069n8uJUp8g9pcHh8IKZE/s+H270VR5TbnMFJSrb+eo8NC+V/hRedJ8 /ryXSgYZBWSsYxWRp+eG/YFpfPLFHFSTfmIXHnGCKe2aDOAGJFG4kBHx9mAKCHEXE3egCk w4u5AfUB2X+JE5oimuAOywAqVf9qN9pS7XIn2mZStHv38uw2R+qTFHinupGUyQ== 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 4XPRHx67LHzvVK; Thu, 10 Oct 2024 10:46:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49AAk5ll020039; Thu, 10 Oct 2024 10:46:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49AAk5dE020036; Thu, 10 Oct 2024 10:46:05 GMT (envelope-from git) Date: Thu, 10 Oct 2024 10:46:05 GMT Message-Id: <202410101046.49AAk5dE020036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: ff2263469ad0 - main - Revert "vfs_subr: optimize inval_buf_range" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff2263469ad0f304b2e5f44f1a62c9b20c0306a3 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=ff2263469ad0f304b2e5f44f1a62c9b20c0306a3 commit ff2263469ad0f304b2e5f44f1a62c9b20c0306a3 Author: Doug Moore AuthorDate: 2024-10-10 10:43:40 +0000 Commit: Doug Moore CommitDate: 2024-10-10 10:45:43 +0000 Revert "vfs_subr: optimize inval_buf_range" @pho has reported that this change leads to a failure of the mmap28.sh stress test, and I have confirmed it, so I withdraw it for further study. This reverts commit af4cd5e7b5b50502922b5d2bb42daa7fc66545bb. --- sys/kern/vfs_subr.c | 49 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 328507efd1fd..f192c6798858 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -2616,24 +2616,17 @@ static int v_inval_buf_range_locked(struct vnode *vp, struct bufobj *bo, daddr_t startlbn, daddr_t endlbn) { - struct bufv *bv; struct buf *bp, *nbp; - uint8_t anyfreed; - bool clean; + bool anyfreed; ASSERT_VOP_LOCKED(vp, "v_inval_buf_range_locked"); ASSERT_BO_LOCKED(bo); - anyfreed = 1; - clean = true; do { - bv = clean ? &bo->bo_clean : &bo->bo_dirty; - bp = BUF_PCTRIE_LOOKUP_GE(&bv->bv_root, startlbn); - if (bp == NULL) - continue; - TAILQ_FOREACH_FROM_SAFE(bp, &bv->bv_hd, b_bobufs, nbp) { - if (bp->b_lblkno >= endlbn) - break; + anyfreed = false; + TAILQ_FOREACH_SAFE(bp, &bo->bo_clean.bv_hd, b_bobufs, nbp) { + if (bp->b_lblkno < startlbn || bp->b_lblkno >= endlbn) + continue; if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_SLEEPFAIL | LK_INTERLOCK, BO_LOCKPTR(bo)) == ENOLCK) { @@ -2645,17 +2638,39 @@ v_inval_buf_range_locked(struct vnode *vp, struct bufobj *bo, bp->b_flags |= B_INVAL | B_RELBUF; bp->b_flags &= ~B_ASYNC; brelse(bp); - anyfreed = 2; + anyfreed = true; BO_LOCK(bo); if (nbp != NULL && - (((nbp->b_xflags & - (clean ? BX_VNCLEAN : BX_VNDIRTY)) == 0) || + (((nbp->b_xflags & BX_VNCLEAN) == 0) || nbp->b_vp != vp || - (nbp->b_flags & B_DELWRI) == (clean? B_DELWRI: 0))) + (nbp->b_flags & B_DELWRI) != 0)) + return (EAGAIN); + } + + TAILQ_FOREACH_SAFE(bp, &bo->bo_dirty.bv_hd, b_bobufs, nbp) { + if (bp->b_lblkno < startlbn || bp->b_lblkno >= endlbn) + continue; + if (BUF_LOCK(bp, + LK_EXCLUSIVE | LK_SLEEPFAIL | LK_INTERLOCK, + BO_LOCKPTR(bo)) == ENOLCK) { + BO_LOCK(bo); + return (EAGAIN); + } + bremfree(bp); + bp->b_flags |= B_INVAL | B_RELBUF; + bp->b_flags &= ~B_ASYNC; + brelse(bp); + anyfreed = true; + + BO_LOCK(bo); + if (nbp != NULL && + (((nbp->b_xflags & BX_VNDIRTY) == 0) || + (nbp->b_vp != vp) || + (nbp->b_flags & B_DELWRI) == 0)) return (EAGAIN); } - } while (clean = !clean, anyfreed-- > 0); + } while (anyfreed); return (0); } From nobody Thu Oct 10 11:44:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPSZm4bfXz5YvVf; Thu, 10 Oct 2024 11:44: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPSZm42b3z46Tp; Thu, 10 Oct 2024 11:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728560640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/tnV+chIvTpdROXTYFIlvSeye73rEVwVTGHxO/zlvA0=; b=jVsnhzdgdLfAdbWvwb3Wja3r4UkYavlnfTtXMZe3K+yl+N1U6wqWj6anBp1o46YuOuJjs+ C1Wz9K0bmeDY2RkVR76ABYOd4YXpEcZAxrky4osVa3Wfpt2h+xrj3GecDCNoQX+E5mK+W8 5QTqmzNSGPeXnP/QS6xiK39uRpo6IoopAPXAq989g/PdttfAf+ChtBIn/ZSGNR6R+b8k7n DukBvsGrhFq+x0W9g/3Z3ITe+US9GL49VRquzX86pNlRdemUGK34G/BegNTtNZ/Q1cfah+ myX/TgZoVbQRYis1tOXlwSEFA0PkQGBAOTu460KPhsvBCeI4eLVm+wjzhfWuqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728560640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/tnV+chIvTpdROXTYFIlvSeye73rEVwVTGHxO/zlvA0=; b=xVqJfZNb1dyNsJi2hRV08McIfdFLyHI2bijefLkXqNeP4gTvaTQngs03xT5y0X4txjwCAm rx34VxlUg/V9Cxxg5BMUqUYrSqJYD8NzSTXSEqEIqkEWcakfyHgA2JVowVGJWjRhp2Oi8b DlGdPjQO20XVJAzDn2vjRDJFTpPn9RdSLP77wkvuGc3oZF59OibFiqE7bCg+aNAGz3q+K+ 5cILiCASTGG0BcMew66MFvHBd16209BE9ri/DSqhNoXIHDb72yJ9CI1/njY1ZBPZELqI4S U19NVZpbbpJiVqLSz90GfNSfVBxiGZFuLze+KQbpG6CoEb1oTy5v06V5ervutg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728560640; a=rsa-sha256; cv=none; b=hyYyaUtbG7W113YfwP30g+RIvqgTtbEYBCJigHS3H1+pBmmC79/gg9gQCgHX4vulstkvoD ukARl53UKwDBDffvjYVWVqJ0J3HhfYexLF3dZrDH669oExuLGzfYF0e0Jpj8a3HJviIr78 hzGBDSPz6lf8SoPJEJ4hYxNd7GB/1MSg9iX/vdIjctxGFvGe3bf7jSgEBdaF+QszK0k8kr aIiCFubIUvGmD37WGLl9N4byjoDp/gzggRyHawW23ytzFuFqDOwRb+v8Bl509dfLjnogq8 K1GVRUVo5YQHSlm4Z/TceTG80JjYvmppdgNf63Esafgjp8VevXsSnsfZTylNXA== 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 4XPSZm3fBmzwvH; Thu, 10 Oct 2024 11:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ABi0dp021008; Thu, 10 Oct 2024 11:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ABi0e0021005; Thu, 10 Oct 2024 11:44:00 GMT (envelope-from git) Date: Thu, 10 Oct 2024 11:44:00 GMT Message-Id: <202410101144.49ABi0e0021005@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 8751fbe36ff0 - main - rc.d/sendmail: Fix stopping service during shutdown List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8751fbe36ff02ed695f02132ee6eac723d2bbe3f Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=8751fbe36ff02ed695f02132ee6eac723d2bbe3f commit 8751fbe36ff02ed695f02132ee6eac723d2bbe3f Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-10-04 12:26:45 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-10 11:43:37 +0000 rc.d/sendmail: Fix stopping service during shutdown The sendmail service script needs to be stopped during shutdown to ensure a clean shutdown of active SMTP connections (and writing any in memory queue files). rcorder(8) requires the rcorder block to be an uninterrupted sequence of REQUIRE, PROVIDE, BEFORE, and KEYWORD lines. Having a comment in between REQUIRE and KEYWORD makes rcorder stop parsing the block when it reaches the comment. Fix that by moving the comment out from the rcorder block. Reviewed by: bnovkov, christos, gshapiro, markj Approved by: bnovkov (mentor), christos (mentor), markj (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D46924 --- libexec/rc/rc.d/sendmail | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.d/sendmail b/libexec/rc/rc.d/sendmail index 94100b6d00a9..af84c6d6b548 100755 --- a/libexec/rc/rc.d/sendmail +++ b/libexec/rc/rc.d/sendmail @@ -4,9 +4,10 @@ # PROVIDE: mail # REQUIRE: LOGIN FILESYSTEMS -# we make mail start late, so that things like .forward's are not -# processed until the system is fully operational # KEYWORD: shutdown +# +# We make mail start late, so that things like .forward's are not processed +# until the system is fully operational. # XXX - Get together with sendmail mantainer to figure out how to # better handle SENDMAIL_ENABLE and 3rd party MTAs. From nobody Thu Oct 10 12:25:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTW06vtNz5Yy2n; Thu, 10 Oct 2024 12:25:48 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTW0698Wz4F9V; Thu, 10 Oct 2024 12:25:48 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Rjmb7LDOdqBRfpz8Guh2Oif03nEWVx1wuzWnghplaIE=; b=tFAGis0k4z0TXNOQmTRJu4Mf8034sLG0OY1ZZMAMBiuXCFQY7ZtA7MsTkg38HQlx7jikom rPBf4g6csFWBjP1NyGOroFVRqmAWxANZJxy6qQ1q4D6dOKTmlEZjRQDLBfYI6jMnD1Qwy8 Bf9sbIoqLkZDa66Ha47TC4ZSupmEZslk7mIjAE6aJ7ICxEthCG4PfmFrBs/tvjAVR0JYym t1+z/IpHhBnxFDS+D7FEUkERgXnMooc8D0rxf9V+bPogai3ONa5rvIrOnezb2qbz3YSuSg yUIekkfmELHQhC0hn66hzmg8wJDkYesoEkIWMjLEvZ364AT7aUkUQ2vEJ5xw5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Rjmb7LDOdqBRfpz8Guh2Oif03nEWVx1wuzWnghplaIE=; b=tH2t2OpYC0fKOFShNKrftqNikydoK84xozXJFvMyhZiEQRBWMrGex0PXiS5THkHhCRcjt3 LqfFICGKH2yPGpPdkCTgLXq7XwgF+ZAAe1+cHXpdzd23Psg6z9f6ua9ILn8KjEDV0aIMur ydpkPX633WC4NLT0DtG7sCnMOcFny1AyaExwRUW8ChcggS4HVVFiOeEaVN+KSp/d8+B6zS 6UA1U+h1K2UxvpPVptnEKiS/h31qfDimi4FrOM5vXhLMxy2JmXfT6QRHgys6XiY7NHepQ/ l2vTdpDC/iKkAN0nFXuDBbwbUXPATmQvtVJ6s+xFjpzX46WUV7z2LkHkTqbuSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563148; a=rsa-sha256; cv=none; b=VS6FPKu/j5oP4D2T3dyWgr8t4yTkdDFkdTVvYtoO0S2vc+NuVFcj/ww3uALE+D0SCnWCUY XDGJ9t0Nap/3vGqD8X4tK1KRrMswfANGoX2EFpFzGX1rcBZV9QjGFNUE0XU6egCQ5pN0UQ mNW+1OY9jX0Cu20Q/ra58GaO+jU4EEwQJKYzSpL4+0dgaL1k6PwQf2v4O+cUrgwdLltuYI li/6q5iwVVGqIYZ8yQi0IJ/WqUgFlik5Ok9kfZ1t3XqIwrdusXEQSv0ppGjsDMWn4uXCP4 hV3UvaNk8akeIkR/QWfVml2Au3xSZMq6iM20A/CN7pCTUmJ2s8pS5qI5A6Bh/Q== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.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 (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R11" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XPTW045Qlz1c6g; Thu, 10 Oct 2024 12:25:48 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id EAF63BD0A; Thu, 10 Oct 2024 14:25:43 +0200 (CEST) From: Kristof Provost To: Konstantin Belousov Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 2851aafe96c1 - main - mlx5 ipsec_offload: ensure that driver does not dereference dead sahindex Date: Thu, 10 Oct 2024 14:25:43 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: <9DD418B6-E346-4ED8-9212-6BD555FB2431@FreeBSD.org> In-Reply-To: <202410101000.49AA07wh039872@gitrepo.freebsd.org> References: <202410101000.49AA07wh039872@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_25357E85-7349-467E-8FED-1670C4B2178C_=" --=_MailMate_25357E85-7349-467E-8FED-1670C4B2178C_= Content-Type: text/plain; format=flowed Content-Transfer-Encoding: quoted-printable On 10 Oct 2024, at 12:00, Konstantin Belousov wrote: > The branch main has been updated by kib: > > URL: = > https://cgit.FreeBSD.org/src/commit/?id=3D2851aafe96c1e357971f2b331fff8= 37ead20522b > > commit 2851aafe96c1e357971f2b331fff837ead20522b > Author: Konstantin Belousov > AuthorDate: 2024-09-28 23:17:05 +0000 > Commit: Konstantin Belousov > CommitDate: 2024-10-10 09:55:45 +0000 > > mlx5 ipsec_offload: ensure that driver does not dereference dead = > sahindex > > Take the sahtree rlock and check for the DEAD SA state before = > validating > and filling the SA xfrm attributes. > > Sponsored by: NVidia networking > --- I believe this commit breaks LINT-NOIP builds: --- kernel --- linking kernel ld: error: undefined symbol: ipsec_sahtree_rlock >>> referenced by mlx5_ipsec.c >>> mlx5_ipsec.o:(mlx5e_if_sa_newkey_onedir) >>> referenced by mlx5_ipsec.c >>> mlx5_ipsec.o:(mlx5e_if_sa_newkey_onedir) ld: error: undefined symbol: ipsec_sahtree_runlock >>> referenced by mlx5_ipsec.c >>> mlx5_ipsec.o:(mlx5e_if_sa_newkey_onedir) >>> referenced by mlx5_ipsec.c >>> mlx5_ipsec.o:(mlx5e_if_sa_newkey_onedir) >>> referenced by mlx5_ipsec.c >>> mlx5_ipsec.o:(mlx5e_if_sa_newkey_onedir) *** [kernel] Error code 1 Best regards, Kristof --=_MailMate_25357E85-7349-467E-8FED-1670C4B2178C_= Content-Type: text/html Content-Transfer-Encoding: quoted-printable

On 10 Oct 2024, at 12:00, Konstantin Belousov wrote:

The branch main has been updated by= kib:

URL: https://cgit.FreeBSD.org/src/co= mmit/?id=3D2851aafe96c1e357971f2b331fff837ead20522b

commit 2851aafe96c1e357971f2b331fff837ead20522b
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-09-28 23:17:05 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-10-10 09:55:45 +0000

mlx5 ipsec_offload: ensure that driver does not deref= erence dead sahindex

Take the sahtree rlock and check for the DEAD SA stat= e before validating
and filling the SA xfrm attributes.

Sponsored by: NVidia networking
---

I believe this commit breaks LINT-NOIP builds:

--=
- kernel ---
linking kernel
ld: error: undefined symbol: ipsec_sahtree_rlock
>>> referenced by mlx5_ipsec.c
>>>               mlx5_ipsec.o:(mlx5e_if_sa_newkey_onedir)
>>> referenced by mlx5_ipsec.c
>>>               mlx5_ipsec.o:(mlx5e_if_sa_newkey_onedir)

ld: error: undefined symbol: ipsec_sahtree_runlock
>>> referenced by mlx5_ipsec.c
>>>               mlx5_ipsec.o:(mlx5e_if_sa_newkey_onedir)
>>> referenced by mlx5_ipsec.c
>>>               mlx5_ipsec.o:(mlx5e_if_sa_newkey_onedir)
>>> referenced by mlx5_ipsec.c
>>>               mlx5_ipsec.o:(mlx5e_if_sa_newkey_onedir)
*** [kernel] Error code 1

Best regards,
Kristof

--=_MailMate_25357E85-7349-467E-8FED-1670C4B2178C_=-- From nobody Thu Oct 10 12:37:12 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTm916vsz5YysP; Thu, 10 Oct 2024 12:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTm90tbWz4GsD; Thu, 10 Oct 2024 12:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqrnUXBKetI5nLK76CoQ+Hl7cYnAHl/hSol+djNAmhQ=; b=S27U9ylMuKmOpiywgTS70QS4068g9hI2yUGBBHHcuOrKCBhX0eDq8dLPO7shTJws+P1J5Q FlhCaeqMfIXDrAerkpr5zXWFBidwNaMvUo3aTNsiXuPvOFTmQJUMQyqeBIFtCKh695pGZr UCaP8cn3XDITDD0r4iNxeLC0vD13fM6+u9WgNHs7taRIHzKFSkZN6hXi6Sy9NzmcmNxsIW c5hn2srF42+vCK8Db4gJk+OfGnhShCMf00uU02NaIQM+RkywdkZ17rw91DJ7HvzRMpxOo+ AaLwbLcQPwSY8b/fKMZmmDR2+FR9pV6T7MBvQUPZnvewwTu0c8YcTMKh5CbL8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqrnUXBKetI5nLK76CoQ+Hl7cYnAHl/hSol+djNAmhQ=; b=O+UV7/sq6A4QyhtH9UiO7PN8GQOW0CiQNjWGtLz781rzk1aF9lg6g+Klvjpmcxl6T2uOYJ GuYqtgKL+Mn5CcdssqoDEZ2kiMItyr1pjXIkI2yVNWwVlIhLvyTPc1FF5y2n6fGSTcxHvr knTzj0RGXfppccsi5jKOQP73d4mK5h7OZgPCUrhXAmvspFbg1X61yud8l+2VK7QE31brtw 9ewvTrIO+MJr8XWPDconcNuxuhcYwvQTcMI9k0YW0MEx4lvpJyA1jrIoNKg3gBPhwmLDjt EIDk9p0ebx782Drc04UNn5vAiegpvARqB6qBoK1h592mONSJiJ/xx0yR8yzqWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563833; a=rsa-sha256; cv=none; b=xQnYbEuVOYi+RXAxIY+bVbJpkvWIV/RsXT6rqR5bHZ/JzsZSJf6phb+LdGyAPEGSfK3tNX p+9tFjW1av8boVbr4zYFQ21v4j318uGtURIA/U2lkOJV7I2kYQ1qmZjPVrpE5D/ifR0R69 sNOaXC6Jr8w7iVvkrAzfEhY+YLWiTu8wM3y4CFnCapuqz0XHjkupSekni3Jxli45uPSFcI tbUJcisMO54zYH78LneoYylGRxOd4JN5XQ7Le0T6zE8wpqsIxM3Ug2Ac0eiT6IqmBWv0TB uAAf9i6u00fEiVfNLMx96DUeomciYxYAAvR2lJEwOK/tgmAcMC6yg2OqmfmR2Q== 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 4XPTm90TMfzxrd; Thu, 10 Oct 2024 12:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbDww005996; Thu, 10 Oct 2024 12:37:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbCw9005993; Thu, 10 Oct 2024 12:37:12 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:12 GMT Message-Id: <202410101237.49ACbCw9005993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 8de7f8ed5eef - main - pf: reduce IPv6 header parsing code duplication List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8de7f8ed5eefe85b4df068c54059656e12539c4b Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8de7f8ed5eefe85b4df068c54059656e12539c4b commit 8de7f8ed5eefe85b4df068c54059656e12539c4b Author: Kristof Provost AuthorDate: 2024-09-21 16:00:13 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:39 +0000 pf: reduce IPv6 header parsing code duplication There were two loops in pf_setup_pdesc() and pf_normalize_ip6() walking over the IPv6 header chain. Merge them into one loop, adjust some length checks and fix IPv6 jumbo option handling. Also allow strange but legal IPv6 packets with plen=0 passing through pf. IPv6 jumbo packets still get dropped. testing dhill@; ok mcbride@ henning@ Obtained from: OpenBSD, bluhm , d68283bbf0 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46925 --- sys/net/pfvar.h | 6 +- sys/netpfil/pf/pf.c | 261 ++++++++++++++++++++++++++++++++++------------- sys/netpfil/pf/pf_norm.c | 145 ++++++-------------------- 3 files changed, 225 insertions(+), 187 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index b5d56ab45ce7..1e28693b960d 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2361,8 +2361,10 @@ int pf_normalize_ip(struct mbuf **, struct pfi_kkif *, u_short *, #endif /* INET */ #ifdef INET6 -int pf_normalize_ip6(struct mbuf **, struct pfi_kkif *, u_short *, - struct pf_pdesc *); +int pf_walk_header6(struct mbuf *, uint8_t *, int *, int *, uint32_t *, + u_short *); +int pf_normalize_ip6(struct mbuf **, struct pfi_kkif *, int, + u_short *, struct pf_pdesc *); void pf_poolmask(struct pf_addr *, struct pf_addr*, struct pf_addr *, struct pf_addr *, sa_family_t); void pf_addr_inc(struct pf_addr *, sa_family_t); diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 7edf65ae4a09..a482e08dd6ac 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -363,6 +363,8 @@ static u_int16_t pf_calc_mss(struct pf_addr *, sa_family_t, int, u_int16_t); static int pf_check_proto_cksum(struct mbuf *, int, int, u_int8_t, sa_family_t); +static int pf_walk_option6(struct mbuf *, int, int, uint32_t *, + u_short *); static void pf_print_state_parts(struct pf_kstate *, struct pf_state_key *, struct pf_state_key *); static void pf_patch_8(struct mbuf *, u_int16_t *, u_int8_t *, u_int8_t, @@ -8460,6 +8462,144 @@ pf_dummynet_route(struct pf_pdesc *pd, struct pf_kstate *s, return (0); } +#ifdef INET6 +static int +pf_walk_option6(struct mbuf *m, int off, int end, uint32_t *jumbolen, + u_short *reason) +{ + struct ip6_opt opt; + struct ip6_opt_jumbo jumbo; + struct ip6_hdr *h = mtod(m, struct ip6_hdr *); + + while (off < end) { + if (!pf_pull_hdr(m, off, &opt.ip6o_type, sizeof(opt.ip6o_type), + NULL, reason, AF_INET6)) { + DPFPRINTF(PF_DEBUG_MISC, ("IPv6 short opt type")); + return (PF_DROP); + } + if (opt.ip6o_type == IP6OPT_PAD1) { + off++; + continue; + } + if (!pf_pull_hdr(m, off, &opt, sizeof(opt), NULL, reason, + AF_INET6)) { + DPFPRINTF(PF_DEBUG_MISC, ("IPv6 short opt")); + return (PF_DROP); + } + if (off + sizeof(opt) + opt.ip6o_len > end) { + DPFPRINTF(PF_DEBUG_MISC, ("IPv6 long opt")); + REASON_SET(reason, PFRES_IPOPTIONS); + return (PF_DROP); + } + switch (opt.ip6o_type) { + case IP6OPT_JUMBO: + if (*jumbolen != 0) { + DPFPRINTF(PF_DEBUG_MISC, ("IPv6 multiple jumbo")); + REASON_SET(reason, PFRES_IPOPTIONS); + return (PF_DROP); + } + if (ntohs(h->ip6_plen) != 0) { + DPFPRINTF(PF_DEBUG_MISC, ("IPv6 bad jumbo plen")); + REASON_SET(reason, PFRES_IPOPTIONS); + return (PF_DROP); + } + if (!pf_pull_hdr(m, off, &jumbo, sizeof(jumbo), NULL, + reason, AF_INET6)) { + DPFPRINTF(PF_DEBUG_MISC, ("IPv6 short jumbo")); + return (PF_DROP); + } + memcpy(jumbolen, jumbo.ip6oj_jumbo_len, + sizeof(*jumbolen)); + *jumbolen = ntohl(*jumbolen); + if (*jumbolen < IPV6_MAXPACKET) { + DPFPRINTF(PF_DEBUG_MISC, ("IPv6 short jumbolen")); + REASON_SET(reason, PFRES_IPOPTIONS); + return (PF_DROP); + } + break; + default: + break; + } + off += sizeof(opt) + opt.ip6o_len; + } + + return (PF_PASS); +} + +int +pf_walk_header6(struct mbuf *m, uint8_t *nxt, int *off, int *extoff, + uint32_t *jumbolen, u_short *reason) +{ + struct ip6_ext ext; + struct ip6_rthdr rthdr; + struct ip6_hdr *h = mtod(m, struct ip6_hdr *); + int rthdr_cnt = 0; + + *nxt = h->ip6_nxt; + *off = sizeof(struct ip6_hdr); + *extoff = 0; + *jumbolen = 0; + for (;;) { + switch (*nxt) { + case IPPROTO_FRAGMENT: + /* jumbo payload packets cannot be fragmented */ + if (*jumbolen != 0) { + DPFPRINTF(PF_DEBUG_MISC, ("IPv6 fragmented jumbo")); + REASON_SET(reason, PFRES_FRAG); + return (PF_DROP); + } + return (PF_PASS); + case IPPROTO_ROUTING: + if (rthdr_cnt++) { + DPFPRINTF(PF_DEBUG_MISC, ("IPv6 multiple rthdr")); + REASON_SET(reason, PFRES_IPOPTIONS); + return (PF_DROP); + } + if (!pf_pull_hdr(m, *off, &rthdr, sizeof(rthdr), NULL, + reason, AF_INET6)) { + DPFPRINTF(PF_DEBUG_MISC, ("IPv6 short rthdr")); + return (PF_DROP); + } + if (rthdr.ip6r_type == IPV6_RTHDR_TYPE_0) { + DPFPRINTF(PF_DEBUG_MISC, ("IPv6 rthdr0")); + REASON_SET(reason, PFRES_IPOPTIONS); + return (PF_DROP); + } + /* FALLTHROUGH */ + case IPPROTO_AH: + case IPPROTO_HOPOPTS: + case IPPROTO_DSTOPTS: + if (!pf_pull_hdr(m, *off, &ext, sizeof(ext), NULL, + reason, AF_INET6)) { + DPFPRINTF(PF_DEBUG_MISC, ("IPv6 short exthdr")); + return (PF_DROP); + } + *extoff = *off; + if (*nxt == IPPROTO_HOPOPTS) { + if (pf_walk_option6(m, *off + sizeof(ext), + *off + (ext.ip6e_len + 1) * 8, jumbolen, + reason) != PF_PASS) + return (PF_DROP); + if (ntohs(h->ip6_plen) == 0 && *jumbolen != 0) { + DPFPRINTF(PF_DEBUG_MISC, + ("IPv6 missing jumbo")); + REASON_SET(reason, PFRES_IPOPTIONS); + return (PF_DROP); + } + } + if (*nxt == IPPROTO_AH) + *off += (ext.ip6e_len + 2) * 4; + else + *off += (ext.ip6e_len + 1) * 8; + *nxt = ext.ip6e_nxt; + break; + default: + return (PF_PASS); + } + } +} +#endif + static void pf_init_pdesc(struct pf_pdesc *pd, struct mbuf *m) { @@ -8554,7 +8694,9 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, #ifdef INET6 case AF_INET6: { struct ip6_hdr *h; - int terminal = 0; + int extoff; + uint32_t jumbolen; + uint8_t nxt; if (__predict_false(m->m_len < sizeof(struct ip6_hdr)) && (m = *m0 = m_pullup(*m0, sizeof(struct ip6_hdr))) == NULL) { @@ -8566,12 +8708,11 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, return (-1); } - /* We do IP header normalization and packet reassembly here */ - if (pf_normalize_ip6(m0, kif, reason, pd) != PF_PASS) { + if (pf_walk_header6(m, &nxt, off, &extoff, &jumbolen, reason) + != PF_PASS) { *action = PF_DROP; return (-1); } - m = *m0; h = mtod(m, struct ip6_hdr *); pd->src = (struct pf_addr *)&h->ip6_src; @@ -8584,76 +8725,51 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, pd->didx = (dir == PF_IN) ? 1 : 0; pd->tos = IPV6_DSCP(h); pd->tot_len = ntohs(h->ip6_plen) + sizeof(struct ip6_hdr); - *off = ((caddr_t)h - m->m_data) + sizeof(struct ip6_hdr); pd->virtual_proto = pd->proto = h->ip6_nxt; pd->act.rtableid = -1; - do { - switch (pd->proto) { - case IPPROTO_FRAGMENT: - pd->virtual_proto = PF_VPROTO_FRAGMENT; - if (kif == NULL || r == NULL) /* pflog */ - *action = PF_DROP; - else - *action = pf_test_rule(r, s, kif, m, *off, - pd, a, ruleset, inp, - *hdrlen); - if (*action == PF_DROP) - REASON_SET(reason, PFRES_FRAG); - return (-1); - case IPPROTO_ROUTING: { - struct ip6_rthdr rthdr; + /* We do IP header normalization and packet reassembly here */ + if (pf_normalize_ip6(m0, kif, *off, reason, pd) != + PF_PASS) { + *action = PF_DROP; + return (-1); + } + m = *m0; + if (m == NULL) { + /* packet sits in reassembly queue, no error */ + *action = PF_PASS; + return (-1); + } - if (pd->badopts++) { - DPFPRINTF(PF_DEBUG_MISC, - ("pf: IPv6 more than one rthdr")); - *action = PF_DROP; - REASON_SET(reason, PFRES_IPOPTIONS); - return (-1); - } - if (!pf_pull_hdr(m, *off, &rthdr, sizeof(rthdr), - NULL, reason, pd->af)) { - DPFPRINTF(PF_DEBUG_MISC, - ("pf: IPv6 short rthdr")); - *action = PF_DROP; - REASON_SET(reason, PFRES_SHORT); - return (-1); - } - if (rthdr.ip6r_type == IPV6_RTHDR_TYPE_0) { - DPFPRINTF(PF_DEBUG_MISC, - ("pf: IPv6 rthdr0")); - *action = PF_DROP; - REASON_SET(reason, PFRES_IPOPTIONS); - return (-1); - } - /* FALLTHROUGH */ - } - case IPPROTO_AH: - case IPPROTO_HOPOPTS: - case IPPROTO_DSTOPTS: { - /* get next header and header length */ - struct ip6_ext opt6; - - if (!pf_pull_hdr(m, *off, &opt6, sizeof(opt6), - NULL, reason, pd->af)) { - DPFPRINTF(PF_DEBUG_MISC, - ("pf: IPv6 short opt")); - *action = PF_DROP; - return (-1); - } - if (pd->proto == IPPROTO_AH) - *off += (opt6.ip6e_len + 2) * 4; - else - *off += (opt6.ip6e_len + 1) * 8; - pd->virtual_proto = pd->proto = opt6.ip6e_nxt; - /* goto the next header */ - break; - } - default: - terminal++; - break; - } - } while (!terminal); + /* + * Reassembly may have changed the next protocol from fragment + * to something else, so update. + */ + h = mtod(m, struct ip6_hdr *); + pd->virtual_proto = pd->proto = h->ip6_nxt; + + /* recalc offset, refetch header, then update pd */ + if (pf_walk_header6(m, &nxt, off, &extoff, &jumbolen, reason) != + PF_PASS) { + *action = PF_DROP; + return (-1); + } + + if (pd->proto == IPPROTO_FRAGMENT) { + /* + * handle fragments that aren't reassembled by + * normalization + */ + pd->virtual_proto = PF_VPROTO_FRAGMENT; + if (kif == NULL || r == NULL) /* pflog */ + *action = PF_DROP; + else + *action = pf_test_rule(r, s, kif, m, *off, + pd, a, ruleset, NULL /* XXX TODO */, *hdrlen); + if (*action != PF_PASS) + REASON_SET(reason, PFRES_FRAG); + return (-1); + } break; } @@ -9160,8 +9276,12 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 } done: + m = *m0; PF_RULES_RUNLOCK(); + if (m == NULL) + goto eat_pkt; + if (action == PF_PASS && pd.badopts && !((s && s->state_flags & PFSTATE_ALLOWOPTS) || r->allow_opts)) { action = PF_DROP; @@ -9355,6 +9475,7 @@ done: break; } +eat_pkt: SDT_PROBE4(pf, ip, test, done, action, reason, r, s); if (s && action != PF_DROP) { diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 18a9cff2a5c2..a159528c1756 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1210,25 +1210,25 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, #ifdef INET6 int pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, - u_short *reason, struct pf_pdesc *pd) + int off, u_short *reason, struct pf_pdesc *pd) { - struct mbuf *m = *m0; + struct mbuf *m; struct pf_krule *r; - struct ip6_hdr *h = mtod(m, struct ip6_hdr *); - int extoff; - int off; - struct ip6_ext ext; - struct ip6_opt opt; struct ip6_frag frag; - u_int32_t plen; - int optend; - int ooff; - u_int8_t proto; - int terminal; + int extoff; + uint32_t jumbolen; + uint8_t nxt; bool scrub_compat; PF_RULES_RASSERT(); +again: + m = *m0; + + if (pf_walk_header6(m, &nxt, &off, &extoff, &jumbolen, reason) + != PF_PASS) + return (PF_DROP); + r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_SCRUB].active.ptr); /* * Check if there are any scrub rules, matching or not. @@ -1247,16 +1247,14 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, r = r->skip[PF_SKIP_DIR]; else if (r->af && r->af != AF_INET6) r = r->skip[PF_SKIP_AF]; -#if 0 /* header chain! */ - else if (r->proto && r->proto != h->ip6_nxt) + else if (r->proto && r->proto != pd->proto) r = r->skip[PF_SKIP_PROTO]; -#endif else if (PF_MISMATCHAW(&r->src.addr, - (struct pf_addr *)&h->ip6_src, AF_INET6, + (struct pf_addr *)&pd->src, AF_INET6, r->src.neg, kif, M_GETFIB(m))) r = r->skip[PF_SKIP_SRC_ADDR]; else if (PF_MISMATCHAW(&r->dst.addr, - (struct pf_addr *)&h->ip6_dst, AF_INET6, + (struct pf_addr *)&pd->dst, AF_INET6, r->dst.neg, NULL, M_GETFIB(m))) r = r->skip[PF_SKIP_DST_ADDR]; else @@ -1276,112 +1274,29 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, pf_rule_to_actions(r, &pd->act); } - /* Check for illegal packets */ - if (sizeof(struct ip6_hdr) + IPV6_MAXPACKET < m->m_pkthdr.len) - goto drop; - -again: - h = mtod(m, struct ip6_hdr *); - plen = ntohs(h->ip6_plen); - /* jumbo payload option not supported */ - if (plen == 0) - goto drop; - - extoff = 0; - off = sizeof(struct ip6_hdr); - proto = h->ip6_nxt; - terminal = 0; - do { - switch (proto) { - case IPPROTO_FRAGMENT: - goto fragment; - break; - case IPPROTO_AH: - case IPPROTO_ROUTING: - case IPPROTO_DSTOPTS: - if (!pf_pull_hdr(m, off, &ext, sizeof(ext), NULL, - NULL, AF_INET6)) - goto shortpkt; - extoff = off; - if (proto == IPPROTO_AH) - off += (ext.ip6e_len + 2) * 4; - else - off += (ext.ip6e_len + 1) * 8; - proto = ext.ip6e_nxt; - break; - case IPPROTO_HOPOPTS: - if (!pf_pull_hdr(m, off, &ext, sizeof(ext), NULL, - NULL, AF_INET6)) - goto shortpkt; - extoff = off; - optend = off + (ext.ip6e_len + 1) * 8; - ooff = off + sizeof(ext); - do { - if (!pf_pull_hdr(m, ooff, &opt.ip6o_type, - sizeof(opt.ip6o_type), NULL, NULL, - AF_INET6)) - goto shortpkt; - if (opt.ip6o_type == IP6OPT_PAD1) { - ooff++; - continue; - } - if (!pf_pull_hdr(m, ooff, &opt, sizeof(opt), - NULL, NULL, AF_INET6)) - goto shortpkt; - if (ooff + sizeof(opt) + opt.ip6o_len > optend) - goto drop; - if (opt.ip6o_type == IP6OPT_JUMBO) - goto drop; - ooff += sizeof(opt) + opt.ip6o_len; - } while (ooff < optend); - - off = optend; - proto = ext.ip6e_nxt; - break; - default: - terminal = 1; - break; - } - } while (!terminal); - - if (sizeof(struct ip6_hdr) + plen > m->m_pkthdr.len) - goto shortpkt; - - return (PF_PASS); - - fragment: - if (pd->flags & PFDESC_IP_REAS) + if (!pf_pull_hdr(m, off, &frag, sizeof(frag), NULL, reason, AF_INET6)) return (PF_DROP); - if (sizeof(struct ip6_hdr) + plen > m->m_pkthdr.len) - goto shortpkt; - - if (!pf_pull_hdr(m, off, &frag, sizeof(frag), NULL, NULL, AF_INET6)) - goto shortpkt; /* Offset now points to data portion. */ off += sizeof(frag); - /* Returns PF_DROP or *m0 is NULL or completely reassembled mbuf. */ - if (pf_reassemble6(m0, &frag, off, extoff, reason) != PF_PASS) - return (PF_DROP); - m = *m0; - if (m == NULL) - return (PF_DROP); + if (nxt == IPPROTO_FRAGMENT) { + if (pd->flags & PFDESC_IP_REAS) + return (PF_DROP); - pd->flags |= PFDESC_IP_REAS; - goto again; + /* Returns PF_DROP or *m0 is NULL or completely reassembled + * mbuf. */ + if (pf_reassemble6(m0, &frag, off, extoff, reason) != PF_PASS) + return (PF_DROP); - shortpkt: - REASON_SET(reason, PFRES_SHORT); - if (r != NULL && r->log) - PFLOG_PACKET(kif, m, PF_DROP, *reason, r, NULL, NULL, pd, 1); - return (PF_DROP); + pd->flags |= PFDESC_IP_REAS; + m = *m0; + if (m == NULL) + return (PF_DROP); + goto again; + } - drop: - REASON_SET(reason, PFRES_NORM); - if (r != NULL && r->log) - PFLOG_PACKET(kif, m, PF_DROP, *reason, r, NULL, NULL, pd, 1); - return (PF_DROP); + return (PF_PASS); } #endif /* INET6 */ From nobody Thu Oct 10 12:37:14 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTmB2Gdqz5Z03V; Thu, 10 Oct 2024 12:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTmB1Yxtz4Gv0; Thu, 10 Oct 2024 12:37:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U5EM+eKBggstKwY8VFzJhuxokX3gWqZmBblUSrOwgrY=; b=TqRU6tV4lgcIK3tgsEaoxHH49vqfFj+z9R4uZzntoicvqxyQlQDUIol9cCkPA7W+os/YpB u50IHm/52iKJLbddxC1Fr0ltfqxJ953ZYeh3Nx0yFBFOAa9PRdMH0zo593rXmJ/BDWJ6Ra oBz9m+ZoPswi6KKAatVAmjK4U2ZhJKdhI7qIrkbECZ7h/fQGbDKjeKvD3wZ8mcVRLbJwWF E8sZn7wPh28sst7OIu88K/Z0EqbTd1ODEJOSKbH3speCgaLEYL5qja0ZPPfVoAFcjo1cAm W5ZioPB7BT8NppuFm/qDO4vsKoi2mI4BcJhuKmuqEXcP2SEua7v8EudIhgvogQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U5EM+eKBggstKwY8VFzJhuxokX3gWqZmBblUSrOwgrY=; b=M3yNMQ4dkpOiBBRHw+fMMe5F6A3R3BFJNvlKMbJpMGGZFhy2fZdJAneRlLO+ZyHPpQT+M+ tQmgehGuDFi7/CHHY0CumFGrh2E1Y/rHax6Zfkq3vKnJJWJfJU85ubbv02zA9ETYkG3jvE /ZT0m4DvFhv3ip9iFfmVPR+E8tci6zOOgWt/2nlKCkeFkGWo2V4AxfCvOGrvJ/2dNMF0F6 noZy/GLEeaQL+vJl/NXoVKmmZZWN0N9HuUTF0aJJAOovX/9HvG3uFXdIfB6UJDtSe9HIad UIVM0+aR1CW0Vgvbql5DoQs4FVrT76JeqqTck7REan3I2rZYLTm+uT9pK9Awig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563834; a=rsa-sha256; cv=none; b=H4EZMNbLrlYcszNRqGj0MuzK81zJH5Rbdn7w7eaYA9+ganRxLTqs3eWHad9ZhnTvkRDX8Y bPB6JXeGki+jxO+v6iwld+H7onis7JRUyfuyPGDCLpUFwRG2Jw9LzCR0EOXI5qoVKTSbZ1 wtS3+Mz9HFv/d4FN7ZDgVNrLvH0qpJMR/ICGgf7WRUhRliH8X/0v3M4F/yTK5O1L5VnhnS Yn0z+ywzaoVPT52LKZgEmBJkJmQZ/+/jMiniw4Juxo66CBO5tAZf5C32rTgAWC/Mw+Zbln Wm1unM0ApulKX6MyycwYHEppzevphzH2cqCWQA1yB0yzbi/C4KBc1qfsAKIr5Q== 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 4XPTmB1BY0zxrf; Thu, 10 Oct 2024 12:37:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbEqI006050; Thu, 10 Oct 2024 12:37:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbERj006047; Thu, 10 Oct 2024 12:37:14 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:14 GMT Message-Id: <202410101237.49ACbERj006047@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: ee9f418c8041 - main - pfctl: correctly print skip steps in -vv mode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ee9f418c804184feb7139a0b4dac396b4934a8e7 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ee9f418c804184feb7139a0b4dac396b4934a8e7 commit ee9f418c804184feb7139a0b4dac396b4934a8e7 Author: Kristof Provost AuthorDate: 2024-09-26 14:12:49 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:39 +0000 pfctl: correctly print skip steps in -vv mode - Changed order of address and ports. Obtained from: OpenBSD, mcbride , 0bcfb1e086 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46926 --- sbin/pfctl/pfctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 45bfdf31f8dc..16c54981b348 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1038,7 +1038,7 @@ pfctl_print_rule_counters(struct pfctl_rule *rule, int opts) { if (opts & PF_OPT_DEBUG) { const char *t[PF_SKIP_COUNT] = { "i", "d", "f", - "p", "sa", "sp", "da", "dp" }; + "p", "sa", "da", "sp", "dp" }; int i; printf(" [ Skip steps: "); From nobody Thu Oct 10 12:37:15 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTmC5QxRz5Yyqj; Thu, 10 Oct 2024 12:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTmC3DVwz4H9g; Thu, 10 Oct 2024 12:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iriO64jsPctTOsqCbTr9QboEVgtmzOVwa+6t/B3GBxo=; b=vaZBxrY2oTIyldd2MMM4o5gNJOFHqglxw/D8+MAj9PzlXOu+IAanRfdpndCHc7dMdEz4wO NjtPB7RAqcAtTPw4QeQ4obhwrK+6I8Z1302lF1us7qMsmTGhJV3xJgVGfSQyMlCuAd3H9v u0f4hzPu1kcj1PSxdypi/AOZgIs82PfFX2kvLsK2uTbYO9mBlKuKZzmzBJ0irPc+k1Z9gT 7V1TjTnNDUXgKGZoYmpSjEcFVA/7XZPvLahRQJ3x6/erpS4p7NnU3iwx+akZ7xSO35DLzk 7neqYD3cBr1ijnhCkS8guaV+QAW3qzxgtpVyRv9gsGn+pZm1udTqCtrI+ga4YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iriO64jsPctTOsqCbTr9QboEVgtmzOVwa+6t/B3GBxo=; b=v+UhxoLud4ik/rRC94Rlom3eQoDPI0O6InxBJQwhP4/fjADsaPZCTh36i7tq7VoleZ6M5i 7B7DRyr1ZRGfHX0QS5r2bYh7ZooKLnMS8CWJgIpVnPha8cGDNw3u3Ae4QtQmv0UM6hiRrH 2Mjv+4lUSoRwsPD0dWMRG0A1QsMcUxsQsswF3gKGhzVK+/XYTDQMRUeHpCSO/ODz8b6rO1 v+dzb4nUST8nYSYeqokCQ1cnS4SZzP/rZzcq6Da7+3p8NSB8GedFN8ReO+7j9TJXeVCQOl 55bikiJkIGjWfC0m7ftWZWnbVDd0z8ujVktBxURwSJWZbaqMLiIXICmcHZd66A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563835; a=rsa-sha256; cv=none; b=x1xM16PSYkDxP39AxDVeMypk59BLA4V4N2eSAOtFUXaEtMVLOqNS1QgSr8aw6ThVP1Gi/D iDex1ylQCgSU/bcNL+dsQFfpg983KTGse4iX3iji85isstekOs8gmvCNcjcxNW+V+ZAMJo fyuTZOqHhmXAGbwIk2RuCzTAYVsBQaP5CqnGh2EBC2aPYdmaZRg7vEvv9X0Q7eI7xiG1Pj LBVTxhh4SLet6JX6vu2cKxtPd5KJLEpwqbOjGSPksdypkyRUJ8bSd1/X2DsbY80b5aMPlp yFryJnibmjvGDeV5kOnFCgaDgkfZbKQJxR0ZfYx8XwDHAevFkZX9eDOjV93OCg== 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 4XPTmC27WHzxTP; Thu, 10 Oct 2024 12:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbFM8006104; Thu, 10 Oct 2024 12:37:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbFWA006101; Thu, 10 Oct 2024 12:37:15 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:15 GMT Message-Id: <202410101237.49ACbFWA006101@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 7d0f8cd93bce - main - pf: ensure that we won't enter an endless loop List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7d0f8cd93bce786728a1fff8b2e2184c8e48f3b2 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7d0f8cd93bce786728a1fff8b2e2184c8e48f3b2 commit 7d0f8cd93bce786728a1fff8b2e2184c8e48f3b2 Author: Kristof Provost AuthorDate: 2024-09-26 15:53:53 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:39 +0000 pf: ensure that we won't enter an endless loop ensure that we won't enter an endless loop while iterating over an address pool. problem found and solution tested by claudio. ok claudio, henning, "reads fine" to zinke Obtained from: OpenBSD, mikeb , e4fc4bddb9 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46927 --- sys/netpfil/pf/pf_table.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/pf/pf_table.c b/sys/netpfil/pf/pf_table.c index 690cb6d9ab90..77bd466ec2b3 100644 --- a/sys/netpfil/pf/pf_table.c +++ b/sys/netpfil/pf/pf_table.c @@ -2245,7 +2245,7 @@ pfr_pool_get(struct pfr_ktable *kt, int *pidx, struct pf_addr *counter, struct pf_addr addr, cur, mask, umask_addr; union sockaddr_union uaddr, umask; struct pfr_kentry *ke, *ke2 = NULL; - int idx = -1, use_counter = 0; + int startidx, idx = -1, loop = 0, use_counter = 0; MPASS(pidx != NULL); MPASS(counter != NULL); @@ -2272,18 +2272,29 @@ pfr_pool_get(struct pfr_ktable *kt, int *pidx, struct pf_addr *counter, use_counter = 1; if (idx < 0) idx = 0; + startidx = idx; _next_block: - ke = pfr_kentry_byidx(kt, idx, af); - if (ke == NULL) { + if (loop && startidx == idx) { pfr_kstate_counter_add(&kt->pfrkt_nomatch, 1); return (1); } + + ke = pfr_kentry_byidx(kt, idx, af); + if (ke == NULL) { + /* we don't have this idx, try looping */ + if (loop || (ke = pfr_kentry_byidx(kt, 0, af)) == NULL) { + pfr_kstate_counter_add(&kt->pfrkt_nomatch, 1); + return (1); + } + idx = 0; + loop++; + } pfr_prepare_network(&umask, af, ke->pfrke_net); pfr_sockaddr_to_pf_addr(&ke->pfrke_sa, &cur); pfr_sockaddr_to_pf_addr(&umask, &mask); - if (use_counter) { + if (use_counter && !PF_AZERO(counter, af)) { /* is supplied address within block? */ if (!PF_MATCHA(0, &cur, &mask, counter, af)) { /* no, go to next block in table */ From nobody Thu Oct 10 12:37:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTmD5Hm7z5YysV; Thu, 10 Oct 2024 12:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTmD3qL7z4Gq3; Thu, 10 Oct 2024 12:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e1c1KzWRye4NKWK6fPJjHu6b+dBtmwD9tnIDRhRIoEk=; b=ZlDzIFMjMRiDF5aZ/wwQo5Fa/L2le7z2eykxX77na+OBsMo/LX5y8j9AWBEmc8mAuFedUG Kb/7J0QRT3/eWItrz7UUIEOw8wWJXlCnDO0gqoZCuBlXCr1g7VG3bWKflkP2NbwlWtb17s 5f2k2o+U24xbwhgZyhRRApjhFO1GYWZsdQTouBrQSy3FL0shkP1Uh4BE8atL5RZPVzXN6G m+H77VD3vvr335YMSUzqJtnZUv7wP1Hf0QXI/8tibfK+gJSQ8/q+8G3o0lBIPDI7YnsgPv Rn88fxSrUeR5yWaVWrwgmCdLfyrJYNXBSXuXgDS09bNzxaOGzRoKl2lw8J68oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e1c1KzWRye4NKWK6fPJjHu6b+dBtmwD9tnIDRhRIoEk=; b=EWaMhvfTOuw03/1M37w3Q7mjOw80pFtwatK1UpVDnuakuVfSmLZ122rmGWI9tNwB1gugpi Nr1MgrxKggWiGTJhyd7mSX8MchOEwSfebcTwcq6knNquBcIVlAGCEJYisn8i92MDi0A3RN Z9W2aJlaOHUINXUmr4+M4tBt2QsTEHzqLwBhnyBmMos3Eru8NR9c8/qg3EILVgjGbMUawM JwNNX+0IAUZTJqo3dDfXZWvDzDd7oRxYLWHse+znApzE2mr2Inrhz9vqqLKe3CkX3vNVAN i0iSH+HryUQG3Xa+CdORY0nvQYsnOVTkMjtf6PUIpIWRNb4CFEgB5JxDvsAVVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563836; a=rsa-sha256; cv=none; b=n4d6gwIU7O5aBao7bakXYhWeLxjgSn5P3udzC79Xrndhgb35iQfoCd0vjnx/6CpjJ7PHQ2 PoS5W0TQX1jGprqePcLBOR8TjLPZEkX54SekKeilc7reooqYSzSohB/WJDNUiYbCj48Yln im3O7f9yHCO9rNUkwXyVH53f1yc+bO/25dXezqbRSQck7ikpuz9z14IT3Q75SKVejpuGgl xMgZvy9HUupbI+T4DBRhzV9SYXAL2/rTQh8zXauOCzMs4+56dXYMEbNaNwmrrrxhv5dQnQ +ln/skw1CsFpxF10QpIfzBru4Jx4r6esGRpnrHPZLN73rfdouXOpMa+OCQj9jQ== 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 4XPTmD3Ry7zxZm; Thu, 10 Oct 2024 12:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbGM5006146; Thu, 10 Oct 2024 12:37:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbGv8006143; Thu, 10 Oct 2024 12:37:16 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:16 GMT Message-Id: <202410101237.49ACbGv8006143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 5c3d74eca642 - main - pf: add ttl to pf_pdesc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5c3d74eca642220c1a6137528f66245b86d6939d Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5c3d74eca642220c1a6137528f66245b86d6939d commit 5c3d74eca642220c1a6137528f66245b86d6939d Author: Kristof Provost AuthorDate: 2024-09-27 22:13:23 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:39 +0000 pf: add ttl to pf_pdesc This simplifies the code a little, because we can now avoid looking at the IP(v6) header at all in pf_test() itself. We do have to move the Jumbogram check into pf_setup_pdesc as well. Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46928 --- sys/net/pfvar.h | 3 ++- sys/netpfil/pf/pf.c | 59 ++++++++++-------------------------------- sys/netpfil/pf/pf_syncookies.c | 4 +-- 3 files changed, 17 insertions(+), 49 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 1e28693b960d..66e3e53b8b37 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1618,6 +1618,7 @@ struct pf_pdesc { sa_family_t af; u_int8_t proto; u_int8_t tos; + u_int8_t ttl; u_int8_t dir; /* direction */ u_int8_t sidx; /* key index for source */ u_int8_t didx; /* key index for destination */ @@ -2509,7 +2510,7 @@ void pf_syncookie_send(struct mbuf *m, int off, struct pf_pdesc *); bool pf_syncookie_check(struct pf_pdesc *); u_int8_t pf_syncookie_validate(struct pf_pdesc *); -struct mbuf * pf_syncookie_recreate_syn(uint8_t, int, +struct mbuf * pf_syncookie_recreate_syn(int, struct pf_pdesc *); VNET_DECLARE(struct pf_kstatus, pf_status); diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index a482e08dd6ac..aa63c2c1d390 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8666,6 +8666,7 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, pd->sidx = (dir == PF_IN) ? 0 : 1; pd->didx = (dir == PF_IN) ? 1 : 0; pd->tos = h->ip_tos; + pd->ttl = h->ip_ttl; pd->tot_len = ntohs(h->ip_len); pd->act.rtableid = -1; @@ -8724,10 +8725,20 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, pd->sidx = (dir == PF_IN) ? 0 : 1; pd->didx = (dir == PF_IN) ? 1 : 0; pd->tos = IPV6_DSCP(h); + pd->ttl = h->ip6_hlim; pd->tot_len = ntohs(h->ip6_plen) + sizeof(struct ip6_hdr); pd->virtual_proto = pd->proto = h->ip6_nxt; pd->act.rtableid = -1; + /* + * we do not support jumbogram. if we keep going, zero ip6_plen + * will do something bad, so drop the packet for now. + */ + if (htons(h->ip6_plen) == 0) { + *action = PF_DROP; + return (-1); + } + /* We do IP header normalization and packet reassembly here */ if (pf_normalize_ip6(m0, kif, *off, reason, pd) != PF_PASS) { @@ -8974,12 +8985,6 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 struct pfi_kkif *kif; u_short action, reason = 0; struct mbuf *m = *m0; -#ifdef INET - struct ip *h = NULL; -#endif -#ifdef INET6 - struct ip6_hdr *h6 = NULL; -#endif struct m_tag *mtag; struct pf_krule *a = NULL, *r = &V_pf_default_rule; struct pf_kstate *s = NULL; @@ -8988,7 +8993,6 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 int off, hdrlen, use_2nd_queue = 0; uint16_t tag; uint8_t rt; - uint8_t ttl; PF_RULES_RLOCK_TRACKER; KASSERT(dir == PF_IN || dir == PF_OUT, ("%s: bad direction %d\n", __func__, dir)); @@ -9079,23 +9083,6 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 } m = *m0; - switch (af) { -#ifdef INET - case AF_INET: - h = mtod(m, struct ip *); - ttl = h->ip_ttl; - break; -#endif -#ifdef INET6 - case AF_INET6: - h6 = mtod(m, struct ip6_hdr *); - ttl = h6->ip6_hlim; - break; -#endif - default: - panic("Unknown af %d", af); - } - if (__predict_false(ip_divert_ptr != NULL) && ((mtag = m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL)) != NULL)) { struct pf_divert_mtag *dt = (struct pf_divert_mtag *)(mtag+1); @@ -9119,18 +9106,6 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 m_tag_delete(m, mtag); } -#ifdef INET6 - /* - * we do not support jumbogram. if we keep going, zero ip6_plen - * will do something bad, so drop the packet for now. - */ - if (af == AF_INET6 && htons(h6->ip6_plen) == 0) { - action = PF_DROP; - REASON_SET(&reason, PFRES_NORM); /*XXX*/ - goto done; - } -#endif - switch (pd.proto) { case IPPROTO_TCP: { /* Respond to SYN with a syncookie. */ @@ -9160,8 +9135,7 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 pd.dir == PF_IN) { struct mbuf *msyn; - msyn = pf_syncookie_recreate_syn(ttl, off, - &pd); + msyn = pf_syncookie_recreate_syn(off, &pd); if (msyn == NULL) { action = PF_DROP; break; @@ -9340,14 +9314,7 @@ done: else pd.pf_mtag->qid = pd.act.qid; /* Add hints for ecn. */ -#ifdef INET - if (af == AF_INET) - pd.pf_mtag->hdr = h; -#endif -#ifdef INET6 - if (af == AF_INET6) - pd.pf_mtag->hdr = h6; -#endif + pd.pf_mtag->hdr = mtod(m, void *); } } #endif /* ALTQ */ diff --git a/sys/netpfil/pf/pf_syncookies.c b/sys/netpfil/pf/pf_syncookies.c index 538ab1dfd94c..40c664f48914 100644 --- a/sys/netpfil/pf/pf_syncookies.c +++ b/sys/netpfil/pf/pf_syncookies.c @@ -498,7 +498,7 @@ pf_syncookie_generate(struct mbuf *m, int off, struct pf_pdesc *pd, } struct mbuf * -pf_syncookie_recreate_syn(uint8_t ttl, int off, struct pf_pdesc *pd) +pf_syncookie_recreate_syn(int off, struct pf_pdesc *pd) { uint8_t wscale; uint16_t mss; @@ -517,6 +517,6 @@ pf_syncookie_recreate_syn(uint8_t ttl, int off, struct pf_pdesc *pd) wscale = pf_syncookie_wstab[cookie.flags.wscale_idx]; return (pf_build_tcp(NULL, pd->af, pd->src, pd->dst, *pd->sport, - *pd->dport, seq, 0, TH_SYN, wscale, mss, ttl, false, 0, + *pd->dport, seq, 0, TH_SYN, wscale, mss, pd->ttl, false, 0, PF_MTAG_FLAG_SYNCOOKIE_RECREATED, pd->act.rtableid)); } From nobody Thu Oct 10 12:37:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTmF6gHgz5Z05h; Thu, 10 Oct 2024 12:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTmF4vs3z4H5Y; Thu, 10 Oct 2024 12:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NppLi33fonn8K2KL/0FlszzKceGE1XxDhLKOhw+8mKQ=; b=GVTwVdQcGDM/LNrsbXFKcw5TryRxBZc2PnDEYzSBtIMSkf7oSmAWUCrh8Ja7Fq7fnRRaaq PIlUoHePSrnQctyR0HZ8vvTJfcrJkBkneTXG1XM4T6daZZPPTCJYjXXqH1UwvUg2S+GBQo wJ5GyUUVDb/qsSY9TcewNgd3Bb1T1OJ0ZJAF/MXq+ZklPz23Te1yVjMWWd7s/86x8ldDf2 QoXTvEDG7ThHB+b/ehjYvrAwHDoiDESAwtr2RLkz6yvYD76g0qyfH5X6Cphx+AKWiGahaN WCIVKh9hQT4Ru2GDNHTk5MqCbQMWfE+xpSHAEedAWa1uS3g6IuVtXYD0sPy87Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NppLi33fonn8K2KL/0FlszzKceGE1XxDhLKOhw+8mKQ=; b=nOr3KxyRb8VyyecqlTcrgIxZFKqtYeaWg8fVLQnKdoB8m+fJyNSa0TQ/lLnvObI60YqDre TTt6ULdeaKVbkwz1QLrQcwxpZb3fKo39NJBzUumCm9Eff8Y6l+HB7FG+Pk32xx6V+BD9fM r2+pNiJp1VMNFuxT409OAkTv3FVOZtlKxK0fA5C+6eOCMiwRRneFgQPxYSAobpso7CGbRR noOJ001yJ32fX5tn6LG0aYi+iesSe1wL1sx4r0wZZwu8rJ5y7M1bt/eSiHQKBK4Dy7rgVB jxtHgJvo8O6rTeewPZ8Yg5Itoq1mydXEqGJyZ62gRk2Qnt0Cs/yVKrzBavLmYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563837; a=rsa-sha256; cv=none; b=sgwFyD0mDBTgo82hca1nJkKem6SMNT7TpAKTEh1svmSK32ymeRIPINqKiJ4YYDTjEvKlM7 TBILgBt9ynbD2RGz5+HNX2zjZOGGxUq3MpZP1ybmbyCgyNpvwcicnACJCFxYp3UGSeRtsb wiKIq1CA7RgyS0sVBcZuWQhZ2HYeiZyW0pCt33dsbz2MfQxSaiqi1ak8vIroAEjqe7UWHO kbr1lz5QjuExmh+8SUw0XCe72UNxfAmZ1eBfCyuUBfpe6QjW7N1RHmR3911y+YhTOB9opB LsSqYsa+2ghyHsNFqjx43Sdd5ar1aGxj7Fs1BnS4BkWtsv/VwNK4mnvW7uio3g== 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 4XPTmF4VmFzy2N; Thu, 10 Oct 2024 12:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbHeI006194; Thu, 10 Oct 2024 12:37:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbHjv006191; Thu, 10 Oct 2024 12:37:17 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:17 GMT Message-Id: <202410101237.49ACbHjv006191@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 7b033960e15a - main - pf: stricter address family checks in icmp-in-icmp List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7b033960e15a998a388b1e4e84be9169b7762470 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7b033960e15a998a388b1e4e84be9169b7762470 commit 7b033960e15a998a388b1e4e84be9169b7762470 Author: Kristof Provost AuthorDate: 2024-09-30 12:31:13 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:39 +0000 pf: stricter address family checks in icmp-in-icmp If ipv4+icmp6 or ipv6+icmp packets were embedded into an icmp payload, we missed to drop them. While there, also add a reason to the corresponding check in pf_test(). ok mcbride@ claudio@ Obtained from: OpenBSD, bluhm , 7ce93f3346 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46929 --- sys/netpfil/pf/pf.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index aa63c2c1d390..891c490a0b1e 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7342,6 +7342,11 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, case IPPROTO_ICMP: { struct icmp *iih = &pd2.hdr.icmp; + if (pd2.af != AF_INET) { + REASON_SET(reason, PFRES_NORM); + return (PF_DROP); + } + if (!pf_pull_hdr(m, off2, iih, ICMP_MINLEN, NULL, reason, pd2.af)) { DPFPRINTF(PF_DEBUG_MISC, @@ -7400,6 +7405,11 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, case IPPROTO_ICMPV6: { struct icmp6_hdr *iih = &pd2.hdr.icmp6; + if (pd2.af != AF_INET6) { + REASON_SET(reason, PFRES_NORM); + return (PF_DROP); + } + if (!pf_pull_hdr(m, off2, iih, sizeof(struct icmp6_hdr), NULL, reason, pd2.af)) { DPFPRINTF(PF_DEBUG_MISC, @@ -9201,6 +9211,7 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 case IPPROTO_ICMP: { if (af != AF_INET) { action = PF_DROP; + REASON_SET(&reason, PFRES_NORM); DPFPRINTF(PF_DEBUG_MISC, ("dropping IPv6 packet with ICMPv4 payload")); goto done; @@ -9220,6 +9231,7 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 case IPPROTO_ICMPV6: { if (af != AF_INET6) { action = PF_DROP; + REASON_SET(&reason, PFRES_NORM); DPFPRINTF(PF_DEBUG_MISC, ("pf: dropping IPv4 packet with ICMPv6 payload\n")); goto done; From nobody Thu Oct 10 12:37:18 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTmH0vrBz5Z05j; Thu, 10 Oct 2024 12:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTmG63Fvz4H5t; Thu, 10 Oct 2024 12:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KEv+deKePZRgkH364TiJmc7W9Hu39pxnSIkEY3fHncI=; b=R8veL9ooMHpRPxSRrDE71yfWmCY/5e5WB6/cWMV0JpJHmIpG1geM5UkGJxcknipBsJPWlC TpWBPux7/MuTVBG4jJ/zXRwcNH5jz8sv7IPP+rFuTTsOw3ZDnn7SdeN6w7vZ95ql4eXS5F Rm9j7l1U/5AgNKjmSnIiS8xl5cHZdaU/cIX/A8rffD85raSwueelZxFS/knyT+/ehcywiv 667AlSul018W/BR0FvoAS2txQLe4YQiE/VWGyEkq1aPr2iyW491nhfGdpfzQgo2FzeeZxD seQsI+VSOPHLWKaxJ4dBNvmPvqJSpUJ/UiUD3Bw91GUzZtfJsPjxTXb8+7ZAWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KEv+deKePZRgkH364TiJmc7W9Hu39pxnSIkEY3fHncI=; b=u3OAwSYup92ghpVORVGHj2t2LWhotr+s4WLUb7UJkiYR2rBGOGJelPGqYXLIfk1D0cCW3q fB270F8sXthSTKEUz2CUhbmitMACqMx2c6GCvggkDA4foMiNcpZ0F9vGlZU5DUIec9MGmf baz2vXj9YMRMXD9sETJyluLIZFpY9lWi7apFqSbsiA6NVPbLVqrPv7ZoCoWa16HwY+4eKv JPpi7FjFAj0/snlkSNYZHiuo0r2fqyUpmjE+HFntIAQx50EPGx/wdpjGNoZl+2sCPWzEqW g7qxncW/elUzxmPWd6QUjAjWYFhQ9wVPXIgaBlcgnnO0WKnATmT7xBRFjI4HHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563838; a=rsa-sha256; cv=none; b=CFD9I/FEjEaE75Qs+HENIXxNjqYTRqv2lhxZtErmFOo1xCMdjfwuYFrCkl6FfsWKbhJE3X vl/tYWOV/wEppm44pxreBf8aXES8CWwnPUb7pbsgEjU/J1QGTS9JObgABXwqR5Orb3hEW9 8uhNFGzrAla8CB2LsYTsJDv+N1EDgtSl6aEnx4PWqw3C5JaBP4qDiGJYj64r4ymT9udP/S v4wYJZROdsTQ8kOgMB9WX8r7IfIHZ7G11dCKPPRAu0RcJaDcBCT3EKBvPoGjhGaC/g/ugX Oj5vR5v1SPVU403qA6mNdMRRgIx8pDpHmjBIp+MWXu8ZgemqW1bwAmLdmPp6Xw== 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 4XPTmG5ZBmzxq3; Thu, 10 Oct 2024 12:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbI9B006236; Thu, 10 Oct 2024 12:37:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbIR5006233; Thu, 10 Oct 2024 12:37:18 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:18 GMT Message-Id: <202410101237.49ACbIR5006233@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 25e0f8f99f54 - main - pf: convert DIOCGETRULESETS to netlink List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 25e0f8f99f544f5bb737b2c7709fe6ea572e37f0 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=25e0f8f99f544f5bb737b2c7709fe6ea572e37f0 commit 25e0f8f99f544f5bb737b2c7709fe6ea572e37f0 Author: Kristof Provost AuthorDate: 2024-10-01 17:15:54 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:40 +0000 pf: convert DIOCGETRULESETS to netlink Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46930 --- lib/libpfctl/libpfctl.c | 48 ++++++++++++++++++++++++++++++++++++++++++- lib/libpfctl/libpfctl.h | 1 + sbin/pfctl/pfctl.c | 22 +++++++++----------- sys/net/pfvar.h | 1 + sys/netpfil/pf/pf_ioctl.c | 52 +++++++++++++++++++++++++++++------------------ sys/netpfil/pf/pf_nl.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ sys/netpfil/pf/pf_nl.h | 7 +++++++ 7 files changed, 149 insertions(+), 33 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 36b83c480aa7..c9f315a0db67 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -2914,5 +2914,51 @@ pfctl_get_addr(struct pfctl_handle *h, uint32_t ticket, uint32_t r_num, continue; } - return (0); + return (e.error); } + +#define _OUT(_field) offsetof(struct pfioc_ruleset, _field) +static const struct snl_attr_parser ap_ruleset[] = { + { .type = PF_RS_NR, .off = _OUT(nr), .cb = snl_attr_get_uint32 }, +}; +static struct snl_field_parser fp_ruleset[] = {}; +SNL_DECLARE_PARSER(ruleset_parser, struct genlmsghdr, fp_ruleset, ap_ruleset); +#undef _OUT + +int +pfctl_get_rulesets(struct pfctl_handle *h, const char *path, uint32_t *nr) +{ + struct snl_writer nw; + struct snl_errmsg_data e = {}; + struct nlmsghdr *hdr; + struct pfioc_ruleset rs = {}; + uint32_t seq_id; + int family_id; + + family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); + if (family_id == 0) + return (ENOTSUP); + + snl_init_writer(&h->ss, &nw); + hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GET_RULESETS); + + snl_add_msg_attr_string(&nw, PF_RS_PATH, path); + + if ((hdr = snl_finalize_msg(&nw)) == NULL) + return (ENXIO); + + seq_id = hdr->nlmsg_seq; + + if (! snl_send_message(&h->ss, hdr)) + return (ENXIO); + + while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { + if (! snl_parse_nlmsg(&h->ss, hdr, &ruleset_parser, &rs)) + continue; + } + + *nr = rs.nr; + + return (e.error); +} + diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 6088e18554b3..6d8be24dd04f 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -504,5 +504,6 @@ int pfctl_get_addrs(struct pfctl_handle *h, uint32_t ticket, uint32_t r_num, uint8_t r_action, const char *anchor, uint32_t *nr); int pfctl_get_addr(struct pfctl_handle *h, uint32_t ticket, uint32_t r_num, uint8_t r_action, const char *anchor, uint32_t nr, struct pfioc_pooladdr *pa); +int pfctl_get_rulesets(struct pfctl_handle *h, const char *path, uint32_t *nr); #endif diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 16c54981b348..ee49e7b12278 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1253,14 +1253,13 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, memset(&prs, 0, sizeof(prs)); memcpy(prs.path, npath, sizeof(prs.path)); - if (ioctl(dev, DIOCGETRULESETS, &prs)) { - if (errno == EINVAL) + if ((ret = pfctl_get_rulesets(pfh, npath, &mnr)) != 0) { + if (ret == EINVAL) fprintf(stderr, "Anchor '%s' " "not found.\n", anchorname); else - err(1, "DIOCGETRULESETS"); + errc(1, ret, "DIOCGETRULESETS"); } - mnr = prs.nr; pfctl_print_rule_counters(&rule, opts); for (nr = 0; nr < mnr; ++nr) { @@ -1457,14 +1456,13 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth, u_int32_t mnr, nr; memset(&prs, 0, sizeof(prs)); memcpy(prs.path, npath, sizeof(prs.path)); - if (ioctl(dev, DIOCGETRULESETS, &prs)) { - if (errno == EINVAL) + if ((ret = pfctl_get_rulesets(pfh, npath, &mnr)) != 0) { + if (ret == EINVAL) fprintf(stderr, "NAT anchor '%s' " "not found.\n", anchorname); else - err(1, "DIOCGETRULESETS"); + errc(1, ret, "DIOCGETRULESETS"); } - mnr = prs.nr; pfctl_print_rule_counters(&rule, opts); for (nr = 0; nr < mnr; ++nr) { @@ -2815,18 +2813,18 @@ pfctl_show_anchors(int dev, int opts, char *anchorname) { struct pfioc_ruleset pr; u_int32_t mnr, nr; + int ret; memset(&pr, 0, sizeof(pr)); memcpy(pr.path, anchorname, sizeof(pr.path)); - if (ioctl(dev, DIOCGETRULESETS, &pr)) { - if (errno == EINVAL) + if ((ret = pfctl_get_rulesets(pfh, anchorname, &mnr)) != 0) { + if (ret == EINVAL) fprintf(stderr, "Anchor '%s' not found.\n", anchorname); else - err(1, "DIOCGETRULESETS"); + errc(1, ret, "DIOCGETRULESETS"); return (-1); } - mnr = pr.nr; for (nr = 0; nr < mnr; ++nr) { char sub[MAXPATHLEN]; diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 66e3e53b8b37..e27c5e666de8 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2581,6 +2581,7 @@ int pf_ioctl_begin_addrs(uint32_t *); int pf_ioctl_add_addr(struct pfioc_pooladdr *); int pf_ioctl_get_addrs(struct pfioc_pooladdr *); int pf_ioctl_get_addr(struct pfioc_pooladdr *); +int pf_ioctl_get_rulesets(struct pfioc_ruleset *); void pf_krule_free(struct pf_krule *); void pf_krule_clear_counters(struct pf_krule *); diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 8081960933a2..e3fb3150db5f 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -2665,6 +2665,37 @@ pf_ioctl_get_addr(struct pfioc_pooladdr *pp) return (0); } +int +pf_ioctl_get_rulesets(struct pfioc_ruleset *pr) +{ + struct pf_kruleset *ruleset; + struct pf_kanchor *anchor; + + PF_RULES_RLOCK_TRACKER; + + pr->path[sizeof(pr->path) - 1] = 0; + + PF_RULES_RLOCK(); + if ((ruleset = pf_find_kruleset(pr->path)) == NULL) { + PF_RULES_RUNLOCK(); + return (ENOENT); + } + pr->nr = 0; + if (ruleset->anchor == NULL) { + /* XXX kludge for pf_main_ruleset */ + RB_FOREACH(anchor, pf_kanchor_global, &V_pf_anchors) + if (anchor->parent == NULL) + pr->nr++; + } else { + RB_FOREACH(anchor, pf_kanchor_node, + &ruleset->anchor->children) + pr->nr++; + } + PF_RULES_RUNLOCK(); + + return (0); +} + static int pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td) { @@ -4474,29 +4505,10 @@ DIOCCHANGEADDR_error: case DIOCGETRULESETS: { struct pfioc_ruleset *pr = (struct pfioc_ruleset *)addr; - struct pf_kruleset *ruleset; - struct pf_kanchor *anchor; pr->path[sizeof(pr->path) - 1] = 0; - PF_RULES_RLOCK(); - if ((ruleset = pf_find_kruleset(pr->path)) == NULL) { - PF_RULES_RUNLOCK(); - error = ENOENT; - break; - } - pr->nr = 0; - if (ruleset->anchor == NULL) { - /* XXX kludge for pf_main_ruleset */ - RB_FOREACH(anchor, pf_kanchor_global, &V_pf_anchors) - if (anchor->parent == NULL) - pr->nr++; - } else { - RB_FOREACH(anchor, pf_kanchor_node, - &ruleset->anchor->children) - pr->nr++; - } - PF_RULES_RUNLOCK(); + error = pf_ioctl_get_rulesets(pr); break; } diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 15fe341ce57e..e3c0369f550d 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -1635,6 +1635,49 @@ pf_handle_get_addr(struct nlmsghdr *hdr, struct nl_pstate *npt) return (0); } +#define _OUT(_field) offsetof(struct pfioc_ruleset, _field) +static const struct nlattr_parser nla_p_ruleset[] = { + { .type = PF_RS_PATH, .off = _OUT(path), .arg = (void *)MAXPATHLEN, .cb = nlattr_get_chara }, +}; +static const struct nlfield_parser nlf_p_ruleset[] = { +}; +NL_DECLARE_PARSER(ruleset_parser, struct genlmsghdr, nlf_p_ruleset, nla_p_ruleset); +#undef _OUT + +static int +pf_handle_get_rulesets(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + struct pfioc_ruleset attrs = { 0 }; + struct nl_writer *nw = npt->nw; + struct genlmsghdr *ghdr_new; + int error; + + error = nl_parse_nlmsg(hdr, &ruleset_parser, npt, &attrs); + if (error != 0) + return (error); + + error = pf_ioctl_get_rulesets(&attrs); + if (error != 0) + return (error); + + if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) + return (ENOMEM); + + ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); + ghdr_new->cmd = PFNL_CMD_GET_RULESETS; + ghdr_new->version = 0; + ghdr_new->reserved = 0; + + nlattr_add_u32(nw, PF_RS_NR, attrs.nr); + + if (!nlmsg_end(nw)) { + nlmsg_abort(nw); + return (ENOMEM); + } + + return (0); +} + static const struct nlhdr_parser *all_parsers[] = { &state_parser, &addrule_parser, @@ -1647,6 +1690,7 @@ static const struct nlhdr_parser *all_parsers[] = { &set_limit_parser, &pool_addr_parser, &add_addr_parser, + &ruleset_parser, }; static int family_id; @@ -1806,6 +1850,13 @@ static const struct genl_cmd pf_cmds[] = { .cmd_flags = GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL, .cmd_priv = PRIV_NETINET_PF, }, + { + .cmd_num = PFNL_CMD_GET_RULESETS, + .cmd_name = "GET_RULESETS", + .cmd_cb = pf_handle_get_rulesets, + .cmd_flags = GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL, + .cmd_priv = PRIV_NETINET_PF, + }, }; void diff --git a/sys/netpfil/pf/pf_nl.h b/sys/netpfil/pf/pf_nl.h index acb4b31320c0..5aa02d10214b 100644 --- a/sys/netpfil/pf/pf_nl.h +++ b/sys/netpfil/pf/pf_nl.h @@ -58,6 +58,7 @@ enum { PFNL_CMD_ADD_ADDR = 20, PFNL_CMD_GET_ADDRS = 21, PFNL_CMD_GET_ADDR = 22, + PFNL_CMD_GET_RULESETS = 23, __PFNL_CMD_MAX, }; #define PFNL_CMD_MAX (__PFNL_CMD_MAX -1) @@ -380,6 +381,12 @@ enum pf_add_addr_types_t { PF_AA_ADDR = 9, /* nested, pf_pooladdr */ }; +enum pf_get_rulesets_types_t { + PF_RS_UNSPEC, + PF_RS_PATH = 1, /* string */ + PF_RS_NR = 2, /* u32 */ +}; + #ifdef _KERNEL void pf_nl_register(void); From nobody Thu Oct 10 12:37:19 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTmJ1KVnz5Z03d; Thu, 10 Oct 2024 12:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTmH6qBXz4HDm; Thu, 10 Oct 2024 12:37:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6D++H4IWMoSH1hoC6cg4i8yvCpp2ETEY2MfRVUcnn9E=; b=F3Cvx1W+jeqzZR5M8JcHpq1auxDUzsSejYGQjo6F/SxZU9ReCuCjR4fWlrU1wx/H3DtjOm 0/cVNcyC+cwixtYl9GfIuJB2uW4bwyV8SR8YCBeFTKF3A2c/Y3RMAbQEcBr2VD4oIyDvCK u8zirpm1UxoNar1e5wX40B/COYBmzytuaTut5n7b+MXA6p065I1uhKF9kWf/MBEa0GEB4x tF8U4ve5eQn7siktOEulLlZFIR7fkdNgSQU8t6T0b/bsEuycuY93BfhGtHILnU5ZLg4wpn buapgcKLfEWhkjOXFE/ls8bjU3tSS9wbSHBbiEw4qHv8tYg+tG1o6S6k7Gz3pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6D++H4IWMoSH1hoC6cg4i8yvCpp2ETEY2MfRVUcnn9E=; b=WXxeSkhaPoUaUqbYYCl105o958eo/YnZWPtmA68GeeJxPTxCDi6ti7e2lMqlDH/UDPHYsl ZrMVzjlb54Of6y/kbmm94ymYXeAcQuAvL9fDRIo/O8cnTA8v+3y3wcIq7HnH13aAQmUkEg OPcHLHtq/NrQ6gv5x8CUHOfhlTW4WJbuitQuntiMZNT/Y0IkijMNIyQiCCJnW2+5fG7+Zn +TlTV34HqHRMBF7TMFkK2XokEcVssagkny8OJXevCSJgyUyoHuMaWONyMCEYnVQ0svgHMF uUl4XVYzWY9E2wH7gr++qs3Ex8nY0p8B5lrcoKajhX7FBj9HKPDiVJ9v+IcpsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563840; a=rsa-sha256; cv=none; b=BMroSKeUFoak8axJg3Egf5WRp4DLrCrs6cLrqRpg71BTgI15Zufm+NUCMEbZFIcfR9WP9J Ve4gZlcd8b7WKwawaQBPg23amkq58nBnwPL7u/140mdG7VQRwhppyfLhEhABteVpN2kWFx Njnd/v+XHTsYWysLz4unbQL1uEFH0ErQah87w/CDK/SpJVQKANEfyApDhMPT9uIJfTC6zz S24dQdirGRw9fZ6VMkLSKC4mIg0VHBXXV5E6C4ZW6YLlQV49THfJn5Wg+8IdWol6egFyCF b1GFdajkRLu2KHoA7ZVOPtY7izTcGxFSzk5H0DUIH10/YKOZptGMxOSb6cQ0UQ== 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 4XPTmH6Pp7zxTQ; Thu, 10 Oct 2024 12:37:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbJp6006297; Thu, 10 Oct 2024 12:37:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbJRs006294; Thu, 10 Oct 2024 12:37:19 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:19 GMT Message-Id: <202410101237.49ACbJRs006294@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 5de77e952a2f - main - pf: remove the last hand-rolled IPv6 extension header loop List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5de77e952a2f497722bb204dcd8b5e669adc1dd7 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5de77e952a2f497722bb204dcd8b5e669adc1dd7 commit 5de77e952a2f497722bb204dcd8b5e669adc1dd7 Author: Kristof Provost AuthorDate: 2024-09-30 14:59:24 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:40 +0000 pf: remove the last hand-rolled IPv6 extension header loop Replace the IPv6 header walking loop in pf_test_state_icmp() with the common function pf_walk_header6(). For that, pf_walk_header6() can now extract both the information wether it is a fragment and the final protocol if it is the first fragment. This allows to match the icmp6 too big packet of a first fragment to the reassembled packet's state. This is neccesary if a refragmented fragment is to big for the Path-MTU. Note that pd.proto contains the real protocol number for the first fragment and IPPROTO_FRAGMENT for later fragments. pd.virtual_protocol is set to PF_VPROTO_FRAGMENT for all fragments. ok mcbride@ Obtained from: OpenBSD, bluhm , 90b3c57e94 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46931 --- sys/net/pfvar.h | 6 +-- sys/netpfil/pf/pf.c | 130 +++++++++++++++++++++++++++-------------------- sys/netpfil/pf/pf_norm.c | 18 +------ 3 files changed, 81 insertions(+), 73 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index e27c5e666de8..4b8f7e45e03b 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1612,9 +1612,9 @@ struct pf_pdesc { u_int16_t flags; /* Let SCRUB trigger behavior in * state code. Easier than tags */ #define PFDESC_TCP_NORM 0x0001 /* TCP shall be statefully scrubbed */ -#define PFDESC_IP_REAS 0x0002 /* IP frags would've been reassembled */ u_int16_t virtual_proto; #define PF_VPROTO_FRAGMENT 256 + int extoff; sa_family_t af; u_int8_t proto; u_int8_t tos; @@ -2362,8 +2362,8 @@ int pf_normalize_ip(struct mbuf **, struct pfi_kkif *, u_short *, #endif /* INET */ #ifdef INET6 -int pf_walk_header6(struct mbuf *, uint8_t *, int *, int *, uint32_t *, - u_short *); +int pf_walk_header6(struct mbuf *, struct ip6_hdr *, int *, int *, int *, + uint8_t *, uint32_t *, u_short *); int pf_normalize_ip6(struct mbuf **, struct pfi_kkif *, int, u_short *, struct pf_pdesc *); void pf_poolmask(struct pf_addr *, struct pf_addr*, diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 891c490a0b1e..cd90cc1c85c4 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7026,7 +7026,8 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, #endif /* INET */ #ifdef INET6 struct ip6_hdr h2_6; - int terminal = 0; + int fragoff2, extoff2; + u_int32_t jumbolen; #endif /* INET6 */ int ipoff2 = 0; int off2 = 0; @@ -7078,47 +7079,16 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, "(ip6)\n")); return (PF_DROP); } - pd2.proto = h2_6.ip6_nxt; + off2 = ipoff2; + if (pf_walk_header6(m, &h2_6, &off2, &extoff2, + &fragoff2, &pd2.proto, &jumbolen, + reason) != PF_PASS) + return (PF_DROP); + pd2.src = (struct pf_addr *)&h2_6.ip6_src; pd2.dst = (struct pf_addr *)&h2_6.ip6_dst; pd2.ip_sum = NULL; off2 = ipoff2 + sizeof(h2_6); - do { - switch (pd2.proto) { - case IPPROTO_FRAGMENT: - /* - * ICMPv6 error messages for - * non-first fragments - */ - REASON_SET(reason, PFRES_FRAG); - return (PF_DROP); - case IPPROTO_AH: - case IPPROTO_HOPOPTS: - case IPPROTO_ROUTING: - case IPPROTO_DSTOPTS: { - /* get next header and header length */ - struct ip6_ext opt6; - - if (!pf_pull_hdr(m, off2, &opt6, - sizeof(opt6), NULL, reason, - pd2.af)) { - DPFPRINTF(PF_DEBUG_MISC, - ("pf: ICMPv6 short opt\n")); - return (PF_DROP); - } - if (pd2.proto == IPPROTO_AH) - off2 += (opt6.ip6e_len + 2) * 4; - else - off2 += (opt6.ip6e_len + 1) * 8; - pd2.proto = opt6.ip6e_nxt; - /* goto the next header */ - break; - } - default: - terminal++; - break; - } - } while (!terminal); break; #endif /* INET6 */ } @@ -8537,28 +8507,44 @@ pf_walk_option6(struct mbuf *m, int off, int end, uint32_t *jumbolen, } int -pf_walk_header6(struct mbuf *m, uint8_t *nxt, int *off, int *extoff, - uint32_t *jumbolen, u_short *reason) +pf_walk_header6(struct mbuf *m, struct ip6_hdr *h, int *off, int *extoff, + int *fragoff, uint8_t *nxt, uint32_t *jumbolen, u_short *reason) { + struct ip6_frag frag; struct ip6_ext ext; struct ip6_rthdr rthdr; - struct ip6_hdr *h = mtod(m, struct ip6_hdr *); int rthdr_cnt = 0; + *off += sizeof(struct ip6_hdr); + *extoff = *fragoff = 0; *nxt = h->ip6_nxt; - *off = sizeof(struct ip6_hdr); - *extoff = 0; *jumbolen = 0; for (;;) { switch (*nxt) { case IPPROTO_FRAGMENT: + if (*fragoff != 0) { + DPFPRINTF(PF_DEBUG_MISC, ("IPv6 multiple fragment")); + REASON_SET(reason, PFRES_FRAG); + return (PF_DROP); + } /* jumbo payload packets cannot be fragmented */ if (*jumbolen != 0) { DPFPRINTF(PF_DEBUG_MISC, ("IPv6 fragmented jumbo")); REASON_SET(reason, PFRES_FRAG); return (PF_DROP); } - return (PF_PASS); + if (!pf_pull_hdr(m, *off, &frag, sizeof(frag), NULL, + reason, AF_INET6)) { + DPFPRINTF(PF_DEBUG_MISC, ("IPv6 short fragment")); + return (PF_DROP); + } + *fragoff = *off; + /* stop walking over non initial fragments */ + if ((frag.ip6f_offlg & IP6F_OFF_MASK) != 0) + return (PF_PASS); + *off += sizeof(frag); + *nxt = frag.ip6f_nxt; + break; case IPPROTO_ROUTING: if (rthdr_cnt++) { DPFPRINTF(PF_DEBUG_MISC, ("IPv6 multiple rthdr")); @@ -8567,6 +8553,12 @@ pf_walk_header6(struct mbuf *m, uint8_t *nxt, int *off, int *extoff, } if (!pf_pull_hdr(m, *off, &rthdr, sizeof(rthdr), NULL, reason, AF_INET6)) { + /* fragments may be short */ + if (*fragoff != 0) { + *off = *fragoff; + *nxt = IPPROTO_FRAGMENT; + return (PF_PASS); + } DPFPRINTF(PF_DEBUG_MISC, ("IPv6 short rthdr")); return (PF_DROP); } @@ -8581,11 +8573,19 @@ pf_walk_header6(struct mbuf *m, uint8_t *nxt, int *off, int *extoff, case IPPROTO_DSTOPTS: if (!pf_pull_hdr(m, *off, &ext, sizeof(ext), NULL, reason, AF_INET6)) { + /* fragments may be short */ + if (*fragoff != 0) { + *off = *fragoff; + *nxt = IPPROTO_FRAGMENT; + return (PF_PASS); + } DPFPRINTF(PF_DEBUG_MISC, ("IPv6 short exthdr")); return (PF_DROP); } - *extoff = *off; - if (*nxt == IPPROTO_HOPOPTS) { + /* reassembly needs the ext header before the frag */ + if (*fragoff == 0) + *extoff = *off; + if (*nxt == IPPROTO_HOPOPTS && *fragoff == 0) { if (pf_walk_option6(m, *off + sizeof(ext), *off + (ext.ip6e_len + 1) * 8, jumbolen, reason) != PF_PASS) @@ -8603,6 +8603,20 @@ pf_walk_header6(struct mbuf *m, uint8_t *nxt, int *off, int *extoff, *off += (ext.ip6e_len + 1) * 8; *nxt = ext.ip6e_nxt; break; + case IPPROTO_TCP: + case IPPROTO_UDP: + case IPPROTO_SCTP: + case IPPROTO_ICMPV6: + /* fragments may be short, ignore inner header then */ + if (*fragoff != 0 && ntohs(h->ip6_plen) < *off + + (*nxt == IPPROTO_TCP ? sizeof(struct tcphdr) : + *nxt == IPPROTO_UDP ? sizeof(struct udphdr) : + *nxt == IPPROTO_SCTP ? sizeof(struct sctphdr) : + sizeof(struct icmp6_hdr))) { + *off = *fragoff; + *nxt = IPPROTO_FRAGMENT; + } + /* FALLTHROUGH */ default: return (PF_PASS); } @@ -8705,7 +8719,7 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, #ifdef INET6 case AF_INET6: { struct ip6_hdr *h; - int extoff; + int fragoff; uint32_t jumbolen; uint8_t nxt; @@ -8719,8 +8733,10 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, return (-1); } - if (pf_walk_header6(m, &nxt, off, &extoff, &jumbolen, reason) - != PF_PASS) { + h = mtod(m, struct ip6_hdr *); + *off = 0; + if (pf_walk_header6(m, h, off, &pd->extoff, &fragoff, &nxt, + &jumbolen, reason) != PF_PASS) { *action = PF_DROP; return (-1); } @@ -8740,6 +8756,9 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, pd->virtual_proto = pd->proto = h->ip6_nxt; pd->act.rtableid = -1; + if (fragoff != 0) + pd->virtual_proto = PF_VPROTO_FRAGMENT; + /* * we do not support jumbogram. if we keep going, zero ip6_plen * will do something bad, so drop the packet for now. @@ -8750,7 +8769,7 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, } /* We do IP header normalization and packet reassembly here */ - if (pf_normalize_ip6(m0, kif, *off, reason, pd) != + if (pf_normalize_ip6(m0, kif, fragoff, reason, pd) != PF_PASS) { *action = PF_DROP; return (-1); @@ -8769,14 +8788,17 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, h = mtod(m, struct ip6_hdr *); pd->virtual_proto = pd->proto = h->ip6_nxt; - /* recalc offset, refetch header, then update pd */ - if (pf_walk_header6(m, &nxt, off, &extoff, &jumbolen, reason) != - PF_PASS) { + /* refetch header, recalc offset, then update pd */ + h = mtod(m, struct ip6_hdr *); + *off = 0; + + if (pf_walk_header6(m, h, off, &pd->extoff, &fragoff, &nxt, + &jumbolen, reason) != PF_PASS) { *action = PF_DROP; return (-1); } - if (pd->proto == IPPROTO_FRAGMENT) { + if (fragoff != 0) { /* * handle fragments that aren't reassembled by * normalization diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index a159528c1756..1bdcdc5573aa 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1215,20 +1215,12 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, struct mbuf *m; struct pf_krule *r; struct ip6_frag frag; - int extoff; - uint32_t jumbolen; - uint8_t nxt; bool scrub_compat; PF_RULES_RASSERT(); -again: m = *m0; - if (pf_walk_header6(m, &nxt, &off, &extoff, &jumbolen, reason) - != PF_PASS) - return (PF_DROP); - r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_SCRUB].active.ptr); /* * Check if there are any scrub rules, matching or not. @@ -1280,20 +1272,14 @@ again: /* Offset now points to data portion. */ off += sizeof(frag); - if (nxt == IPPROTO_FRAGMENT) { - if (pd->flags & PFDESC_IP_REAS) - return (PF_DROP); - + if (pd->virtual_proto == PF_VPROTO_FRAGMENT) { /* Returns PF_DROP or *m0 is NULL or completely reassembled * mbuf. */ - if (pf_reassemble6(m0, &frag, off, extoff, reason) != PF_PASS) + if (pf_reassemble6(m0, &frag, off, pd->extoff, reason) != PF_PASS) return (PF_DROP); - - pd->flags |= PFDESC_IP_REAS; m = *m0; if (m == NULL) return (PF_DROP); - goto again; } return (PF_PASS); From nobody Thu Oct 10 12:37:20 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTmK1dNZz5Z089; Thu, 10 Oct 2024 12:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTmK0wT5z4GyS; Thu, 10 Oct 2024 12:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ThTPNvH5+q3FTYaM5Of2qJLFF0tS3dNSRsZvurWFEsM=; b=J4OjHb3hesH2nZ3xEYxBhTLjmumR/wMBXGF/BU6iNmb5pGFDUMOEMBVtqugp+xFDz+8cWF cz7mGAy19HRWoD6JzI9py53O9MwRnbhzgZDJGLXINdiLDF35Vxb5A/Tet0JVaAmpzbbYuj 3T4/OKLzKCyEPuAq6lkZ49B7VNq6aUiy7irxRmNshumBICjybgmVmozIeI239AqGY19PS/ 166Uq+DsGkmUvNQKAa+WWaylE5huumcndYFfix/NAHa+c/ReVu8IitvcOo+4ZrG1VtMD0l EpTVNixY7NfN0ojjCserErjI0CA7i/ehm9Sl2OaJWeZjjRhNxYAUAmQkuAirgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ThTPNvH5+q3FTYaM5Of2qJLFF0tS3dNSRsZvurWFEsM=; b=gyAoLOEp6ymckY4UB7ZTh3u/9LVPM8StCmVpWe1Rkv+/t+OF8aL7G7JZtMNdXtr5nZYgVw WflH/yjvOFZOWJSB/CAH7436Gp58Sw4H0MIH2LcpPMBxtvjILw+kZJT42ZaAzSANJ+mqEi MbCk2xEh+Hpr+Kb3V8mn36ZJ/RhJSJFpneJ6NfqGYjtdGCcJ3ca3ZR+1WlSNnhBvcYXWPh IqpXKmjji/7Qx0+q2i267DVSBHKzngG0OYOsdst5DjPfODQxIM5OzDmd91E6j7mkTJmjGU 8tuC92TfqvxJWVcodm7tE7Ys1ACjYhRDeLBWZZ5h2dEy3xL66Y+pxF8GoJqicw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563841; a=rsa-sha256; cv=none; b=IN3zJafrvoPhRMXLxM50+mBlTj4ur9CuKzcIyY/l2oLmmMesCwYDTSG3tme3Ag2+BXQss0 9lGyt7U11fLcTes/VGvkIG2Hw8O0TZ9kSWyxb1hqt9mqg5h/uX6fLWUsb5Ur+eAKyRHkIU CSRXY7sRyJd7NJS3VqUIAf6NBb3QgSaxLKl+iy62V68BZpf5DN47yNfCq2dQOQ2gYQ9vYp lAlbgaQbg2Yh3O2AK6ImZCVMA4BIucOksVX23HP04F7qPdeUAzLlresMzW0ksQgbvW7kGG GbHvAHqZhXskwN5z/EizBDJhsUefVu3FYz+y6B+56OyXP5iIhiTs2yzEWbIvOA== 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 4XPTmK0XnxzyDW; Thu, 10 Oct 2024 12:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbKAK006386; Thu, 10 Oct 2024 12:37:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbKq5006383; Thu, 10 Oct 2024 12:37:20 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:20 GMT Message-Id: <202410101237.49ACbKq5006383@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: d01949e8a210 - main - pf.conf.5: sync documentation with code on the matter of max state limit behavior List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d01949e8a210c4531ed4172e344501b37ded729e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d01949e8a210c4531ed4172e344501b37ded729e commit d01949e8a210c4531ed4172e344501b37ded729e Author: Kristof Provost AuthorDate: 2024-10-02 06:38:59 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:40 +0000 pf.conf.5: sync documentation with code on the matter of max state limit behavior When one of the state limits is reached, further packets that would create state are dropped, until existing states time out. Discussed with mcbride, ok henning, jmc Obtained from: OpenBSD, mikeb , 677ed08ce1 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46932 --- share/man/man5/pf.conf.5 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 9531f18e8858..2edc7b1fb280 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -27,7 +27,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 6, 2024 +.Dd October 2, 2024 .Dt PF.CONF 5 .Os .Sh NAME @@ -2432,7 +2432,7 @@ must be specified explicitly to apply options to a rule. .It Ar max Aq Ar number Limits the number of concurrent states the rule may create. When this limit is reached, further packets that would create -state will not match this rule until existing states time out. +state are dropped until existing states time out. .It Ar no-sync Prevent state changes for states created by this rule from appearing on the .Xr pfsync 4 @@ -2514,6 +2514,9 @@ Limit the rate of new connections over a time interval. The connection rate is an approximation calculated as a moving average. .El .Pp +When one of these limits is reached, further packets that would create +state are dropped until existing states time out. +.Pp Because the 3-way handshake ensures that the source address is not being spoofed, more aggressive action can be taken based on these limits. With the From nobody Thu Oct 10 12:37:22 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTmL4nzHz5Z03g; Thu, 10 Oct 2024 12:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTmL1kvFz4HF8; Thu, 10 Oct 2024 12:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jlCTD3LRQb54vWbiVRrzR4BQgHGsp1HsOasAUA5N1Lg=; b=Su61vqnuk9ste33QlmPblxkuX0hRVow9U+LaHX+B/L3um/8oZlYbFihNRYbd1tKYmxfm5T sXO9XUxowEBM4cAGUl0sLEKzZPKoHS4H5sS6mmNOfLIX8xV5rDX8aR0efc/TSdIftwa4MV NRjBf/vNpFzJ1FEQszcZZchr38ozAnhqaDFvj54F9ebOHm0XR5SrjLbRibtEExMl2xVVM5 1qY9xwXdpVpxxurgqLBbv75xwblPfxQh/3EzaxhKpnyufjbUlBkjkJfgzmcv1P6oYqXZ8s +tSZe13JSWm9bZcYez/peNExcFniGjsJvysxrCKEWH5I1tQawZ68koMyd2wdzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jlCTD3LRQb54vWbiVRrzR4BQgHGsp1HsOasAUA5N1Lg=; b=QCkbWKatDA/2UyJC3mEyIW0052v+hg+N8RR393nmWBgfgM1SvTGhbya2DEukoqN8bdYZyE W6QYH8cYLbfUXF2dpJdmc4er9E5LT0wTdUsYEoE7NFBmyWjMHgwpAyOIs1JTz3YNOVqbbC XvL9f4+nZNBlVcRJPCPYEK6qP2bvhQTyMTqXDqEnaKPM+47FJ76UI1tgxC4jdFBV2koe4G Le5PPejt59NCVW7YisM2xeQxIhOXU9LGYEf5pDF4qUAP92EujiP1cmWFByJX0XYcm47h3F EeblptnFwSdrU4GfkKFC9WG+GoAdf7Ee2pFO1yvYJDA8tZWdL2or++IEgWYaZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563842; a=rsa-sha256; cv=none; b=JiDM0hTM0nzdP5LEXK+2lgAS7ps9dRB5xcbKSnVNYG8FjPJ/k9u1PBxeQmyIXl96G76vYy lPZpstwV4q5kafDAuT5pRuj2pnaHC4fx3QY0o7ZmOgZxpKkYAzSwAfzn3gw8jr6s1lVfuk yrS1R64guskpRrP1murrUHguzzzaCUwYp7S4iwqEw7/hvgHWhX4cWQb+yrt6c2xKbzjG8l aisSrN0ga9FtyKBOowG/6dwAYDb+ER/A4Qc24PzMexxNcaAJP5ZEURsw4MBtP6gqb9GQhR 7/v5XqnIY05WQU6k9JVJyA5TPkXWT4KMYJ/GT59VWbVECcZOHkcVZ3UWRLUGGQ== 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 4XPTmL1JghzxmP; Thu, 10 Oct 2024 12:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbMBU006446; Thu, 10 Oct 2024 12:37:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbMqB006443; Thu, 10 Oct 2024 12:37:22 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:22 GMT Message-Id: <202410101237.49ACbMqB006443@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 6562157dfad0 - main - pfctl: avoid possible SIGSEGV when wrong tos option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 6562157dfad0d18447cfcac08435f7ffdb8fa46c Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6562157dfad0d18447cfcac08435f7ffdb8fa46c commit 6562157dfad0d18447cfcac08435f7ffdb8fa46c Author: Kristof Provost AuthorDate: 2024-10-02 06:42:56 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:40 +0000 pfctl: avoid possible SIGSEGV when wrong tos option Obtained from: OpenBSD, haesbaert , 934eaac797 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46933 --- sbin/pfctl/parse.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index ad25f1996d36..f198dcb0b054 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -4214,7 +4214,7 @@ tos : STRING { | NUMBER { $$ = $1; if ($$ < 0 || $$ > 255) { - yyerror("illegal tos value %s", $1); + yyerror("illegal tos value %lu", $1); YYERROR; } } From nobody Thu Oct 10 12:37:23 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTmM6WxZz5Z01L; Thu, 10 Oct 2024 12:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTmM3Hqmz4H49; Thu, 10 Oct 2024 12:37:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sH6AsV/btiO940+kVjQmCc+CZge32s8Jeeh92MbUtgA=; b=MZ9BloFIlol+TD5r2T9Bp3XfYRHQqvolJOgr/UfDmFvuZQlxOhRvidoaDaEhiyNqVnSI9E /F7dsHIiq9y305CdDvbfvJ4+N89k8uSPjJNurkXalM8K5MjIA04bTe3Req2LRnqqWIB1oQ fl8YSi/e1HYPhLKefQNDzpy99kmvtbv3OdcKRfLHds7sUxvJFReX55avRFqex1n9olHgIg fBNQ11IcT7EYgeMENVH4qhjTwCi4pVBqmMYYvCppULAzo4sSG4Iovtd3fEFHfTQioLhbcc I7a0+MQiLJ2SgzXUDX86puZiRPETvLJJfGd7Z1jXgYhe/eNpnrUaVtmw6v1eiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sH6AsV/btiO940+kVjQmCc+CZge32s8Jeeh92MbUtgA=; b=OWiu2jM0A7C4NNjYsUZLh1yLX3x0eNjuFOXuHlz8mN2DTLWUJlrhMkj/cJkHz2CT3n/tkZ +M70HkjNrP/ZsejtsTHCc6Cd3x11nUY9BHbKwaobm0jFu31ZjRUi+p3yW/4mC/TfLOOqnw I/RFyGNnDyIFMX0zZO5To3NswZsrYTTkjsKW0MTjrDiqhSV0fcv7PQBKASEe4YzPVULRy9 ezRc4tTndDR8gdOwrcaqA2sLG7IjXR1/UnOn92sTyl9rvIuyHe8mPKtxsEtULAt8FhuixO ZuxCo7cFT6xoGZFQ+5anzQUlsEz1Nuedyhoj0ktoFmUNrdcCdvwL+icwf6jiVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563843; a=rsa-sha256; cv=none; b=aKXEIy8VzMuvaSyAiUhgCz2tKYkFZM0VzIGoBDEQSWelM8IyS8fWBc86Aq6GPbxAE6ULso 2f21VmxALLPTkEV4DkniGozBv/DiJglfZwtQCW3GkKIU79im/rdtIpgfSiQOtlF59xvbY6 L5oDj0MUD0euUfQh/ZAIfbdBdHX3/Z+uEtp6/8MvE0NBjR0bXvI3vPN4/6yfOZZluptVZY sak1i9KloWqAH9O/A+I1CM09Rk7zDnPCxU+sbB2XYvQCGSykQLZ2dT8wX9Elvn+ayHSkCX vePMlh6FzGu4a5Ikv+lvKex7yOgTGgz3l9+wJylzZWgsbhxubvLlZNEy7TgAHQ== 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 4XPTmM2KNkzy2P; Thu, 10 Oct 2024 12:37:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbNSO006500; Thu, 10 Oct 2024 12:37:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbNLR006497; Thu, 10 Oct 2024 12:37:23 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:23 GMT Message-Id: <202410101237.49ACbNLR006497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: abc8996e7fa6 - main - pf: deduplicate IPv4 and IPv6 code that handles fragments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: abc8996e7fa6c3755306021bffbf58c707e33d18 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=abc8996e7fa6c3755306021bffbf58c707e33d18 commit abc8996e7fa6c3755306021bffbf58c707e33d18 Author: Kristof Provost AuthorDate: 2024-10-02 06:47:52 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:40 +0000 pf: deduplicate IPv4 and IPv6 code that handles fragments Deduplicate IPv4 and IPv6 code that handles fragments that have not been reassembled by normalization. ok henning claudio Obtained from: OpenBSD, bluhm , ddd2494207 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46934 --- sys/netpfil/pf/pf.c | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index cd90cc1c85c4..653365d42059 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8697,21 +8697,8 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, if (h->ip_hl > 5) /* has options */ pd->badopts++; - if (h->ip_off & htons(IP_MF | IP_OFFMASK)) { - /* - * handle fragments that aren't reassembled by - * normalization - */ + if (h->ip_off & htons(IP_MF | IP_OFFMASK)) pd->virtual_proto = PF_VPROTO_FRAGMENT; - if (kif == NULL || r == NULL) /* pflog */ - *action = PF_DROP; - else - *action = pf_test_rule(r, s, kif, m, *off, - pd, a, ruleset, inp, *hdrlen); - if (*action != PF_PASS) - REASON_SET(reason, PFRES_FRAG); - return (-1); - } break; } @@ -8798,21 +8785,8 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, return (-1); } - if (fragoff != 0) { - /* - * handle fragments that aren't reassembled by - * normalization - */ + if (fragoff != 0) pd->virtual_proto = PF_VPROTO_FRAGMENT; - if (kif == NULL || r == NULL) /* pflog */ - *action = PF_DROP; - else - *action = pf_test_rule(r, s, kif, m, *off, - pd, a, ruleset, NULL /* XXX TODO */, *hdrlen); - if (*action != PF_PASS) - REASON_SET(reason, PFRES_FRAG); - return (-1); - } break; } @@ -8821,7 +8795,20 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, panic("pf_setup_pdesc called with illegal af %u", af); } - switch (pd->proto) { + switch (pd->virtual_proto) { + case PF_VPROTO_FRAGMENT: + /* + * handle fragments that aren't reassembled by + * normalization + */ + if (kif == NULL || r == NULL) /* pflog */ + *action = PF_DROP; + else + *action = pf_test_rule(r, s, kif, m, *off, pd, a, + ruleset, inp, *hdrlen); + if (*action != PF_PASS) + REASON_SET(reason, PFRES_FRAG); + return (-1); case IPPROTO_TCP: { struct tcphdr *th = &pd->hdr.tcp; From nobody Thu Oct 10 12:37:24 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTmN5Ct4z5Z08H; Thu, 10 Oct 2024 12:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTmN3QGZz4H4F; Thu, 10 Oct 2024 12:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CXajVqUjYDhW2MQArw0v3KrhsBtnkNtj2qpTpFA8lr4=; b=amRgul8qjElxCiIJl2SoLXotcyxd7j9UUbWcK3jRnzpkAnp/7AgcabPS/04SgTuurJuOjK W53tq8ucRqz6eWoogTlfomWTLmxkQITvN0XzxB19daTXGPsN+T+Lx8jCjkAO6ZuJSmWCBe uGtIcnHt31u1GS7qsZPdLsgYQWrRi2z0Z5cPhxUSPeySoZXa64ius5Wnm+m187Dr1U77+H UbxugFVZH/hxf/KSTsG/oHgpnrGXF+pyvmAHp4JPALbp+KTwVZsFiwT4IG+IKwGYu05McS EjFK5Y52VDGKUaaEd70Dzqb7eOQrHHPxiLIuqrUS8qNsqD6EoafWjOL/bnAC2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CXajVqUjYDhW2MQArw0v3KrhsBtnkNtj2qpTpFA8lr4=; b=H7wHILgv6awoS2OA4TNAT43/oWb+Bro015zbxOAVL2gYIaByPrLSISihhz7CzT2m8187lE kLBERv7eAS/Rw0z3S0MWGioFBSHjf+a3yVrCc+oBnKQvpyAq5MMhYc4fL3AbJNEn/SVxXh t1YJ4f7OQRJPS10KvXcRE+Zmf/wNenS/MZg06yZZ4EOzaFeNvNzYatlZSLO2UOzSb7LQTY OlgQAUmBeYjtsELX9eoWS54x2FL9wnbFeB1xmKWerryLlImarA2PsWw7OFzFqqWi7ClR6Q pZu5guLDu9ooHmM9YgLtkS2mNegaYrFI8THftoVuwzv61R4HLliPMmda/sRg1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563844; a=rsa-sha256; cv=none; b=CsD7vxEQacf1O2OhATKSZkdz/+TQcjWiPkhhRH7Qi6NWK9HJxosXAqBf/J2SZ4j0A/W/Kc sEPUyZLHbTzRxY0xrVd2AX7l+4aJ3uVEaMG2Gi9JVYq23ps5XuM5odZenlmMjHGhcVq/3q zSjgG3hWqp3d3jge4tfGyr57A4S5n5CfSR/knO5mpO/VFhFtpMeHLp1sq6rSKIsCjt0my1 3K3cRbJES8YwMhVkoOVI8+i5l7OyZqlgQnhf9fgwugMIopfv6coJF7kNrOOicxbh4MzWwT 7sv7zq3fKShC0Ffhj9MdW9DEPpl8BrcHn8yk+Aauo/upmU13iS4KF9bcxHn+kg== 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 4XPTmN32bGzxrg; Thu, 10 Oct 2024 12:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbO0v006546; Thu, 10 Oct 2024 12:37:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbOZ2006543; Thu, 10 Oct 2024 12:37:24 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:24 GMT Message-Id: <202410101237.49ACbOZ2006543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 05896f1ef8be - main - pf: move pf_test_rule() out of pf_setup_pdesc() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 05896f1ef8be5ce9f6d2080b9b116a994ffa06de Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=05896f1ef8be5ce9f6d2080b9b116a994ffa06de commit 05896f1ef8be5ce9f6d2080b9b116a994ffa06de Author: Kristof Provost AuthorDate: 2024-10-02 07:28:32 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:40 +0000 pf: move pf_test_rule() out of pf_setup_pdesc() Move the call to pf_test_rule() for fragments that have not been reassembled by normalization from pf_setup_pdesc() to pf_test(). This simplifies the paramter list of pf_setup_pdesc() as it can concentrate on its job filling the pf_pdesc struct. ok henning mpf Obtained from: OpenBSD, bluhm , fb9fe53b92 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46935 --- sys/net/pfvar.h | 3 +-- sys/netpfil/pf/pf.c | 41 ++++++++++++++++++++--------------------- sys/netpfil/pf/pf_syncookies.c | 2 +- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 4b8f7e45e03b..34a6e2028100 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2510,8 +2510,7 @@ void pf_syncookie_send(struct mbuf *m, int off, struct pf_pdesc *); bool pf_syncookie_check(struct pf_pdesc *); u_int8_t pf_syncookie_validate(struct pf_pdesc *); -struct mbuf * pf_syncookie_recreate_syn(int, - struct pf_pdesc *); +struct mbuf * pf_syncookie_recreate_syn(struct pf_pdesc *); VNET_DECLARE(struct pf_kstatus, pf_status); #define V_pf_status VNET(pf_status) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 653365d42059..26820f233cdb 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8633,10 +8633,8 @@ pf_init_pdesc(struct pf_pdesc *pd, struct mbuf *m) static int pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, - u_short *action, u_short *reason, struct pfi_kkif *kif, struct pf_krule **a, - struct pf_krule **r, struct pf_kstate **s, struct pf_kruleset **ruleset, - int *off, int *hdrlen, struct inpcb *inp, - struct pf_rule_actions *default_actions) + u_short *action, u_short *reason, struct pfi_kkif *kif, int *off, + int *hdrlen, struct pf_rule_actions *default_actions) { struct mbuf *m = *m0; @@ -8796,19 +8794,6 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, } switch (pd->virtual_proto) { - case PF_VPROTO_FRAGMENT: - /* - * handle fragments that aren't reassembled by - * normalization - */ - if (kif == NULL || r == NULL) /* pflog */ - *action = PF_DROP; - else - *action = pf_test_rule(r, s, kif, m, *off, pd, a, - ruleset, inp, *hdrlen); - if (*action != PF_PASS) - REASON_SET(reason, PFRES_FRAG); - return (-1); case IPPROTO_TCP: { struct tcphdr *th = &pd->hdr.tcp; @@ -9094,8 +9079,8 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 return (PF_PASS); } - if (pf_setup_pdesc(af, dir, &pd, m0, &action, &reason, kif, &a, &r, - &s, &ruleset, &off, &hdrlen, inp, default_actions) == -1) { + if (pf_setup_pdesc(af, dir, &pd, m0, &action, &reason, + kif, &off, &hdrlen, default_actions) == -1) { if (action != PF_PASS) pd.act.log |= PF_LOG_FORCE; goto done; @@ -9125,7 +9110,21 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 m_tag_delete(m, mtag); } - switch (pd.proto) { + switch (pd.virtual_proto) { + case PF_VPROTO_FRAGMENT: + /* + * handle fragments that aren't reassembled by + * normalization + */ + if (kif == NULL || r == NULL) /* pflog */ + action = PF_DROP; + else + action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, + &ruleset, inp, hdrlen); + if (action != PF_PASS) + REASON_SET(&reason, PFRES_FRAG); + break; + case IPPROTO_TCP: { /* Respond to SYN with a syncookie. */ if ((pd.hdr.tcp.th_flags & (TH_SYN|TH_ACK|TH_RST)) == TH_SYN && @@ -9154,7 +9153,7 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 pd.dir == PF_IN) { struct mbuf *msyn; - msyn = pf_syncookie_recreate_syn(off, &pd); + msyn = pf_syncookie_recreate_syn(&pd); if (msyn == NULL) { action = PF_DROP; break; diff --git a/sys/netpfil/pf/pf_syncookies.c b/sys/netpfil/pf/pf_syncookies.c index 40c664f48914..bbb33d134ce5 100644 --- a/sys/netpfil/pf/pf_syncookies.c +++ b/sys/netpfil/pf/pf_syncookies.c @@ -498,7 +498,7 @@ pf_syncookie_generate(struct mbuf *m, int off, struct pf_pdesc *pd, } struct mbuf * -pf_syncookie_recreate_syn(int off, struct pf_pdesc *pd) +pf_syncookie_recreate_syn(struct pf_pdesc *pd) { uint8_t wscale; uint16_t mss; From nobody Thu Oct 10 12:37:25 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTmP6kFDz5Yyr4; Thu, 10 Oct 2024 12:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTmP4fpMz4H9Z; Thu, 10 Oct 2024 12:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XC4D2AvWhqSY5ujq8Uji5QOFkdBotKdIazOpOeDzT3s=; b=Z7EeG2TVcIZ2kZcZP/w5hAjFXO7y74WHlNJh3YWbg9nI08dtpYB4O15yO75ysr4P/ITcCn 9MiyHWZjPjMbRIzv9g1nhqGJq3EntJ5JVBKPa/69JzEKa9QoJNkdobFuY+hbd+zJ/2CRuv O2OuA5G0gMFXqSPqxZiTVO4FYtfTVane261WllZvygcyc4Det4b1PHwp6BYxnEhA6LRP1K vb8rTREBEl/gby6D+GqgBh5oc/+0eQqyHddnO784E/P7NytVvV8z9pbjIi0qu5GXBL7Fye FPv8kXW0d5o6+CTIXvu16LOTfcYf9at9R3ASgZq78Rgk9RlcP16i6R+9TFxVbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XC4D2AvWhqSY5ujq8Uji5QOFkdBotKdIazOpOeDzT3s=; b=oPoEBj35nOANdI6Twxzi4RCCuAXZ0cp4hSoC2gH8i1htjsd3j5WCWl+AyBxWzWEcyOZ53v kFKey2jJkC3gmEohABWJr8GeDeTZwRkA8K4qxSLdGM9OmCTioHFVtT9+v4+E3fWK+GxFtb pdURxGaGETpvTBzdDEZdzw+IrLJGBn0iAGmG6vx8fatIMlmoFzPRYkD+0Z4x+i/HPmD/UO VONvTfJfy8LM7pRT5tzEqGOGS2lYw018j5C3YFsQiURjCbKxnw6aVfmCqa2I8QSi+PPRYI kr0D9ZaMugWlFnKJ6OSBoNvl54YbVCsUgvgNVhFaZJKEuihj3PC5nbXEACWrGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563845; a=rsa-sha256; cv=none; b=KYcOX6F3Hx5e+F3no97WBtQVfls5FeE3R4mG67gR7DR9ed18NWg59C+i1uXoCpCoNe9+qC zK8xkUBAJa+M3oDnye348fFc1Xm8kZt8hXi9h72BHr+MvxNvpaR1t/mbNS7QYqFsU9OrMs f/Wvo02SQqD/XxVyaDOcUfJBdGTP0VqyUiZbd8DSldjsFqV6W9btaPcEADWm8Iy2CPNySe mFspiRFGOqSvrJ1S6EBKo3a9UmTjhhePWViCeir7pqLsMi1HADsT56r5TnavT/dH7Vnl0Y D5SSSe2jvXq/Y3JYCxAdyr1px3C32BV+Q2N/GFwh0yF7RB5JVF1BkZzGjNpVSg== 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 4XPTmP4GvVzxrh; Thu, 10 Oct 2024 12:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbPGi006600; Thu, 10 Oct 2024 12:37:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbPss006597; Thu, 10 Oct 2024 12:37:25 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:25 GMT Message-Id: <202410101237.49ACbPss006597@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 9414b8dbf1e4 - main - pf: unify some IPv4/IPv6 code in pf_setup_pdesc() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 9414b8dbf1e44491a29bf3f64d88d094b71215dd Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9414b8dbf1e44491a29bf3f64d88d094b71215dd commit 9414b8dbf1e44491a29bf3f64d88d094b71215dd Author: Kristof Provost AuthorDate: 2024-10-02 13:22:57 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:41 +0000 pf: unify some IPv4/IPv6 code in pf_setup_pdesc() Obtained from: OpenBSD, bluhm , c62e803e5c Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46936 --- sys/netpfil/pf/pf.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 26820f233cdb..669539e9e997 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8640,6 +8640,10 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, pd->af = af; pd->dir = dir; + pd->sidx = (dir == PF_IN) ? 0 : 1; + pd->didx = (dir == PF_IN) ? 1 : 0; + *off = 0; + *hdrlen = 0; TAILQ_INIT(&pd->sctp_multihome_jobs); if (default_actions != NULL) @@ -8680,13 +8684,9 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, } pd->src = (struct pf_addr *)&h->ip_src; pd->dst = (struct pf_addr *)&h->ip_dst; - pd->sport = pd->dport = NULL; pd->ip_sum = &h->ip_sum; pd->proto_sum = NULL; pd->virtual_proto = pd->proto = h->ip_p; - pd->dir = dir; - pd->sidx = (dir == PF_IN) ? 0 : 1; - pd->didx = (dir == PF_IN) ? 1 : 0; pd->tos = h->ip_tos; pd->ttl = h->ip_ttl; pd->tot_len = ntohs(h->ip_len); @@ -8729,12 +8729,8 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, h = mtod(m, struct ip6_hdr *); pd->src = (struct pf_addr *)&h->ip6_src; pd->dst = (struct pf_addr *)&h->ip6_dst; - pd->sport = pd->dport = NULL; pd->ip_sum = NULL; pd->proto_sum = NULL; - pd->dir = dir; - pd->sidx = (dir == PF_IN) ? 0 : 1; - pd->didx = (dir == PF_IN) ? 1 : 0; pd->tos = IPV6_DSCP(h); pd->ttl = h->ip6_hlim; pd->tot_len = ntohs(h->ip6_plen) + sizeof(struct ip6_hdr); From nobody Thu Oct 10 12:37:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTmS1FDYz5Z05s; Thu, 10 Oct 2024 12:37:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTmR6Jcsz4HLV; Thu, 10 Oct 2024 12:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2viMATA41PpJUWb5YbO0v8Ilz8V9JOzQo3pi44KrtnY=; b=JRXMxgFORjLb5f0TRfDGoxjP+LJv1N1+8oLFVcVIrG9qLjXQUDa3M9I8jtEmwXZwx7Bs5E +Oq73JihwRr+FsrUemhrO4yJMPQfBuENEyTIuOCVrXukSJJtLmlIeQsDw7Rkdv0lqVbOTw 29LPNeSaovhNXLgvc1RzHnKtkdUfgd309DJFeBUWLWcSvM8PV3klsa7yeS0afklkGRInXa +W+i17LjCt8mPjBCDwG5wsVfb2ELn+zpJ6AmpWbDRarThVRTlpiCr5ccKhkwWPWkGg1ddc sGKEXvmqYcLXMSGrBt27n+MdtqZAKPk6f8Quqjh6s/NOKm1hVbuu5y1a+7ctNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2viMATA41PpJUWb5YbO0v8Ilz8V9JOzQo3pi44KrtnY=; b=ViHdxJMjBseXmKSxD1WGwIxsPJMJaLIHz3TLSKmZmMxu5BSfWCbb2yD354gVnE+Luy4UH+ PNn1tPutq3xcepynfQAquva0tru8/g2BQIZnQuwCS27KLifgWqOsgF7hMm2Kepi144OntP yIrcFmQFfxXy4dVPp3hYDwuWxhOocWVv3vj0PZdYxwLKIygaATe+yWUgG4zkV+jSqrCHHu YDkiaJu9hlECyxjGMESyj3p98a7nV3SNWgSmWaEn+YUYMrKemVVR0i1KgAq5WF7cQizxXq 5xpna4iHGrmxmYqamaJ6Tb79xZ095TJsHrUqK1MB18MRL0bxkbNRhrQF6qxDjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563847; a=rsa-sha256; cv=none; b=BT3dzTMNaERofSrDVxHCnFB44FeX9ko653zua9jeUoYMYOV+oe0qfPDIttJj2j47/esyAK 7cOj9uW1HzURFGowBoAqtglgWVCUTs1BgW1nq8/79On9J9P+1syZWCBJQnlsMzt7aRuyDl HTf1O32OEQZW6WTUiD3QuYF70UsluepDXawQFD7PAxNL6sjxfkBW8IZlFV6thuVbAW2vHY c51wuaBb0AMb/cGDTTZfoD5WCbxnYd7KQcHgitUJsnNbzhxTHNEVTe6K1v9Ygk9VAJN1Rw xOFox449mv0H9VTByitpsEJvK9KUOG7Ej8+1nTk+J2ILm6Bxr0QSxwnaca8+pw== 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 4XPTmR5wbmzxTR; Thu, 10 Oct 2024 12:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbRH0006684; Thu, 10 Oct 2024 12:37:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbRW9006681; Thu, 10 Oct 2024 12:37:27 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:27 GMT Message-Id: <202410101237.49ACbRW9006681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 48f5bf8be6fa - main - pf: convert DIOCGETRULESET to netlink List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 48f5bf8be6fa6755a8cd285d74facb4ffefc8413 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=48f5bf8be6fa6755a8cd285d74facb4ffefc8413 commit 48f5bf8be6fa6755a8cd285d74facb4ffefc8413 Author: Kristof Provost AuthorDate: 2024-10-03 12:07:40 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:41 +0000 pf: convert DIOCGETRULESET to netlink Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46938 --- lib/libpfctl/libpfctl.c | 36 ++++++++++++++++++++++++ lib/libpfctl/libpfctl.h | 1 + sbin/pfctl/pfctl.c | 18 ++++-------- sys/net/pfvar.h | 1 + sys/netpfil/pf/pf_ioctl.c | 72 +++++++++++++++++++++++++++-------------------- sys/netpfil/pf/pf_nl.c | 42 +++++++++++++++++++++++++++ sys/netpfil/pf/pf_nl.h | 2 ++ 7 files changed, 130 insertions(+), 42 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index c9f315a0db67..e0d93041c551 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -2920,6 +2920,7 @@ pfctl_get_addr(struct pfctl_handle *h, uint32_t ticket, uint32_t r_num, #define _OUT(_field) offsetof(struct pfioc_ruleset, _field) static const struct snl_attr_parser ap_ruleset[] = { { .type = PF_RS_NR, .off = _OUT(nr), .cb = snl_attr_get_uint32 }, + { .type = PF_RS_NAME, .off = _OUT(name), .arg = (void *)PF_ANCHOR_NAME_SIZE, .cb = snl_attr_copy_string }, }; static struct snl_field_parser fp_ruleset[] = {}; SNL_DECLARE_PARSER(ruleset_parser, struct genlmsghdr, fp_ruleset, ap_ruleset); @@ -2962,3 +2963,38 @@ pfctl_get_rulesets(struct pfctl_handle *h, const char *path, uint32_t *nr) return (e.error); } +int +pfctl_get_ruleset(struct pfctl_handle *h, const char *path, uint32_t nr, struct pfioc_ruleset *rs) +{ + struct snl_writer nw; + struct snl_errmsg_data e = {}; + struct nlmsghdr *hdr; + uint32_t seq_id; + int family_id; + + family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); + if (family_id == 0) + return (ENOTSUP); + + snl_init_writer(&h->ss, &nw); + hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GET_RULESET); + + snl_add_msg_attr_string(&nw, PF_RS_PATH, path); + snl_add_msg_attr_u32(&nw, PF_RS_NR, nr); + + if ((hdr = snl_finalize_msg(&nw)) == NULL) + return (ENXIO); + + seq_id = hdr->nlmsg_seq; + + if (! snl_send_message(&h->ss, hdr)) + return (ENXIO); + + while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { + if (! snl_parse_nlmsg(&h->ss, hdr, &ruleset_parser, rs)) + continue; + } + + return (e.error); +} + diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 6d8be24dd04f..4da21774a958 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -505,5 +505,6 @@ int pfctl_get_addrs(struct pfctl_handle *h, uint32_t ticket, uint32_t r_num, int pfctl_get_addr(struct pfctl_handle *h, uint32_t ticket, uint32_t r_num, uint8_t r_action, const char *anchor, uint32_t nr, struct pfioc_pooladdr *pa); int pfctl_get_rulesets(struct pfctl_handle *h, const char *path, uint32_t *nr); +int pfctl_get_ruleset(struct pfctl_handle *h, const char *path, uint32_t nr, struct pfioc_ruleset *rs); #endif diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index ee49e7b12278..4ca77f6c5f4a 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1252,7 +1252,6 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, u_int32_t mnr, nr; memset(&prs, 0, sizeof(prs)); - memcpy(prs.path, npath, sizeof(prs.path)); if ((ret = pfctl_get_rulesets(pfh, npath, &mnr)) != 0) { if (ret == EINVAL) fprintf(stderr, "Anchor '%s' " @@ -1263,9 +1262,8 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, pfctl_print_rule_counters(&rule, opts); for (nr = 0; nr < mnr; ++nr) { - prs.nr = nr; - if (ioctl(dev, DIOCGETRULESET, &prs)) - err(1, "DIOCGETRULESET"); + if ((ret = pfctl_get_ruleset(pfh, npath, nr, &prs)) != 0) + errc(1, ret, "DIOCGETRULESET"); INDENT(depth, !(opts & PF_OPT_VERBOSE)); printf("anchor \"%s\" all {\n", prs.name); pfctl_show_rules(dev, npath, opts, @@ -1455,7 +1453,6 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth, struct pfioc_ruleset prs; u_int32_t mnr, nr; memset(&prs, 0, sizeof(prs)); - memcpy(prs.path, npath, sizeof(prs.path)); if ((ret = pfctl_get_rulesets(pfh, npath, &mnr)) != 0) { if (ret == EINVAL) fprintf(stderr, "NAT anchor '%s' " @@ -1466,9 +1463,8 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth, pfctl_print_rule_counters(&rule, opts); for (nr = 0; nr < mnr; ++nr) { - prs.nr = nr; - if (ioctl(dev, DIOCGETRULESET, &prs)) - err(1, "DIOCGETRULESET"); + if ((ret = pfctl_get_ruleset(pfh, npath, nr, &prs)) != 0) + errc(1, ret, "DIOCGETRULESET"); INDENT(depth, !(opts & PF_OPT_VERBOSE)); printf("nat-anchor \"%s\" all {\n", prs.name); pfctl_show_nat(dev, npath, opts, @@ -2816,7 +2812,6 @@ pfctl_show_anchors(int dev, int opts, char *anchorname) int ret; memset(&pr, 0, sizeof(pr)); - memcpy(pr.path, anchorname, sizeof(pr.path)); if ((ret = pfctl_get_rulesets(pfh, anchorname, &mnr)) != 0) { if (ret == EINVAL) fprintf(stderr, "Anchor '%s' not found.\n", @@ -2828,9 +2823,8 @@ pfctl_show_anchors(int dev, int opts, char *anchorname) for (nr = 0; nr < mnr; ++nr) { char sub[MAXPATHLEN]; - pr.nr = nr; - if (ioctl(dev, DIOCGETRULESET, &pr)) - err(1, "DIOCGETRULESET"); + if ((ret = pfctl_get_ruleset(pfh, anchorname, nr, &pr)) != 0) + errc(1, ret, "DIOCGETRULESET"); if (!strcmp(pr.name, PF_RESERVED_ANCHOR)) continue; sub[0] = 0; diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 62f1edad7051..cf7db417034d 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2581,6 +2581,7 @@ int pf_ioctl_add_addr(struct pfioc_pooladdr *); int pf_ioctl_get_addrs(struct pfioc_pooladdr *); int pf_ioctl_get_addr(struct pfioc_pooladdr *); int pf_ioctl_get_rulesets(struct pfioc_ruleset *); +int pf_ioctl_get_ruleset(struct pfioc_ruleset *); void pf_krule_free(struct pf_krule *); void pf_krule_clear_counters(struct pf_krule *); diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index e3fb3150db5f..ce28a9cd6dc1 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -2696,6 +2696,47 @@ pf_ioctl_get_rulesets(struct pfioc_ruleset *pr) return (0); } +int +pf_ioctl_get_ruleset(struct pfioc_ruleset *pr) +{ + struct pf_kruleset *ruleset; + struct pf_kanchor *anchor; + u_int32_t nr = 0; + int error = 0; + + PF_RULES_RLOCK_TRACKER; + + PF_RULES_RLOCK(); + if ((ruleset = pf_find_kruleset(pr->path)) == NULL) { + PF_RULES_RUNLOCK(); + return (ENOENT); + } + + pr->name[0] = 0; + if (ruleset->anchor == NULL) { + /* XXX kludge for pf_main_ruleset */ + RB_FOREACH(anchor, pf_kanchor_global, &V_pf_anchors) + if (anchor->parent == NULL && nr++ == pr->nr) { + strlcpy(pr->name, anchor->name, + sizeof(pr->name)); + break; + } + } else { + RB_FOREACH(anchor, pf_kanchor_node, + &ruleset->anchor->children) + if (nr++ == pr->nr) { + strlcpy(pr->name, anchor->name, + sizeof(pr->name)); + break; + } + } + if (!pr->name[0]) + error = EBUSY; + PF_RULES_RUNLOCK(); + + return (error); +} + static int pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td) { @@ -4514,39 +4555,10 @@ DIOCCHANGEADDR_error: case DIOCGETRULESET: { struct pfioc_ruleset *pr = (struct pfioc_ruleset *)addr; - struct pf_kruleset *ruleset; - struct pf_kanchor *anchor; - u_int32_t nr = 0; pr->path[sizeof(pr->path) - 1] = 0; - PF_RULES_RLOCK(); - if ((ruleset = pf_find_kruleset(pr->path)) == NULL) { - PF_RULES_RUNLOCK(); - error = ENOENT; - break; - } - pr->name[0] = 0; - if (ruleset->anchor == NULL) { - /* XXX kludge for pf_main_ruleset */ - RB_FOREACH(anchor, pf_kanchor_global, &V_pf_anchors) - if (anchor->parent == NULL && nr++ == pr->nr) { - strlcpy(pr->name, anchor->name, - sizeof(pr->name)); - break; - } - } else { - RB_FOREACH(anchor, pf_kanchor_node, - &ruleset->anchor->children) - if (nr++ == pr->nr) { - strlcpy(pr->name, anchor->name, - sizeof(pr->name)); - break; - } - } - if (!pr->name[0]) - error = EBUSY; - PF_RULES_RUNLOCK(); + error = pf_ioctl_get_ruleset(pr); break; } diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index e3c0369f550d..c75af9091d08 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -1638,6 +1638,7 @@ pf_handle_get_addr(struct nlmsghdr *hdr, struct nl_pstate *npt) #define _OUT(_field) offsetof(struct pfioc_ruleset, _field) static const struct nlattr_parser nla_p_ruleset[] = { { .type = PF_RS_PATH, .off = _OUT(path), .arg = (void *)MAXPATHLEN, .cb = nlattr_get_chara }, + { .type = PF_RS_NR, .off = _OUT(nr), .cb = nlattr_get_uint32 }, }; static const struct nlfield_parser nlf_p_ruleset[] = { }; @@ -1678,6 +1679,40 @@ pf_handle_get_rulesets(struct nlmsghdr *hdr, struct nl_pstate *npt) return (0); } +static int +pf_handle_get_ruleset(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + struct pfioc_ruleset attrs = { 0 }; + struct nl_writer *nw = npt->nw; + struct genlmsghdr *ghdr_new; + int error; + + error = nl_parse_nlmsg(hdr, &ruleset_parser, npt, &attrs); + if (error) + return (error); + + error = pf_ioctl_get_ruleset(&attrs); + if (error != 0) + return (error); + + if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) + return (ENOMEM); + + ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); + ghdr_new->cmd = PFNL_CMD_GET_RULESET; + ghdr_new->version = 0; + ghdr_new->reserved = 0; + + nlattr_add_string(nw, PF_RS_NAME, attrs.name); + + if (!nlmsg_end(nw)) { + nlmsg_abort(nw); + return (ENOMEM); + } + + return (0); +} + static const struct nlhdr_parser *all_parsers[] = { &state_parser, &addrule_parser, @@ -1857,6 +1892,13 @@ static const struct genl_cmd pf_cmds[] = { .cmd_flags = GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL, .cmd_priv = PRIV_NETINET_PF, }, + { + .cmd_num = PFNL_CMD_GET_RULESET, + .cmd_name = "GET_RULESET", + .cmd_cb = pf_handle_get_ruleset, + .cmd_flags = GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL, + .cmd_priv = PRIV_NETINET_PF, + }, }; void diff --git a/sys/netpfil/pf/pf_nl.h b/sys/netpfil/pf/pf_nl.h index 5aa02d10214b..0ec68658dcf3 100644 --- a/sys/netpfil/pf/pf_nl.h +++ b/sys/netpfil/pf/pf_nl.h @@ -59,6 +59,7 @@ enum { PFNL_CMD_GET_ADDRS = 21, PFNL_CMD_GET_ADDR = 22, PFNL_CMD_GET_RULESETS = 23, + PFNL_CMD_GET_RULESET = 24, __PFNL_CMD_MAX, }; #define PFNL_CMD_MAX (__PFNL_CMD_MAX -1) @@ -385,6 +386,7 @@ enum pf_get_rulesets_types_t { PF_RS_UNSPEC, PF_RS_PATH = 1, /* string */ PF_RS_NR = 2, /* u32 */ + PF_RS_NAME = 3, /* string */ }; #ifdef _KERNEL From nobody Thu Oct 10 12:37:26 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTmQ5hpnz5YyvX; Thu, 10 Oct 2024 12:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTmQ5Flcz4HD4; Thu, 10 Oct 2024 12:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eM4uuFB3HngwMBmdm0Hq0v3RPIKdmb14FTdDSXLLbfc=; b=N7cMTwHvL/f0zKrg/0QrsLrwgd7VxHhj/hPHDLIReQh2fydillbXC9ofpkYFdbo0X33/b+ 4kPFD8XNQGN1JQNjQqyZZpNT7I5bRtm9rekXLvVyFNeM68pnH1QyNJDwEnqG7nYWiXhfIa 0NvlkIlP3YiK078X6DBaKjU4f9WC1Kh2RJ7/Pe8WBU+YN9h7PeFaaWTjDKgj/3ji3+8BeA HeLqW4MmI1fmfXTpMrSq74AzWS4B8DGrMCU2oSykTpyvPQ5cfP3n7RlLWLXQY0W2X7Wb58 vK5Di7zBDyeoFYjcXFf2hJduL3R5GEyK+/lWIrEWDk+ZtKm6TQT9qjgB0BJdIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eM4uuFB3HngwMBmdm0Hq0v3RPIKdmb14FTdDSXLLbfc=; b=A1+qgD95pUiP8o87kAd2a2x+jEvKJgFcPc9c6PT6MXX3t4jGnv2JZT483bXN0be9RKe1iA xf0FZCAZx8Q2ASixobX4vE3iiVuYRju7LKEgYoqfkxLygolY6qY/EtCUe5Xp+nvSyoalSA 2JXGe00T/vVQgHv4xsEhJ9VdnhbhDp6PqIt8uYpK5j6MMDZdbtOe34Cct8kZk8iCpURLp+ x0RBA0l+UXRmDP1Cc9VY8FHD9cpQniRY/JWXS3TctQwD86+7fbv79FZhgIsBaClHMFwJAz 5YkBTY+Ajy6sBtuIexYNU/VhtRebT4RZuOVmfDkskJUpireOpsENYrryUSKilw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563846; a=rsa-sha256; cv=none; b=tuYnWWKtF7IncFDTvrTTWKO/38ch4h3MMbl6XFESnD9S2IB4TCNZ048O626qrGv9x5t6OM N1PGoA9/VtzP6E0UCje2weFBTLnKMnmrAmRCSx6SkcR0ohq99S3ECdvzLg4avXEiEZNlWO 4kKSRK0jcvAUDrbDa8oHOoYT6RD5gqlvVTPn3wvJCbUr1CY1rN2aBYUs8P9EeyzWl8lDud n/83HNJI4zkNnQ+5aNYRMw01cNKSlU7F9wVz5Ec/OT5YtHVYCAbjSjMJAZWP80kDmJdCvb wypfU++5jRXi1kgUjDNcQ1LmoA55UFxzFqdDF7kkjFSbANSrFEG9AJR/WwHzlg== 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 4XPTmQ4sfhzyDX; Thu, 10 Oct 2024 12:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbQbU006642; Thu, 10 Oct 2024 12:37:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbQE7006639; Thu, 10 Oct 2024 12:37:26 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:26 GMT Message-Id: <202410101237.49ACbQE7006639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 739731b8ca80 - main - pf: consolidate pf function parameters List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 739731b8ca800540ed45d1ce92726ee5b61a87e5 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=739731b8ca800540ed45d1ce92726ee5b61a87e5 commit 739731b8ca800540ed45d1ce92726ee5b61a87e5 Author: Kristof Provost AuthorDate: 2024-10-02 14:45:05 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:41 +0000 pf: consolidate pf function parameters Move off and hdrlen into pdesc and change their type from int to u_int32_t. Do not pass struct tcphdr *th and sa_family_t af, it is in pd anyway. Do not use af and pd->af intermixed, the latter makes clear where it comes from. Do not calculate the packet length again if pd already has it. Use pd2.off instead of off2. go go go go don't stop henning@ mpf@ Obtained from: OpenBSD, bluhm , 110e53770d Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46937 --- sys/net/pfvar.h | 29 ++- sys/netpfil/pf/pf.c | 387 +++++++++++++++++++---------------------- sys/netpfil/pf/pf_lb.c | 20 +-- sys/netpfil/pf/pf_norm.c | 39 ++--- sys/netpfil/pf/pf_osfp.c | 4 +- sys/netpfil/pf/pf_syncookies.c | 13 +- 6 files changed, 230 insertions(+), 262 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 34a6e2028100..62f1edad7051 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1604,7 +1604,9 @@ struct pf_pdesc { struct pf_mtag *pf_mtag; struct pf_rule_actions act; - u_int32_t p_len; /* total length of payload */ + u_int32_t off; /* protocol header offset */ + u_int32_t hdrlen; /* protocol header length */ + u_int32_t p_len; /* total length of protocol payload */ u_int32_t badopts; /* v4 options or v6 routing headers */ u_int16_t *ip_sum; @@ -2398,18 +2400,16 @@ int pf_match_port(u_int8_t, u_int16_t, u_int16_t, u_int16_t); void pf_normalize_init(void); void pf_normalize_cleanup(void); -int pf_normalize_tcp(struct pfi_kkif *, struct mbuf *, int, int, - struct pf_pdesc *); +int pf_normalize_tcp(struct pfi_kkif *, struct mbuf *, struct pf_pdesc *); void pf_normalize_tcp_cleanup(struct pf_kstate *); -int pf_normalize_tcp_init(struct mbuf *, int, struct pf_pdesc *, +int pf_normalize_tcp_init(struct mbuf *, struct pf_pdesc *, struct tcphdr *, struct pf_state_peer *, struct pf_state_peer *); -int pf_normalize_tcp_stateful(struct mbuf *, int, struct pf_pdesc *, +int pf_normalize_tcp_stateful(struct mbuf *, struct pf_pdesc *, u_short *, struct tcphdr *, struct pf_kstate *, struct pf_state_peer *, struct pf_state_peer *, int *); -int pf_normalize_sctp_init(struct mbuf *, int, struct pf_pdesc *, +int pf_normalize_sctp_init(struct mbuf *, struct pf_pdesc *, struct pf_state_peer *, struct pf_state_peer *); -int pf_normalize_sctp(int, struct pfi_kkif *, struct mbuf *, int, - int, struct pf_pdesc *); +int pf_normalize_sctp(struct pfi_kkif *, struct mbuf *, struct pf_pdesc *); u_int32_t pf_state_expires(const struct pf_kstate *); void pf_purge_expired_fragments(void); @@ -2488,8 +2488,8 @@ int pf_tag_packet(struct mbuf *, struct pf_pdesc *, int); int pf_addr_cmp(struct pf_addr *, struct pf_addr *, sa_family_t); -u_int16_t pf_get_mss(struct mbuf *, int, u_int16_t, sa_family_t); -u_int8_t pf_get_wscale(struct mbuf *, int, u_int16_t, sa_family_t); +u_int16_t pf_get_mss(struct mbuf *, struct pf_pdesc *); +u_int8_t pf_get_wscale(struct mbuf *, struct pf_pdesc *); struct mbuf *pf_build_tcp(const struct pf_krule *, sa_family_t, const struct pf_addr *, const struct pf_addr *, u_int16_t, u_int16_t, u_int32_t, u_int32_t, @@ -2506,7 +2506,7 @@ void pf_syncookies_cleanup(void); int pf_get_syncookies(struct pfioc_nv *); int pf_set_syncookies(struct pfioc_nv *); int pf_synflood_check(struct pf_pdesc *); -void pf_syncookie_send(struct mbuf *m, int off, +void pf_syncookie_send(struct mbuf *m, struct pf_pdesc *); bool pf_syncookie_check(struct pf_pdesc *); u_int8_t pf_syncookie_validate(struct pf_pdesc *); @@ -2591,7 +2591,7 @@ void pf_addr_copyout(struct pf_addr_wrap *); int pf_osfp_add(struct pf_osfp_ioctl *); #ifdef _KERNEL struct pf_osfp_enlist * - pf_osfp_fingerprint(struct pf_pdesc *, struct mbuf *, int, + pf_osfp_fingerprint(struct pf_pdesc *, struct mbuf *, const struct tcphdr *); #endif /* _KERNEL */ void pf_osfp_flush(void); @@ -2631,13 +2631,12 @@ u_short pf_get_translation(struct pf_pdesc *, struct mbuf *, struct pf_krule **, struct pf_udp_mapping **udp_mapping); -struct pf_state_key *pf_state_key_setup(struct pf_pdesc *, struct mbuf *, int, +struct pf_state_key *pf_state_key_setup(struct pf_pdesc *, struct mbuf *, struct pf_addr *, struct pf_addr *, u_int16_t, u_int16_t); struct pf_state_key *pf_state_key_clone(const struct pf_state_key *); void pf_rule_to_actions(struct pf_krule *, struct pf_rule_actions *); -int pf_normalize_mss(struct mbuf *m, int off, - struct pf_pdesc *pd); +int pf_normalize_mss(struct mbuf *m, struct pf_pdesc *pd); #if defined(INET) || defined(INET6) void pf_scrub(struct mbuf *, struct pf_pdesc *); #endif diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 669539e9e997..4ed3597154a8 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -294,7 +294,7 @@ static int pf_check_threshold(struct pf_threshold *); static void pf_change_ap(struct mbuf *, struct pf_addr *, u_int16_t *, u_int16_t *, u_int16_t *, struct pf_addr *, u_int16_t, u_int8_t, sa_family_t); -static int pf_modulate_sack(struct mbuf *, int, struct pf_pdesc *, +static int pf_modulate_sack(struct mbuf *, struct pf_pdesc *, struct tcphdr *, struct pf_state_peer *); int pf_icmp_mapping(struct pf_pdesc *, u_int8_t, int *, int *, u_int16_t *, u_int16_t *); @@ -320,42 +320,42 @@ static int pf_dummynet_route(struct pf_pdesc *, static int pf_test_eth_rule(int, struct pfi_kkif *, struct mbuf **); static int pf_test_rule(struct pf_krule **, struct pf_kstate **, - struct pfi_kkif *, struct mbuf *, int, + struct pfi_kkif *, struct mbuf *, struct pf_pdesc *, struct pf_krule **, - struct pf_kruleset **, struct inpcb *, int); + struct pf_kruleset **, struct inpcb *); static int pf_create_state(struct pf_krule *, struct pf_krule *, struct pf_krule *, struct pf_pdesc *, struct pf_ksrc_node *, struct pf_state_key *, - struct pf_state_key *, struct mbuf *, int, + struct pf_state_key *, struct mbuf *, u_int16_t, u_int16_t, int *, struct pfi_kkif *, struct pf_kstate **, int, u_int16_t, u_int16_t, - int, struct pf_krule_slist *, struct pf_udp_mapping *); + struct pf_krule_slist *, struct pf_udp_mapping *); static int pf_state_key_addr_setup(struct pf_pdesc *, struct mbuf *, - int, struct pf_state_key_cmp *, int, struct pf_addr *, + struct pf_state_key_cmp *, int, struct pf_addr *, int, struct pf_addr *, int); static int pf_tcp_track_full(struct pf_kstate **, - struct pfi_kkif *, struct mbuf *, int, + struct pfi_kkif *, struct mbuf *, struct pf_pdesc *, u_short *, int *); static int pf_tcp_track_sloppy(struct pf_kstate **, struct pf_pdesc *, u_short *); static int pf_test_state_tcp(struct pf_kstate **, - struct pfi_kkif *, struct mbuf *, int, + struct pfi_kkif *, struct mbuf *, struct pf_pdesc *, u_short *); static int pf_test_state_udp(struct pf_kstate **, - struct pfi_kkif *, struct mbuf *, int, + struct pfi_kkif *, struct mbuf *, struct pf_pdesc *); int pf_icmp_state_lookup(struct pf_state_key_cmp *, struct pf_pdesc *, struct pf_kstate **, struct mbuf *, - int, int, struct pfi_kkif *, u_int16_t, u_int16_t, + int, struct pfi_kkif *, u_int16_t, u_int16_t, int, int *, int, int); static int pf_test_state_icmp(struct pf_kstate **, - struct pfi_kkif *, struct mbuf *, int, + struct pfi_kkif *, struct mbuf *, struct pf_pdesc *, u_short *); static void pf_sctp_multihome_detach_addr(const struct pf_kstate *); -static void pf_sctp_multihome_delayed(struct pf_pdesc *, int, +static void pf_sctp_multihome_delayed(struct pf_pdesc *, struct pfi_kkif *, struct pf_kstate *, int); static int pf_test_state_sctp(struct pf_kstate **, - struct pfi_kkif *, struct mbuf *, int, + struct pfi_kkif *, struct mbuf *, struct pf_pdesc *, u_short *); static int pf_test_state_other(struct pf_kstate **, struct pfi_kkif *, struct mbuf *, struct pf_pdesc *); @@ -1572,7 +1572,7 @@ pf_state_key_ctor(void *mem, int size, void *arg, int flags) } static int -pf_state_key_addr_setup(struct pf_pdesc *pd, struct mbuf *m, int off, +pf_state_key_addr_setup(struct pf_pdesc *pd, struct mbuf *m, struct pf_state_key_cmp *key, int sidx, struct pf_addr *saddr, int didx, struct pf_addr *daddr, int multi) { @@ -1588,7 +1588,7 @@ pf_state_key_addr_setup(struct pf_pdesc *pd, struct mbuf *m, int off, case ND_NEIGHBOR_SOLICIT: if (multi) return (-1); - if (!pf_pull_hdr(m, off, &nd, sizeof(nd), &action, &reason, pd->af)) + if (!pf_pull_hdr(m, pd->off, &nd, sizeof(nd), &action, &reason, pd->af)) return (-1); target = (struct pf_addr *)&nd.nd_ns_target; daddr = target; @@ -1596,7 +1596,7 @@ pf_state_key_addr_setup(struct pf_pdesc *pd, struct mbuf *m, int off, case ND_NEIGHBOR_ADVERT: if (multi) return (-1); - if (!pf_pull_hdr(m, off, &nd, sizeof(nd), &action, &reason, pd->af)) + if (!pf_pull_hdr(m, pd->off, &nd, sizeof(nd), &action, &reason, pd->af)) return (-1); target = (struct pf_addr *)&nd.nd_ns_target; saddr = target; @@ -1628,7 +1628,7 @@ copy: } struct pf_state_key * -pf_state_key_setup(struct pf_pdesc *pd, struct mbuf *m, int off, +pf_state_key_setup(struct pf_pdesc *pd, struct mbuf *m, struct pf_addr *saddr, struct pf_addr *daddr, u_int16_t sport, u_int16_t dport) { @@ -1638,7 +1638,7 @@ pf_state_key_setup(struct pf_pdesc *pd, struct mbuf *m, int off, if (sk == NULL) return (NULL); - if (pf_state_key_addr_setup(pd, m, off, (struct pf_state_key_cmp *)sk, + if (pf_state_key_addr_setup(pd, m, (struct pf_state_key_cmp *)sk, pd->sidx, pd->src, pd->didx, pd->dst, 0)) { uma_zfree(V_pf_state_key_z, sk); return (NULL); @@ -3290,7 +3290,7 @@ pf_change_icmp(struct pf_addr *ia, u_int16_t *ip, struct pf_addr *oa, * (credits to Krzysztof Pfaff for report and patch) */ static int -pf_modulate_sack(struct mbuf *m, int off, struct pf_pdesc *pd, +pf_modulate_sack(struct mbuf *m, struct pf_pdesc *pd, struct tcphdr *th, struct pf_state_peer *dst) { int hlen = (th->th_off << 2) - sizeof(*th), thoptlen = hlen; @@ -3300,7 +3300,7 @@ pf_modulate_sack(struct mbuf *m, int off, struct pf_pdesc *pd, #define TCPOLEN_SACKLEN (TCPOLEN_SACK + 2) if (hlen < TCPOLEN_SACKLEN || - !pf_pull_hdr(m, off + sizeof(*th), opts, hlen, NULL, NULL, pd->af)) + !pf_pull_hdr(m, pd->off + sizeof(*th), opts, hlen, NULL, NULL, pd->af)) return 0; while (hlen >= TCPOLEN_SACKLEN) { @@ -3343,7 +3343,7 @@ pf_modulate_sack(struct mbuf *m, int off, struct pf_pdesc *pd, } if (copyback) - m_copyback(m, off + sizeof(*th), thoptlen, (caddr_t)opts); + m_copyback(m, pd->off + sizeof(*th), thoptlen, (caddr_t)opts); return (copyback); } @@ -3654,18 +3654,17 @@ pf_send_tcp(const struct pf_krule *r, sa_family_t af, static void pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, - struct pf_state_key *sk, int off, struct mbuf *m, struct tcphdr *th, - struct pfi_kkif *kif, u_int16_t bproto_sum, u_int16_t bip_sum, int hdrlen, + struct pf_state_key *sk, struct mbuf *m, struct tcphdr *th, + struct pfi_kkif *kif, u_int16_t bproto_sum, u_int16_t bip_sum, u_short *reason, int rtableid) { struct pf_addr * const saddr = pd->src; struct pf_addr * const daddr = pd->dst; - sa_family_t af = pd->af; /* undo NAT changes, if they have taken place */ if (nr != NULL) { - PF_ACPY(saddr, &sk->addr[pd->sidx], af); - PF_ACPY(daddr, &sk->addr[pd->didx], af); + PF_ACPY(saddr, &sk->addr[pd->sidx], pd->af); + PF_ACPY(daddr, &sk->addr[pd->didx], pd->af); if (pd->sport) *pd->sport = sk->port[pd->sidx]; if (pd->dport) @@ -3674,59 +3673,38 @@ pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, *pd->proto_sum = bproto_sum; if (pd->ip_sum) *pd->ip_sum = bip_sum; - m_copyback(m, off, hdrlen, pd->hdr.any); + m_copyback(m, pd->off, pd->hdrlen, pd->hdr.any); } if (pd->proto == IPPROTO_TCP && ((r->rule_flag & PFRULE_RETURNRST) || (r->rule_flag & PFRULE_RETURN)) && !(th->th_flags & TH_RST)) { u_int32_t ack = ntohl(th->th_seq) + pd->p_len; - int len = 0; -#ifdef INET - struct ip *h4; -#endif -#ifdef INET6 - struct ip6_hdr *h6; -#endif - - switch (af) { -#ifdef INET - case AF_INET: - h4 = mtod(m, struct ip *); - len = ntohs(h4->ip_len) - off; - break; -#endif -#ifdef INET6 - case AF_INET6: - h6 = mtod(m, struct ip6_hdr *); - len = ntohs(h6->ip6_plen) - (off - sizeof(*h6)); - break; -#endif - } - if (pf_check_proto_cksum(m, off, len, IPPROTO_TCP, af)) + if (pf_check_proto_cksum(m, pd->off, pd->tot_len - pd->off, + IPPROTO_TCP, pd->af)) REASON_SET(reason, PFRES_PROTCKSUM); else { if (th->th_flags & TH_SYN) ack++; if (th->th_flags & TH_FIN) ack++; - pf_send_tcp(r, af, pd->dst, + pf_send_tcp(r, pd->af, pd->dst, pd->src, th->th_dport, th->th_sport, ntohl(th->th_ack), ack, TH_RST|TH_ACK, 0, 0, r->return_ttl, true, 0, 0, rtableid); } } else if (pd->proto == IPPROTO_SCTP && (r->rule_flag & PFRULE_RETURN)) { - pf_send_sctp_abort(af, pd, r->return_ttl, rtableid); - } else if (pd->proto != IPPROTO_ICMP && af == AF_INET && + pf_send_sctp_abort(pd->af, pd, r->return_ttl, rtableid); + } else if (pd->proto != IPPROTO_ICMP && pd->af == AF_INET && r->return_icmp) pf_send_icmp(m, r->return_icmp >> 8, - r->return_icmp & 255, af, r, rtableid); - else if (pd->proto != IPPROTO_ICMPV6 && af == AF_INET6 && + r->return_icmp & 255, pd->af, r, rtableid); + else if (pd->proto != IPPROTO_ICMPV6 && pd->af == AF_INET6 && r->return_icmp6) pf_send_icmp(m, r->return_icmp6 >> 8, - r->return_icmp6 & 255, af, r, rtableid); + r->return_icmp6 & 255, pd->af, r, rtableid); } static int @@ -4394,17 +4372,18 @@ pf_socket_lookup(struct pf_pdesc *pd, struct mbuf *m) } u_int8_t -pf_get_wscale(struct mbuf *m, int off, u_int16_t th_off, sa_family_t af) +pf_get_wscale(struct mbuf *m, struct pf_pdesc *pd) { + struct tcphdr *th = &pd->hdr.tcp; int hlen; u_int8_t hdr[60]; u_int8_t *opt, optlen; u_int8_t wscale = 0; - hlen = th_off << 2; /* hlen <= sizeof(hdr) */ + hlen = th->th_off << 2; /* hlen <= sizeof(hdr) */ if (hlen <= sizeof(struct tcphdr)) return (0); - if (!pf_pull_hdr(m, off, hdr, hlen, NULL, NULL, af)) + if (!pf_pull_hdr(m, pd->off, hdr, hlen, NULL, NULL, pd->af)) return (0); opt = hdr + sizeof(struct tcphdr); hlen -= sizeof(struct tcphdr); @@ -4434,17 +4413,18 @@ pf_get_wscale(struct mbuf *m, int off, u_int16_t th_off, sa_family_t af) } u_int16_t -pf_get_mss(struct mbuf *m, int off, u_int16_t th_off, sa_family_t af) +pf_get_mss(struct mbuf *m, struct pf_pdesc *pd) { + struct tcphdr *th = &pd->hdr.tcp; int hlen; u_int8_t hdr[60]; u_int8_t *opt, optlen; u_int16_t mss = V_tcp_mssdflt; - hlen = th_off << 2; /* hlen <= sizeof(hdr) */ + hlen = th->th_off << 2; /* hlen <= sizeof(hdr) */ if (hlen <= sizeof(struct tcphdr)) return (0); - if (!pf_pull_hdr(m, off, hdr, hlen, NULL, NULL, af)) + if (!pf_pull_hdr(m, pd->off, hdr, hlen, NULL, NULL, pd->af)) return (0); opt = hdr + sizeof(struct tcphdr); hlen -= sizeof(struct tcphdr); @@ -4886,13 +4866,12 @@ pf_test_eth_rule(int dir, struct pfi_kkif *kif, struct mbuf **m0) static int pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, - struct mbuf *m, int off, struct pf_pdesc *pd, struct pf_krule **am, - struct pf_kruleset **rsm, struct inpcb *inp, int hdrlen) + struct mbuf *m, struct pf_pdesc *pd, struct pf_krule **am, + struct pf_kruleset **rsm, struct inpcb *inp) { struct pf_krule *nr = NULL; struct pf_addr * const saddr = pd->src; struct pf_addr * const daddr = pd->dst; - sa_family_t af = pd->af; struct pf_krule *r, *a = NULL; struct pf_kruleset *ruleset = NULL; struct pf_krule_slist match_rules; @@ -4938,7 +4917,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, break; #ifdef INET case IPPROTO_ICMP: - MPASS(af == AF_INET); + MPASS(pd->af == AF_INET); icmptype = pd->hdr.icmp.icmp_type; icmpcode = pd->hdr.icmp.icmp_code; state_icmp = pf_icmp_mapping(pd, icmptype, @@ -4954,7 +4933,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, #endif /* INET */ #ifdef INET6 case IPPROTO_ICMPV6: - MPASS(af == AF_INET6); + MPASS(pd->af == AF_INET6); icmptype = pd->hdr.icmp6.icmp6_type; icmpcode = pd->hdr.icmp6.icmp6_code; state_icmp = pf_icmp_mapping(pd, icmptype, @@ -4977,7 +4956,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); /* check packet for BINAT/NAT/RDR */ - transerror = pf_get_translation(pd, m, off, kif, &nsn, &sk, + transerror = pf_get_translation(pd, m, pd->off, kif, &nsn, &sk, &nk, saddr, daddr, sport, dport, anchor_stack, &nr, &udp_mapping); switch (transerror) { default: @@ -5004,20 +4983,20 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, bproto_sum = th->th_sum; pd->proto_sum = &th->th_sum; - if (PF_ANEQ(saddr, &nk->addr[pd->sidx], af) || + if (PF_ANEQ(saddr, &nk->addr[pd->sidx], pd->af) || nk->port[pd->sidx] != sport) { pf_change_ap(m, saddr, &th->th_sport, pd->ip_sum, &th->th_sum, &nk->addr[pd->sidx], - nk->port[pd->sidx], 0, af); + nk->port[pd->sidx], 0, pd->af); pd->sport = &th->th_sport; sport = th->th_sport; } - if (PF_ANEQ(daddr, &nk->addr[pd->didx], af) || + if (PF_ANEQ(daddr, &nk->addr[pd->didx], pd->af) || nk->port[pd->didx] != dport) { pf_change_ap(m, daddr, &th->th_dport, pd->ip_sum, &th->th_sum, &nk->addr[pd->didx], - nk->port[pd->didx], 0, af); + nk->port[pd->didx], 0, pd->af); dport = th->th_dport; pd->dport = &th->th_dport; } @@ -5027,22 +5006,22 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, bproto_sum = pd->hdr.udp.uh_sum; pd->proto_sum = &pd->hdr.udp.uh_sum; - if (PF_ANEQ(saddr, &nk->addr[pd->sidx], af) || + if (PF_ANEQ(saddr, &nk->addr[pd->sidx], pd->af) || nk->port[pd->sidx] != sport) { pf_change_ap(m, saddr, &pd->hdr.udp.uh_sport, pd->ip_sum, &pd->hdr.udp.uh_sum, &nk->addr[pd->sidx], - nk->port[pd->sidx], 1, af); + nk->port[pd->sidx], 1, pd->af); sport = pd->hdr.udp.uh_sport; pd->sport = &pd->hdr.udp.uh_sport; } - if (PF_ANEQ(daddr, &nk->addr[pd->didx], af) || + if (PF_ANEQ(daddr, &nk->addr[pd->didx], pd->af) || nk->port[pd->didx] != dport) { pf_change_ap(m, daddr, &pd->hdr.udp.uh_dport, pd->ip_sum, &pd->hdr.udp.uh_sum, &nk->addr[pd->didx], - nk->port[pd->didx], 1, af); + nk->port[pd->didx], 1, pd->af); dport = pd->hdr.udp.uh_dport; pd->dport = &pd->hdr.udp.uh_dport; } @@ -5051,19 +5030,19 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, case IPPROTO_SCTP: { uint16_t checksum = 0; - if (PF_ANEQ(saddr, &nk->addr[pd->sidx], af) || + if (PF_ANEQ(saddr, &nk->addr[pd->sidx], pd->af) || nk->port[pd->sidx] != sport) { pf_change_ap(m, saddr, &pd->hdr.sctp.src_port, pd->ip_sum, &checksum, &nk->addr[pd->sidx], - nk->port[pd->sidx], 1, af); + nk->port[pd->sidx], 1, pd->af); } - if (PF_ANEQ(daddr, &nk->addr[pd->didx], af) || + if (PF_ANEQ(daddr, &nk->addr[pd->didx], pd->af) || nk->port[pd->didx] != dport) { pf_change_ap(m, daddr, &pd->hdr.sctp.dest_port, pd->ip_sum, &checksum, &nk->addr[pd->didx], - nk->port[pd->didx], 1, af); + nk->port[pd->didx], 1, pd->af); } break; } @@ -5085,7 +5064,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, pd->hdr.icmp.icmp_id = nk->port[pd->sidx]; pd->sport = &pd->hdr.icmp.icmp_id; } - m_copyback(m, off, ICMP_MINLEN, (caddr_t)&pd->hdr.icmp); + m_copyback(m, pd->off, ICMP_MINLEN, (caddr_t)&pd->hdr.icmp); break; #endif /* INET */ #ifdef INET6 @@ -5101,7 +5080,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, break; #endif /* INET */ default: - switch (af) { + switch (pd->af) { #ifdef INET case AF_INET: if (PF_ANEQ(saddr, @@ -5121,11 +5100,11 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, case AF_INET6: if (PF_ANEQ(saddr, &nk->addr[pd->sidx], AF_INET6)) - PF_ACPY(saddr, &nk->addr[pd->sidx], af); + PF_ACPY(saddr, &nk->addr[pd->sidx], pd->af); if (PF_ANEQ(daddr, &nk->addr[pd->didx], AF_INET6)) - PF_ACPY(daddr, &nk->addr[pd->didx], af); + PF_ACPY(daddr, &nk->addr[pd->didx], pd->af); break; #endif /* INET */ } @@ -5141,14 +5120,14 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, r->skip[PF_SKIP_IFP]); PF_TEST_ATTRIB(r->direction && r->direction != pd->dir, r->skip[PF_SKIP_DIR]); - PF_TEST_ATTRIB(r->af && r->af != af, + PF_TEST_ATTRIB(r->af && r->af != pd->af, r->skip[PF_SKIP_AF]); PF_TEST_ATTRIB(r->proto && r->proto != pd->proto, r->skip[PF_SKIP_PROTO]); - PF_TEST_ATTRIB(PF_MISMATCHAW(&r->src.addr, saddr, af, + PF_TEST_ATTRIB(PF_MISMATCHAW(&r->src.addr, saddr, pd->af, r->src.neg, kif, M_GETFIB(m)), r->skip[PF_SKIP_SRC_ADDR]); - PF_TEST_ATTRIB(PF_MISMATCHAW(&r->dst.addr, daddr, af, + PF_TEST_ATTRIB(PF_MISMATCHAW(&r->dst.addr, daddr, pd->af, r->dst.neg, NULL, M_GETFIB(m)), r->skip[PF_SKIP_DST_ADDR]); switch (pd->virtual_proto) { @@ -5225,7 +5204,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, TAILQ_NEXT(r, entries)); PF_TEST_ATTRIB(r->os_fingerprint != PF_OSFP_ANY && (pd->virtual_proto != IPPROTO_TCP || !pf_osfp_match( - pf_osfp_fingerprint(pd, m, off, th), + pf_osfp_fingerprint(pd, m, th), r->os_fingerprint)), TAILQ_NEXT(r, entries)); /* FALLTHROUGH */ @@ -5282,7 +5261,7 @@ nextrule: if (r->log || pd->act.log & PF_LOG_MATCHES) { if (rewrite) - m_copyback(m, off, hdrlen, pd->hdr.any); + m_copyback(m, pd->off, pd->hdrlen, pd->hdr.any); PFLOG_PACKET(kif, m, r->action, reason, r, a, ruleset, pd, 1); } @@ -5291,8 +5270,8 @@ nextrule: ((r->rule_flag & PFRULE_RETURNRST) || (r->rule_flag & PFRULE_RETURNICMP) || (r->rule_flag & PFRULE_RETURN))) { - pf_return(r, nr, pd, sk, off, m, th, kif, bproto_sum, - bip_sum, hdrlen, &reason, r->rtableid); + pf_return(r, nr, pd, sk, m, th, kif, bproto_sum, + bip_sum, &reason, r->rtableid); } if (r->action == PF_DROP) @@ -5309,15 +5288,15 @@ nextrule: (!state_icmp && (r->keep_state || nr != NULL || (pd->flags & PFDESC_TCP_NORM)))) { int action; - action = pf_create_state(r, nr, a, pd, nsn, nk, sk, m, off, + action = pf_create_state(r, nr, a, pd, nsn, nk, sk, m, sport, dport, &rewrite, kif, sm, tag, bproto_sum, bip_sum, - hdrlen, &match_rules, udp_mapping); + &match_rules, udp_mapping); if (action != PF_PASS) { pf_udp_mapping_release(udp_mapping); if (action == PF_DROP && (r->rule_flag & PFRULE_RETURN)) - pf_return(r, nr, pd, sk, off, m, th, kif, - bproto_sum, bip_sum, hdrlen, &reason, + pf_return(r, nr, pd, sk, m, th, kif, + bproto_sum, bip_sum, &reason, pd->act.rtableid); return (action); } @@ -5334,7 +5313,7 @@ nextrule: /* copy back packet headers if we performed NAT operations */ if (rewrite) - m_copyback(m, off, hdrlen, pd->hdr.any); + m_copyback(m, pd->off, pd->hdrlen, pd->hdr.any); if (*sm != NULL && !((*sm)->state_flags & PFSTATE_NOSYNC) && pd->dir == PF_OUT && @@ -5365,9 +5344,9 @@ cleanup: static int pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, struct pf_pdesc *pd, struct pf_ksrc_node *nsn, struct pf_state_key *nk, - struct pf_state_key *sk, struct mbuf *m, int off, u_int16_t sport, + struct pf_state_key *sk, struct mbuf *m, u_int16_t sport, u_int16_t dport, int *rewrite, struct pfi_kkif *kif, struct pf_kstate **sm, - int tag, u_int16_t bproto_sum, u_int16_t bip_sum, int hdrlen, + int tag, u_int16_t bproto_sum, u_int16_t bip_sum, struct pf_krule_slist *match_rules, struct pf_udp_mapping *udp_mapping) { struct pf_kstate *s = NULL; @@ -5443,8 +5422,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, s->src.seqdiff = 0; if (th->th_flags & TH_SYN) { s->src.seqhi++; - s->src.wscale = pf_get_wscale(m, off, - th->th_off, pd->af); + s->src.wscale = pf_get_wscale(m, pd); } s->src.max_win = MAX(ntohs(th->th_win), 1); if (s->src.wscale & PF_WSCALE_MASK) { @@ -5504,12 +5482,12 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, } if (pd->proto == IPPROTO_TCP) { if (s->state_flags & PFSTATE_SCRUB_TCP && - pf_normalize_tcp_init(m, off, pd, th, &s->src, &s->dst)) { + pf_normalize_tcp_init(m, pd, th, &s->src, &s->dst)) { REASON_SET(&reason, PFRES_MEMORY); goto csfailed; } if (s->state_flags & PFSTATE_SCRUB_TCP && s->src.scrub && - pf_normalize_tcp_stateful(m, off, pd, &reason, th, s, + pf_normalize_tcp_stateful(m, pd, &reason, th, s, &s->src, &s->dst, rewrite)) { /* This really shouldn't happen!!! */ DPFPRINTF(PF_DEBUG_URGENT, @@ -5518,7 +5496,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, goto csfailed; } } else if (pd->proto == IPPROTO_SCTP) { - if (pf_normalize_sctp_init(m, off, pd, &s->src, &s->dst)) + if (pf_normalize_sctp_init(m, pd, &s->src, &s->dst)) goto csfailed; if (! (pd->sctp_flags & (PFDESC_SCTP_INIT | PFDESC_SCTP_ADD_IP))) goto csfailed; @@ -5531,7 +5509,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, if (nr == NULL) { KASSERT((sk == NULL && nk == NULL), ("%s: nr %p sk %p, nk %p", __func__, nr, sk, nk)); - sk = pf_state_key_setup(pd, m, off, pd->src, pd->dst, sport, dport); + sk = pf_state_key_setup(pd, m, pd->src, pd->dst, sport, dport); if (sk == NULL) goto csfailed; nk = sk; @@ -5568,12 +5546,12 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, *pd->proto_sum = bproto_sum; if (pd->ip_sum) *pd->ip_sum = bip_sum; - m_copyback(m, off, hdrlen, pd->hdr.any); + m_copyback(m, pd->off, pd->hdrlen, pd->hdr.any); } s->src.seqhi = htonl(arc4random()); /* Find mss option */ int rtid = M_GETFIB(m); - mss = pf_get_mss(m, off, th->th_off, pd->af); + mss = pf_get_mss(m, pd); mss = pf_calc_mss(pd->src, pd->af, rtid, mss); mss = pf_calc_mss(pd->dst, pd->af, rtid, mss); s->src.mss = mss; @@ -5633,7 +5611,7 @@ drop: static int pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, - struct mbuf *m, int off, struct pf_pdesc *pd, u_short *reason, + struct mbuf *m, struct pf_pdesc *pd, u_short *reason, int *copyback) { struct tcphdr *th = &pd->hdr.tcp; @@ -5673,7 +5651,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, if (((*state)->state_flags & PFSTATE_SCRUB_TCP || dst->scrub) && src->scrub == NULL) { - if (pf_normalize_tcp_init(m, off, pd, th, src, dst)) { + if (pf_normalize_tcp_init(m, pd, th, src, dst)) { REASON_SET(reason, PFRES_MEMORY); return (PF_DROP); } @@ -5697,8 +5675,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, if (th->th_flags & TH_SYN) { end++; if (dst->wscale & PF_WSCALE_FLAG) { - src->wscale = pf_get_wscale(m, off, th->th_off, - pd->af); + src->wscale = pf_get_wscale(m, pd); if (src->wscale & PF_WSCALE_FLAG) { /* Remove scale factor from initial * window */ @@ -5787,7 +5764,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, * options anyway. */ if (dst->seqdiff && (th->th_off << 2) > sizeof(struct tcphdr)) { - if (pf_modulate_sack(m, off, pd, th, dst)) + if (pf_modulate_sack(m, pd, th, dst)) *copyback = 1; } @@ -5805,7 +5782,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { - if (pf_normalize_tcp_stateful(m, off, pd, reason, th, + if (pf_normalize_tcp_stateful(m, pd, reason, th, *state, src, dst, copyback)) return (PF_DROP); } @@ -5905,7 +5882,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, } if (dst->scrub || src->scrub) { - if (pf_normalize_tcp_stateful(m, off, pd, reason, th, + if (pf_normalize_tcp_stateful(m, pd, reason, th, *state, src, dst, copyback)) return (PF_DROP); } @@ -6155,7 +6132,7 @@ pf_synproxy(struct pf_pdesc *pd, struct pf_kstate **state, u_short *reason) static int pf_test_state_tcp(struct pf_kstate **state, struct pfi_kkif *kif, - struct mbuf *m, int off, struct pf_pdesc *pd, + struct mbuf *m, struct pf_pdesc *pd, u_short *reason) { struct pf_state_key_cmp key; @@ -6214,7 +6191,7 @@ pf_test_state_tcp(struct pf_kstate **state, struct pfi_kkif *kif, if (pf_tcp_track_sloppy(state, pd, reason) == PF_DROP) return (PF_DROP); } else { - if (pf_tcp_track_full(state, kif, m, off, pd, reason, + if (pf_tcp_track_full(state, kif, m, pd, reason, ©back) == PF_DROP) return (PF_DROP); } @@ -6239,14 +6216,14 @@ pf_test_state_tcp(struct pf_kstate **state, struct pfi_kkif *kif, /* Copyback sequence modulation or stateful scrub changes if needed */ if (copyback) - m_copyback(m, off, sizeof(*th), (caddr_t)th); + m_copyback(m, pd->off, sizeof(*th), (caddr_t)th); return (PF_PASS); } static int pf_test_state_udp(struct pf_kstate **state, struct pfi_kkif *kif, - struct mbuf *m, int off, struct pf_pdesc *pd) + struct mbuf *m, struct pf_pdesc *pd) { struct pf_state_peer *src, *dst; struct pf_state_key_cmp key; @@ -6310,7 +6287,7 @@ pf_test_state_udp(struct pf_kstate **state, struct pfi_kkif *kif, pf_change_ap(m, pd->dst, &uh->uh_dport, pd->ip_sum, &uh->uh_sum, &nk->addr[pd->didx], nk->port[pd->didx], 1, pd->af); - m_copyback(m, off, sizeof(*uh), (caddr_t)uh); + m_copyback(m, pd->off, sizeof(*uh), (caddr_t)uh); } return (PF_PASS); @@ -6318,7 +6295,7 @@ pf_test_state_udp(struct pf_kstate **state, struct pfi_kkif *kif, static int pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, - struct mbuf *m, int off, struct pf_pdesc *pd, u_short *reason) + struct mbuf *m, struct pf_pdesc *pd, u_short *reason) { struct pf_state_key_cmp key; struct pf_state_peer *src, *dst; @@ -6531,7 +6508,7 @@ pf_sctp_multihome_add_addr(struct pf_pdesc *pd, struct pf_addr *a, uint32_t v_ta } static void -pf_sctp_multihome_delayed(struct pf_pdesc *pd, int off, struct pfi_kkif *kif, +pf_sctp_multihome_delayed(struct pf_pdesc *pd, struct pfi_kkif *kif, struct pf_kstate *s, int action) { struct pf_sctp_multihome_job *j, *tmp; @@ -6583,8 +6560,7 @@ again: * That's why we pass V_pfi_all rather than kif. */ ret = pf_test_rule(&r, &sm, V_pfi_all, - j->m, off, &j->pd, &ra, &rs, NULL, - sizeof(j->pd.hdr.sctp)); + j->m, &j->pd, &ra, &rs, NULL); PF_RULES_RUNLOCK(); SDT_PROBE4(pf, sctp, multihome, test, kif, r, j->m, ret); if (ret != PF_DROP && sm != NULL) { @@ -6852,7 +6828,7 @@ pf_multihome_scan_asconf(struct mbuf *m, int start, int len, int pf_icmp_state_lookup(struct pf_state_key_cmp *key, struct pf_pdesc *pd, - struct pf_kstate **state, struct mbuf *m, int off, int direction, + struct pf_kstate **state, struct mbuf *m, int direction, struct pfi_kkif *kif, u_int16_t icmpid, u_int16_t type, int icmp_dir, int *iidx, int multi, int inner) { @@ -6867,7 +6843,7 @@ pf_icmp_state_lookup(struct pf_state_key_cmp *key, struct pf_pdesc *pd, key->port[pd->sidx] = type; key->port[pd->didx] = icmpid; } - if (pf_state_key_addr_setup(pd, m, off, key, pd->sidx, pd->src, + if (pf_state_key_addr_setup(pd, m, key, pd->sidx, pd->src, pd->didx, pd->dst, multi)) return (PF_DROP); @@ -6896,7 +6872,7 @@ pf_icmp_state_lookup(struct pf_state_key_cmp *key, struct pf_pdesc *pd, static int pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, - struct mbuf *m, int off, struct pf_pdesc *pd, u_short *reason) + struct mbuf *m, struct pf_pdesc *pd, u_short *reason) { struct pf_addr *saddr = pd->src, *daddr = pd->dst; u_int16_t *icmpsum, virtual_id, virtual_type; @@ -6937,14 +6913,14 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, * ICMP query/reply message not related to a TCP/UDP packet. * Search for an ICMP state. */ - ret = pf_icmp_state_lookup(&key, pd, state, m, off, pd->dir, + ret = pf_icmp_state_lookup(&key, pd, state, m, pd->dir, kif, virtual_id, virtual_type, icmp_dir, &iidx, PF_ICMP_MULTI_NONE, 0); if (ret >= 0) { MPASS(*state == NULL); if (ret == PF_DROP && pd->af == AF_INET6 && icmp_dir == PF_OUT) { - ret = pf_icmp_state_lookup(&key, pd, state, m, off, + ret = pf_icmp_state_lookup(&key, pd, state, m, pd->dir, kif, virtual_id, virtual_type, icmp_dir, &iidx, multi, 0); if (ret >= 0) { @@ -6987,7 +6963,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, nk->port[iidx]; } - m_copyback(m, off, ICMP_MINLEN, + m_copyback(m, pd->off, ICMP_MINLEN, (caddr_t )&pd->hdr.icmp); break; #endif /* INET */ @@ -7005,7 +6981,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, &pd->hdr.icmp6.icmp6_cksum, &nk->addr[pd->didx], 0); - m_copyback(m, off, sizeof(struct icmp6_hdr), + m_copyback(m, pd->off, sizeof(struct icmp6_hdr), (caddr_t )&pd->hdr.icmp6); break; #endif /* INET6 */ @@ -7030,7 +7006,6 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, u_int32_t jumbolen; #endif /* INET6 */ int ipoff2 = 0; - int off2 = 0; pd2.af = pd->af; pd2.dir = pd->dir; @@ -7041,7 +7016,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, #ifdef INET case AF_INET: /* offset of h2 in mbuf chain */ - ipoff2 = off + ICMP_MINLEN; + ipoff2 = pd->off + ICMP_MINLEN; if (!pf_pull_hdr(m, ipoff2, &h2, sizeof(h2), NULL, reason, pd2.af)) { @@ -7060,7 +7035,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, } /* offset of protocol header that follows h2 */ - off2 = ipoff2 + (h2.ip_hl << 2); + pd2.off = ipoff2 + (h2.ip_hl << 2); pd2.proto = h2.ip_p; pd2.src = (struct pf_addr *)&h2.ip_src; @@ -7070,7 +7045,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, #endif /* INET */ #ifdef INET6 case AF_INET6: - ipoff2 = off + sizeof(struct icmp6_hdr); + ipoff2 = pd->off + sizeof(struct icmp6_hdr); if (!pf_pull_hdr(m, ipoff2, &h2_6, sizeof(h2_6), NULL, reason, pd2.af)) { @@ -7079,8 +7054,8 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, "(ip6)\n")); return (PF_DROP); } - off2 = ipoff2; - if (pf_walk_header6(m, &h2_6, &off2, &extoff2, + pd2.off = ipoff2; + if (pf_walk_header6(m, &h2_6, &pd2.off, &extoff2, &fragoff2, &pd2.proto, &jumbolen, reason) != PF_PASS) return (PF_DROP); @@ -7088,7 +7063,6 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, pd2.src = (struct pf_addr *)&h2_6.ip6_src; pd2.dst = (struct pf_addr *)&h2_6.ip6_dst; pd2.ip_sum = NULL; - off2 = ipoff2 + sizeof(h2_6); break; #endif /* INET6 */ } @@ -7123,7 +7097,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, * expected. Don't access any TCP header fields after * th_seq, an ackskew test is not possible. */ - if (!pf_pull_hdr(m, off2, &th, 8, NULL, reason, + if (!pf_pull_hdr(m, pd2.off, &th, 8, NULL, reason, pd2.af)) { DPFPRINTF(PF_DEBUG_MISC, ("pf: ICMP error message too short " @@ -7219,7 +7193,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, switch (pd2.af) { #ifdef INET case AF_INET: - m_copyback(m, off, ICMP_MINLEN, + m_copyback(m, pd->off, ICMP_MINLEN, (caddr_t )&pd->hdr.icmp); m_copyback(m, ipoff2, sizeof(h2), (caddr_t )&h2); @@ -7227,7 +7201,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, #endif /* INET */ #ifdef INET6 case AF_INET6: - m_copyback(m, off, + m_copyback(m, pd->off, sizeof(struct icmp6_hdr), (caddr_t )&pd->hdr.icmp6); m_copyback(m, ipoff2, sizeof(h2_6), @@ -7235,7 +7209,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, break; #endif /* INET6 */ } - m_copyback(m, off2, 8, (caddr_t)&th); + m_copyback(m, pd2.off, 8, (caddr_t)&th); } return (PF_PASS); @@ -7244,7 +7218,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, case IPPROTO_UDP: { struct udphdr uh; - if (!pf_pull_hdr(m, off2, &uh, sizeof(uh), + if (!pf_pull_hdr(m, pd2.off, &uh, sizeof(uh), NULL, reason, pd2.af)) { DPFPRINTF(PF_DEBUG_MISC, ("pf: ICMP error message too short " @@ -7288,14 +7262,14 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, switch (pd2.af) { #ifdef INET case AF_INET: - m_copyback(m, off, ICMP_MINLEN, + m_copyback(m, pd->off, ICMP_MINLEN, (caddr_t )&pd->hdr.icmp); m_copyback(m, ipoff2, sizeof(h2), (caddr_t)&h2); break; *** 728 LINES SKIPPED *** From nobody Thu Oct 10 12:37:28 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTmT38wVz5Z01Q; Thu, 10 Oct 2024 12:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTmS6tmkz4HNc; Thu, 10 Oct 2024 12:37:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B/y5bSPAvS/5pNxfWLe2IpqzdNAnbAONBsktHio24/Q=; b=Ky8iW+vfo3VxFTaNaRSOh1p8rxJFzvVblGGsiyd8KH1PSXQNknjLGkBZ6pYAk+/CsRIL9l hF0+7PXLWz7wzwV4TWkDVpDdRFt9ybVOdMTUXdwplrbyuu7La7uEVLJowCv2Yxsz3TLFl8 hz4EXdJkYK/H5FmJKMHd7GrCxmMGOz73FTkpn8JEKLB2bvhfPhtujHW75AmFaz4ECVb8lu 2G+LQmjAdVcAYC0CbpUY3EJ8OVupquEvHOLmSvR5fex9CyJkTbm6fIjhrsXDjaM5kZBjGQ +zhJsbUjii8/ryvviZv230fz57QUVWX1ONmKG12IWgL6t8doGEoaQkxLog4S5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B/y5bSPAvS/5pNxfWLe2IpqzdNAnbAONBsktHio24/Q=; b=XHE9GEP8rZfJ6Xqq1yM4jooIEV7Lwn5wreQzWWmjo03aKo8Ezeow4pt2fdt0k+JdvGMhYC /k0D3fWirnCocRNFXDosyyT54iQ1QP46v0rP3+tqgvPx20gfVzNuE0QgqSSpuebsROtNsq VAVm41ERLo1DSynVH2eHClIqck70uZagvHdNGVYFcI5Qp8rMIRUvH+WvrJ9VqZh3LBbdsp 1vWQvORz87gZUnFsqszhz2LU8mucZvVQqqLjZLdadqNVQKg7N8PEGk5Ijx3Sjm9mE5fxIk vAM4eehLa4o6IYKj7GIRhjRp4xOV7TkE0CIowy0huXMT0FJUQ3nTi8WW2ISnBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563848; a=rsa-sha256; cv=none; b=NGNqqhWAKZI0Qrf9Ltrv20olx7EUotZiBo7TZsaI3vg09a+0T3Av2JGgxAGiuJccC9p6Ue olQxUeTfOKqgICKNMWG6DtXBX3zIBVfxd1eDj0c03nX+D53omp/x4YJ0S9ejxoIQ90zVq9 zDhJEe+BlvY8w7EiFiPpV4ITDLR7xbBjB0VDF4nWrLSykjFmk4JyB/wYMgP4MUHDtGZ06X rDMBYdKNOL00nee9oY4ZvbY09dgN5LM64PQ+o6cV+tgcUMCAFUrFvORdjGo9I4uSyc/OKx BDAXcanAYAodz4om3IMrHVaxFvJ0L40ZkOnV6YP+80BWAnKm929snD1XYxOC6A== 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 4XPTmS6VgRzxq4; Thu, 10 Oct 2024 12:37:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbSoO006729; Thu, 10 Oct 2024 12:37:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbSrc006726; Thu, 10 Oct 2024 12:37:28 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:28 GMT Message-Id: <202410101237.49ACbSrc006726@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: b4a42589116b - main - pf: put kif into struct pf_pdesc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b4a42589116bcf21e1c07224900dae6caad23c97 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b4a42589116bcf21e1c07224900dae6caad23c97 commit b4a42589116bcf21e1c07224900dae6caad23c97 Author: Kristof Provost AuthorDate: 2024-10-03 12:37:54 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:41 +0000 pf: put kif into struct pf_pdesc Put kif and dir into pdesc an use this instead of passing the values around. This is a mechanical change. Initialize pd2 and use it where appropriate. ok henning on an earlier version; ok mpf Obtained from: OpenBSD, bluhm , 47de5c193e Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46939 --- sys/net/if_pflog.h | 4 +- sys/net/pfvar.h | 26 +++---- sys/netpfil/pf/if_pflog.c | 8 +- sys/netpfil/pf/pf.c | 187 ++++++++++++++++++++++------------------------ sys/netpfil/pf/pf_lb.c | 21 +++--- sys/netpfil/pf/pf_norm.c | 52 +++++++------ 6 files changed, 142 insertions(+), 156 deletions(-) diff --git a/sys/net/if_pflog.h b/sys/net/if_pflog.h index 58c178e3798a..0f8caef5fe8b 100644 --- a/sys/net/if_pflog.h +++ b/sys/net/if_pflog.h @@ -69,9 +69,9 @@ struct pf_ruleset; struct pfi_kif; struct pf_pdesc; -#define PFLOG_PACKET(i,a,b,t,c,d,e,f,g) do { \ +#define PFLOG_PACKET(a,b,t,c,d,e,f,g) do { \ if (pflog_packet_ptr != NULL) \ - pflog_packet_ptr(i,a,b,t,c,d,e,f,g); \ + pflog_packet_ptr(a,b,t,c,d,e,f,g); \ } while (0) #endif /* _KERNEL */ #endif /* _NET_IF_PFLOG_H_ */ diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index cf7db417034d..f88a619dd184 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1249,8 +1249,8 @@ void pf_state_export(struct pf_state_export *, /* pflog */ struct pf_kruleset; struct pf_pdesc; -typedef int pflog_packet_t(struct pfi_kkif *, struct mbuf *, - uint8_t, u_int8_t, struct pf_krule *, struct pf_krule *, struct pf_kruleset *, +typedef int pflog_packet_t(struct mbuf *, uint8_t, u_int8_t, + struct pf_krule *, struct pf_krule *, struct pf_kruleset *, struct pf_pdesc *, int); extern pflog_packet_t *pflog_packet_ptr; @@ -1597,6 +1597,8 @@ struct pf_pdesc { char any[0]; } hdr; + struct pfi_kkif *kif; /* incomming interface */ + struct pf_addr *src; /* src address */ struct pf_addr *dst; /* dst address */ u_int16_t *sport; @@ -2353,21 +2355,19 @@ extern void pf_addrcpy(struct pf_addr *, struct pf_addr *, void pf_free_rule(struct pf_krule *); int pf_test_eth(int, int, struct ifnet *, struct mbuf **, struct inpcb *); -int pf_scan_sctp(struct mbuf *, int, struct pf_pdesc *, struct pfi_kkif *); +int pf_scan_sctp(struct mbuf *, struct pf_pdesc *); #if defined(INET) || defined(INET6) int pf_test(sa_family_t, int, int, struct ifnet *, struct mbuf **, struct inpcb *, struct pf_rule_actions *); #endif #ifdef INET -int pf_normalize_ip(struct mbuf **, struct pfi_kkif *, u_short *, - struct pf_pdesc *); +int pf_normalize_ip(struct mbuf **, u_short *, struct pf_pdesc *); #endif /* INET */ #ifdef INET6 int pf_walk_header6(struct mbuf *, struct ip6_hdr *, int *, int *, int *, uint8_t *, uint32_t *, u_short *); -int pf_normalize_ip6(struct mbuf **, struct pfi_kkif *, int, - u_short *, struct pf_pdesc *); +int pf_normalize_ip6(struct mbuf **, int, u_short *, struct pf_pdesc *); void pf_poolmask(struct pf_addr *, struct pf_addr*, struct pf_addr *, struct pf_addr *, sa_family_t); void pf_addr_inc(struct pf_addr *, sa_family_t); @@ -2375,10 +2375,8 @@ int pf_max_frag_size(struct mbuf *); int pf_refragment6(struct ifnet *, struct mbuf **, struct m_tag *, bool); #endif /* INET6 */ -int pf_multihome_scan_init(struct mbuf *, int, int, struct pf_pdesc *, - struct pfi_kkif *); -int pf_multihome_scan_asconf(struct mbuf *, int, int, struct pf_pdesc *, - struct pfi_kkif *); +int pf_multihome_scan_init(struct mbuf *, int, int, struct pf_pdesc *); +int pf_multihome_scan_asconf(struct mbuf *, int, int, struct pf_pdesc *); u_int32_t pf_new_isn(struct pf_kstate *); void *pf_pull_hdr(const struct mbuf *, int, void *, int, u_short *, u_short *, @@ -2400,7 +2398,7 @@ int pf_match_port(u_int8_t, u_int16_t, u_int16_t, u_int16_t); void pf_normalize_init(void); void pf_normalize_cleanup(void); -int pf_normalize_tcp(struct pfi_kkif *, struct mbuf *, struct pf_pdesc *); +int pf_normalize_tcp(struct mbuf *, struct pf_pdesc *); void pf_normalize_tcp_cleanup(struct pf_kstate *); int pf_normalize_tcp_init(struct mbuf *, struct pf_pdesc *, struct tcphdr *, struct pf_state_peer *, struct pf_state_peer *); @@ -2409,7 +2407,7 @@ int pf_normalize_tcp_stateful(struct mbuf *, struct pf_pdesc *, struct pf_state_peer *, struct pf_state_peer *, int *); int pf_normalize_sctp_init(struct mbuf *, struct pf_pdesc *, struct pf_state_peer *, struct pf_state_peer *); -int pf_normalize_sctp(struct pfi_kkif *, struct mbuf *, struct pf_pdesc *); +int pf_normalize_sctp(struct mbuf *, struct pf_pdesc *); u_int32_t pf_state_expires(const struct pf_kstate *); void pf_purge_expired_fragments(void); @@ -2625,7 +2623,7 @@ u_short pf_map_addr_sn(u_int8_t, struct pf_krule *, struct pfi_kkif **nkif, struct pf_addr *, struct pf_ksrc_node **); u_short pf_get_translation(struct pf_pdesc *, struct mbuf *, - int, struct pfi_kkif *, struct pf_ksrc_node **, + int, struct pf_ksrc_node **, struct pf_state_key **, struct pf_state_key **, struct pf_addr *, struct pf_addr *, uint16_t, uint16_t, struct pf_kanchor_stackframe *, diff --git a/sys/netpfil/pf/if_pflog.c b/sys/netpfil/pf/if_pflog.c index 9276b472a845..4db178b8f279 100644 --- a/sys/netpfil/pf/if_pflog.c +++ b/sys/netpfil/pf/if_pflog.c @@ -213,14 +213,14 @@ pflogioctl(struct ifnet *ifp, u_long cmd, caddr_t data) } static int -pflog_packet(struct pfi_kkif *kif, struct mbuf *m, - uint8_t action, u_int8_t reason, struct pf_krule *rm, struct pf_krule *am, +pflog_packet(struct mbuf *m, uint8_t action, u_int8_t reason, + struct pf_krule *rm, struct pf_krule *am, struct pf_kruleset *ruleset, struct pf_pdesc *pd, int lookupsafe) { struct ifnet *ifn; struct pfloghdr hdr; - if (kif == NULL || m == NULL || rm == NULL || pd == NULL) + if (m == NULL || rm == NULL || pd == NULL) return (1); ifn = V_pflogifs[rm->logif]; @@ -232,7 +232,7 @@ pflog_packet(struct pfi_kkif *kif, struct mbuf *m, hdr.af = pd->af; hdr.action = action; hdr.reason = reason; - memcpy(hdr.ifname, kif->pfik_name, sizeof(hdr.ifname)); + memcpy(hdr.ifname, pd->kif->pfik_name, sizeof(hdr.ifname)); if (am == NULL) { hdr.rulenr = htonl(rm->nr); diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 4ed3597154a8..d1240dc37a1c 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -320,45 +320,39 @@ static int pf_dummynet_route(struct pf_pdesc *, static int pf_test_eth_rule(int, struct pfi_kkif *, struct mbuf **); static int pf_test_rule(struct pf_krule **, struct pf_kstate **, - struct pfi_kkif *, struct mbuf *, - struct pf_pdesc *, struct pf_krule **, + struct mbuf *, struct pf_pdesc *, struct pf_krule **, struct pf_kruleset **, struct inpcb *); static int pf_create_state(struct pf_krule *, struct pf_krule *, struct pf_krule *, struct pf_pdesc *, struct pf_ksrc_node *, struct pf_state_key *, struct pf_state_key *, struct mbuf *, - u_int16_t, u_int16_t, int *, struct pfi_kkif *, + u_int16_t, u_int16_t, int *, struct pf_kstate **, int, u_int16_t, u_int16_t, struct pf_krule_slist *, struct pf_udp_mapping *); static int pf_state_key_addr_setup(struct pf_pdesc *, struct mbuf *, struct pf_state_key_cmp *, int, struct pf_addr *, int, struct pf_addr *, int); static int pf_tcp_track_full(struct pf_kstate **, - struct pfi_kkif *, struct mbuf *, - struct pf_pdesc *, u_short *, int *); + struct mbuf *, struct pf_pdesc *, u_short *, int *); static int pf_tcp_track_sloppy(struct pf_kstate **, struct pf_pdesc *, u_short *); static int pf_test_state_tcp(struct pf_kstate **, - struct pfi_kkif *, struct mbuf *, - struct pf_pdesc *, u_short *); + struct mbuf *, struct pf_pdesc *, u_short *); static int pf_test_state_udp(struct pf_kstate **, - struct pfi_kkif *, struct mbuf *, - struct pf_pdesc *); + struct mbuf *, struct pf_pdesc *); int pf_icmp_state_lookup(struct pf_state_key_cmp *, struct pf_pdesc *, struct pf_kstate **, struct mbuf *, - int, struct pfi_kkif *, u_int16_t, u_int16_t, + int, u_int16_t, u_int16_t, int, int *, int, int); -static int pf_test_state_icmp(struct pf_kstate **, - struct pfi_kkif *, struct mbuf *, +static int pf_test_state_icmp(struct pf_kstate **, struct mbuf *, struct pf_pdesc *, u_short *); static void pf_sctp_multihome_detach_addr(const struct pf_kstate *); static void pf_sctp_multihome_delayed(struct pf_pdesc *, struct pfi_kkif *, struct pf_kstate *, int); -static int pf_test_state_sctp(struct pf_kstate **, - struct pfi_kkif *, struct mbuf *, +static int pf_test_state_sctp(struct pf_kstate **, struct mbuf *, struct pf_pdesc *, u_short *); static int pf_test_state_other(struct pf_kstate **, - struct pfi_kkif *, struct mbuf *, struct pf_pdesc *); + struct mbuf *, struct pf_pdesc *); static u_int16_t pf_calc_mss(struct pf_addr *, sa_family_t, int, u_int16_t); static int pf_check_proto_cksum(struct mbuf *, int, int, @@ -373,8 +367,7 @@ static struct pf_kstate *pf_find_state(struct pfi_kkif *, const struct pf_state_key_cmp *, u_int); static int pf_src_connlimit(struct pf_kstate **); static int pf_match_rcvif(struct mbuf *, struct pf_krule *); -static void pf_counters_inc(int, - struct pf_pdesc *, struct pfi_kkif *, +static void pf_counters_inc(int, struct pf_pdesc *, struct pf_kstate *, struct pf_krule *, struct pf_krule *); static void pf_overload_task(void *v, int pending); @@ -422,10 +415,10 @@ enum { PF_ICMP_MULTI_NONE, PF_ICMP_MULTI_LINK }; #define PACKET_LOOPED(pd) ((pd)->pf_mtag && \ (pd)->pf_mtag->flags & PF_MTAG_FLAG_PACKET_LOOPED) -#define STATE_LOOKUP(i, k, s, pd) \ +#define STATE_LOOKUP(k, s, pd) \ do { \ - (s) = pf_find_state((i), (k), (pd->dir)); \ - SDT_PROBE5(pf, ip, state, lookup, i, k, (pd->dir), pd, (s)); \ + (s) = pf_find_state((pd->kif), (k), (pd->dir)); \ + SDT_PROBE5(pf, ip, state, lookup, pd->kif, k, (pd->dir), pd, (s)); \ if ((s) == NULL) \ return (PF_DROP); \ if (PACKET_LOOPED(pd)) \ @@ -3655,7 +3648,7 @@ pf_send_tcp(const struct pf_krule *r, sa_family_t af, static void pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, struct pf_state_key *sk, struct mbuf *m, struct tcphdr *th, - struct pfi_kkif *kif, u_int16_t bproto_sum, u_int16_t bip_sum, + u_int16_t bproto_sum, u_int16_t bip_sum, u_short *reason, int rtableid) { struct pf_addr * const saddr = pd->src; @@ -4865,7 +4858,7 @@ pf_test_eth_rule(int dir, struct pfi_kkif *kif, struct mbuf **m0) } while (0) static int -pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, +pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct mbuf *m, struct pf_pdesc *pd, struct pf_krule **am, struct pf_kruleset **rsm, struct inpcb *inp) { @@ -4956,7 +4949,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); /* check packet for BINAT/NAT/RDR */ - transerror = pf_get_translation(pd, m, pd->off, kif, &nsn, &sk, + transerror = pf_get_translation(pd, m, pd->off, &nsn, &sk, &nk, saddr, daddr, sport, dport, anchor_stack, &nr, &udp_mapping); switch (transerror) { default: @@ -4971,7 +4964,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, KASSERT(nk != NULL, ("%s: null nk", __func__)); if (nr->log) { - PFLOG_PACKET(kif, m, PF_PASS, PFRES_MATCH, nr, a, + PFLOG_PACKET(m, PF_PASS, PFRES_MATCH, nr, a, ruleset, pd, 1); } @@ -5116,7 +5109,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, while (r != NULL) { pf_counter_u64_add(&r->evaluations, 1); - PF_TEST_ATTRIB(pfi_kkif_match(r->kif, kif) == r->ifnot, + PF_TEST_ATTRIB(pfi_kkif_match(r->kif, pd->kif) == r->ifnot, r->skip[PF_SKIP_IFP]); PF_TEST_ATTRIB(r->direction && r->direction != pd->dir, r->skip[PF_SKIP_DIR]); @@ -5125,7 +5118,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, PF_TEST_ATTRIB(r->proto && r->proto != pd->proto, r->skip[PF_SKIP_PROTO]); PF_TEST_ATTRIB(PF_MISMATCHAW(&r->src.addr, saddr, pd->af, - r->src.neg, kif, M_GETFIB(m)), + r->src.neg, pd->kif, M_GETFIB(m)), r->skip[PF_SKIP_SRC_ADDR]); PF_TEST_ATTRIB(PF_MISMATCHAW(&r->dst.addr, daddr, pd->af, r->dst.neg, NULL, M_GETFIB(m)), @@ -5225,7 +5218,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, pf_counter_u64_critical_exit(); pf_rule_to_actions(r, &pd->act); if (r->log || pd->act.log & PF_LOG_MATCHES) - PFLOG_PACKET(kif, m, + PFLOG_PACKET(m, r->action, PFRES_MATCH, r, a, ruleset, pd, 1); } else { @@ -5234,7 +5227,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, *am = a; *rsm = ruleset; if (pd->act.log & PF_LOG_MATCHES) - PFLOG_PACKET(kif, m, + PFLOG_PACKET(m, r->action, PFRES_MATCH, r, a, ruleset, pd, 1); } @@ -5262,7 +5255,7 @@ nextrule: if (r->log || pd->act.log & PF_LOG_MATCHES) { if (rewrite) m_copyback(m, pd->off, pd->hdrlen, pd->hdr.any); - PFLOG_PACKET(kif, m, r->action, reason, r, a, ruleset, pd, 1); + PFLOG_PACKET(m, r->action, reason, r, a, ruleset, pd, 1); } if (pd->virtual_proto != PF_VPROTO_FRAGMENT && @@ -5270,7 +5263,7 @@ nextrule: ((r->rule_flag & PFRULE_RETURNRST) || (r->rule_flag & PFRULE_RETURNICMP) || (r->rule_flag & PFRULE_RETURN))) { - pf_return(r, nr, pd, sk, m, th, kif, bproto_sum, + pf_return(r, nr, pd, sk, m, th, bproto_sum, bip_sum, &reason, r->rtableid); } @@ -5289,13 +5282,13 @@ nextrule: (pd->flags & PFDESC_TCP_NORM)))) { int action; action = pf_create_state(r, nr, a, pd, nsn, nk, sk, m, - sport, dport, &rewrite, kif, sm, tag, bproto_sum, bip_sum, + sport, dport, &rewrite, sm, tag, bproto_sum, bip_sum, &match_rules, udp_mapping); if (action != PF_PASS) { pf_udp_mapping_release(udp_mapping); if (action == PF_DROP && (r->rule_flag & PFRULE_RETURN)) - pf_return(r, nr, pd, sk, m, th, kif, + pf_return(r, nr, pd, sk, m, th, bproto_sum, bip_sum, &reason, pd->act.rtableid); return (action); @@ -5345,7 +5338,7 @@ static int pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, struct pf_pdesc *pd, struct pf_ksrc_node *nsn, struct pf_state_key *nk, struct pf_state_key *sk, struct mbuf *m, u_int16_t sport, - u_int16_t dport, int *rewrite, struct pfi_kkif *kif, struct pf_kstate **sm, + u_int16_t dport, int *rewrite, struct pf_kstate **sm, int tag, u_int16_t bproto_sum, u_int16_t bip_sum, struct pf_krule_slist *match_rules, struct pf_udp_mapping *udp_mapping) { @@ -5518,7 +5511,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, __func__, nr, sk, nk)); /* Swap sk/nk for PF_OUT. */ - if (pf_state_insert(BOUND_IFACE(s, kif), kif, + if (pf_state_insert(BOUND_IFACE(s, pd->kif), pd->kif, (pd->dir == PF_IN) ? sk : nk, (pd->dir == PF_IN) ? nk : sk, s)) { REASON_SET(&reason, PFRES_STATEINS); @@ -5610,9 +5603,8 @@ drop: } static int -pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, - struct mbuf *m, struct pf_pdesc *pd, u_short *reason, - int *copyback) +pf_tcp_track_full(struct pf_kstate **state, struct mbuf *m, + struct pf_pdesc *pd, u_short *reason, int *copyback) { struct tcphdr *th = &pd->hdr.tcp; struct pf_state_peer *src, *dst; @@ -6131,9 +6123,8 @@ pf_synproxy(struct pf_pdesc *pd, struct pf_kstate **state, u_short *reason) } static int -pf_test_state_tcp(struct pf_kstate **state, struct pfi_kkif *kif, - struct mbuf *m, struct pf_pdesc *pd, - u_short *reason) +pf_test_state_tcp(struct pf_kstate **state, struct mbuf *m, + struct pf_pdesc *pd, u_short *reason) { struct pf_state_key_cmp key; struct tcphdr *th = &pd->hdr.tcp; @@ -6156,7 +6147,7 @@ pf_test_state_tcp(struct pf_kstate **state, struct pfi_kkif *kif, key.port[0] = th->th_dport; } - STATE_LOOKUP(kif, &key, *state, pd); + STATE_LOOKUP(&key, *state, pd); if (pd->dir == (*state)->direction) { src = &(*state)->src; @@ -6191,7 +6182,7 @@ pf_test_state_tcp(struct pf_kstate **state, struct pfi_kkif *kif, if (pf_tcp_track_sloppy(state, pd, reason) == PF_DROP) return (PF_DROP); } else { - if (pf_tcp_track_full(state, kif, m, pd, reason, + if (pf_tcp_track_full(state, m, pd, reason, ©back) == PF_DROP) return (PF_DROP); } @@ -6222,8 +6213,8 @@ pf_test_state_tcp(struct pf_kstate **state, struct pfi_kkif *kif, } static int -pf_test_state_udp(struct pf_kstate **state, struct pfi_kkif *kif, - struct mbuf *m, struct pf_pdesc *pd) +pf_test_state_udp(struct pf_kstate **state, struct mbuf *m, + struct pf_pdesc *pd) { struct pf_state_peer *src, *dst; struct pf_state_key_cmp key; @@ -6245,7 +6236,7 @@ pf_test_state_udp(struct pf_kstate **state, struct pfi_kkif *kif, key.port[0] = uh->uh_dport; } - STATE_LOOKUP(kif, &key, *state, pd); + STATE_LOOKUP(&key, *state, pd); if (pd->dir == (*state)->direction) { src = &(*state)->src; @@ -6294,8 +6285,8 @@ pf_test_state_udp(struct pf_kstate **state, struct pfi_kkif *kif, } static int -pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, - struct mbuf *m, struct pf_pdesc *pd, u_short *reason) +pf_test_state_sctp(struct pf_kstate **state, struct mbuf *m, + struct pf_pdesc *pd, u_short *reason) { struct pf_state_key_cmp key; struct pf_state_peer *src, *dst; @@ -6317,7 +6308,7 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, key.port[0] = sh->dest_port; } - STATE_LOOKUP(kif, &key, *state, pd); + STATE_LOOKUP(&key, *state, pd); if (pd->dir == (*state)->direction) { src = &(*state)->src; @@ -6559,7 +6550,8 @@ again: * we cannot know what interfaces it will use. * That's why we pass V_pfi_all rather than kif. */ - ret = pf_test_rule(&r, &sm, V_pfi_all, + j->pd.kif = V_pfi_all; + ret = pf_test_rule(&r, &sm, j->m, &j->pd, &ra, &rs, NULL); PF_RULES_RUNLOCK(); SDT_PROBE4(pf, sctp, multihome, test, kif, r, j->m, ret); @@ -6678,7 +6670,7 @@ again: static int pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, - struct pfi_kkif *kif, int op) + int op) { int off = 0; struct pf_sctp_multihome_job *job; @@ -6777,7 +6769,7 @@ pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, return (PF_DROP); ret = pf_multihome_scan(m, start + off + sizeof(ah), - ntohs(ah.ph.param_length) - sizeof(ah), pd, kif, + ntohs(ah.ph.param_length) - sizeof(ah), pd, SCTP_ADD_IP_ADDRESS); if (ret != PF_PASS) return (ret); @@ -6791,7 +6783,7 @@ pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, NULL, NULL, pd->af)) return (PF_DROP); ret = pf_multihome_scan(m, start + off + sizeof(ah), - ntohs(ah.ph.param_length) - sizeof(ah), pd, kif, + ntohs(ah.ph.param_length) - sizeof(ah), pd, SCTP_DEL_IP_ADDRESS); if (ret != PF_PASS) return (ret); @@ -6807,29 +6799,28 @@ pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, return (PF_PASS); } int -pf_multihome_scan_init(struct mbuf *m, int start, int len, struct pf_pdesc *pd, - struct pfi_kkif *kif) +pf_multihome_scan_init(struct mbuf *m, int start, int len, struct pf_pdesc *pd) { start += sizeof(struct sctp_init_chunk); len -= sizeof(struct sctp_init_chunk); - return (pf_multihome_scan(m, start, len, pd, kif, SCTP_ADD_IP_ADDRESS)); + return (pf_multihome_scan(m, start, len, pd, SCTP_ADD_IP_ADDRESS)); } int pf_multihome_scan_asconf(struct mbuf *m, int start, int len, - struct pf_pdesc *pd, struct pfi_kkif *kif) + struct pf_pdesc *pd) { start += sizeof(struct sctp_asconf_chunk); len -= sizeof(struct sctp_asconf_chunk); - return (pf_multihome_scan(m, start, len, pd, kif, SCTP_ADD_IP_ADDRESS)); + return (pf_multihome_scan(m, start, len, pd, SCTP_ADD_IP_ADDRESS)); } int pf_icmp_state_lookup(struct pf_state_key_cmp *key, struct pf_pdesc *pd, struct pf_kstate **state, struct mbuf *m, int direction, - struct pfi_kkif *kif, u_int16_t icmpid, u_int16_t type, int icmp_dir, + u_int16_t icmpid, u_int16_t type, int icmp_dir, int *iidx, int multi, int inner) { key->af = pd->af; @@ -6847,7 +6838,7 @@ pf_icmp_state_lookup(struct pf_state_key_cmp *key, struct pf_pdesc *pd, pd->didx, pd->dst, multi)) return (PF_DROP); - STATE_LOOKUP(kif, key, *state, pd); + STATE_LOOKUP(key, *state, pd); if ((*state)->state_flags & PFSTATE_SLOPPY) return (-1); @@ -6871,8 +6862,8 @@ pf_icmp_state_lookup(struct pf_state_key_cmp *key, struct pf_pdesc *pd, } static int -pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, - struct mbuf *m, struct pf_pdesc *pd, u_short *reason) +pf_test_state_icmp(struct pf_kstate **state, struct mbuf *m, + struct pf_pdesc *pd, u_short *reason) { struct pf_addr *saddr = pd->src, *daddr = pd->dst; u_int16_t *icmpsum, virtual_id, virtual_type; @@ -6914,14 +6905,14 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, * Search for an ICMP state. */ ret = pf_icmp_state_lookup(&key, pd, state, m, pd->dir, - kif, virtual_id, virtual_type, icmp_dir, &iidx, + virtual_id, virtual_type, icmp_dir, &iidx, PF_ICMP_MULTI_NONE, 0); if (ret >= 0) { MPASS(*state == NULL); if (ret == PF_DROP && pd->af == AF_INET6 && icmp_dir == PF_OUT) { ret = pf_icmp_state_lookup(&key, pd, state, m, - pd->dir, kif, virtual_id, virtual_type, + pd->dir, virtual_id, virtual_type, icmp_dir, &iidx, multi, 0); if (ret >= 0) { MPASS(*state == NULL); @@ -7112,7 +7103,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, key.port[pd2.sidx] = th.th_sport; key.port[pd2.didx] = th.th_dport; - STATE_LOOKUP(kif, &key, *state, pd); + STATE_LOOKUP(&key, *state, pd); if (pd->dir == (*state)->direction) { src = &(*state)->dst; @@ -7233,7 +7224,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, key.port[pd2.sidx] = uh.uh_sport; key.port[pd2.didx] = uh.uh_dport; - STATE_LOOKUP(kif, &key, *state, pd); + STATE_LOOKUP(&key, *state, pd); /* translate source/destination address, if necessary */ if ((*state)->key[PF_SK_WIRE] != @@ -7304,7 +7295,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, &icmp_dir, &multi, &virtual_id, &virtual_type); ret = pf_icmp_state_lookup(&key, &pd2, state, m, - pd2.dir, kif, virtual_id, virtual_type, + pd2.dir, virtual_id, virtual_type, icmp_dir, &iidx, PF_ICMP_MULTI_NONE, 1); if (ret >= 0) { MPASS(*state == NULL); @@ -7366,14 +7357,14 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, &icmp_dir, &multi, &virtual_id, &virtual_type); ret = pf_icmp_state_lookup(&key, &pd2, state, m, - pd->dir, kif, virtual_id, virtual_type, + pd->dir, virtual_id, virtual_type, icmp_dir, &iidx, PF_ICMP_MULTI_NONE, 1); if (ret >= 0) { MPASS(*state == NULL); if (ret == PF_DROP && pd2.af == AF_INET6 && icmp_dir == PF_OUT) { ret = pf_icmp_state_lookup(&key, &pd2, - state, m, pd->dir, kif, + state, m, pd->dir, virtual_id, virtual_type, icmp_dir, &iidx, multi, 1); if (ret >= 0) { @@ -7427,7 +7418,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, PF_ACPY(&key.addr[pd2.didx], pd2.dst, key.af); key.port[0] = key.port[1] = 0; - STATE_LOOKUP(kif, &key, *state, pd); + STATE_LOOKUP(&key, *state, pd); /* translate source/destination address, if necessary */ if ((*state)->key[PF_SK_WIRE] != @@ -7476,8 +7467,8 @@ pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, } static int -pf_test_state_other(struct pf_kstate **state, struct pfi_kkif *kif, - struct mbuf *m, struct pf_pdesc *pd) +pf_test_state_other(struct pf_kstate **state, struct mbuf *m, + struct pf_pdesc *pd) { struct pf_state_peer *src, *dst; struct pf_state_key_cmp key; @@ -7496,7 +7487,7 @@ pf_test_state_other(struct pf_kstate **state, struct pfi_kkif *kif, key.port[1] = key.port[0] = 0; } - STATE_LOOKUP(kif, &key, *state, pd); + STATE_LOOKUP(&key, *state, pd); if (pd->dir == (*state)->direction) { src = &(*state)->src; @@ -8614,6 +8605,7 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, pd->af = af; pd->dir = dir; + pd->kif = kif; pd->sidx = (dir == PF_IN) ? 0 : 1; pd->didx = (dir == PF_IN) ? 1 : 0; @@ -8640,7 +8632,7 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, return (-1); } - if (pf_normalize_ip(m0, kif, reason, pd) != PF_PASS) { + if (pf_normalize_ip(m0, reason, pd) != PF_PASS) { /* We do IP header normalization and packet reassembly here */ *action = PF_DROP; return (-1); @@ -8722,7 +8714,7 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, } /* We do IP header normalization and packet reassembly here */ - if (pf_normalize_ip6(m0, kif, fragoff, reason, pd) != + if (pf_normalize_ip6(m0, fragoff, reason, pd) != PF_PASS) { *action = PF_DROP; return (-1); @@ -8815,7 +8807,7 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, REASON_SET(reason, PFRES_SHORT); return (-1); } - if (pf_scan_sctp(m, pd->off, pd, kif) != PF_PASS) { + if (pf_scan_sctp(m, pd) != PF_PASS) { *action = PF_DROP; REASON_SET(reason, PFRES_SHORT); return (-1); @@ -8870,8 +8862,7 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, static void pf_counters_inc(int action, struct pf_pdesc *pd, - struct pfi_kkif *kif, struct pf_kstate *s, - struct pf_krule *r, struct pf_krule *a) + struct pf_kstate *s, struct pf_krule *r, struct pf_krule *a) { struct pf_krule *tr; int dir = pd->dir; @@ -8879,10 +8870,10 @@ pf_counters_inc(int action, struct pf_pdesc *pd, pf_counter_u64_critical_enter(); pf_counter_u64_add_protected( - &kif->pfik_bytes[pd->af == AF_INET6][dir == PF_OUT][action != PF_PASS], + &pd->kif->pfik_bytes[pd->af == AF_INET6][dir == PF_OUT][action != PF_PASS], pd->tot_len); pf_counter_u64_add_protected( - &kif->pfik_packets[pd->af == AF_INET6][dir == PF_OUT][action != PF_PASS], + &pd->kif->pfik_packets[pd->af == AF_INET6][dir == PF_OUT][action != PF_PASS], 1); if (action == PF_PASS || r->action == PF_DROP) { @@ -9087,7 +9078,7 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 if (kif == NULL || r == NULL) /* pflog */ action = PF_DROP; else - action = pf_test_rule(&r, &s, kif, m, &pd, &a, + action = pf_test_rule(&r, &s, m, &pd, &a, &ruleset, inp); if (action != PF_PASS) REASON_SET(&reason, PFRES_FRAG); @@ -9104,10 +9095,10 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 if ((pd.hdr.tcp.th_flags & TH_ACK) && pd.p_len == 0) use_2nd_queue = 1; - action = pf_normalize_tcp(kif, m, &pd); + action = pf_normalize_tcp(m, &pd); if (action == PF_DROP) goto done; - action = pf_test_state_tcp(&s, kif, m, &pd, &reason); + action = pf_test_state_tcp(&s, m, &pd, &reason); if (action == PF_PASS) { if (V_pfsync_update_state_ptr != NULL) V_pfsync_update_state_ptr(s); @@ -9133,7 +9124,7 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 if (action != PF_PASS) break; - action = pf_test_state_tcp(&s, kif, m, + action = pf_test_state_tcp(&s, m, &pd, &reason); if (action != PF_PASS || s == NULL) { action = PF_DROP; @@ -9146,7 +9137,7 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 action = pf_synproxy(&pd, &s, &reason); break; } else { - action = pf_test_rule(&r, &s, kif, m, &pd, + action = pf_test_rule(&r, &s, m, &pd, &a, &ruleset, inp); } } @@ -9154,30 +9145,30 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 } case IPPROTO_UDP: { - action = pf_test_state_udp(&s, kif, m, &pd); + action = pf_test_state_udp(&s, m, &pd); if (action == PF_PASS) { if (V_pfsync_update_state_ptr != NULL) V_pfsync_update_state_ptr(s); r = s->rule; a = s->anchor; } else if (s == NULL) - action = pf_test_rule(&r, &s, kif, m, &pd, + action = pf_test_rule(&r, &s, m, &pd, &a, &ruleset, inp); break; } case IPPROTO_SCTP: { - action = pf_normalize_sctp(kif, m, &pd); + action = pf_normalize_sctp(m, &pd); if (action == PF_DROP) goto done; - action = pf_test_state_sctp(&s, kif, m, &pd, &reason); + action = pf_test_state_sctp(&s, m, &pd, &reason); if (action == PF_PASS) { if (V_pfsync_update_state_ptr != NULL) V_pfsync_update_state_ptr(s); r = s->rule; a = s->anchor; } else if (s == NULL) { - action = pf_test_rule(&r, &s, kif, m, + action = pf_test_rule(&r, &s, m, &pd, &a, &ruleset, inp); } break; @@ -9191,14 +9182,14 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 ("dropping IPv6 packet with ICMPv4 payload")); goto done; } - action = pf_test_state_icmp(&s, kif, m, &pd, &reason); + action = pf_test_state_icmp(&s, m, &pd, &reason); if (action == PF_PASS) { if (V_pfsync_update_state_ptr != NULL) V_pfsync_update_state_ptr(s); r = s->rule; a = s->anchor; } else if (s == NULL) - action = pf_test_rule(&r, &s, kif, m, &pd, + action = pf_test_rule(&r, &s, m, &pd, &a, &ruleset, inp); break; } @@ -9211,27 +9202,27 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 ("pf: dropping IPv4 packet with ICMPv6 payload\n")); goto done; } - action = pf_test_state_icmp(&s, kif, m, &pd, &reason); + action = pf_test_state_icmp(&s, m, &pd, &reason); if (action == PF_PASS) { if (V_pfsync_update_state_ptr != NULL) V_pfsync_update_state_ptr(s); r = s->rule; a = s->anchor; } else if (s == NULL) - action = pf_test_rule(&r, &s, kif, m, &pd, + action = pf_test_rule(&r, &s, m, &pd, &a, &ruleset, inp); break; } default: - action = pf_test_state_other(&s, kif, m, &pd); + action = pf_test_state_other(&s, m, &pd); if (action == PF_PASS) { if (V_pfsync_update_state_ptr != NULL) V_pfsync_update_state_ptr(s); r = s->rule; a = s->anchor; } else if (s == NULL) - action = pf_test_rule(&r, &s, kif, m, &pd, + action = pf_test_rule(&r, &s, m, &pd, &a, &ruleset, inp); break; } @@ -9379,17 +9370,17 @@ done: lr = r; if (pd.act.log & PF_LOG_FORCE || lr->log & PF_LOG_ALL) - PFLOG_PACKET(kif, m, action, reason, lr, a, + PFLOG_PACKET(m, action, reason, lr, a, ruleset, &pd, (s == NULL)); if (s) { SLIST_FOREACH(ri, &s->match_rules, entry) if (ri->r->log & PF_LOG_ALL) - PFLOG_PACKET(kif, m, action, + PFLOG_PACKET(m, action, reason, ri->r, a, ruleset, &pd, 0); } } - pf_counters_inc(action, &pd, kif, s, r, a); + pf_counters_inc(action, &pd, s, r, a); switch (action) { case PF_SYNPROXY_DROP: diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index 227d68f54702..76a7b7f8005f 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -64,7 +64,7 @@ VNET_DEFINE_STATIC(int, pf_rdr_srcport_rewrite_tries) = 16; static void pf_hash(struct pf_addr *, struct pf_addr *, struct pf_poolhashkey *, sa_family_t); static struct pf_krule *pf_match_translation(struct pf_pdesc *, struct mbuf *, - struct pfi_kkif *, struct pf_addr *, u_int16_t, + struct pf_addr *, u_int16_t, struct pf_addr *, uint16_t, int, struct pf_kanchor_stackframe *); static int pf_get_sport(sa_family_t, uint8_t, struct pf_krule *, @@ -132,7 +132,7 @@ pf_hash(struct pf_addr *inaddr, struct pf_addr *hash, static struct pf_krule * pf_match_translation(struct pf_pdesc *pd, struct mbuf *m, - struct pfi_kkif *kif, struct pf_addr *saddr, u_int16_t sport, + struct pf_addr *saddr, u_int16_t sport, struct pf_addr *daddr, uint16_t dport, int rs_num, struct pf_kanchor_stackframe *anchor_stack) { @@ -157,7 +157,7 @@ pf_match_translation(struct pf_pdesc *pd, struct mbuf *m, } pf_counter_u64_add(&r->evaluations, 1); - if (pfi_kkif_match(r->kif, kif) == r->ifnot) + if (pfi_kkif_match(r->kif, pd->kif) == r->ifnot) r = r->skip[PF_SKIP_IFP]; else if (r->direction && r->direction != pd->dir) r = r->skip[PF_SKIP_DIR]; @@ -166,7 +166,7 @@ pf_match_translation(struct pf_pdesc *pd, struct mbuf *m, else if (r->proto && r->proto != pd->proto) r = r->skip[PF_SKIP_PROTO]; else if (PF_MISMATCHAW(&src->addr, saddr, pd->af, - src->neg, kif, M_GETFIB(m))) + src->neg, pd->kif, M_GETFIB(m))) r = r->skip[src == &r->src ? PF_SKIP_SRC_ADDR : PF_SKIP_DST_ADDR]; else if (src->port_op && !pf_match_port(src->port_op, @@ -697,9 +697,8 @@ done: u_short pf_get_translation(struct pf_pdesc *pd, struct mbuf *m, int off, - struct pfi_kkif *kif, struct pf_ksrc_node **sn, - struct pf_state_key **skp, struct pf_state_key **nkp, - struct pf_addr *saddr, struct pf_addr *daddr, + struct pf_ksrc_node **sn, struct pf_state_key **skp, + struct pf_state_key **nkp, struct pf_addr *saddr, struct pf_addr *daddr, uint16_t sport, uint16_t dport, struct pf_kanchor_stackframe *anchor_stack, struct pf_krule **rp, struct pf_udp_mapping **udp_mapping) @@ -717,17 +716,17 @@ pf_get_translation(struct pf_pdesc *pd, struct mbuf *m, int off, *rp = NULL; if (pd->dir == PF_OUT) { - r = pf_match_translation(pd, m, kif, saddr, + r = pf_match_translation(pd, m, saddr, sport, daddr, dport, PF_RULESET_BINAT, anchor_stack); if (r == NULL) - r = pf_match_translation(pd, m, kif, + r = pf_match_translation(pd, m, saddr, sport, daddr, dport, PF_RULESET_NAT, anchor_stack); } else { - r = pf_match_translation(pd, m, kif, saddr, + r = pf_match_translation(pd, m, saddr, sport, daddr, dport, PF_RULESET_RDR, anchor_stack); if (r == NULL) - r = pf_match_translation(pd, m, kif, + r = pf_match_translation(pd, m, saddr, sport, daddr, dport, PF_RULESET_BINAT, anchor_stack); } diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 9eaa20587294..19206d83a732 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1047,7 +1047,7 @@ pf_refragment6(struct ifnet *ifp, struct mbuf **m0, struct m_tag *mtag, #ifdef INET int -pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, +pf_normalize_ip(struct mbuf **m0, u_short *reason, struct pf_pdesc *pd) { struct mbuf *m = *m0; @@ -1078,7 +1078,7 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, scrub_compat = (r != NULL); while (r != NULL) { pf_counter_u64_add(&r->evaluations, 1); - if (pfi_kkif_match(r->kif, kif) == r->ifnot) + if (pfi_kkif_match(r->kif, pd->kif) == r->ifnot) r = r->skip[PF_SKIP_IFP]; else if (r->direction && r->direction != pd->dir) r = r->skip[PF_SKIP_DIR]; @@ -1088,7 +1088,7 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, r = r->skip[PF_SKIP_PROTO]; else if (PF_MISMATCHAW(&r->src.addr, (struct pf_addr *)&h->ip_src.s_addr, AF_INET, - r->src.neg, kif, M_GETFIB(m))) + r->src.neg, pd->kif, M_GETFIB(m))) r = r->skip[PF_SKIP_SRC_ADDR]; else if (PF_MISMATCHAW(&r->dst.addr, (struct pf_addr *)&h->ip_dst.s_addr, AF_INET, @@ -1201,7 +1201,7 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, REASON_SET(reason, PFRES_FRAG); drop: if (r != NULL && r->log) - PFLOG_PACKET(kif, m, PF_DROP, *reason, r, NULL, NULL, pd, 1); + PFLOG_PACKET(m, PF_DROP, *reason, r, NULL, NULL, pd, 1); return (PF_DROP); } @@ -1209,8 +1209,8 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, #ifdef INET6 int -pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, - int off, u_short *reason, struct pf_pdesc *pd) +pf_normalize_ip6(struct mbuf **m0, int off, u_short *reason, + struct pf_pdesc *pd) { struct mbuf *m; struct pf_krule *r; @@ -1233,7 +1233,7 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, scrub_compat = (r != NULL); while (r != NULL) { pf_counter_u64_add(&r->evaluations, 1); - if (pfi_kkif_match(r->kif, kif) == r->ifnot) + if (pfi_kkif_match(r->kif, pd->kif) == r->ifnot) r = r->skip[PF_SKIP_IFP]; else if (r->direction && r->direction != pd->dir) r = r->skip[PF_SKIP_DIR]; @@ -1243,7 +1243,7 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, r = r->skip[PF_SKIP_PROTO]; else if (PF_MISMATCHAW(&r->src.addr, (struct pf_addr *)&pd->src, AF_INET6, - r->src.neg, kif, M_GETFIB(m))) + r->src.neg, pd->kif, M_GETFIB(m))) r = r->skip[PF_SKIP_SRC_ADDR]; else if (PF_MISMATCHAW(&r->dst.addr, (struct pf_addr *)&pd->dst, AF_INET6, @@ -1287,7 +1287,7 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, #endif /* INET6 */ int *** 129 LINES SKIPPED *** From nobody Thu Oct 10 12:37:29 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTmV3Cj0z5YyyF; Thu, 10 Oct 2024 12:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTmV1LZmz4HK8; Thu, 10 Oct 2024 12:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gw0iDRHjSXrq3XWjP2YUvH3RMflLfOEjVnFG+WuHVco=; b=bQ7pTbes5w6/J+5okL6euOi0gxNCkPFl9oXobIOuQgt1deaOD7wYUoKX95dWKcZjb+HE9X YQhK0jES6yTXU277ggwlpuktTbBeYhboNNQ1GNS4qSfQfSQnoHGR/OppkyQHm7784QLPfk Pf6RKeRUVX4M0OjUj/PikLDI6BYFzrshkBMMRNGXqgQWndrAWnxysjeF6iZ9tJxBYvMFpS ACPtAYZPpi6ASrS/LumSoLlEezqngafiduL+DcznQpbJrIrm6bCaC2XOA92cgHEVp8SxJH jucci/l3X2+R5/JOeaLtJdJ5nCoEl1NTOscmO6wigAEyDpfOzzqi4HUG0s9h0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gw0iDRHjSXrq3XWjP2YUvH3RMflLfOEjVnFG+WuHVco=; b=Xq50o6talB1M+QfzMO00KNo0iwLSwfBXv3OWKsRJHSHzq8QZR6TDHU7bd7tqvxyem+FG2J L6L3VJsYOeO2mg6+Lo6eMlvCNycAIbld27fPb03sFBkWmX5p9sbsTXxRXyLQ57KSznBGPs 0HO7c31MaQ8eIs3QCREXQBV7Ao4bQtMTc0+JGvufclHhz61j9UGAGglAISb3Og22pXwgBe 4gGOPOdgEUzi/dTWeHKWJEG6dDHXYRze57bvbhcmhdOOdA+5JoAK0H2CtcA47COGtdriQT r8lEIv+MPNGnOkqvVShDL/sHkoQA2/ycikHIID49s2FDdJPW1K29fXHZm9X5Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563850; a=rsa-sha256; cv=none; b=vX5vMpvW4RX/08bM7DBwwOO1djlUE19UMM9szXWs5OIR/1c+5K4lg6reBX/a7jrlyDn7SF 9H7W/rE87RzlBKleYP2bhQjNOUfQPWuSo4nqP/9Ndg+QZx8P5IrOMtpsWSN9p5HvdQKyLP PzCFnPQfSXsKmx6/8UFQnGvKVydNVp56vHH0bMz4EVjvqz6MxhkXLBffX3Lt4sYdv0LP0j vBdGbrQz89AXM/n/uX8K1msXWm92i7lw19ixOxOEaOhNrg36QEmKytxdAgUJLzNVKQhx74 mCsXQjtU5B1+bZv8UyFjudls4uf7Gy8ffw9j4E3cCWTXWdu/I+gs0pkXveTRjg== 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 4XPTmV0nSvzxZn; Thu, 10 Oct 2024 12:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbUJq006777; Thu, 10 Oct 2024 12:37:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbTCX006774; Thu, 10 Oct 2024 12:37:29 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:29 GMT Message-Id: <202410101237.49ACbTCX006774@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 08b53c6efcae - main - pf: remove switch (af) default cases List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 08b53c6efcae3f4e050a6815b1a4112b090f6f02 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=08b53c6efcae3f4e050a6815b1a4112b090f6f02 commit 08b53c6efcae3f4e050a6815b1a4112b090f6f02 Author: Kristof Provost AuthorDate: 2024-10-03 14:43:51 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:41 +0000 pf: remove switch (af) default cases pf_setup_pdesc() panics if address family is neither AF_INET nor AF_INET6. So remove useless af switch defaults here and there. Always use "switch(af)" instead of "if (af) else" for af dependent code. Always use AF_ defines instead of PF_ when checking af values. ok claudio mpf henning Obtained from: OpenBSD, bluhm , fb75e2fc14 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46940 --- sys/netpfil/pf/pf.c | 48 +++++++++++++++++------------------------------- sys/netpfil/pf/pf_norm.c | 8 ++++++-- sys/netpfil/pf/pf_osfp.c | 17 +++++++++-------- sys/netpfil/pf/pflow.c | 7 +++++-- 4 files changed, 37 insertions(+), 43 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index d1240dc37a1c..993feff92233 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -569,8 +569,6 @@ pf_addr_cmp(struct pf_addr *a, struct pf_addr *b, sa_family_t af) return (-1); break; #endif /* INET6 */ - default: - panic("%s: unknown address family %u", __func__, af); } return (0); } @@ -708,8 +706,6 @@ pf_hashsrc(struct pf_addr *addr, sa_family_t af) h = murmur3_32_hash32((uint32_t *)&addr->v6, sizeof(addr->v6)/sizeof(uint32_t), V_pf_hashseed); break; - default: - panic("%s: unknown address family %u", __func__, af); } return (h & V_pf_srchashmask); @@ -2024,8 +2020,6 @@ pf_isforlocal(struct mbuf *m, int af) return (! (ia->ia6_flags & IN6_IFF_NOTREADY)); } #endif - default: - panic("Unsupported af %d", af); } return (false); @@ -2187,11 +2181,6 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, } break; #endif /* INET6 */ - default: - *icmp_dir = PF_IN; - *virtual_type = type; - *virtual_id = 0; - break; } HTONS(*virtual_type); return (0); /* These types match to their own state */ @@ -3378,8 +3367,6 @@ pf_build_tcp(const struct pf_krule *r, sa_family_t af, len = sizeof(struct ip6_hdr) + tlen; break; #endif /* INET6 */ - default: - panic("%s: unsupported af %d", __func__, af); } m = m_gethdr(M_NOWAIT, MT_DATA); @@ -3743,18 +3730,20 @@ pf_send_icmp(struct mbuf *m, u_int8_t type, u_int8_t code, sa_family_t af, struct pf_mtag *pf_mtag; /* ICMP packet rate limitation. */ + switch (af) { #ifdef INET6 - if (af == AF_INET6) { + case AF_INET6: if (icmp6_ratelimit(NULL, type, code)) return; - } + break; #endif #ifdef INET - if (af == AF_INET) { + case AF_INET: if (badport_bandlim(pf_icmp_to_bandlim(type)) != 0) return; - } + break; #endif + } /* Allocate outgoing queue entry, mbuf and mbuf tag. */ pfse = malloc(sizeof(*pfse), M_PFTEMP, M_NOWAIT); @@ -4352,9 +4341,6 @@ pf_socket_lookup(struct pf_pdesc *pd, struct mbuf *m) } break; #endif /* INET6 */ - - default: - return (-1); } INP_RLOCK_ASSERT(inp); pd->lookup.uid = inp->inp_cred->cr_uid; @@ -4501,12 +4487,15 @@ pf_tcp_iss(struct pf_pdesc *pd) MD5Update(&ctx, (char *)&pd->hdr.tcp.th_sport, sizeof(u_short)); MD5Update(&ctx, (char *)&pd->hdr.tcp.th_dport, sizeof(u_short)); - if (pd->af == AF_INET6) { + switch (pd->af) { + case AF_INET6: MD5Update(&ctx, (char *)&pd->src->v6, sizeof(struct in6_addr)); MD5Update(&ctx, (char *)&pd->dst->v6, sizeof(struct in6_addr)); - } else { + break; + case AF_INET: MD5Update(&ctx, (char *)&pd->src->v4, sizeof(struct in_addr)); MD5Update(&ctx, (char *)&pd->dst->v4, sizeof(struct in_addr)); + break; } MD5Final((u_char *)digest, &ctx); V_pf_tcp_iss_off += 4096; @@ -8174,8 +8163,6 @@ pf_check_proto_cksum(struct mbuf *m, int off, int len, u_int8_t p, sa_family_t a sum = in6_cksum(m, p, off, len); break; #endif /* INET6 */ - default: - return (1); } } if (sum) { @@ -8273,9 +8260,6 @@ pf_pdesc_to_dnflow(const struct pf_pdesc *pd, const struct pf_krule *r, dnflow->f_id.src_ip6 = pd->src->v6; dnflow->f_id.dst_ip6 = pd->dst->v6; break; - default: - panic("Invalid AF"); - break; } return (true); @@ -8370,12 +8354,16 @@ pf_dummynet_route(struct pf_pdesc *pd, struct pf_kstate *s, MPASS(sa != NULL); - if (pd->af == AF_INET) + switch (pd->af) { + case AF_INET: memcpy(&pd->pf_mtag->dst, sa, sizeof(struct sockaddr_in)); - else + break; + case AF_INET6: memcpy(&pd->pf_mtag->dst, sa, sizeof(struct sockaddr_in6)); + break; + } } if (s != NULL && s->nat_rule != NULL && @@ -9408,8 +9396,6 @@ done: pf_route6(m0, r, kif->pfik_ifp, s, &pd, inp); break; #endif - default: - panic("Unknown af %d", af); } goto out; } diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 19206d83a732..95f35aaa0598 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -2203,7 +2203,8 @@ pf_scrub(struct mbuf *m, struct pf_pdesc *pd) #endif /* Enforce tos */ if (pd->act.flags & PFSTATE_SETTOS) { - if (pd->af == AF_INET) { + switch (pd->af) { + case AF_INET: { u_int16_t ov, nv; ov = *(u_int16_t *)h; @@ -2211,10 +2212,13 @@ pf_scrub(struct mbuf *m, struct pf_pdesc *pd) nv = *(u_int16_t *)h; h->ip_sum = pf_cksum_fixup(h->ip_sum, ov, nv, 0); + break; + } #ifdef INET6 - } else if (pd->af == AF_INET6) { + case AF_INET6: h6->ip6_flow &= IPV6_FLOWLABEL_MASK | IPV6_VERSION_MASK; h6->ip6_flow |= htonl((pd->act.set_tos | IPV6_ECN(h6)) << 20); + break; #endif } } diff --git a/sys/netpfil/pf/pf_osfp.c b/sys/netpfil/pf/pf_osfp.c index 5217d68eac95..ef78283b4d07 100644 --- a/sys/netpfil/pf/pf_osfp.c +++ b/sys/netpfil/pf/pf_osfp.c @@ -70,20 +70,21 @@ struct pf_osfp_enlist * pf_osfp_fingerprint(struct pf_pdesc *pd, struct mbuf *m, const struct tcphdr *tcp) { - struct ip *ip; - struct ip6_hdr *ip6; - char hdr[60]; + struct ip *ip = NULL; + struct ip6_hdr *ip6 = NULL; + char hdr[60]; - if ((pd->af != PF_INET && pd->af != PF_INET6) || - pd->proto != IPPROTO_TCP || (tcp->th_off << 2) < sizeof(*tcp)) + if (pd->proto != IPPROTO_TCP || (tcp->th_off << 2) < sizeof(*tcp)) return (NULL); - if (pd->af == PF_INET) { + switch (pd->af) { + case AF_INET: ip = mtod(m, struct ip *); ip6 = (struct ip6_hdr *)NULL; - } else { - ip = (struct ip *)NULL; + break; + case AF_INET6: ip6 = mtod(m, struct ip6_hdr *); + break; } if (!pf_pull_hdr(m, pd->off, hdr, tcp->th_off << 2, NULL, NULL, pd->af)) return (NULL); diff --git a/sys/netpfil/pf/pflow.c b/sys/netpfil/pf/pflow.c index 8157ddc1c751..5ce1369d9f14 100644 --- a/sys/netpfil/pf/pflow.c +++ b/sys/netpfil/pf/pflow.c @@ -982,7 +982,8 @@ pflow_pack_flow_ipfix(const struct pf_kstate *st, struct pf_state_key *sk, int ret = 0; bool nat = false; - if (sk->af == AF_INET) { + switch (sk->af) { + case AF_INET: bzero(&flow4_1, sizeof(flow4_1)); bzero(&flow4_2, sizeof(flow4_2)); @@ -1019,7 +1020,8 @@ pflow_pack_flow_ipfix(const struct pf_kstate *st, struct pf_state_key *sk, PFIX_NAT_EVENT_SESSION_DELETE, st->expire); } } - } else if (sk->af == AF_INET6) { + break; + case AF_INET6: bzero(&flow6_1, sizeof(flow6_1)); bzero(&flow6_2, sizeof(flow6_2)); @@ -1035,6 +1037,7 @@ pflow_pack_flow_ipfix(const struct pf_kstate *st, struct pf_state_key *sk, if (st->bytes[1] != 0) /* second flow from state */ ret = copy_flow_ipfix_6_to_m(&flow6_2, sc); + break; } return (ret); } From nobody Thu Oct 10 12:37:32 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTmX73NHz5YyrG; Thu, 10 Oct 2024 12:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTmX3C1rz4HY0; Thu, 10 Oct 2024 12:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bUC9ASwBMDWa6sL9IEqu4e8c3orSiCqM5AvxB8IvLlE=; b=uvR5kkHyUDYo5/x61RySJHMuwTI/LqrrYphbcX64gv29PbvyVQhWDzJ7T+OHBQbT0Mfqm3 GPCWGzPsE4KWQxGOk8tfgXfZ/QYOxQT09ii/xLLATUxPGtczPWgW0nRn+bmsdcOv/kEMI6 GnKRwMo6nYg7PyYIsoh+LjENv4BK+6BllcIuixvCmSfnZBVhl9pRDBr2jvXaXpdGS3pbos VPa48q8yMjySyorSqRMLXqwzQDLpmtqKV9vYkfy8mzonplFolf81ygS7JadpZzQsBnvC9a a2SJg7HPYLiNhuBIlN/6TvcaUPoGuifsv4f5weRo7rcQ8vpTc3pfvbuK+Z/MbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bUC9ASwBMDWa6sL9IEqu4e8c3orSiCqM5AvxB8IvLlE=; b=PQTKovzDt1iKxnAtzAlepycb5fPEwcOTndkZmE8qxtBUewZI7bjF+kMeCw/FRnm+KUHTDi iV2vpQDsCuN1aNak2b3woLfBM7M9rdSQbSLH4Afows1nb0bHpSMX4wOo0rk/aYQdKQrhnj 36WDI9Yu8KLQqFxZpovd2SYRWHb3cOaMpPhjZAEfxQAC1OEOvRcWxf7irFR0IQEVELdmiH X5T3I72Uj5isazPB6PvRx3s98PG1JLrGwcYbfKAuaXAnBrAj18GLY66KPZkKoGYEgxvoNk 7Zc4rDIYGW6njSIFgd4omtf/vChQ/roqbA5i4OB+B+jy/JKXCC9+CMUwjSuMTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563852; a=rsa-sha256; cv=none; b=JA9TEAMAXydZWzkN39DVbD1NzjFa3PiD71A1jNQwGrE/T9M0DNUDOcyIHeQjPX5Z51R/Fj vLYT3o36dBKffkIj7l8zTLyBMtN+5OIdhuzbTuA8WMRnnk/VDIAc+M3ym779NKVqJmciuH x6wtAKVlaV4kGZJYnuxIFEY/0Ee/7ShJYGH02y6P0mgIqfACWW7ytCAMsZ41VY44ttdmKU Y3psYAhqVeKlI62bRDwAnVW/fzqSSjx7dQjaIRJacJgUMKlz/SP8gjLBZDduf2LBuvkm/T 8Vnt5442Z0KOX2ILd8K2wmz1DXLb9/IovkLU7AeTqH2ZHV5Lh86bNSNH36sx+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 4XPTmX2qBPzxq5; Thu, 10 Oct 2024 12:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbWRS006879; Thu, 10 Oct 2024 12:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbWpZ006876; Thu, 10 Oct 2024 12:37:32 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:32 GMT Message-Id: <202410101237.49ACbWpZ006876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 8978a080cfa7 - main - pf: remove redundant arguments to pf_state_key_addr_setup() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8978a080cfa79a51e50591b839f40606d139b2ee Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8978a080cfa79a51e50591b839f40606d139b2ee commit 8978a080cfa79a51e50591b839f40606d139b2ee Author: Kristof Provost AuthorDate: 2024-10-07 12:29:15 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:42 +0000 pf: remove redundant arguments to pf_state_key_addr_setup() We always pass these values from struct pf_pdesc, which we also pass, so remove the redundant arguments. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 216d5805b11e..f5b90424d246 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -330,8 +330,7 @@ static int pf_create_state(struct pf_krule *, struct pf_krule *, struct pf_kstate **, int, u_int16_t, u_int16_t, struct pf_krule_slist *, struct pf_udp_mapping *); static int pf_state_key_addr_setup(struct pf_pdesc *, - struct pf_state_key_cmp *, int, struct pf_addr *, - int, struct pf_addr *, int); + struct pf_state_key_cmp *, int); static int pf_tcp_track_full(struct pf_kstate **, struct pf_pdesc *, u_short *, int *); static int pf_tcp_track_sloppy(struct pf_kstate **, @@ -1562,9 +1561,10 @@ pf_state_key_ctor(void *mem, int size, void *arg, int flags) static int pf_state_key_addr_setup(struct pf_pdesc *pd, - struct pf_state_key_cmp *key, int sidx, struct pf_addr *saddr, - int didx, struct pf_addr *daddr, int multi) + struct pf_state_key_cmp *key, int multi) { + struct pf_addr *saddr = pd->src; + struct pf_addr *daddr = pd->dst; #ifdef INET6 struct nd_neighbor_solicit nd; struct pf_addr *target; @@ -1590,28 +1590,28 @@ pf_state_key_addr_setup(struct pf_pdesc *pd, target = (struct pf_addr *)&nd.nd_ns_target; saddr = target; if (IN6_IS_ADDR_MULTICAST(&pd->dst->v6)) { - key->addr[didx].addr32[0] = 0; - key->addr[didx].addr32[1] = 0; - key->addr[didx].addr32[2] = 0; - key->addr[didx].addr32[3] = 0; + key->addr[pd->didx].addr32[0] = 0; + key->addr[pd->didx].addr32[1] = 0; + key->addr[pd->didx].addr32[2] = 0; + key->addr[pd->didx].addr32[3] = 0; daddr = NULL; /* overwritten */ } break; default: if (multi == PF_ICMP_MULTI_LINK) { - key->addr[sidx].addr32[0] = IPV6_ADDR_INT32_MLL; - key->addr[sidx].addr32[1] = 0; - key->addr[sidx].addr32[2] = 0; - key->addr[sidx].addr32[3] = IPV6_ADDR_INT32_ONE; + key->addr[pd->sidx].addr32[0] = IPV6_ADDR_INT32_MLL; + key->addr[pd->sidx].addr32[1] = 0; + key->addr[pd->sidx].addr32[2] = 0; + key->addr[pd->sidx].addr32[3] = IPV6_ADDR_INT32_ONE; saddr = NULL; /* overwritten */ } } copy: #endif if (saddr) - PF_ACPY(&key->addr[sidx], saddr, pd->af); + PF_ACPY(&key->addr[pd->sidx], saddr, pd->af); if (daddr) - PF_ACPY(&key->addr[didx], daddr, pd->af); + PF_ACPY(&key->addr[pd->didx], daddr, pd->af); return (0); } @@ -1628,7 +1628,7 @@ pf_state_key_setup(struct pf_pdesc *pd, return (NULL); if (pf_state_key_addr_setup(pd, (struct pf_state_key_cmp *)sk, - pd->sidx, pd->src, pd->didx, pd->dst, 0)) { + 0)) { uma_zfree(V_pf_state_key_z, sk); return (NULL); } @@ -6818,8 +6818,7 @@ pf_icmp_state_lookup(struct pf_state_key_cmp *key, struct pf_pdesc *pd, key->port[pd->sidx] = type; key->port[pd->didx] = icmpid; } - if (pf_state_key_addr_setup(pd, key, pd->sidx, pd->src, - pd->didx, pd->dst, multi)) + if (pf_state_key_addr_setup(pd, key, multi)) return (PF_DROP); STATE_LOOKUP(key, *state, pd); From nobody Thu Oct 10 12:37:31 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPTmW5LrNz5Z08Q; Thu, 10 Oct 2024 12:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPTmW4cv2z4Hb2; Thu, 10 Oct 2024 12:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0TZ3D2BDifNvRVMXFKUzO7PbWlDzVLSWOZySlFKKegA=; b=iB2i/Yc0c7TFVfdGp55H0l9+D12W17uyZbWSo937F6dvTfjEDrFdD5cNJGpOy/ZZtma0hx UlkbqnJhjfqt7xQonX8BKME2JKQyvtEAQjwfFIzNwWg/l5zVjRcN+DjeZcjrhzFj68CkFj zNlEHoZjxDdecameO1sVGMUjtmEKybMPBUk3pcRTjYWUDEzmYvXww9oBsKtURxjYYGa254 34+kenIODCQsqNrfn7AHxlZB1EBPgq/wGFw4TRlat6nFlqsXjaU8RDVCp1A5kjrM/bW11I GRWnsRez7qtTg7TbN20WwHayN3rVv2f+FWZcMRsQ7kEcbk0jG1IWsqf52CiAvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728563851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0TZ3D2BDifNvRVMXFKUzO7PbWlDzVLSWOZySlFKKegA=; b=o8EeLFeavWcMq2N3AZvMWxL3/zF6bWcTcb7gvA0IuQKp+NonAnZcypmsTkjANlRjWWmq1N e/R4ZuuQhZD01MoZgyX/U6j+z+3+wg5j7breg8M7tx8/4Tnx9zVs0r61G8ZmiRnlattoju 5nD3Z9fXy+EctystAjehsQeRUsMbrJjR1x3J9sHldYXyW0V7n2LgSgq1WKktPlGdVtPyBG KbQDrmBiqnrqfEcGBwhtB9oXZWyj9gWbJhF+fwRg4Jj0isR1SmTScyVNNNYZsDghs27PXs W3q9wZQkKN54mbbILY32RR8ANHLuQH1SItzasgqmAu/6qr0H3cxhnaOcg4r+Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728563851; a=rsa-sha256; cv=none; b=Xe9kmAkdYAGmw3r3vommxEQdE2Ec2Vu+Dr6Yyob8VH5FJG0Es7f/pwVWPtCzMFQ9le+85a G4J2XmxCX07sf1KY6rbgAKnCGg8TnsEQoRm2xXrc7qPAgRjWckiB75LanjZXpOqEEy8Vkk MHTziT98NXqWD2N6qVgDv3KKNYv5ATjRcb91bKlnbWTRiYfmVhdZi0XW29NpE2svVGzLpe cE+Ue4vhbDt2ugFSIRkHivm1GukOlD1hDv0cEaQ35HaWITKQ8IW6B6qzehJZFpontrwj6q LbPHd9jhUCJp1srsdvcpmAe/fRQ6QwQMotzCvAKMCjOlwaLI4CKhqmkf7SkoCg== 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 4XPTmW1kX4zyDY; Thu, 10 Oct 2024 12:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ACbVpi006834; Thu, 10 Oct 2024 12:37:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ACbVeZ006831; Thu, 10 Oct 2024 12:37:31 GMT (envelope-from git) Date: Thu, 10 Oct 2024 12:37:31 GMT Message-Id: <202410101237.49ACbVeZ006831@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 9a405864e0cf - main - pf: move the mbuf into struct pf_pdesc too List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 9a405864e0cf7d794ba067fa762b5d3743cd7db5 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9a405864e0cf7d794ba067fa762b5d3743cd7db5 commit 9a405864e0cf7d794ba067fa762b5d3743cd7db5 Author: Kristof Provost AuthorDate: 2024-10-03 17:53:09 +0000 Commit: Kristof Provost CommitDate: 2024-10-10 12:10:42 +0000 pf: move the mbuf into struct pf_pdesc too As requested by henning, move the mbuf pointer into struct pf_pdesc. Also sort pd to the beginning of the functions' parameter lists for consistency. ok henning Obtained from: OpenBSD, bluhm , 776f210a75 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46941 --- sys/net/if_pflog.h | 4 +- sys/net/pfvar.h | 42 ++-- sys/netpfil/pf/if_pflog.c | 14 +- sys/netpfil/pf/pf.c | 470 ++++++++++++++++++++--------------------- sys/netpfil/pf/pf_lb.c | 30 +-- sys/netpfil/pf/pf_norm.c | 110 +++++----- sys/netpfil/pf/pf_osfp.c | 9 +- sys/netpfil/pf/pf_syncookies.c | 13 +- 8 files changed, 338 insertions(+), 354 deletions(-) diff --git a/sys/net/if_pflog.h b/sys/net/if_pflog.h index 0f8caef5fe8b..b2052d5bd5f3 100644 --- a/sys/net/if_pflog.h +++ b/sys/net/if_pflog.h @@ -69,9 +69,9 @@ struct pf_ruleset; struct pfi_kif; struct pf_pdesc; -#define PFLOG_PACKET(a,b,t,c,d,e,f,g) do { \ +#define PFLOG_PACKET(b,t,c,d,e,f,g) do { \ if (pflog_packet_ptr != NULL) \ - pflog_packet_ptr(a,b,t,c,d,e,f,g); \ + pflog_packet_ptr(b,t,c,d,e,f,g); \ } while (0) #endif /* _KERNEL */ #endif /* _NET_IF_PFLOG_H_ */ diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index f88a619dd184..30be1128d4d3 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1249,7 +1249,7 @@ void pf_state_export(struct pf_state_export *, /* pflog */ struct pf_kruleset; struct pf_pdesc; -typedef int pflog_packet_t(struct mbuf *, uint8_t, u_int8_t, +typedef int pflog_packet_t(uint8_t, u_int8_t, struct pf_krule *, struct pf_krule *, struct pf_kruleset *, struct pf_pdesc *, int); extern pflog_packet_t *pflog_packet_ptr; @@ -1598,6 +1598,7 @@ struct pf_pdesc { } hdr; struct pfi_kkif *kif; /* incomming interface */ + struct mbuf *m; struct pf_addr *src; /* src address */ struct pf_addr *dst; /* dst address */ @@ -1650,7 +1651,6 @@ struct pf_sctp_multihome_job { struct pf_pdesc pd; struct pf_addr src; struct pf_addr dst; - struct mbuf *m; int op; }; @@ -2355,7 +2355,7 @@ extern void pf_addrcpy(struct pf_addr *, struct pf_addr *, void pf_free_rule(struct pf_krule *); int pf_test_eth(int, int, struct ifnet *, struct mbuf **, struct inpcb *); -int pf_scan_sctp(struct mbuf *, struct pf_pdesc *); +int pf_scan_sctp(struct pf_pdesc *); #if defined(INET) || defined(INET6) int pf_test(sa_family_t, int, int, struct ifnet *, struct mbuf **, struct inpcb *, struct pf_rule_actions *); @@ -2375,8 +2375,8 @@ int pf_max_frag_size(struct mbuf *); int pf_refragment6(struct ifnet *, struct mbuf **, struct m_tag *, bool); #endif /* INET6 */ -int pf_multihome_scan_init(struct mbuf *, int, int, struct pf_pdesc *); -int pf_multihome_scan_asconf(struct mbuf *, int, int, struct pf_pdesc *); +int pf_multihome_scan_init(int, int, struct pf_pdesc *); +int pf_multihome_scan_asconf(int, int, struct pf_pdesc *); u_int32_t pf_new_isn(struct pf_kstate *); void *pf_pull_hdr(const struct mbuf *, int, void *, int, u_short *, u_short *, @@ -2398,23 +2398,23 @@ int pf_match_port(u_int8_t, u_int16_t, u_int16_t, u_int16_t); void pf_normalize_init(void); void pf_normalize_cleanup(void); -int pf_normalize_tcp(struct mbuf *, struct pf_pdesc *); +int pf_normalize_tcp(struct pf_pdesc *); void pf_normalize_tcp_cleanup(struct pf_kstate *); -int pf_normalize_tcp_init(struct mbuf *, struct pf_pdesc *, +int pf_normalize_tcp_init(struct pf_pdesc *, struct tcphdr *, struct pf_state_peer *, struct pf_state_peer *); -int pf_normalize_tcp_stateful(struct mbuf *, struct pf_pdesc *, +int pf_normalize_tcp_stateful(struct pf_pdesc *, u_short *, struct tcphdr *, struct pf_kstate *, struct pf_state_peer *, struct pf_state_peer *, int *); -int pf_normalize_sctp_init(struct mbuf *, struct pf_pdesc *, +int pf_normalize_sctp_init(struct pf_pdesc *, struct pf_state_peer *, struct pf_state_peer *); -int pf_normalize_sctp(struct mbuf *, struct pf_pdesc *); +int pf_normalize_sctp(struct pf_pdesc *); u_int32_t pf_state_expires(const struct pf_kstate *); void pf_purge_expired_fragments(void); void pf_purge_fragments(uint32_t); int pf_routable(struct pf_addr *addr, sa_family_t af, struct pfi_kkif *, int); -int pf_socket_lookup(struct pf_pdesc *, struct mbuf *); +int pf_socket_lookup(struct pf_pdesc *); struct pf_state_key *pf_alloc_state_key(int); void pfr_initialize(void); void pfr_cleanup(void); @@ -2482,12 +2482,12 @@ int pfi_set_flags(const char *, int); int pfi_clear_flags(const char *, int); int pf_match_tag(struct mbuf *, struct pf_krule *, int *, int); -int pf_tag_packet(struct mbuf *, struct pf_pdesc *, int); +int pf_tag_packet(struct pf_pdesc *, int); int pf_addr_cmp(struct pf_addr *, struct pf_addr *, sa_family_t); -u_int16_t pf_get_mss(struct mbuf *, struct pf_pdesc *); -u_int8_t pf_get_wscale(struct mbuf *, struct pf_pdesc *); +u_int16_t pf_get_mss(struct pf_pdesc *); +u_int8_t pf_get_wscale(struct pf_pdesc *); struct mbuf *pf_build_tcp(const struct pf_krule *, sa_family_t, const struct pf_addr *, const struct pf_addr *, u_int16_t, u_int16_t, u_int32_t, u_int32_t, @@ -2504,8 +2504,7 @@ void pf_syncookies_cleanup(void); int pf_get_syncookies(struct pfioc_nv *); int pf_set_syncookies(struct pfioc_nv *); int pf_synflood_check(struct pf_pdesc *); -void pf_syncookie_send(struct mbuf *m, - struct pf_pdesc *); +void pf_syncookie_send(struct pf_pdesc *); bool pf_syncookie_check(struct pf_pdesc *); u_int8_t pf_syncookie_validate(struct pf_pdesc *); struct mbuf * pf_syncookie_recreate_syn(struct pf_pdesc *); @@ -2590,8 +2589,7 @@ void pf_addr_copyout(struct pf_addr_wrap *); int pf_osfp_add(struct pf_osfp_ioctl *); #ifdef _KERNEL struct pf_osfp_enlist * - pf_osfp_fingerprint(struct pf_pdesc *, struct mbuf *, - const struct tcphdr *); + pf_osfp_fingerprint(struct pf_pdesc *, const struct tcphdr *); #endif /* _KERNEL */ void pf_osfp_flush(void); int pf_osfp_get(struct pf_osfp_ioctl *); @@ -2622,7 +2620,7 @@ u_short pf_map_addr_sn(u_int8_t, struct pf_krule *, struct pf_addr *, struct pf_addr *, struct pfi_kkif **nkif, struct pf_addr *, struct pf_ksrc_node **); -u_short pf_get_translation(struct pf_pdesc *, struct mbuf *, +u_short pf_get_translation(struct pf_pdesc *, int, struct pf_ksrc_node **, struct pf_state_key **, struct pf_state_key **, struct pf_addr *, struct pf_addr *, @@ -2630,14 +2628,14 @@ u_short pf_get_translation(struct pf_pdesc *, struct mbuf *, struct pf_krule **, struct pf_udp_mapping **udp_mapping); -struct pf_state_key *pf_state_key_setup(struct pf_pdesc *, struct mbuf *, +struct pf_state_key *pf_state_key_setup(struct pf_pdesc *, struct pf_addr *, struct pf_addr *, u_int16_t, u_int16_t); struct pf_state_key *pf_state_key_clone(const struct pf_state_key *); void pf_rule_to_actions(struct pf_krule *, struct pf_rule_actions *); -int pf_normalize_mss(struct mbuf *m, struct pf_pdesc *pd); +int pf_normalize_mss(struct pf_pdesc *pd); #if defined(INET) || defined(INET6) -void pf_scrub(struct mbuf *, struct pf_pdesc *); +void pf_scrub(struct pf_pdesc *); #endif struct pfi_kkif *pf_kkif_create(int); diff --git a/sys/netpfil/pf/if_pflog.c b/sys/netpfil/pf/if_pflog.c index 4db178b8f279..3cd7cd1f2ddc 100644 --- a/sys/netpfil/pf/if_pflog.c +++ b/sys/netpfil/pf/if_pflog.c @@ -213,14 +213,14 @@ pflogioctl(struct ifnet *ifp, u_long cmd, caddr_t data) } static int -pflog_packet(struct mbuf *m, uint8_t action, u_int8_t reason, +pflog_packet(uint8_t action, u_int8_t reason, struct pf_krule *rm, struct pf_krule *am, struct pf_kruleset *ruleset, struct pf_pdesc *pd, int lookupsafe) { struct ifnet *ifn; struct pfloghdr hdr; - if (m == NULL || rm == NULL || pd == NULL) + if (rm == NULL || pd == NULL) return (1); ifn = V_pflogifs[rm->logif]; @@ -251,7 +251,7 @@ pflog_packet(struct mbuf *m, uint8_t action, u_int8_t reason, * These conditions are very very rare, however. */ if (rm->log & PF_LOG_SOCKET_LOOKUP && !pd->lookup.done && lookupsafe) - pd->lookup.done = pf_socket_lookup(pd, m); + pd->lookup.done = pf_socket_lookup(pd); if (pd->lookup.done > 0) hdr.uid = pd->lookup.uid; else @@ -265,15 +265,15 @@ pflog_packet(struct mbuf *m, uint8_t action, u_int8_t reason, if (pd->af == AF_INET && pd->dir == PF_OUT) { struct ip *ip; - ip = mtod(m, struct ip *); + ip = mtod(pd->m, struct ip *); ip->ip_sum = 0; - ip->ip_sum = in_cksum(m, ip->ip_hl << 2); + ip->ip_sum = in_cksum(pd->m, ip->ip_hl << 2); } #endif /* INET */ if_inc_counter(ifn, IFCOUNTER_OPACKETS, 1); - if_inc_counter(ifn, IFCOUNTER_OBYTES, m->m_pkthdr.len); - bpf_mtap2(ifn->if_bpf, &hdr, PFLOG_HDRLEN, m); + if_inc_counter(ifn, IFCOUNTER_OBYTES, pd->m->m_pkthdr.len); + bpf_mtap2(ifn->if_bpf, &hdr, PFLOG_HDRLEN, pd->m); return (0); } diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 993feff92233..216d5805b11e 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -294,7 +294,7 @@ static int pf_check_threshold(struct pf_threshold *); static void pf_change_ap(struct mbuf *, struct pf_addr *, u_int16_t *, u_int16_t *, u_int16_t *, struct pf_addr *, u_int16_t, u_int8_t, sa_family_t); -static int pf_modulate_sack(struct mbuf *, struct pf_pdesc *, +static int pf_modulate_sack(struct pf_pdesc *, struct tcphdr *, struct pf_state_peer *); int pf_icmp_mapping(struct pf_pdesc *, u_int8_t, int *, int *, u_int16_t *, u_int16_t *); @@ -320,39 +320,39 @@ static int pf_dummynet_route(struct pf_pdesc *, static int pf_test_eth_rule(int, struct pfi_kkif *, struct mbuf **); static int pf_test_rule(struct pf_krule **, struct pf_kstate **, - struct mbuf *, struct pf_pdesc *, struct pf_krule **, + struct pf_pdesc *, struct pf_krule **, struct pf_kruleset **, struct inpcb *); static int pf_create_state(struct pf_krule *, struct pf_krule *, struct pf_krule *, struct pf_pdesc *, struct pf_ksrc_node *, struct pf_state_key *, - struct pf_state_key *, struct mbuf *, + struct pf_state_key *, u_int16_t, u_int16_t, int *, struct pf_kstate **, int, u_int16_t, u_int16_t, struct pf_krule_slist *, struct pf_udp_mapping *); -static int pf_state_key_addr_setup(struct pf_pdesc *, struct mbuf *, +static int pf_state_key_addr_setup(struct pf_pdesc *, struct pf_state_key_cmp *, int, struct pf_addr *, int, struct pf_addr *, int); static int pf_tcp_track_full(struct pf_kstate **, - struct mbuf *, struct pf_pdesc *, u_short *, int *); + struct pf_pdesc *, u_short *, int *); static int pf_tcp_track_sloppy(struct pf_kstate **, struct pf_pdesc *, u_short *); static int pf_test_state_tcp(struct pf_kstate **, - struct mbuf *, struct pf_pdesc *, u_short *); + struct pf_pdesc *, u_short *); static int pf_test_state_udp(struct pf_kstate **, - struct mbuf *, struct pf_pdesc *); + struct pf_pdesc *); int pf_icmp_state_lookup(struct pf_state_key_cmp *, - struct pf_pdesc *, struct pf_kstate **, struct mbuf *, + struct pf_pdesc *, struct pf_kstate **, int, u_int16_t, u_int16_t, int, int *, int, int); -static int pf_test_state_icmp(struct pf_kstate **, struct mbuf *, +static int pf_test_state_icmp(struct pf_kstate **, struct pf_pdesc *, u_short *); static void pf_sctp_multihome_detach_addr(const struct pf_kstate *); static void pf_sctp_multihome_delayed(struct pf_pdesc *, struct pfi_kkif *, struct pf_kstate *, int); -static int pf_test_state_sctp(struct pf_kstate **, struct mbuf *, +static int pf_test_state_sctp(struct pf_kstate **, struct pf_pdesc *, u_short *); static int pf_test_state_other(struct pf_kstate **, - struct mbuf *, struct pf_pdesc *); + struct pf_pdesc *); static u_int16_t pf_calc_mss(struct pf_addr *, sa_family_t, int, u_int16_t); static int pf_check_proto_cksum(struct mbuf *, int, int, @@ -1561,7 +1561,7 @@ pf_state_key_ctor(void *mem, int size, void *arg, int flags) } static int -pf_state_key_addr_setup(struct pf_pdesc *pd, struct mbuf *m, +pf_state_key_addr_setup(struct pf_pdesc *pd, struct pf_state_key_cmp *key, int sidx, struct pf_addr *saddr, int didx, struct pf_addr *daddr, int multi) { @@ -1577,7 +1577,7 @@ pf_state_key_addr_setup(struct pf_pdesc *pd, struct mbuf *m, case ND_NEIGHBOR_SOLICIT: if (multi) return (-1); - if (!pf_pull_hdr(m, pd->off, &nd, sizeof(nd), &action, &reason, pd->af)) + if (!pf_pull_hdr(pd->m, pd->off, &nd, sizeof(nd), &action, &reason, pd->af)) return (-1); target = (struct pf_addr *)&nd.nd_ns_target; daddr = target; @@ -1585,7 +1585,7 @@ pf_state_key_addr_setup(struct pf_pdesc *pd, struct mbuf *m, case ND_NEIGHBOR_ADVERT: if (multi) return (-1); - if (!pf_pull_hdr(m, pd->off, &nd, sizeof(nd), &action, &reason, pd->af)) + if (!pf_pull_hdr(pd->m, pd->off, &nd, sizeof(nd), &action, &reason, pd->af)) return (-1); target = (struct pf_addr *)&nd.nd_ns_target; saddr = target; @@ -1617,7 +1617,7 @@ copy: } struct pf_state_key * -pf_state_key_setup(struct pf_pdesc *pd, struct mbuf *m, +pf_state_key_setup(struct pf_pdesc *pd, struct pf_addr *saddr, struct pf_addr *daddr, u_int16_t sport, u_int16_t dport) { @@ -1627,7 +1627,7 @@ pf_state_key_setup(struct pf_pdesc *pd, struct mbuf *m, if (sk == NULL) return (NULL); - if (pf_state_key_addr_setup(pd, m, (struct pf_state_key_cmp *)sk, + if (pf_state_key_addr_setup(pd, (struct pf_state_key_cmp *)sk, pd->sidx, pd->src, pd->didx, pd->dst, 0)) { uma_zfree(V_pf_state_key_z, sk); return (NULL); @@ -3272,8 +3272,8 @@ pf_change_icmp(struct pf_addr *ia, u_int16_t *ip, struct pf_addr *oa, * (credits to Krzysztof Pfaff for report and patch) */ static int -pf_modulate_sack(struct mbuf *m, struct pf_pdesc *pd, - struct tcphdr *th, struct pf_state_peer *dst) +pf_modulate_sack(struct pf_pdesc *pd, struct tcphdr *th, + struct pf_state_peer *dst) { int hlen = (th->th_off << 2) - sizeof(*th), thoptlen = hlen; u_int8_t opts[TCP_MAXOLEN], *opt = opts; @@ -3282,7 +3282,7 @@ pf_modulate_sack(struct mbuf *m, struct pf_pdesc *pd, #define TCPOLEN_SACKLEN (TCPOLEN_SACK + 2) if (hlen < TCPOLEN_SACKLEN || - !pf_pull_hdr(m, pd->off + sizeof(*th), opts, hlen, NULL, NULL, pd->af)) + !pf_pull_hdr(pd->m, pd->off + sizeof(*th), opts, hlen, NULL, NULL, pd->af)) return 0; while (hlen >= TCPOLEN_SACKLEN) { @@ -3301,12 +3301,12 @@ pf_modulate_sack(struct mbuf *m, struct pf_pdesc *pd, for (i = 2; i + TCPOLEN_SACK <= olen; i += TCPOLEN_SACK) { memcpy(&sack, &opt[i], sizeof(sack)); - pf_patch_32_unaligned(m, + pf_patch_32_unaligned(pd->m, &th->th_sum, &sack.start, htonl(ntohl(sack.start) - dst->seqdiff), PF_ALGNMNT(startoff), 0); - pf_patch_32_unaligned(m, &th->th_sum, + pf_patch_32_unaligned(pd->m, &th->th_sum, &sack.end, htonl(ntohl(sack.end) - dst->seqdiff), PF_ALGNMNT(startoff), @@ -3325,7 +3325,7 @@ pf_modulate_sack(struct mbuf *m, struct pf_pdesc *pd, } if (copyback) - m_copyback(m, pd->off + sizeof(*th), thoptlen, (caddr_t)opts); + m_copyback(pd->m, pd->off + sizeof(*th), thoptlen, (caddr_t)opts); return (copyback); } @@ -3634,7 +3634,7 @@ pf_send_tcp(const struct pf_krule *r, sa_family_t af, static void pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, - struct pf_state_key *sk, struct mbuf *m, struct tcphdr *th, + struct pf_state_key *sk, struct tcphdr *th, u_int16_t bproto_sum, u_int16_t bip_sum, u_short *reason, int rtableid) { @@ -3653,7 +3653,7 @@ pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, *pd->proto_sum = bproto_sum; if (pd->ip_sum) *pd->ip_sum = bip_sum; - m_copyback(m, pd->off, pd->hdrlen, pd->hdr.any); + m_copyback(pd->m, pd->off, pd->hdrlen, pd->hdr.any); } if (pd->proto == IPPROTO_TCP && ((r->rule_flag & PFRULE_RETURNRST) || @@ -3661,7 +3661,7 @@ pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, !(th->th_flags & TH_RST)) { u_int32_t ack = ntohl(th->th_seq) + pd->p_len; - if (pf_check_proto_cksum(m, pd->off, pd->tot_len - pd->off, + if (pf_check_proto_cksum(pd->m, pd->off, pd->tot_len - pd->off, IPPROTO_TCP, pd->af)) REASON_SET(reason, PFRES_PROTCKSUM); else { @@ -3679,11 +3679,11 @@ pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, pf_send_sctp_abort(pd->af, pd, r->return_ttl, rtableid); } else if (pd->proto != IPPROTO_ICMP && pd->af == AF_INET && r->return_icmp) - pf_send_icmp(m, r->return_icmp >> 8, + pf_send_icmp(pd->m, r->return_icmp >> 8, r->return_icmp & 255, pd->af, r, rtableid); else if (pd->proto != IPPROTO_ICMPV6 && pd->af == AF_INET6 && r->return_icmp6) - pf_send_icmp(m, r->return_icmp6 >> 8, + pf_send_icmp(pd->m, r->return_icmp6 >> 8, r->return_icmp6 & 255, pd->af, r, rtableid); } @@ -3950,12 +3950,12 @@ pf_match_rcvif(struct mbuf *m, struct pf_krule *r) } int -pf_tag_packet(struct mbuf *m, struct pf_pdesc *pd, int tag) +pf_tag_packet(struct pf_pdesc *pd, int tag) { KASSERT(tag > 0, ("%s: tag %d", __func__, tag)); - if (pd->pf_mtag == NULL && ((pd->pf_mtag = pf_get_mtag(m)) == NULL)) + if (pd->pf_mtag == NULL && ((pd->pf_mtag = pf_get_mtag(pd->m)) == NULL)) return (ENOMEM); pd->pf_mtag->tag = tag; @@ -4278,7 +4278,7 @@ pf_rule_to_actions(struct pf_krule *r, struct pf_rule_actions *a) } int -pf_socket_lookup(struct pf_pdesc *pd, struct mbuf *m) +pf_socket_lookup(struct pf_pdesc *pd) { struct pf_addr *saddr, *daddr; u_int16_t sport, dport; @@ -4318,11 +4318,11 @@ pf_socket_lookup(struct pf_pdesc *pd, struct mbuf *m) #ifdef INET case AF_INET: inp = in_pcblookup_mbuf(pi, saddr->v4, sport, daddr->v4, - dport, INPLOOKUP_RLOCKPCB, NULL, m); + dport, INPLOOKUP_RLOCKPCB, NULL, pd->m); if (inp == NULL) { inp = in_pcblookup_mbuf(pi, saddr->v4, sport, daddr->v4, dport, INPLOOKUP_WILDCARD | - INPLOOKUP_RLOCKPCB, NULL, m); + INPLOOKUP_RLOCKPCB, NULL, pd->m); if (inp == NULL) return (-1); } @@ -4331,11 +4331,11 @@ pf_socket_lookup(struct pf_pdesc *pd, struct mbuf *m) #ifdef INET6 case AF_INET6: inp = in6_pcblookup_mbuf(pi, &saddr->v6, sport, &daddr->v6, - dport, INPLOOKUP_RLOCKPCB, NULL, m); + dport, INPLOOKUP_RLOCKPCB, NULL, pd->m); if (inp == NULL) { inp = in6_pcblookup_mbuf(pi, &saddr->v6, sport, &daddr->v6, dport, INPLOOKUP_WILDCARD | - INPLOOKUP_RLOCKPCB, NULL, m); + INPLOOKUP_RLOCKPCB, NULL, pd->m); if (inp == NULL) return (-1); } @@ -4351,7 +4351,7 @@ pf_socket_lookup(struct pf_pdesc *pd, struct mbuf *m) } u_int8_t -pf_get_wscale(struct mbuf *m, struct pf_pdesc *pd) +pf_get_wscale(struct pf_pdesc *pd) { struct tcphdr *th = &pd->hdr.tcp; int hlen; @@ -4362,7 +4362,7 @@ pf_get_wscale(struct mbuf *m, struct pf_pdesc *pd) hlen = th->th_off << 2; /* hlen <= sizeof(hdr) */ if (hlen <= sizeof(struct tcphdr)) return (0); - if (!pf_pull_hdr(m, pd->off, hdr, hlen, NULL, NULL, pd->af)) + if (!pf_pull_hdr(pd->m, pd->off, hdr, hlen, NULL, NULL, pd->af)) return (0); opt = hdr + sizeof(struct tcphdr); hlen -= sizeof(struct tcphdr); @@ -4392,7 +4392,7 @@ pf_get_wscale(struct mbuf *m, struct pf_pdesc *pd) } u_int16_t -pf_get_mss(struct mbuf *m, struct pf_pdesc *pd) +pf_get_mss(struct pf_pdesc *pd) { struct tcphdr *th = &pd->hdr.tcp; int hlen; @@ -4403,7 +4403,7 @@ pf_get_mss(struct mbuf *m, struct pf_pdesc *pd) hlen = th->th_off << 2; /* hlen <= sizeof(hdr) */ if (hlen <= sizeof(struct tcphdr)) return (0); - if (!pf_pull_hdr(m, pd->off, hdr, hlen, NULL, NULL, pd->af)) + if (!pf_pull_hdr(pd->m, pd->off, hdr, hlen, NULL, NULL, pd->af)) return (0); opt = hdr + sizeof(struct tcphdr); hlen -= sizeof(struct tcphdr); @@ -4848,7 +4848,7 @@ pf_test_eth_rule(int dir, struct pfi_kkif *kif, struct mbuf **m0) static int pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, - struct mbuf *m, struct pf_pdesc *pd, struct pf_krule **am, + struct pf_pdesc *pd, struct pf_krule **am, struct pf_kruleset **rsm, struct inpcb *inp) { struct pf_krule *nr = NULL; @@ -4938,7 +4938,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); /* check packet for BINAT/NAT/RDR */ - transerror = pf_get_translation(pd, m, pd->off, &nsn, &sk, + transerror = pf_get_translation(pd, pd->off, &nsn, &sk, &nk, saddr, daddr, sport, dport, anchor_stack, &nr, &udp_mapping); switch (transerror) { default: @@ -4953,7 +4953,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, KASSERT(nk != NULL, ("%s: null nk", __func__)); if (nr->log) { - PFLOG_PACKET(m, PF_PASS, PFRES_MATCH, nr, a, + PFLOG_PACKET(PF_PASS, PFRES_MATCH, nr, a, ruleset, pd, 1); } @@ -4967,7 +4967,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, if (PF_ANEQ(saddr, &nk->addr[pd->sidx], pd->af) || nk->port[pd->sidx] != sport) { - pf_change_ap(m, saddr, &th->th_sport, pd->ip_sum, + pf_change_ap(pd->m, saddr, &th->th_sport, pd->ip_sum, &th->th_sum, &nk->addr[pd->sidx], nk->port[pd->sidx], 0, pd->af); pd->sport = &th->th_sport; @@ -4976,7 +4976,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, if (PF_ANEQ(daddr, &nk->addr[pd->didx], pd->af) || nk->port[pd->didx] != dport) { - pf_change_ap(m, daddr, &th->th_dport, pd->ip_sum, + pf_change_ap(pd->m, daddr, &th->th_dport, pd->ip_sum, &th->th_sum, &nk->addr[pd->didx], nk->port[pd->didx], 0, pd->af); dport = th->th_dport; @@ -4990,7 +4990,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, if (PF_ANEQ(saddr, &nk->addr[pd->sidx], pd->af) || nk->port[pd->sidx] != sport) { - pf_change_ap(m, saddr, &pd->hdr.udp.uh_sport, + pf_change_ap(pd->m, saddr, &pd->hdr.udp.uh_sport, pd->ip_sum, &pd->hdr.udp.uh_sum, &nk->addr[pd->sidx], nk->port[pd->sidx], 1, pd->af); @@ -5000,7 +5000,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, if (PF_ANEQ(daddr, &nk->addr[pd->didx], pd->af) || nk->port[pd->didx] != dport) { - pf_change_ap(m, daddr, &pd->hdr.udp.uh_dport, + pf_change_ap(pd->m, daddr, &pd->hdr.udp.uh_dport, pd->ip_sum, &pd->hdr.udp.uh_sum, &nk->addr[pd->didx], nk->port[pd->didx], 1, pd->af); @@ -5014,14 +5014,14 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, if (PF_ANEQ(saddr, &nk->addr[pd->sidx], pd->af) || nk->port[pd->sidx] != sport) { - pf_change_ap(m, saddr, &pd->hdr.sctp.src_port, + pf_change_ap(pd->m, saddr, &pd->hdr.sctp.src_port, pd->ip_sum, &checksum, &nk->addr[pd->sidx], nk->port[pd->sidx], 1, pd->af); } if (PF_ANEQ(daddr, &nk->addr[pd->didx], pd->af) || nk->port[pd->didx] != dport) { - pf_change_ap(m, daddr, &pd->hdr.sctp.dest_port, + pf_change_ap(pd->m, daddr, &pd->hdr.sctp.dest_port, pd->ip_sum, &checksum, &nk->addr[pd->didx], nk->port[pd->didx], 1, pd->af); @@ -5046,7 +5046,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, pd->hdr.icmp.icmp_id = nk->port[pd->sidx]; pd->sport = &pd->hdr.icmp.icmp_id; } - m_copyback(m, pd->off, ICMP_MINLEN, (caddr_t)&pd->hdr.icmp); + m_copyback(pd->m, pd->off, ICMP_MINLEN, (caddr_t)&pd->hdr.icmp); break; #endif /* INET */ #ifdef INET6 @@ -5107,10 +5107,10 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, PF_TEST_ATTRIB(r->proto && r->proto != pd->proto, r->skip[PF_SKIP_PROTO]); PF_TEST_ATTRIB(PF_MISMATCHAW(&r->src.addr, saddr, pd->af, - r->src.neg, pd->kif, M_GETFIB(m)), + r->src.neg, pd->kif, M_GETFIB(pd->m)), r->skip[PF_SKIP_SRC_ADDR]); PF_TEST_ATTRIB(PF_MISMATCHAW(&r->dst.addr, daddr, pd->af, - r->dst.neg, NULL, M_GETFIB(m)), + r->dst.neg, NULL, M_GETFIB(pd->m)), r->skip[PF_SKIP_DST_ADDR]); switch (pd->virtual_proto) { case PF_VPROTO_FRAGMENT: @@ -5143,13 +5143,13 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, r->skip[PF_SKIP_DST_PORT]); /* tcp/udp only. uid.op always 0 in other cases */ PF_TEST_ATTRIB(r->uid.op && (pd->lookup.done || (pd->lookup.done = - pf_socket_lookup(pd, m), 1)) && + pf_socket_lookup(pd), 1)) && !pf_match_uid(r->uid.op, r->uid.uid[0], r->uid.uid[1], pd->lookup.uid), TAILQ_NEXT(r, entries)); /* tcp/udp only. gid.op always 0 in other cases */ PF_TEST_ATTRIB(r->gid.op && (pd->lookup.done || (pd->lookup.done = - pf_socket_lookup(pd, m), 1)) && + pf_socket_lookup(pd), 1)) && !pf_match_gid(r->gid.op, r->gid.gid[0], r->gid.gid[1], pd->lookup.gid), TAILQ_NEXT(r, entries)); @@ -5171,22 +5171,22 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, PF_TEST_ATTRIB(r->tos && !(r->tos == pd->tos), TAILQ_NEXT(r, entries)); PF_TEST_ATTRIB(r->prio && - !pf_match_ieee8021q_pcp(r->prio, m), + !pf_match_ieee8021q_pcp(r->prio, pd->m), TAILQ_NEXT(r, entries)); PF_TEST_ATTRIB(r->prob && r->prob <= arc4random(), TAILQ_NEXT(r, entries)); - PF_TEST_ATTRIB(r->match_tag && !pf_match_tag(m, r, &tag, + PF_TEST_ATTRIB(r->match_tag && !pf_match_tag(pd->m, r, &tag, pd->pf_mtag ? pd->pf_mtag->tag : 0), TAILQ_NEXT(r, entries)); - PF_TEST_ATTRIB(r->rcv_kif && !pf_match_rcvif(m, r), + PF_TEST_ATTRIB(r->rcv_kif && !pf_match_rcvif(pd->m, r), TAILQ_NEXT(r, entries)); PF_TEST_ATTRIB((r->rule_flag & PFRULE_FRAGMENT && pd->virtual_proto != PF_VPROTO_FRAGMENT), TAILQ_NEXT(r, entries)); PF_TEST_ATTRIB(r->os_fingerprint != PF_OSFP_ANY && (pd->virtual_proto != IPPROTO_TCP || !pf_osfp_match( - pf_osfp_fingerprint(pd, m, th), + pf_osfp_fingerprint(pd, th), r->os_fingerprint)), TAILQ_NEXT(r, entries)); /* FALLTHROUGH */ @@ -5207,8 +5207,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, pf_counter_u64_critical_exit(); pf_rule_to_actions(r, &pd->act); if (r->log || pd->act.log & PF_LOG_MATCHES) - PFLOG_PACKET(m, - r->action, PFRES_MATCH, r, + PFLOG_PACKET(r->action, PFRES_MATCH, r, a, ruleset, pd, 1); } else { match = 1; @@ -5216,8 +5215,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, *am = a; *rsm = ruleset; if (pd->act.log & PF_LOG_MATCHES) - PFLOG_PACKET(m, - r->action, PFRES_MATCH, r, + PFLOG_PACKET(r->action, PFRES_MATCH, r, a, ruleset, pd, 1); } if ((*rm)->quick) @@ -5243,8 +5241,8 @@ nextrule: if (r->log || pd->act.log & PF_LOG_MATCHES) { if (rewrite) - m_copyback(m, pd->off, pd->hdrlen, pd->hdr.any); - PFLOG_PACKET(m, r->action, reason, r, a, ruleset, pd, 1); + m_copyback(pd->m, pd->off, pd->hdrlen, pd->hdr.any); + PFLOG_PACKET(r->action, reason, r, a, ruleset, pd, 1); } if (pd->virtual_proto != PF_VPROTO_FRAGMENT && @@ -5252,32 +5250,32 @@ nextrule: ((r->rule_flag & PFRULE_RETURNRST) || (r->rule_flag & PFRULE_RETURNICMP) || (r->rule_flag & PFRULE_RETURN))) { - pf_return(r, nr, pd, sk, m, th, bproto_sum, + pf_return(r, nr, pd, sk, th, bproto_sum, bip_sum, &reason, r->rtableid); } if (r->action == PF_DROP) goto cleanup; - if (tag > 0 && pf_tag_packet(m, pd, tag)) { + if (tag > 0 && pf_tag_packet(pd, tag)) { REASON_SET(&reason, PFRES_MEMORY); goto cleanup; } if (pd->act.rtableid >= 0) - M_SETFIB(m, pd->act.rtableid); + M_SETFIB(pd->m, pd->act.rtableid); if (pd->virtual_proto != PF_VPROTO_FRAGMENT && (!state_icmp && (r->keep_state || nr != NULL || (pd->flags & PFDESC_TCP_NORM)))) { int action; - action = pf_create_state(r, nr, a, pd, nsn, nk, sk, m, + action = pf_create_state(r, nr, a, pd, nsn, nk, sk, sport, dport, &rewrite, sm, tag, bproto_sum, bip_sum, &match_rules, udp_mapping); if (action != PF_PASS) { pf_udp_mapping_release(udp_mapping); if (action == PF_DROP && (r->rule_flag & PFRULE_RETURN)) - pf_return(r, nr, pd, sk, m, th, + pf_return(r, nr, pd, sk, th, bproto_sum, bip_sum, &reason, pd->act.rtableid); return (action); @@ -5295,11 +5293,11 @@ nextrule: /* copy back packet headers if we performed NAT operations */ if (rewrite) - m_copyback(m, pd->off, pd->hdrlen, pd->hdr.any); + m_copyback(pd->m, pd->off, pd->hdrlen, pd->hdr.any); if (*sm != NULL && !((*sm)->state_flags & PFSTATE_NOSYNC) && pd->dir == PF_OUT && - V_pfsync_defer_ptr != NULL && V_pfsync_defer_ptr(*sm, m)) + V_pfsync_defer_ptr != NULL && V_pfsync_defer_ptr(*sm, pd->m)) /* * We want the state created, but we dont * want to send this in case a partner @@ -5326,7 +5324,7 @@ cleanup: static int pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, struct pf_pdesc *pd, struct pf_ksrc_node *nsn, struct pf_state_key *nk, - struct pf_state_key *sk, struct mbuf *m, u_int16_t sport, + struct pf_state_key *sk, u_int16_t sport, u_int16_t dport, int *rewrite, struct pf_kstate **sm, int tag, u_int16_t bproto_sum, u_int16_t bip_sum, struct pf_krule_slist *match_rules, struct pf_udp_mapping *udp_mapping) @@ -5397,14 +5395,14 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, if ((s->src.seqdiff = pf_tcp_iss(pd) - s->src.seqlo) == 0) s->src.seqdiff = 1; - pf_change_proto_a(m, &th->th_seq, &th->th_sum, + pf_change_proto_a(pd->m, &th->th_seq, &th->th_sum, htonl(s->src.seqlo + s->src.seqdiff), 0); *rewrite = 1; } else s->src.seqdiff = 0; if (th->th_flags & TH_SYN) { s->src.seqhi++; - s->src.wscale = pf_get_wscale(m, pd); + s->src.wscale = pf_get_wscale(pd); } s->src.max_win = MAX(ntohs(th->th_win), 1); if (s->src.wscale & PF_WSCALE_MASK) { @@ -5464,12 +5462,12 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, } if (pd->proto == IPPROTO_TCP) { if (s->state_flags & PFSTATE_SCRUB_TCP && - pf_normalize_tcp_init(m, pd, th, &s->src, &s->dst)) { + pf_normalize_tcp_init(pd, th, &s->src, &s->dst)) { REASON_SET(&reason, PFRES_MEMORY); goto csfailed; } if (s->state_flags & PFSTATE_SCRUB_TCP && s->src.scrub && - pf_normalize_tcp_stateful(m, pd, &reason, th, s, + pf_normalize_tcp_stateful(pd, &reason, th, s, &s->src, &s->dst, rewrite)) { /* This really shouldn't happen!!! */ DPFPRINTF(PF_DEBUG_URGENT, @@ -5478,7 +5476,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, goto csfailed; } } else if (pd->proto == IPPROTO_SCTP) { - if (pf_normalize_sctp_init(m, pd, &s->src, &s->dst)) + if (pf_normalize_sctp_init(pd, &s->src, &s->dst)) goto csfailed; if (! (pd->sctp_flags & (PFDESC_SCTP_INIT | PFDESC_SCTP_ADD_IP))) goto csfailed; @@ -5491,7 +5489,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, if (nr == NULL) { KASSERT((sk == NULL && nk == NULL), ("%s: nr %p sk %p, nk %p", __func__, nr, sk, nk)); - sk = pf_state_key_setup(pd, m, pd->src, pd->dst, sport, dport); + sk = pf_state_key_setup(pd, pd->src, pd->dst, sport, dport); if (sk == NULL) goto csfailed; nk = sk; @@ -5528,12 +5526,12 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, *pd->proto_sum = bproto_sum; if (pd->ip_sum) *pd->ip_sum = bip_sum; - m_copyback(m, pd->off, pd->hdrlen, pd->hdr.any); + m_copyback(pd->m, pd->off, pd->hdrlen, pd->hdr.any); } s->src.seqhi = htonl(arc4random()); /* Find mss option */ - int rtid = M_GETFIB(m); - mss = pf_get_mss(m, pd); + int rtid = M_GETFIB(pd->m); + mss = pf_get_mss(pd); mss = pf_calc_mss(pd->src, pd->af, rtid, mss); mss = pf_calc_mss(pd->dst, pd->af, rtid, mss); s->src.mss = mss; @@ -5592,8 +5590,8 @@ drop: } static int -pf_tcp_track_full(struct pf_kstate **state, struct mbuf *m, - struct pf_pdesc *pd, u_short *reason, int *copyback) +pf_tcp_track_full(struct pf_kstate **state, struct pf_pdesc *pd, + u_short *reason, int *copyback) { struct tcphdr *th = &pd->hdr.tcp; struct pf_state_peer *src, *dst; @@ -5632,7 +5630,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct mbuf *m, if (((*state)->state_flags & PFSTATE_SCRUB_TCP || dst->scrub) && src->scrub == NULL) { - if (pf_normalize_tcp_init(m, pd, th, src, dst)) { + if (pf_normalize_tcp_init(pd, th, src, dst)) { REASON_SET(reason, PFRES_MEMORY); return (PF_DROP); } @@ -5644,9 +5642,9 @@ pf_tcp_track_full(struct pf_kstate **state, struct mbuf *m, while ((src->seqdiff = arc4random() - seq) == 0) ; ack = ntohl(th->th_ack) - dst->seqdiff; - pf_change_proto_a(m, &th->th_seq, &th->th_sum, htonl(seq + + pf_change_proto_a(pd->m, &th->th_seq, &th->th_sum, htonl(seq + src->seqdiff), 0); - pf_change_proto_a(m, &th->th_ack, &th->th_sum, htonl(ack), 0); + pf_change_proto_a(pd->m, &th->th_ack, &th->th_sum, htonl(ack), 0); *copyback = 1; } else { ack = ntohl(th->th_ack); @@ -5656,7 +5654,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct mbuf *m, if (th->th_flags & TH_SYN) { end++; if (dst->wscale & PF_WSCALE_FLAG) { - src->wscale = pf_get_wscale(m, pd); + src->wscale = pf_get_wscale(pd); if (src->wscale & PF_WSCALE_FLAG) { /* Remove scale factor from initial * window */ @@ -5697,9 +5695,9 @@ pf_tcp_track_full(struct pf_kstate **state, struct mbuf *m, ack = ntohl(th->th_ack) - dst->seqdiff; if (src->seqdiff) { /* Modulate sequence numbers */ - pf_change_proto_a(m, &th->th_seq, &th->th_sum, htonl(seq + + pf_change_proto_a(pd->m, &th->th_seq, &th->th_sum, htonl(seq + src->seqdiff), 0); - pf_change_proto_a(m, &th->th_ack, &th->th_sum, htonl(ack), 0); + pf_change_proto_a(pd->m, &th->th_ack, &th->th_sum, htonl(ack), 0); *copyback = 1; } end = seq + pd->p_len; @@ -5745,7 +5743,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct mbuf *m, * options anyway. */ if (dst->seqdiff && (th->th_off << 2) > sizeof(struct tcphdr)) { - if (pf_modulate_sack(m, pd, th, dst)) + if (pf_modulate_sack(pd, th, dst)) *copyback = 1; } @@ -5763,7 +5761,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct mbuf *m, /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { - if (pf_normalize_tcp_stateful(m, pd, reason, th, + if (pf_normalize_tcp_stateful(pd, reason, th, *state, src, dst, copyback)) return (PF_DROP); } @@ -5863,7 +5861,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct mbuf *m, } if (dst->scrub || src->scrub) { - if (pf_normalize_tcp_stateful(m, pd, reason, th, + if (pf_normalize_tcp_stateful(pd, reason, th, *state, src, dst, copyback)) return (PF_DROP); } @@ -6112,8 +6110,8 @@ pf_synproxy(struct pf_pdesc *pd, struct pf_kstate **state, u_short *reason) } static int -pf_test_state_tcp(struct pf_kstate **state, struct mbuf *m, - struct pf_pdesc *pd, u_short *reason) +pf_test_state_tcp(struct pf_kstate **state, struct pf_pdesc *pd, + u_short *reason) { struct pf_state_key_cmp key; struct tcphdr *th = &pd->hdr.tcp; @@ -6171,7 +6169,7 @@ pf_test_state_tcp(struct pf_kstate **state, struct mbuf *m, if (pf_tcp_track_sloppy(state, pd, reason) == PF_DROP) return (PF_DROP); } else { - if (pf_tcp_track_full(state, m, pd, reason, + if (pf_tcp_track_full(state, pd, reason, ©back) == PF_DROP) return (PF_DROP); } @@ -6182,13 +6180,13 @@ pf_test_state_tcp(struct pf_kstate **state, struct mbuf *m, if (PF_ANEQ(pd->src, &nk->addr[pd->sidx], pd->af) || nk->port[pd->sidx] != th->th_sport) - pf_change_ap(m, pd->src, &th->th_sport, + pf_change_ap(pd->m, pd->src, &th->th_sport, pd->ip_sum, &th->th_sum, &nk->addr[pd->sidx], nk->port[pd->sidx], 0, pd->af); if (PF_ANEQ(pd->dst, &nk->addr[pd->didx], pd->af) || nk->port[pd->didx] != th->th_dport) - pf_change_ap(m, pd->dst, &th->th_dport, + pf_change_ap(pd->m, pd->dst, &th->th_dport, pd->ip_sum, &th->th_sum, &nk->addr[pd->didx], nk->port[pd->didx], 0, pd->af); copyback = 1; @@ -6196,14 +6194,13 @@ pf_test_state_tcp(struct pf_kstate **state, struct mbuf *m, /* Copyback sequence modulation or stateful scrub changes if needed */ if (copyback) - m_copyback(m, pd->off, sizeof(*th), (caddr_t)th); + m_copyback(pd->m, pd->off, sizeof(*th), (caddr_t)th); return (PF_PASS); } static int -pf_test_state_udp(struct pf_kstate **state, struct mbuf *m, - struct pf_pdesc *pd) +pf_test_state_udp(struct pf_kstate **state, struct pf_pdesc *pd) { struct pf_state_peer *src, *dst; struct pf_state_key_cmp key; @@ -6258,24 +6255,24 @@ pf_test_state_udp(struct pf_kstate **state, struct mbuf *m, if (PF_ANEQ(pd->src, &nk->addr[pd->sidx], pd->af) || nk->port[pd->sidx] != uh->uh_sport) - pf_change_ap(m, pd->src, &uh->uh_sport, pd->ip_sum, + pf_change_ap(pd->m, pd->src, &uh->uh_sport, pd->ip_sum, &uh->uh_sum, &nk->addr[pd->sidx], nk->port[pd->sidx], 1, pd->af); if (PF_ANEQ(pd->dst, &nk->addr[pd->didx], pd->af) || nk->port[pd->didx] != uh->uh_dport) - pf_change_ap(m, pd->dst, &uh->uh_dport, pd->ip_sum, + pf_change_ap(pd->m, pd->dst, &uh->uh_dport, pd->ip_sum, &uh->uh_sum, &nk->addr[pd->didx], nk->port[pd->didx], 1, pd->af); - m_copyback(m, pd->off, sizeof(*uh), (caddr_t)uh); + m_copyback(pd->m, pd->off, sizeof(*uh), (caddr_t)uh); } return (PF_PASS); } static int -pf_test_state_sctp(struct pf_kstate **state, struct mbuf *m, - struct pf_pdesc *pd, u_short *reason) +pf_test_state_sctp(struct pf_kstate **state, struct pf_pdesc *pd, + u_short *reason) { struct pf_state_key_cmp key; struct pf_state_peer *src, *dst; *** 1556 LINES SKIPPED *** From nobody Thu Oct 10 13:02:54 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPVKp6pCYz5Z1vZ; Thu, 10 Oct 2024 13:02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPVKp5W82z4S3d; Thu, 10 Oct 2024 13:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728565374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=01dIRcGMoYVAXdBMqCvbNTEU9s/8Cis7cdOC8v37qhE=; b=oJhrol3kdbJ3l5PyaO194kEjJZPvL+eXACuAxCaaPaPZIJwmzHz2d5Q0XGtIyc+sTUtA8S mwik0CdQScnkBsbPxLr7ba26fllTJmWO2KfNSmxw4msMGDB/JrjRQFqcK25Z89MngGUpOu SueBBSXV0FtHpqAW75ibFUjoxDr0Yhyyf305ztHQBE9VPvjGprNk5Ox1ISF0PF5ZFt1RMx p2el8ivvfvBTlMG0QSe7wnzpoDK4dE/5o/kYQBQBPR5DBCijNKCln4Tefv1g4argXbGjiE uqXvmVFi9DHuvbm/jo+jRwRjSNDTyMIwmyeVNkhvdV6gVPF7oSycNaE3Qzfpzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728565374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=01dIRcGMoYVAXdBMqCvbNTEU9s/8Cis7cdOC8v37qhE=; b=C4zTPaAeTKbaTqgabfe2fL0ZZi+/gM4VjGReFPMUCisJMrxQ5Af9FZmO4OdxlcZpzGRwWl agMc9cP8lx2ZAwI6lyujpcAr3FkGmIuuokSiR95OrreOo0pGyODYOT8SsoflVrPYNhtC8u PhLJZ3aw+saL6AmTFaTKdAjrX49/84oIx6IJd4V0AcnNoUG5EVX+xt1LJ+lEFo5/syRPhF egJiyzv0w0b7dKYK1V9k0dMuudRLWal/q0yiv1HjOUV7T3zTN6CvNEqUHqwqR/LRl0uab4 MfxpalzDHO0oEp4oDGzTo3ixahGo0fBw+z8vJQmLIauQ+xMCWvcwnwxpf5Y0kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728565374; a=rsa-sha256; cv=none; b=tafGjQX2nRQI5yY5G0xyVvCc5kDouJNpqHwW5UHymi/emyEIFmCCe0R+lMKvS69yfd0m0a RdDp+yTqva6HN7z3CB5J6JUlJGUVbCvfNcT/jGSAaVcOEWPhrgnBj6cQftVnxQ3myvnpip mUlKBEizB/JAXLmgG3ZrLBv+q8bWishNl9EUgkehDIbQnZjEfO57RxBybgRsmwgbHj/jna sMQZxoUmV+7tvnJFVguF1JNfplT9mllj2aet8owuV93YBGJRwo+I6xu4vEmgiUxOxKt04r 0PbHJQJi2vtV1l2Q+p+P1EAgZJE8+guFDSQpmYFglz4NnTNvRJbedsJoa8qmpQ== 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 4XPVKp4zllzyGq; Thu, 10 Oct 2024 13:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49AD2sRj058387; Thu, 10 Oct 2024 13:02:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49AD2sjI058384; Thu, 10 Oct 2024 13:02:54 GMT (envelope-from git) Date: Thu, 10 Oct 2024 13:02:54 GMT Message-Id: <202410101302.49AD2sjI058384@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 0fbfb22a2d4d - main - hier(7): fix manpage location in ports List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fbfb22a2d4d542e2f3d5d0eadd37e0d132a3884 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0fbfb22a2d4d542e2f3d5d0eadd37e0d132a3884 commit 0fbfb22a2d4d542e2f3d5d0eadd37e0d132a3884 Author: Baptiste Daroussin AuthorDate: 2024-10-10 13:00:41 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-10 13:02:47 +0000 hier(7): fix manpage location in ports Since 2020-01-15 the ports manpage are locate in /usr/local/share/man --- share/man/man7/hier.7 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index e0a6ff3dfefc..949b521ab3d9 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 18, 2024 +.Dd October 10, 2024 .Dt HIER 7 .Os .Sh NAME @@ -499,9 +499,6 @@ local 32-bit compatability libraries local utility data files .It Pa libexec/ utilities executed by local utilities -.It Pa man/ -local manual pages; see -.Xr man 1 .It Pa sbin/ local administration utilities .It Pa share/ @@ -512,6 +509,9 @@ local documentation articles, books, FAQ, and handbooks available from the .Fx project +.It Pa share/man/ +local manual pages; see +.Xr man 1 .El .Pp .It Pa obj/ From nobody Thu Oct 10 13:19:40 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPVj83HQQz5Z2Tv; Thu, 10 Oct 2024 13:19: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPVj82T4Bz4WcC; Thu, 10 Oct 2024 13:19:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728566380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5p/sCNUNb0GqJw028bFPRtmMxOMu0BqF3YwPeoezvzo=; b=eu/ZfD2T7DXH4GgBXKy5BfVFN2o6m0cuxFcYjL6TNo2p+OxJXKXRwN+hdruQe4DENT7Mj2 FPPJtmHcEoiCYj4VCVm2L2qXcHI7ilLcH+NSQcWprJ/EDeu19kPqsclm5UNcuzmG9ZlNJU wNPJrTjPvkWwqYlfa5JNALKRAzC79FEJkAgmYj6FZD0/xZTN8NNwDy2qIe264qG1oO/xI1 2Q5EiCwrtOIpZO8b7vO2JzBa6+fb/ECr7e0dDg0nQ7CHRWKPbmkIjkTcouOfwy3LqvoLnk WuwB5NAaRw90kwDhUkgvO/tE/MAqJ0Vob9l5dAFovIsMAfGUf9dDCwag23CNog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728566380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5p/sCNUNb0GqJw028bFPRtmMxOMu0BqF3YwPeoezvzo=; b=m6Ufd6sgr8Vg2p3zxX04r79zcl0jTq2ceEGN1ZXVMlYIBO2BwAJMPFQNxD/1E+Z5kCHFXi EPFZnu0YEd0VMRKSecxgMEpxfA/H/784BHJyGClMUSZ60R9LxzFz/mOLDK/sI8og8MQjXk 13SFzo/wXxFLZDAdfrbMLXuh2nkvTcyQNA+AOlwFOIEeJ+O80CL9F12QizDa150D5IjxzE P/MNR+psrJgWNAucdxGuahEMvZh70xO5RE4tqsel70nhSO9CcjsKI0q3u78nrlGlMGm2bb /Hr19YNZrYrPE1M4gOwQmHqrcwgX5B+drZy0r8Za1AodXPQVCUoxPqw821HArQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728566380; a=rsa-sha256; cv=none; b=qSesLidPhyeePa9HvIHgLXPAdMa8B1hGj3z9BPc0U0HqTc8ms9+SdyjXH8pFKMAVbzgK04 Hxjd88x9wvCtTFOJocqWLZYmR26D+L513RTUFhrPxFU7LnHLYoEbhbHV29lFBv83tQV5aW kz/uQYcn9N2YNhMuyh1X77h1LLr9sw7eeL910bv7lLJFczggPH64xpL2KdeWKlB0uk4doI jUudsvItycnZwnD3KLH1rvJowpTMBEuDaUB7/Ym+jEIhKQj+LIVShmGUI7LI9MRBl20Zxn vZqetX5XS83UzJQnXGACF+9Y3Dmh3bOTBX0iwVZ+yPsTDqMV6UVcreNetyYfFg== 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 4XPVj8240bz102h; Thu, 10 Oct 2024 13:19:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ADJe1N075841; Thu, 10 Oct 2024 13:19:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ADJeDZ075838; Thu, 10 Oct 2024 13:19:40 GMT (envelope-from git) Date: Thu, 10 Oct 2024 13:19:40 GMT Message-Id: <202410101319.49ADJeDZ075838@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8e5b07dd0885 - main - mlx5_ipsec: add enough #ifdef IPSEC_OFFLOAD to make LINT_NOIP compilable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e5b07dd08853f5d910d826bf28d3ae5bccd5a63 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8e5b07dd08853f5d910d826bf28d3ae5bccd5a63 commit 8e5b07dd08853f5d910d826bf28d3ae5bccd5a63 Author: Konstantin Belousov AuthorDate: 2024-10-10 12:53:31 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-10 13:18:11 +0000 mlx5_ipsec: add enough #ifdef IPSEC_OFFLOAD to make LINT_NOIP compilable Reported by: kp Sponsored by: NVidia networking Fixes: 2851aafe96c1e357971f2b331fff837ead20522b --- sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c b/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c index 95afec40d4f6..159c82500a9f 100644 --- a/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c +++ b/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c @@ -328,7 +328,9 @@ mlx5e_if_sa_newkey_onedir(struct ifnet *ifp, void *sav, int dir, u_int drv_spi, struct mlx5e_ipsec_sa_entry **privp, struct mlx5e_ipsec_priv_bothdir *pb, struct ifnet *ifpo) { +#ifdef IPSEC_OFFLOAD struct rm_priotracker tracker; +#endif struct mlx5e_ipsec_sa_entry *sa_entry = NULL; struct mlx5e_priv *priv = if_getsoftc(ifp); struct mlx5_core_dev *mdev = priv->mdev; @@ -342,9 +344,13 @@ mlx5e_if_sa_newkey_onedir(struct ifnet *ifp, void *sav, int dir, u_int drv_spi, if (if_gettype(ifpo) == IFT_L2VLAN) VLAN_TAG(ifpo, &vid); +#ifdef IPSEC_OFFLOAD ipsec_sahtree_rlock(&tracker); +#endif err = mlx5e_xfrm_validate_state(mdev, sav); +#ifdef IPSEC_OFFLOAD ipsec_sahtree_runlock(&tracker); +#endif if (err) return err; @@ -359,14 +365,20 @@ mlx5e_if_sa_newkey_onedir(struct ifnet *ifp, void *sav, int dir, u_int drv_spi, sa_entry->ipsec = ipsec; sa_entry->vid = vid; +#ifdef IPSEC_OFFLOAD ipsec_sahtree_rlock(&tracker); +#endif err = mlx5e_xfrm_validate_state(mdev, sav); if (err != 0) { +#ifdef IPSEC_OFFLOAD ipsec_sahtree_runlock(&tracker); +#endif goto err_xfrm; } mlx5e_ipsec_build_accel_xfrm_attrs(sa_entry, &sa_entry->attrs, dir); +#ifdef IPSEC_OFFLOAD ipsec_sahtree_runlock(&tracker); +#endif err = mlx5e_ipsec_create_dwork(sa_entry, pb); if (err) From nobody Thu Oct 10 13:52:01 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPWQV1025z5Z49L; Thu, 10 Oct 2024 13:52: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPWQV0YG6z4bnR; Thu, 10 Oct 2024 13:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728568322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B7fgZQpHX3WGKjjdSmYgJSSjGCR8OKrCYt59sYhrQPY=; b=U52yG00VKO7bo28/P4asTeSTgoyCDVEhICc8IPF5bEgb8DtWFPBfD8UZMC9n9DvGJM2HII O0JG3W6ddRcSEpX7EPLLTsCWI7io7ihVQDzdPiI2IleGtYd5vPwNiMazexTfc9llxyxh2D 32SONMCF9BumO0NtYbbQETmpNmAFdkORvyTkcBSixamuJFbiGSaP4zd0DMv652xMq4mGFp ndY1tPxPKZE8be0FNNom6kbwSZ0sK6qipx9o1e1mpzssFTQni3UrAaH+/Eg2ms9T8CxCPj kZjQ5zpMDjRuASwbVHT9u7A4S94ToeoX3jTw9nnukTG+Oes+kQnQy44yaUAIwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728568322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B7fgZQpHX3WGKjjdSmYgJSSjGCR8OKrCYt59sYhrQPY=; b=Y8cVTJRkpI/QQyRVaL0zYlTehAP76cy27/yaTNXGlZp4WbmnHhlKYqItcyaiO0Qy9Kn2RA yCxBY6u9cZucfYkfU62AA0ci2zoqAebD1VvRC0IsW3qjJR5hHrB4pvHRvxt/awxvnx5NoX 2KOXJCg5zwoKSBBshmWZ4hcs4CCv0wwRy30mk5sXvQdquoogpC6qFsXWIX3V6Mcqwv4csp opV++I7qoFGO3YtO/8KMXr9LkcbAbT0TqRLGn6nZGeusYOOCapThSp33FSwhGEOuzbUFeB qo0JsnFju86w2/FHjYBAod6ZwrE/XQOHaFdNCVcW35Z5w/QtZfmYUgpg36S9Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728568322; a=rsa-sha256; cv=none; b=xvqZo2V/luEycExYiDGtGVDBueM0upFQrGDCU43ue/vD425YAJ5oTHnJm2sG+tj6MkMfLm 6k3oHoOi681Xkggi3t6PiHVtJHLpV8INlDvm35c7BIWYdE63iLHWGAoVMKBb6wx/6xMExd m3w+WUGyXuU0tTZsAQH74hzjCSp3ZXQZpVGxEPkrE3qBLuLcPd181mi57OUxvWlpo4GJye cmEE8+QOum1NkjjNcQB704rod/oUqwyMEG6YRcBY/30SUfzxo60xmcRfogyMNV5mxPitW5 2NVG9UaycSn0YBR492uKqvKZslh/rPVb/3O18CjPKaxvBZIS0++sLtBa340wQg== 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 4XPWQV08x2z10qY; Thu, 10 Oct 2024 13:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ADq1br038184; Thu, 10 Oct 2024 13:52:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ADq1Ul038181; Thu, 10 Oct 2024 13:52:01 GMT (envelope-from git) Date: Thu, 10 Oct 2024 13:52:01 GMT Message-Id: <202410101352.49ADq1Ul038181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 4466a97e83fd - main - sctp: check locking requirements List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4466a97e83fd9484cb22dd2867b6972f6b185e8b Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4466a97e83fd9484cb22dd2867b6972f6b185e8b commit 4466a97e83fd9484cb22dd2867b6972f6b185e8b Author: Michael Tuexen AuthorDate: 2024-10-10 13:50:41 +0000 Commit: Michael Tuexen CommitDate: 2024-10-10 13:50:41 +0000 sctp: check locking requirements Actually assert the locking instead of describing it in a comment. No functional change intended. MFC after: 3 days --- sys/netinet/sctp_pcb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index d9dfc4b32821..a1509229f593 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -378,13 +378,13 @@ out: /*- * Add an ifa to an ifn. * Register the interface as necessary. - * NOTE: ADDR write lock MUST be held. */ static void sctp_add_ifa_to_ifn(struct sctp_ifn *sctp_ifnp, struct sctp_ifa *sctp_ifap) { int ifa_af; + SCTP_IPI_ADDR_WLOCK_ASSERT(); LIST_INSERT_HEAD(&sctp_ifnp->ifalist, sctp_ifap, next_ifa); sctp_ifap->ifn_p = sctp_ifnp; atomic_add_int(&sctp_ifap->ifn_p->refcount, 1); @@ -415,11 +415,11 @@ sctp_add_ifa_to_ifn(struct sctp_ifn *sctp_ifnp, struct sctp_ifa *sctp_ifap) * Remove an ifa from its ifn. * If no more addresses exist, remove the ifn too. Otherwise, re-register * the interface based on the remaining address families left. - * NOTE: ADDR write lock MUST be held. */ static void sctp_remove_ifa_from_ifn(struct sctp_ifa *sctp_ifap) { + SCTP_IPI_ADDR_WLOCK_ASSERT(); LIST_REMOVE(sctp_ifap, next_ifa); if (sctp_ifap->ifn_p) { /* update address counts */ From nobody Thu Oct 10 16:08:48 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPZSJ24KLz5ZF0X; Thu, 10 Oct 2024 16:08: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPZSJ1Yjpz4y7w; Thu, 10 Oct 2024 16:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728576528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3r9qAjkBplkQlFTwOi2JZ7u8t0LEiXYlwfZ78fJ9c4A=; b=vKdXag2jbf5CrYKhScg1fkbD7LK7qDRaI4ocF3cJq89O8LzoYvidAw/Q8v87ULGM71BQiI 3c0wk6sHgLvE+chXClwkuD8ihg+c0xfeG7Ar6o+Y6ll7AR6fuVzPjZ3usfegxxSPRepmDS DthFcathbnBwr25fMAaZpP7FWyTcZzsuRMZdzqiGcNUJ6raSwgWG6zIyXW2uVZei0xwuIu LaJ7dPxj1+e7YayD47cK5HMovUt3b2BSRhRQm6VyoNATByL4l7AYvGSYQVLll+8LsvyxZA ViZ3KD89js/GfRRIhA6nMtqJwEN8iOfhZI7f+i/aiUHFomy6rhEbBzMGH/HJ6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728576528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3r9qAjkBplkQlFTwOi2JZ7u8t0LEiXYlwfZ78fJ9c4A=; b=nMh0yzP/tYuSSi84Tw5BaafLJSzc7v74AfaBKA8bXlB2bVH355BIJGv2LlL9Jzc6if8s0g 7SS9SEoZOJkuu8k/9ZkdkOzfIpZdTLsatHTj98lPPyF8LaMUkwNyvZyzgP+1pXdnOLhQtS n3v7NGOPA8ChWcnUvUcNZZMt78Aj+D2yAUMZtCud8PStroRq8Vxe9YcF/H0rYcZBwOsm2w GhdowxrVQS+Qqb0MTTQarX3z2/09yEvR+MZh37xFUrVNaB/VwPCW16hCn1e1qUgT2g5frD C8Z9n37ReYlxdvfRhshp5mV2t4rBoKLi4nkuPhCcfOpH/Tgv0M4UYPLnRyeyjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728576528; a=rsa-sha256; cv=none; b=UE2c6rLZf6iWwlhjXyZBZ6YC6Qu5zSbtUdju58KFeLHELbZkCsstGRgHy87LTtVQwgA2Xm 3iaoOpmaa4QW07vyCZfE0QYqAc2W4yevzJpmnOBdoUFD1Ot3V4vFpdzrbpgRIPhvY1NZUA Qr9EefkCJApnIaXgDWbUcNiyI43SMavShqwtaIabBpRqVYtkvU034z4c91t1EWGu93XP/4 6z0u1Y17SbbPCTU81zFty8hPXTfztaTBaT0yjuhhotZthoW4n9a/VQ4QgoQ8NJbhNYQIvN cllP1KelGpGzph6UCwMM2vA1IvlgqP13X2gMVpGinnxLDTqSPTBhdVNZp1MH+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 4XPZSJ131Vz147Z; Thu, 10 Oct 2024 16:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49AG8muK064439; Thu, 10 Oct 2024 16:08:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49AG8m6Q064436; Thu, 10 Oct 2024 16:08:48 GMT (envelope-from git) Date: Thu, 10 Oct 2024 16:08:48 GMT Message-Id: <202410101608.49AG8m6Q064436@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: c71c41da618a - main - vm_radix: add iter insert and remove interfaces List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c71c41da618a468349e5b32b77d627718264f97e Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=c71c41da618a468349e5b32b77d627718264f97e commit c71c41da618a468349e5b32b77d627718264f97e Author: Doug Moore AuthorDate: 2024-10-10 16:07:40 +0000 Commit: Doug Moore CommitDate: 2024-10-10 16:07:40 +0000 vm_radix: add iter insert and remove interfaces Add functions in the vm_radix style for using iterators to insert or remove a page from a radix tree. Reviewed by: alc Differential Revision: https://reviews.freebsd.org/D47021 --- sys/vm/vm_radix.h | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_radix.h b/sys/vm/vm_radix.h index d35c9a171d4b..e1f7323dd205 100644 --- a/sys/vm/vm_radix.h +++ b/sys/vm/vm_radix.h @@ -60,7 +60,7 @@ PCTRIE_DEFINE_SMR(VM_RADIX, vm_page, pindex, vm_radix_node_alloc, vm_radix_node_free, vm_radix_smr); /* - * Inserts the key-value pair into the trie. + * Inserts the key-value pair into the trie, starting search from root. * Panics if the key already exists. */ static __inline int @@ -69,6 +69,16 @@ vm_radix_insert(struct vm_radix *rtree, vm_page_t page) return (VM_RADIX_PCTRIE_INSERT(&rtree->rt_trie, page)); } +/* + * Inserts the key-value pair into the trie, starting search from iterator. + * Panics if the key already exists. + */ +static __inline int +vm_radix_iter_insert(struct pctrie_iter *pages, vm_page_t page) +{ + return (VM_RADIX_PCTRIE_ITER_INSERT(pages, page)); +} + /* * Insert the page into the vm_radix tree with its pindex as the key. Panic if * the pindex already exists. Return zero on success or a non-zero error on @@ -187,6 +197,15 @@ vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index) { return (VM_RADIX_PCTRIE_REMOVE_LOOKUP(&rtree->rt_trie, index)); } + +/* + * Remove the current page from the trie. + */ +static __inline void +vm_radix_iter_remove(struct pctrie_iter *pages) +{ + VM_RADIX_PCTRIE_ITER_REMOVE(pages); +} /* * Reclaim all the interior nodes of the trie, and invoke the callback From nobody Thu Oct 10 16:27:57 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPZtP28Dzz5ZG4g; Thu, 10 Oct 2024 16:27: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPZtP1MdMz53dR; Thu, 10 Oct 2024 16:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728577677; h=from:from:reply-to:subject:subject: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/IsANqY50Oe78R5Fa7mV1dDTfpKyRuUy5Oysfw7Pr0=; b=wOSip+GAf4dPvPS0q59/5ekNfB0AbBa63Dm1Mg6gVZNG9jXMCivykxQqayEN1bf3WLW0dn 4LRzy/wYi9MS0E5GE380nTu8rKOyF5hxamKCT0Rgns/0TnNMEAjmrlh90N16pZ48cWoh0B ycxtBYWI7y7xrHh4mFOD7qWZRWMBtH7d6lc8jMzCPnrBFc+CyRRgMU2MRDn7BUS85q/9OQ sIzj0UN3OnaO2G5xHdt30dJs1EapEvsj04alCIgqGZXXU1Mm1XFPcti+hQJ62e1uJ1ls6+ QVRzJYl/e2Yh0gnTay6aHV5VTwIzzJG6PcLi89ibCJOhi2f1UDgNwP2FnCNOVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728577677; h=from:from:reply-to:subject:subject: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/IsANqY50Oe78R5Fa7mV1dDTfpKyRuUy5Oysfw7Pr0=; b=E0TgUCHAkadhi3fSv60y7FBiCGbj6VH8RpUGp6mdndyxLenhrnAODlfsMgDd0W+e+QJ72X Amwwt3vAiViH/MMX9qgxzc5oeEjSw2gM9uHP7v/JCbaQcAy9YLTpSuAEvU4OLeB1oPstwj XUdKhJ1h9fjS3aBkustnYdV5Z20MMk/oJWHxZcPnIZUfac8/ZWTetXTYyz0fNvdCk85Ke7 zDO+ryOb08b6Kfjb7iM5iX7lejQnyV3/HHo1RWdbNpmjg+UCUtMoC/stNr+WESmL07NjxS paI2l80bqYGaRLwhSK4OaAXA4QqCPZ03zbyGVV6yzlR9kZk6fnFhHa/inhlpVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728577677; a=rsa-sha256; cv=none; b=dH/dJKEQbwna40jFuVT7F5PkV6+wMLvDmn8ogUVicqN8toRbDUajGd1r+NmGS5M5NfJvYS n6JC+3x10tFI5eMwT6ivO9v9VvclQdjgAlr+sldRy1AMwRd6CTw+RP2+ala/8GQ1r+owrC yaU7aEX3Rax6+B5fPNbZm+WFxbdhVUbPyzndp3ZxNPaExsZLAz6PjJ6mfjW6kEkzdabBbe tTqlZE6NjY1e6cLCFEhMLabhz0+ldbnxBJGsfR6oRh8Uae3Y/tB5+eMECkSiZYT2K6Gp9e v3+pNPQuO1q9e5nGLtLUNjNVdzgewp/f8dVPyaj6FClifomTAEM7tjaeHZGn8w== 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 4XPZtP0rWsz14kH; Thu, 10 Oct 2024 16:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49AGRvme097802; Thu, 10 Oct 2024 16:27:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49AGRvAQ097799; Thu, 10 Oct 2024 16:27:57 GMT (envelope-from git) Date: Thu, 10 Oct 2024 16:27:57 GMT Message-Id: <202410101627.49AGRvAQ097799@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: e3f0e0f1b176 - main - committers-doc: add myself List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3f0e0f1b176a62546de5f09de4922fdeec9e2cb Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=e3f0e0f1b176a62546de5f09de4922fdeec9e2cb commit e3f0e0f1b176a62546de5f09de4922fdeec9e2cb Author: Mitchell Horne AuthorDate: 2024-10-10 15:50:09 +0000 Commit: Mitchell Horne CommitDate: 2024-10-10 16:27:10 +0000 committers-doc: add myself Approved by: 0mp (mentor) --- share/misc/committers-doc.dot | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot index 81bf766a2fe9..2c37a5f8ca6e 100644 --- a/share/misc/committers-doc.dot +++ b/share/misc/committers-doc.dot @@ -99,6 +99,7 @@ loader [label="Fukang Chen\nloader@FreeBSD.org\n2007/07/30"] lwhsu [label="Li-Wen Hsu\nlwhsu@FreeBSD.org\n2021/08/01"] marck [label="Dmitry Morozovsky\nmarck@FreeBSD.org\n2004/08/10"] maxim [label="Maxim Konovalov\nmaxim@FreeBSD.org\n2002/02/07"] +mhorne [label="Mitchell Horne\nmhorne@FreeBSD.org\n2024/07/12"] philip [label="Philip Paeps\nphilip@FreeBSD.org\n2021/07/13"] pluknet [label="Sergey Kandaurov\npluknet@FreeBSD.org\n2012/02/14"] rene [label="Rene Ladan\nrene@FreeBSD.org\n2008/11/03"] @@ -113,6 +114,7 @@ ygy [label="Guangyuan Yang\nygy@FreeBSD.org\n2017/09/18"] "0mp" -> debdrup "0mp" -> fernape +"0mp" -> mhorne allanjude -> debdrup From nobody Thu Oct 10 16:27:58 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPZtQ53nPz5ZG0T; Thu, 10 Oct 2024 16:27: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPZtQ29Lwz53nS; Thu, 10 Oct 2024 16:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728577678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iVGjCP7Ps5nnPx5IWGdkL8b2+tOiLAt829EHAeCTvu4=; b=hTudS6DEjPQjpRq87G5qS+JnM2y14fTCbKHkiJOjcwWIxTtELXl7LJ/WhEnCFlKFb6Rlqg 8fD2jQo7VvJmEIK/YPJxNXtknaYsv9wmDJLx9Oz82ZUqPhlJ6SUaqv1Ykfe7renS47CD/X +veQngcHBqFjCvyTm0dhYoowdHimB/y82jHbxJhjptr+aHdDBMD9aGsUbXqKpdmIcjCsHX N+doM79K548M+qPP6z2H2brvW+vzOuLFqm/+7nLBHNDaPe3tEJkjU67pcirH7K2CV45xPj jo1VLbhZDmEk2QYjG/fqyvFA4ckU5QTHl4DSzFfewKF+X+g0wuYl+1KPzE/Tzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728577678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iVGjCP7Ps5nnPx5IWGdkL8b2+tOiLAt829EHAeCTvu4=; b=WStxkLI+CQw9o79QrZLdkbzsF0m2j7Zt/P1wC8q15zavgP5TaM2wNkm09ZgPSVLW1e2Vjj /mer6N0j1u6/HVQgGaZZGKGsFVbo4n35Ce+d/UTWbITup4cLDz1aqd5XYvbYIA6/tShcG5 lgKMe11IB6eu1xj04hPLTTf5R7ufN4trUbPocnSUYCwtbqUw9M45+6HZjwdqQ+b8CpdQeH WMXikir4Hxxt+YaJTuHOWt9ElzYu2XGSzBbOxBsPy8MJpPBFjVAsuiK4P79+m6FNElZW3y dh58xS+yFz/CNwB4DKDGKbeemAjA28NBeHB2EXyX36ZUXBPmJa3ps2xwnbGaTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728577678; a=rsa-sha256; cv=none; b=Cv3C+PorlyO21YPTkjdZ3Qk0K/HxEAm+Ks0riav88tnc3Omy0+g0tlR+1+UnQvqrnD35bp hiRZFwr4l3TsyeW9RQdZGEGsFeJrDfxYcSiub0xrhlWADKgw8tekq/pUGJCMtDpcpKZDKM Qzc+EzCwbFrkV/SwO8LpaJKX8EmbaxBMSZlUHSbqRV2aaqVDyJrpuquBaYU7cZ63S/vhWK oEjURYNF2Y1xUtDCGqnGa/HIhtG1Pf7YavGVK6emkeNuYQOwYSCaPMHxrGolxqBvyFa9LI 22gNYlkwOmoPuM0omvWHL5uCP8QaLaoOxz6s54kkbM8FzuGcirFcVqCTXAB41A== 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 4XPZtQ1nKcz157l; Thu, 10 Oct 2024 16:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49AGRwiK097847; Thu, 10 Oct 2024 16:27:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49AGRw1I097844; Thu, 10 Oct 2024 16:27:58 GMT (envelope-from git) Date: Thu, 10 Oct 2024 16:27:58 GMT Message-Id: <202410101627.49AGRw1I097844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 579300874511 - main - vmem.9: align lists + tag spdx List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5793008745115f9523f9de32cec3136cea2dd8d5 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5793008745115f9523f9de32cec3136cea2dd8d5 commit 5793008745115f9523f9de32cec3136cea2dd8d5 Author: Alexander Ziaee AuthorDate: 2024-10-08 21:48:35 +0000 Commit: Mitchell Horne CommitDate: 2024-10-10 16:27:10 +0000 vmem.9: align lists + tag spdx Reviewed by: mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1456 --- share/man/man9/vmem.9 | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/share/man/man9/vmem.9 b/share/man/man9/vmem.9 index 31a82be88fd0..053aec856a78 100644 --- a/share/man/man9/vmem.9 +++ b/share/man/man9/vmem.9 @@ -1,3 +1,6 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" $NetBSD: vmem.9,v 1.15 2013/01/29 22:02:17 wiz Exp $ .\" .\" Copyright (c)2006 YAMAMOTO Takashi, @@ -74,7 +77,7 @@ other than virtual memory. .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .Fn vmem_create creates a new vmem arena. -.Bl -tag -width qcache_max +.Bl -tag -offset indent -width "qcache_max" .It Fa name The string to describe the vmem. .It Fa base @@ -117,7 +120,7 @@ wait flag. .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .Fn vmem_xalloc allocates a resource from the arena. -.Bl -tag -width nocross +.Bl -tag -offset indent -width "qcache_max" .It Fa vm The arena which we allocate from. .It Fa size @@ -159,7 +162,7 @@ A bitwise OR of an allocation strategy and a .Xr malloc 9 wait flag. The allocation strategy is one of: -.Bl -tag -width indent +.Bl -tag -width "M_FIRSTFIT" .It Dv M_FIRSTFIT Prefer allocation performance. .It Dv M_BESTFIT @@ -182,7 +185,7 @@ overwrites it with the start address of the allocated span. frees resource allocated by .Fn vmem_xalloc to the arena. -.Bl -tag -width addr +.Bl -tag -offset indent -width "qcache_max" .It Fa vm The arena which we free to. .It Fa addr @@ -203,7 +206,7 @@ argument used for .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .Fn vmem_alloc allocates a resource from the arena. -.Bl -tag -width flags +.Bl -tag -offset indent -width "qcache_max" .It Fa vm The arena which we allocate from. .It Fa size @@ -228,7 +231,7 @@ overwrites it with the start address of the allocated span. frees resource allocated by .Fn vmem_alloc to the arena. -.Bl -tag -width addr +.Bl -tag -offset indent -width "qcache_max" .It Fa vm The arena which we free to. .It Fa addr @@ -249,7 +252,7 @@ argument used for .\" ------------------------------------------------------------ .Fn vmem_destroy destroys a vmem arena. -.Bl -tag -width vm +.Bl -tag -offset indent -width "qcache_max" .It Fa vm The vmem arena being destroyed. The caller should ensure that no one will use it anymore. From nobody Thu Oct 10 16:27:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPZtR51LGz5ZG0X; Thu, 10 Oct 2024 16:27: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPZtR2pDrz53nf; Thu, 10 Oct 2024 16:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728577679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DVX412uhQiARTnIlqAUDbjmU7ATi6KzY12jJ/qpdL10=; b=oqzvdoNXxp4sUI57Ytv2KGEw8UtkXJ79mr7aoUcR7EDLR6wAglIc58sYEIEWtFewyeH7BV IWCB+fYjOlz4bgjjz8kPUjvyFVOaK8KBdYJseBCc0BM0PIN8/UiSFASvhoC+4xufmZlKZI 5o2Cv88SHurbzDfE7vBV+6A2qIrg2ddk37Ror38UnNh1pqfdw15xnTShaLMuQT1MhwPgzs I/0c44BmdlCq64o/+u0clyaVoUY9nyNuHNQ10rkl06qPxlaf0F8d+y6dVefyvCgwgT0zC8 4vrDLr/Lx9hMeisWqbW1EDse09mdm1HkhP9TtzU0iVWAmd9CZ0mXmXf80jThlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728577679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DVX412uhQiARTnIlqAUDbjmU7ATi6KzY12jJ/qpdL10=; b=J2Gmt6zJ9QYJIHtVHGsu3FaR2EuBYG2BIuKlAOLDJqQuHOPjRcvpp/k6NO0O3Dz5ZJVGfU i3w+QnbTMwTajsHDd3JbFTQdiWq7ZhpeyY7mfG8D+a1XE2bZ88U4uzSb9ZhXZ8vZirN7n0 HSZFLN5xcsv4VcfARuoYhZ0ZNWsyfRbfDx2lsNUzUSOhFLQK1RSrWa2mvu/cdsi/gFU7Hy 5biuU2uKZy18lU9QxhPfCvNbVAwOaiGMTPUoygky6EJn0aXWYExUztjlCnbmUPGjSdIoCf dHBsWiDDJTh5qXUI58VZ6dsbhtPVCxDNniy36WewCap49ytuEW2tGM5se/tNMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728577679; a=rsa-sha256; cv=none; b=w77uKUIlEN34gzRbHiqN7L+QsuLP2QIZDhMx+EKzRm746rSYS9BlRUMoP+OEef3ca3hacf VzeuRHPik8T+vIMG/ppF+S0Fry+5miWwINSdfvbKQPHhqGMSKxNycf03WZiERiUjjFiKeb Kugo+aKD+GTtQBCTTKFzv6veHS12pu0ANNzL3UduCclzauN5y2I8MJnp3QLGnIPYTVC5Mx tgCayXzFT702b0oQig48qqKYZF0/jw0dVLlx0mde88dMrQv9VIeX1kLFux32+kEXYlKm/v qOVcAXf1i+fnHwAU/y3m6V2nETeuyhK1apO6WGcZhU8oek5Jhbj+0Aa3CoXgTQ== 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 4XPZtR2Qb7z157m; Thu, 10 Oct 2024 16:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49AGRxTF097898; Thu, 10 Oct 2024 16:27:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49AGRxJ2097895; Thu, 10 Oct 2024 16:27:59 GMT (envelope-from git) Date: Thu, 10 Oct 2024 16:27:59 GMT Message-Id: <202410101627.49AGRxJ2097895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: d928328f8d2d - main - manpath.1: align lists + tag spdx List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d928328f8d2d25a4632401795e1c0ebbaeb7b10d Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d928328f8d2d25a4632401795e1c0ebbaeb7b10d commit d928328f8d2d25a4632401795e1c0ebbaeb7b10d Author: Alexander Ziaee AuthorDate: 2024-10-09 11:49:01 +0000 Commit: Mitchell Horne CommitDate: 2024-10-10 16:27:10 +0000 manpath.1: align lists + tag spdx Reviewed by: mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1458 --- usr.bin/man/manpath.1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/usr.bin/man/manpath.1 b/usr.bin/man/manpath.1 index c964e028a244..ac9e3b2db5a7 100644 --- a/usr.bin/man/manpath.1 +++ b/usr.bin/man/manpath.1 @@ -1,4 +1,6 @@ .\"- +.\" SPDX-License-Identifer: BSD-2-Clause +.\" .\" Copyright (c) 2010 Gordon Tetlow .\" All rights reserved. .\" @@ -40,7 +42,7 @@ the user's .Ev PATH , and local configuration files. This result is echoed to the standard output. -.Bl -tag -width ".Fl d" +.Bl -tag -width "-L" .It Fl L Output manual locales list instead of the manual path. .It Fl d @@ -89,7 +91,7 @@ entries. .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : -.Bl -tag -width ".Ev MANLOCALES" +.Bl -tag -width "MANLOCALES" .It Ev MANLOCALES If set with the .Fl L @@ -103,7 +105,7 @@ Influences the manual path as described in the .Sx IMPLEMENTATION NOTES . .El .Sh FILES -.Bl -tag -width indent -compact +.Bl -tag -width "/usr/local/etc/man.d/*.conf" -compact .It Pa /etc/man.conf System configuration file. .It Pa /usr/local/etc/man.d/*.conf From nobody Thu Oct 10 17:42:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPcXg2Hjrz5YMKd; Thu, 10 Oct 2024 17:42: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPcXg1Z26z4004; Thu, 10 Oct 2024 17:42:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728582163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gj0pBCUSUFy7OTBaxC7kUrM5u+o7y+j0Omg+v3fktO4=; b=rB6lAClWfYaTNPlC4Agufz7mlvzHf9YuTGgFxoeWQH+NWtMl6N9VGe2NXK+mrhZ+PWX+0/ DyTPqJ0Nxoh7CmOmWKmYOx0gViX9e1zyAkQWzIgH35gzra4EDkHPq7AHiVfkNpj2+SBBR8 MXo2eHEzuEn+BCn4W/xG/QbszPL81pzS7gDte1ewyMn72gZXTep37fkpvl/5tX94tmAC5S 08ukHeX/wzhSqG0ZkOUVbLe2xirhFMECRhOdCpDQuw6NOj5il+Lp3zIWcO/J6LFoDzAtjl 7y9R5SaV1uYcLEzl91ZriTOUjYytUA/e2SjEYLqMJVbYoGqRxJRheJ9BBx+QtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728582163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gj0pBCUSUFy7OTBaxC7kUrM5u+o7y+j0Omg+v3fktO4=; b=e/73HQza6DWtIJqqzIOjXFKcvLOY5R4gyYcpObEeYluA6+P9vVrR7LFjq/z2WKLtDgC3bj klpEOcuTnubYiELSpRch3pzf9V6QxYBYxfQSNQekofRZF5VQcWal0c9KJVI1MX8/IZkT+b mggqd90EWBpHh5TLOPga+6HHJV/eRef7Aw07Hw+dzDBW6beSNLhKEnJlgd07Xan8m0ijCb oH/9HdV04hm+72A8P4fLi1CFyKe4XZ7HD4q5XgU5POpW8jtNa8leMyNzxqcbOa58GIppxU jbQlzlnqKxBmxmM6WyeZCf5NmBqRcnjqoBQxLrp2liE7m9qi8Yxh2y9p0emlYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728582163; a=rsa-sha256; cv=none; b=RF0fkia8ral3GUxsy5xsSwVwiZp9JuLkzz/odC7RR/r/cStvaYZNEsafVHhloYfOrMNGfU atKVpC2lLeClJViZpkoaKhntsulJY7ajMcR3o13DgLASjmImsGUr0UnZZt6LUKHQ93Bb+0 HXjSqN2SSwvpAT4PmzURvU50juM/YZjhBRUT3ad4uvZULbxehG+MTB9m1NFIf2HCmG+89Z JM1ZfGe2cgGYtla6mCuzbFsV/V12+jYVDyG3iFtfLVRRiqdIMZwXrmBFN8BgH5lFvFm47/ hpKZfGTQ7NpHDXoQm1msfBWmJhtByYgKqb+PuxmzR/1aMv/c7QtQYI2HFg99Mg== 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 4XPcXg19tJz16gF; Thu, 10 Oct 2024 17:42:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49AHgh8o032924; Thu, 10 Oct 2024 17:42:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49AHghvB032921; Thu, 10 Oct 2024 17:42:43 GMT (envelope-from git) Date: Thu, 10 Oct 2024 17:42:43 GMT Message-Id: <202410101742.49AHghvB032921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 41b746e05231 - main - LinuxKPI: 802.11: fix ieee80211_schedule_txq() to avoid rtw89 panic List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41b746e05231b44c87f3a3087a7fe29966af6d0f Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=41b746e05231b44c87f3a3087a7fe29966af6d0f commit 41b746e05231b44c87f3a3087a7fe29966af6d0f Author: Austin Shafer AuthorDate: 2024-10-10 15:31:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-10-10 17:42:06 +0000 LinuxKPI: 802.11: fix ieee80211_schedule_txq() to avoid rtw89 panic rtw89 TX path was faulting in linuxkpi_ieee80211_next_txq() due to a "double scheduling" check in linuxkpI_ieee80211_schedule_txq() being incorrect: the next pointer may be NULL there if the element is the last in the tailq, so correctly check tqe_prev. Without the fix we may have queued the same element to the tailq twice, and because it was the last element and had a NULL tqe_next, that NULL value would get propogated into another node's tqe_prev on removal, and other such nastiness. With this rtw89 no longer panics. Reviewed by: bz MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47006 --- sys/compat/linuxkpi/common/src/linux_80211.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index ae765cda5781..4171f0789977 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -6074,8 +6074,12 @@ void linuxkpi_ieee80211_schedule_txq(struct ieee80211_hw *hw, if (!withoutpkts && ltxq_empty) goto out; - /* Make sure we do not double-schedule. */ - if (ltxq->txq_entry.tqe_next != NULL) + /* + * Make sure we do not double-schedule. We do this by checking tqe_prev, + * the previous entry in our tailq. tqe_prev is always valid if this entry + * is queued, tqe_next may be NULL if this is the only element in the list. + */ + if (ltxq->txq_entry.tqe_prev != NULL) goto out; lhw = HW_TO_LHW(hw); From nobody Fri Oct 11 05:38:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPwQh4vHxz5ZGr4; Fri, 11 Oct 2024 05:38:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPwQh2yXMz4VTk; Fri, 11 Oct 2024 05:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728625116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9lvdp1bkU3LBhl68Gu5anwur3S3MlweiIbGa4L1+4mg=; b=O9/GfPCS0CuMaOWlyUSqnFtPdocRXCavwkgRvWyw6Up87pMC8yxeaqkGDsu6vjDh0ojy/D fy4wVYA7+q+SwhagbdPsCsQl2SS6OTwodLvRvCcBNEm+UAV+s/UKcdvxhqokNGtwOyXVUX pLeqzE1RgXAV4um3xtxcSfmkaVpW6WsDiLmb4wu1BQJ7GrfJEWCEdau4ptp26POJaFg9Z7 Ucfok/FUWzovJ2CtcCGM6trc5UYDYDpXbBG16FJZ8zsi0sZcpHe7B5Uzo8rOno7KQpVY0B jBb7OnTl4F5wnWHRwgRz+YZ/h1pOcrmRI7JqccIEurjxNUmhtaOqybuSj+KGlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728625116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9lvdp1bkU3LBhl68Gu5anwur3S3MlweiIbGa4L1+4mg=; b=DdAxd2EYL1EdXBXFMi4iagp8HQRPSbV7/kGChb6Bz1o5ozknbpT21XHbJZ1uEChthQTZDr 6vp2RuSpbQiP7+tqdhjHkkSr78N3zNi0kkbmClzPZKgJuoIf81ps1coRNhFbKSnNLNGQ8h 5AisBTFjgLIP1wNO8GHeJ2luF9YLUmS3K7CjGzbZwSiDd2UMoyK2YuYl2NGLn0KLlbF1cN n3/bOjkhuSbtiENZ3fqGgK1OX87hoMnJFLG5PO7DXf36iQmTyNtZWm46UUYQtkKNxRZo/X MU+8hIg28otDUnXI63Q+3jKi+p1khvS+GWs7Cp8JQFc7mVap0vR3RobF0CYx2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728625116; a=rsa-sha256; cv=none; b=JOsdY0j0Cp7zvJ1jQUUfsp8z4sLqM+A8MRnzI2JdWcZDxJBH6inMhwoEX1QwP5yoeFtzbh iQMj7PJoyQbi88OqSrkbBfxkqWB3Y49hKoJzFznOjg12tFUiCYiDHxEhEFGeu7g+Zy+kcQ OkhHRIiNDqR5mx8/TRJyX3m0+0Ibxy81n+RAmJNd8tWRKVIvVXlr1GBqQPeTCX5P9Ou3TZ lWW0axvUezdoVB/Js13HGfke5iZfx+OLwqBkh4Oj6tXA9d0/s/5sR+m6gfxQU4ar2oh/9z qowXNkdxIKUBt8NpCM5xiG/NeFsPeUDL/n0MjihBKDcnJbHYQJJPniVhRXJimQ== 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 4XPwQh2Z6JzV9c; Fri, 11 Oct 2024 05:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49B5caL3036570; Fri, 11 Oct 2024 05:38:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49B5caCe036567; Fri, 11 Oct 2024 05:38:36 GMT (envelope-from git) Date: Fri, 11 Oct 2024 05:38:36 GMT Message-Id: <202410110538.49B5caCe036567@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 3e501ef89667 - main - e1000: Re-add AIM List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e501ef896671cb190e8c40c6258b8f27d136f07 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=3e501ef896671cb190e8c40c6258b8f27d136f07 commit 3e501ef896671cb190e8c40c6258b8f27d136f07 Author: Kevin Bowling AuthorDate: 2024-09-22 09:26:05 +0000 Commit: Kevin Bowling CommitDate: 2024-10-11 05:36:43 +0000 e1000: Re-add AIM We originally left this out because iflib modulates interrupts and accomplishes some level of batching versus the custom queues in the older driver. Upon more detailed study of the Linux driver which has a newer implementation, it finally became clear to me this is actually a holdoff timer and not an interrupt limit as it is conventionally (statically) programmed and displayed as an interrupt rate. The data sheets also make this somewhat clear. Thus, AIM accomplishes two beneficial things for a wide variety of workloads[1]: 1. At low throughput/packet rates, it will significantly lower latency (by counter-intuitively "increasing" the interrupt rate.. better thought of as decreasing the holdoff timer because you will modulate down before coming anywhere near these interrupt rates). 2. At bulk data rates, it is tuned to achieve a lower interrupt rate (by increasing the holdoff timer) than the current static 8000/s. This decreases processing overhead and yields more headroom for other work such as packet filters or userland. For a single NIC this might be worth a few sys% on common CPUs, but may be meaningful when multiplied such as if_lagg, if_bridge and forwarding setups. The AIM algorithm was re-introduced from the older igb or out of tree driver, and then modernized with permission to use Intel code from other drivers. I have retroactively added it to lem(4) and em(4) where the same concept applies, albeit to a single ITR register. [1]: http://iommu.com/datasheets/ethernet/controllers-nics/intel/e1000/gbe-controllers-interrupt-moderation-appl-note.pdf Tested by: cc (https://wiki.freebsd.org/chengcui/testD46768) MFC after: 1 week Relnotes: yes Sponsored by: Rubicon Communications, LLC ("Netgate") Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D46768 --- sys/dev/e1000/em_txrx.c | 10 ++ sys/dev/e1000/if_em.c | 269 ++++++++++++++++++++++++++++++++++++++++++++++- sys/dev/e1000/if_em.h | 28 +++-- sys/dev/e1000/igb_txrx.c | 4 + 4 files changed, 299 insertions(+), 12 deletions(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index eec198df7466..6e8fff07cd82 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -455,6 +455,10 @@ em_isc_txd_encap(void *arg, if_pkt_info_t pi) "tx_buffers[%d]->eop = %d ipi_new_pidx=%d\n", first, pidx_last, i); pi->ipi_new_pidx = i; + /* Sent data accounting for AIM */ + txr->tx_bytes += pi->ipi_len; + ++txr->tx_packets; + return (0); } @@ -669,6 +673,7 @@ lem_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) len = le16toh(rxd->length); ri->iri_len += len; + rxr->rx_bytes += ri->iri_len; eop = (status & E1000_RXD_STAT_EOP) != 0; @@ -690,6 +695,8 @@ lem_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) i++; } while (!eop); + rxr->rx_packets++; + if (scctx->isc_capenable & IFCAP_RXCSUM) em_receive_checksum(status, errors, ri); @@ -732,6 +739,7 @@ em_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) len = le16toh(rxd->wb.upper.length); ri->iri_len += len; + rxr->rx_bytes += ri->iri_len; eop = (staterr & E1000_RXD_STAT_EOP) != 0; @@ -752,6 +760,8 @@ em_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) i++; } while (!eop); + rxr->rx_packets++; + if (scctx->isc_capenable & IFCAP_RXCSUM) em_receive_checksum(staterr, staterr >> 24, ri); diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index b9c6131e6741..22578a3d8655 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1,8 +1,9 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * + * Copyright (c) 2001-2024, Intel Corporation * Copyright (c) 2016 Nicole Graziano - * All rights reserved. + * Copyright (c) 2024 Kevin Bowling * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -329,10 +330,12 @@ static int em_sysctl_debug_info(SYSCTL_HANDLER_ARGS); static int em_get_rs(SYSCTL_HANDLER_ARGS); static void em_print_debug_info(struct e1000_softc *); static int em_is_valid_ether_addr(u8 *); +static void em_newitr(struct e1000_softc *, struct em_rx_queue *, + struct tx_ring *, struct rx_ring *); static bool em_automask_tso(if_ctx_t); static int em_sysctl_int_delay(SYSCTL_HANDLER_ARGS); static void em_add_int_delay_sysctl(struct e1000_softc *, const char *, - const char *, struct em_int_delay_info *, int, int); + const char *, struct em_int_delay_info *, int, int); /* Management and WOL Support */ static void em_init_manageability(struct e1000_softc *); static void em_release_manageability(struct e1000_softc *); @@ -545,10 +548,19 @@ static int eee_setting = 1; SYSCTL_INT(_hw_em, OID_AUTO, eee_setting, CTLFLAG_RDTUN, &eee_setting, 0, "Enable Energy Efficient Ethernet"); +/* + * AIM: Adaptive Interrupt Moderation + * which means that the interrupt rate is varied over time based on the + * traffic for that interrupt vector + */ +static int em_enable_aim = 1; +SYSCTL_INT(_hw_em, OID_AUTO, enable_aim, CTLFLAG_RWTUN, &em_enable_aim, + 0, "Enable adaptive interrupt moderation (1=normal, 2=lowlatency)"); + /* ** Tuneable Interrupt rate */ -static int em_max_interrupt_rate = EM_INTS_PER_SEC; +static int em_max_interrupt_rate = EM_INTS_DEFAULT; SYSCTL_INT(_hw_em, OID_AUTO, max_interrupt_rate, CTLFLAG_RDTUN, &em_max_interrupt_rate, 0, "Maximum interrupts per second"); @@ -832,6 +844,11 @@ em_if_attach_pre(if_ctx_t ctx) CTLTYPE_INT | CTLFLAG_RW, sc, 0, em_sysctl_nvm_info, "I", "NVM Information"); + sc->enable_aim = em_enable_aim; + SYSCTL_ADD_INT(ctx_list, child, OID_AUTO, "enable_aim", + CTLFLAG_RW, &sc->enable_aim, 0, + "Interrupt Moderation (1=normal, 2=lowlatency)"); + SYSCTL_ADD_PROC(ctx_list, child, OID_AUTO, "fw_version", CTLTYPE_STRING | CTLFLAG_RD, sc, 0, em_sysctl_print_fw_version, "A", @@ -1437,6 +1454,159 @@ em_if_init(if_ctx_t ctx) } } +enum itr_latency_target { + itr_latency_disabled = 0, + itr_latency_lowest = 1, + itr_latency_low = 2, + itr_latency_bulk = 3 +}; +/********************************************************************* + * + * Helper to calculate next (E)ITR value for AIM + * + *********************************************************************/ +static void +em_newitr(struct e1000_softc *sc, struct em_rx_queue *que, + struct tx_ring *txr, struct rx_ring *rxr) +{ + struct e1000_hw *hw = &sc->hw; + u32 newitr; + u32 bytes; + u32 bytes_packets; + u32 packets; + u8 nextlatency; + + /* Idle, do nothing */ + if ((txr->tx_bytes == 0) && (rxr->rx_bytes == 0)) + return; + + newitr = 0; + + if (sc->enable_aim) { + nextlatency = rxr->rx_nextlatency; + + /* Use half default (4K) ITR if sub-gig */ + if (sc->link_speed != 1000) { + newitr = EM_INTS_4K; + goto em_set_next_itr; + } + /* Want at least enough packet buffer for two frames to AIM */ + if (sc->shared->isc_max_frame_size * 2 > (sc->pba << 10)) { + newitr = em_max_interrupt_rate; + sc->enable_aim = 0; + goto em_set_next_itr; + } + + /* Get the largest values from the associated tx and rx ring */ + if (txr->tx_bytes && txr->tx_packets) { + bytes = txr->tx_bytes; + bytes_packets = txr->tx_bytes/txr->tx_packets; + packets = txr->tx_packets; + } + if (rxr->rx_bytes && rxr->rx_packets) { + bytes = max(bytes, rxr->rx_bytes); + bytes_packets = max(bytes_packets, rxr->rx_bytes/rxr->rx_packets); + packets = max(packets, rxr->rx_packets); + } + + /* Latency state machine */ + switch (nextlatency) { + case itr_latency_disabled: /* Bootstrapping */ + nextlatency = itr_latency_low; + break; + case itr_latency_lowest: /* 70k ints/s */ + /* TSO and jumbo frames */ + if (bytes_packets > 8000) + nextlatency = itr_latency_bulk; + else if ((packets < 5) && (bytes > 512)) + nextlatency = itr_latency_low; + break; + case itr_latency_low: /* 20k ints/s */ + if (bytes > 10000) { + /* Handle TSO */ + if (bytes_packets > 8000) + nextlatency = itr_latency_bulk; + else if ((packets < 10) || (bytes_packets > 1200)) + nextlatency = itr_latency_bulk; + else if (packets > 35) + nextlatency = itr_latency_lowest; + } else if (bytes_packets > 2000) { + nextlatency = itr_latency_bulk; + } else if (packets < 3 && bytes < 512) { + nextlatency = itr_latency_lowest; + } + break; + case itr_latency_bulk: /* 4k ints/s */ + if (bytes > 25000) { + if (packets > 35) + nextlatency = itr_latency_low; + } else if (bytes < 1500) + nextlatency = itr_latency_low; + break; + default: + nextlatency = itr_latency_low; + device_printf(sc->dev, "Unexpected newitr transition %d\n", + nextlatency); + break; + } + + /* Trim itr_latency_lowest for default AIM setting */ + if (sc->enable_aim == 1 && nextlatency == itr_latency_lowest) + nextlatency = itr_latency_low; + + /* Request new latency */ + rxr->rx_nextlatency = nextlatency; + } else { + /* We may have toggled to AIM disabled */ + nextlatency = itr_latency_disabled; + rxr->rx_nextlatency = nextlatency; + } + + /* ITR state machine */ + switch(nextlatency) { + case itr_latency_lowest: + newitr = EM_INTS_70K; + break; + case itr_latency_low: + newitr = EM_INTS_20K; + break; + case itr_latency_bulk: + newitr = EM_INTS_4K; + break; + case itr_latency_disabled: + default: + newitr = em_max_interrupt_rate; + break; + } + +em_set_next_itr: + if (hw->mac.type >= igb_mac_min) { + newitr = IGB_INTS_TO_EITR(newitr); + + if (hw->mac.type == e1000_82575) + newitr |= newitr << 16; + else + newitr |= E1000_EITR_CNT_IGNR; + + if (newitr != que->itr_setting) { + que->itr_setting = newitr; + E1000_WRITE_REG(hw, E1000_EITR(que->msix), que->itr_setting); + } + } else { + newitr = EM_INTS_TO_ITR(newitr); + + if (newitr != que->itr_setting) { + que->itr_setting = newitr; + if (hw->mac.type == e1000_82574 && que->msix) { + E1000_WRITE_REG(hw, + E1000_EITR_82574(que->msix), que->itr_setting); + } else { + E1000_WRITE_REG(hw, E1000_ITR, que->itr_setting); + } + } + } +} + /********************************************************************* * * Fast Legacy/MSI Combined Interrupt Service routine @@ -1446,10 +1616,14 @@ int em_intr(void *arg) { struct e1000_softc *sc = arg; + struct e1000_hw *hw = &sc->hw; + struct em_rx_queue *que = &sc->rx_queues[0]; + struct tx_ring *txr = &sc->tx_queues[0].txr; + struct rx_ring *rxr = &que->rxr; if_ctx_t ctx = sc->ctx; u32 reg_icr; - reg_icr = E1000_READ_REG(&sc->hw, E1000_ICR); + reg_icr = E1000_READ_REG(hw, E1000_ICR); /* Hot eject? */ if (reg_icr == 0xffffffff) @@ -1463,7 +1637,7 @@ em_intr(void *arg) * Starting with the 82571 chip, bit 31 should be used to * determine whether the interrupt belongs to us. */ - if (sc->hw.mac.type >= e1000_82571 && + if (hw->mac.type >= e1000_82571 && (reg_icr & E1000_ICR_INT_ASSERTED) == 0) return FILTER_STRAY; @@ -1482,6 +1656,15 @@ em_intr(void *arg) if (reg_icr & E1000_ICR_RXO) sc->rx_overruns++; + if (hw->mac.type >= e1000_82540) + em_newitr(sc, que, txr, rxr); + + /* Reset state */ + txr->tx_bytes = 0; + txr->tx_packets = 0; + rxr->rx_bytes = 0; + rxr->rx_packets = 0; + return (FILTER_SCHEDULE_THREAD); } @@ -1534,9 +1717,20 @@ static int em_msix_que(void *arg) { struct em_rx_queue *que = arg; + struct e1000_softc *sc = que->sc; + struct tx_ring *txr = &sc->tx_queues[que->msix].txr; + struct rx_ring *rxr = &que->rxr; ++que->irqs; + em_newitr(sc, que, txr, rxr); + + /* Reset state */ + txr->tx_bytes = 0; + txr->tx_packets = 0; + rxr->rx_bytes = 0; + rxr->rx_packets = 0; + return (FILTER_SCHEDULE_THREAD); } @@ -2882,6 +3076,9 @@ em_reset(if_ctx_t ctx) if (hw->mac.type >= igb_mac_min) igb_init_dmac(sc, pba); + /* Save the final PBA off if it needs to be used elsewhere i.e. AIM */ + sc->pba = pba; + E1000_WRITE_REG(hw, E1000_VET, ETHERTYPE_VLAN); e1000_get_phy_info(hw); e1000_check_for_link(hw); @@ -3741,6 +3938,7 @@ em_if_intr_enable(if_ctx_t ctx) E1000_WRITE_REG(hw, EM_EIAC, sc->ims); ims_mask |= sc->ims; } + E1000_WRITE_REG(hw, E1000_IMS, ims_mask); E1000_WRITE_FLUSH(hw); } @@ -4410,6 +4608,57 @@ em_sysctl_reg_handler(SYSCTL_HANDLER_ARGS) return (sysctl_handle_int(oidp, &val, 0, req)); } +/* Per queue holdoff interrupt rate handler */ +static int +em_sysctl_interrupt_rate_handler(SYSCTL_HANDLER_ARGS) +{ + struct em_rx_queue *rque; + struct em_tx_queue *tque; + struct e1000_hw *hw; + int error; + u32 reg, usec, rate; + + bool tx = oidp->oid_arg2; + + if (tx) { + tque = oidp->oid_arg1; + hw = &tque->sc->hw; + if (hw->mac.type >= igb_mac_min) + reg = E1000_READ_REG(hw, E1000_EITR(tque->me)); + else if (hw->mac.type == e1000_82574 && tque->msix) + reg = E1000_READ_REG(hw, E1000_EITR_82574(tque->me)); + else + reg = E1000_READ_REG(hw, E1000_ITR); + } else { + rque = oidp->oid_arg1; + hw = &rque->sc->hw; + if (hw->mac.type >= igb_mac_min) + reg = E1000_READ_REG(hw, E1000_EITR(rque->msix)); + else if (hw->mac.type == e1000_82574 && rque->msix) + reg = E1000_READ_REG(hw, E1000_EITR_82574(rque->msix)); + else + reg = E1000_READ_REG(hw, E1000_ITR); + } + + if (hw->mac.type < igb_mac_min) { + if (reg > 0) + rate = EM_INTS_TO_ITR(reg); + else + rate = 0; + } else { + usec = (reg & IGB_QVECTOR_MASK); + if (usec > 0) + rate = IGB_INTS_TO_EITR(usec); + else + rate = 0; + } + + error = sysctl_handle_int(oidp, &rate, 0, req); + if (error || !req->newptr) + return error; + return 0; +} + /* * Add sysctl variables, one per statistic, to the system. */ @@ -4466,6 +4715,11 @@ em_add_hw_stats(struct e1000_softc *sc) CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "TX Queue Name"); queue_list = SYSCTL_CHILDREN(queue_node); + SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "interrupt_rate", + CTLTYPE_UINT | CTLFLAG_RD, tx_que, + true, em_sysctl_interrupt_rate_handler, + "IU", "Interrupt Rate"); + SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "txd_head", CTLTYPE_UINT | CTLFLAG_RD, sc, E1000_TDH(txr->me), em_sysctl_reg_handler, "IU", @@ -4486,6 +4740,11 @@ em_add_hw_stats(struct e1000_softc *sc) CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "RX Queue Name"); queue_list = SYSCTL_CHILDREN(queue_node); + SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "interrupt_rate", + CTLTYPE_UINT | CTLFLAG_RD, rx_que, + false, em_sysctl_interrupt_rate_handler, + "IU", "Interrupt Rate"); + SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "rxd_head", CTLTYPE_UINT | CTLFLAG_RD, sc, E1000_RDH(rxr->me), em_sysctl_reg_handler, "IU", diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h index 7219dc57c333..52bfed0f9a42 100644 --- a/sys/dev/e1000/if_em.h +++ b/sys/dev/e1000/if_em.h @@ -1,8 +1,9 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * + * Copyright (c) 2001-2024, Intel Corporation * Copyright (c) 2016 Nicole Graziano - * All rights reserved. + * Copyright (c) 2024 Kevin Bowling * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -243,16 +244,19 @@ /* Support AutoMediaDetect for Marvell M88 PHY in i354 */ #define IGB_MEDIA_RESET (1 << 0) -/* Define the starting Interrupt rate per Queue */ -#define EM_INTS_PER_SEC 8000 +/* Define the interrupt rates and ITR helpers */ +#define EM_INTS_4K 4000 +#define EM_INTS_20K 20000 +#define EM_INTS_70K 70000 +#define EM_INTS_DEFAULT 8000 #define EM_INTS_MULTIPLIER 256 #define EM_ITR_DIVIDEND 1000000000 #define EM_INTS_TO_ITR(i) (EM_ITR_DIVIDEND/(i * EM_INTS_MULTIPLIER)) -#define IGB_ITR_DIVIDEND 1000000 -#define IGB_ITR_SHIFT 2 +#define IGB_EITR_DIVIDEND 1000000 +#define IGB_EITR_SHIFT 2 #define IGB_QVECTOR_MASK 0x7FFC -#define IGB_INTS_TO_EITR(i) (((IGB_ITR_DIVIDEND/i) & IGB_QVECTOR_MASK) << \ - IGB_ITR_SHIFT) +#define IGB_INTS_TO_EITR(i) (((IGB_EITR_DIVIDEND/i) & IGB_QVECTOR_MASK) << \ + IGB_EITR_SHIFT) #define IGB_LINK_ITR 2000 #define I210_LINK_DELAY 1000 @@ -390,7 +394,11 @@ struct tx_ring { /* Interrupt resources */ void *tag; struct resource *res; + + /* Soft stats */ unsigned long tx_irq; + unsigned long tx_packets; + unsigned long tx_bytes; /* Saved csum offloading context information */ int csum_flags; @@ -426,6 +434,9 @@ struct rx_ring { unsigned long rx_discarded; unsigned long rx_packets; unsigned long rx_bytes; + + /* Next requested ITR latency */ + u8 rx_nextlatency; }; struct em_tx_queue { @@ -441,6 +452,7 @@ struct em_rx_queue { u32 me; u32 msix; u32 eims; + u32 itr_setting; struct rx_ring rxr; u64 irqs; struct if_irq que_irq; @@ -489,6 +501,7 @@ struct e1000_softc { u32 rx_mbuf_sz; + int enable_aim; /* Management and WOL features */ u32 wol; bool has_manage; @@ -512,6 +525,7 @@ struct e1000_softc { u16 link_duplex; u32 smartspeed; u32 dmac; + u32 pba; int link_mask; int tso_automasked; diff --git a/sys/dev/e1000/igb_txrx.c b/sys/dev/e1000/igb_txrx.c index 2819150acba6..82cbb37ce4cd 100644 --- a/sys/dev/e1000/igb_txrx.c +++ b/sys/dev/e1000/igb_txrx.c @@ -292,6 +292,10 @@ igb_isc_txd_encap(void *arg, if_pkt_info_t pi) txd->read.cmd_type_len |= htole32(E1000_TXD_CMD_EOP | txd_flags); pi->ipi_new_pidx = i; + /* Sent data accounting for AIM */ + txr->tx_bytes += pi->ipi_len; + ++txr->tx_packets; + return (0); } From nobody Fri Oct 11 06:48:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPxzX3Yv1z5YN0y; Fri, 11 Oct 2024 06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPxzX1NV4z4dF9; Fri, 11 Oct 2024 06: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=1728629320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Je2s258Tj+HSdvM1BGOweK4Tq1ZsN4fSngnG2wTIokA=; b=h6VU1zgy7MaCkoEGSuZZy+aS5bqfSpXaV9ny44qGDEtOJ7P+NsGfe+SN/EQ5CZoBONCMHw pWDSSlL1Dg4sT8J+K/UV2r1+qejMnHCyooVsNbThsVBsjjgMjj8AB6coGDiZHXL6RanwV/ 96SVy7TQKcM4G8BLMM2+62eoQmxDl7JATUf3LhPUnV7T9yPCuOBOKFIahmA1M2dOnbRVt7 Oax9tGb/V3FIGCbg6B6wCZ1HMWlx5nP59YqVmJiYQWC7sKRIRdN2MxEXV+/CxDStAdP3x/ 7J+2VK/HPbZs1uTep0r72BHt2wvpSKhjWODHNDtaHRW589UkHn6u5XjRUoMCjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728629320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Je2s258Tj+HSdvM1BGOweK4Tq1ZsN4fSngnG2wTIokA=; b=NqX8yrP4nKovzksJJ/yeP3ct9BMd+Rf/RCIF2B9kaz3AM666ZZjJLLhWYHJ6rkGqdizz2z /9DN4/MzImX5wk+1HFlwOXJIDYDqw69KKEHUfTvMR3ujVoX061BZ04iuSROnsJGR4+f+Xi ij5W+RCkHKXvB2udLj7bGiIgRa9YIM6u5/lLr/Gvz9GaiTZ/5uc4LCK6IwxViX5VxcGGlO F7muJ/S0tCIT6dZLgC4c6NhWit6YooiPwjKefvd9f41/O1VYL40zfFRd88i0nRKMfnL2Lf sKS1mXrZUBawctiNVaF6I3ECHV5PZL1TZlw6BYs8vNMor8suGLqygffsegejEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728629320; a=rsa-sha256; cv=none; b=jzEKvSR1NM3Maf2oi6GT6fX1fVzhOg928T9WwwYqvQQyyuHdGwZWra1JYyJ5GkAD/Wei0T A5G1lPSDimYQRtY9fE0T9XgqLc7KVdrbFilRZv3zDc8Nnt/B/1ng/OQv2JJLVbmMjlZAsW ZbSRFlJvELU8HDf5l5Hj8+QQqVuV+boHBLiGTEjN6r+/WspojB3SevPa+AgTph2+V64VRk h1h+6eCZZDI9kmKra/P/1AwxjzqI7bZyE67FwZBT7LKUghoEacJ3rtVZTY7uGS2qIaVnwK PdK/wgkQchv1Hf8T6Hc+82UtyYM7DD0tb/w1QOVV6/YUp9f4/sfSKn+2A0pBlQ== 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 4XPxzX104MzXRS; Fri, 11 Oct 2024 06:48:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49B6meCo055941; Fri, 11 Oct 2024 06:48:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49B6maOr055929; Fri, 11 Oct 2024 06:48:36 GMT (envelope-from git) Date: Fri, 11 Oct 2024 06:48:36 GMT Message-Id: <202410110648.49B6maOr055929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 7a7741af18d6 - main - zfs: merge openzfs/zfs@b10992582 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a7741af18d6c8a804cc643cb7ecda9d730c6aa6 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=7a7741af18d6c8a804cc643cb7ecda9d730c6aa6 commit 7a7741af18d6c8a804cc643cb7ecda9d730c6aa6 Merge: 3e501ef89667 3a9fca901b44 Author: Martin Matuska AuthorDate: 2024-10-11 06:39:18 +0000 Commit: Martin Matuska CommitDate: 2024-10-11 06:43:49 +0000 zfs: merge openzfs/zfs@b10992582 Notable upstream pull request merges: #9416 -multiple zio_compress: introduce max size threshold #10018 a10e552b9 Adding Direct IO Support #15147 e419a63bf xattr dataset prop: change defaults to sa #15454 7e957fde7 send/recv: open up additional stream feature flags #15810 0d77e738e Defer resilver only when progress is above a threshold #15921 3cf2bfa57 Allocate zap_attribute_t from kmem instead of stack #16483 -multiple dmu_objset: replace dnode_hash impl with cityhash4 #16485 8be2f4c3d zio_resume: log when unsuspending the pool #16491 88433e640 sys/types32.h: Remove struct timeval32 from libspl header #16496 f245541e2 zfs_file: implement zfs_file_deallocate for FreeBSD 14 #16511 308f7c2f1 Fix an uninitialized data access #16529 29c9e6c32 Fix handling of DNS names with '-' in them for sharenfs #16531 ddf5f34f0 Avoid fault diagnosis if multiple vdevs have errors #16539 6f50f8e16 zfs_log: add flex array fields to log record structs #16546 d40d40913 Evicting too many bytes from MFU metadata #16551 3014dcb76 Reduce and handle EAGAIN errors on AIO label reads #16554 80645d658 FreeBSD: restore zfs_znode_update_vfs() #16565 832f66b21 FreeBSD: Sync taskq_cancel_id() returns with Linux #16567 48d1be254 Properly release key in spa_keystore_dsl_key_hold_dd() #16569 141368a4b Restrict raidz faulted vdev count #16583 c84a37ae9 lua: add flex array field to TString type #16584 86737c592 Avoid computing strlen() inside loops #16587 d34d4f97a snapdir: add 'disabled' value to make .zfs inaccessible #16593 224393a32 feature: large_microzap #16597 412105977 Temporarily disable Direct IO by default #16605 4ebe674d9 ARC: Cache arc_c value during arc_evict() Backported pull request merges: #16613 ab777f436 Return boolean_t in inline functions of lib/libspl/include/sys/uio.h #16616 efeb60b86 FreeBSD: ignore some includes when not building kernel #16635 ---TBD--- zdb: fix printf format in dump_zap() Obtained from: OpenZFS OpenZFS commit: b109925820fb79db3e37670c159977f03edd950f OpenZFS tag: 2.3.0-rc1 cddl/lib/libzdb/Makefile | 1 + cddl/lib/libzfs_core/Makefile | 1 + cddl/lib/libzfsbootenv/Makefile | 1 + cddl/lib/libzpool/Makefile | 18 +- cddl/lib/libzutil/Makefile | 1 + cddl/lib/pam_zfs_key/Makefile | 1 + cddl/share/zfs/compatibility.d/Makefile | 12 +- stand/libsa/zfs/Makefile.inc | 2 +- sys/conf/files | 4 +- sys/contrib/openzfs/.github/CONTRIBUTING.md | 18 +- .../.github/workflows/build-dependencies.txt | 57 --- .../.github/workflows/checkstyle-dependencies.txt | 5 - .../openzfs/.github/workflows/checkstyle.yaml | 23 +- sys/contrib/openzfs/.github/workflows/codeql.yml | 10 +- .../openzfs/.github/workflows/scripts/README.md | 14 + .../.github/workflows/scripts/generate-ci-type.py | 107 +++++ .../.github/workflows/scripts/generate-summary.sh | 119 ------ .../.github/workflows/scripts/merge_summary.awk | 109 +++++ .../.github/workflows/scripts/qemu-1-setup.sh | 91 ++++ .../.github/workflows/scripts/qemu-2-start.sh | 213 +++++++++ .../.github/workflows/scripts/qemu-3-deps.sh | 221 ++++++++++ .../.github/workflows/scripts/qemu-4-build.sh | 153 +++++++ .../.github/workflows/scripts/qemu-5-setup.sh | 121 ++++++ .../.github/workflows/scripts/qemu-6-tests.sh | 105 +++++ .../.github/workflows/scripts/qemu-7-prepare.sh | 123 ++++++ .../.github/workflows/scripts/qemu-8-summary.sh | 71 +++ .../workflows/scripts/qemu-9-summary-page.sh | 57 +++ .../workflows/scripts/setup-dependencies.sh | 88 ---- .../.github/workflows/scripts/setup-functional.sh | 24 -- .../openzfs/.github/workflows/zfs-linux-tests.yml | 124 ------ .../openzfs/.github/workflows/zfs-linux.yml | 64 --- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 175 ++++++++ sys/contrib/openzfs/.github/workflows/zloop.yml | 77 ++++ sys/contrib/openzfs/.mailmap | 1 + sys/contrib/openzfs/AUTHORS | 4 + sys/contrib/openzfs/META | 8 +- sys/contrib/openzfs/cmd/arc_summary | 2 +- sys/contrib/openzfs/cmd/arcstat.in | 297 +++++++++---- sys/contrib/openzfs/cmd/zdb/zdb.c | 144 ++++--- sys/contrib/openzfs/cmd/zdb/zdb_il.c | 6 +- sys/contrib/openzfs/cmd/zed/agents/zfs_diagnosis.c | 101 +++-- sys/contrib/openzfs/cmd/zhack.c | 17 +- sys/contrib/openzfs/cmd/zpool/Makefile.am | 9 +- .../openzfs/cmd/zpool/compatibility.d/grub2-2.06 | 23 + .../zpool/compatibility.d/{grub2 => grub2-2.12} | 2 +- .../openzfs/cmd/zpool/compatibility.d/openzfs-2.3 | 45 ++ sys/contrib/openzfs/cmd/zpool/zpool_main.c | 30 +- .../openzfs/cmd/zstream/zstream_recompress.c | 3 +- sys/contrib/openzfs/cmd/zstream/zstream_redup.c | 4 +- sys/contrib/openzfs/cmd/ztest.c | 78 +++- sys/contrib/openzfs/config/ax_compare_version.m4 | 177 ++++++++ sys/contrib/openzfs/config/deb.am | 2 + sys/contrib/openzfs/config/intlmacosx.m4 | 72 ---- sys/contrib/openzfs/config/kernel-acl.m4 | 215 +--------- sys/contrib/openzfs/config/kernel-aio-fsync.m4 | 23 - sys/contrib/openzfs/config/kernel-assign_str.m4 | 62 +++ sys/contrib/openzfs/config/kernel-bdi.m4 | 81 ---- sys/contrib/openzfs/config/kernel-bio.m4 | 313 +------------- sys/contrib/openzfs/config/kernel-blk-queue.m4 | 183 +------- sys/contrib/openzfs/config/kernel-blkdev.m4 | 22 +- sys/contrib/openzfs/config/kernel-clear-inode.m4 | 39 -- .../openzfs/config/kernel-config-defined.m4 | 15 - sys/contrib/openzfs/config/kernel-current-time.m4 | 26 -- sys/contrib/openzfs/config/kernel-dentry-alias.m4 | 30 -- .../openzfs/config/kernel-dentry-operations.m4 | 135 ------ sys/contrib/openzfs/config/kernel-dirty-inode.m4 | 29 -- .../openzfs/config/kernel-encode-fh-inode.m4 | 27 -- sys/contrib/openzfs/config/kernel-evict-inode.m4 | 24 -- sys/contrib/openzfs/config/kernel-fadvise.m4 | 23 - sys/contrib/openzfs/config/kernel-fallocate.m4 | 44 -- sys/contrib/openzfs/config/kernel-file-dentry.m4 | 24 -- sys/contrib/openzfs/config/kernel-file-inode.m4 | 23 - sys/contrib/openzfs/config/kernel-file.m4 | 31 ++ sys/contrib/openzfs/config/kernel-filemap.m4 | 27 -- sys/contrib/openzfs/config/kernel-fsync.m4 | 53 --- .../openzfs/config/kernel-generic_fillattr.m4 | 4 + .../openzfs/config/kernel-generic_io_acct.m4 | 29 -- .../openzfs/config/kernel-generic_readlink.m4 | 25 -- sys/contrib/openzfs/config/kernel-genhd-flags.m4 | 21 +- sys/contrib/openzfs/config/kernel-get-link.m4 | 104 ----- .../openzfs/config/kernel-global_page_state.m4 | 128 ------ sys/contrib/openzfs/config/kernel-group-info.m4 | 22 - sys/contrib/openzfs/config/kernel-hotplug.m4 | 26 -- .../openzfs/config/kernel-in-compat-syscall.m4 | 24 -- sys/contrib/openzfs/config/kernel-inode-getattr.m4 | 26 -- sys/contrib/openzfs/config/kernel-inode-lock.m4 | 24 -- .../openzfs/config/kernel-inode-permission.m4 | 2 + .../openzfs/config/kernel-inode-set-flags.m4 | 22 - .../openzfs/config/kernel-inode-set-iversion.m4 | 23 - sys/contrib/openzfs/config/kernel-inode-setattr.m4 | 22 - sys/contrib/openzfs/config/kernel-inode-times.m4 | 23 - sys/contrib/openzfs/config/kernel-kmem-cache.m4 | 41 -- sys/contrib/openzfs/config/kernel-kmem.m4 | 27 +- sys/contrib/openzfs/config/kernel-kstrtoul.m4 | 21 - sys/contrib/openzfs/config/kernel-kthread.m4 | 37 +- sys/contrib/openzfs/config/kernel-ktime.m4 | 55 --- sys/contrib/openzfs/config/kernel-lseek-execute.m4 | 27 -- .../openzfs/config/kernel-make-request-fn.m4 | 42 +- sys/contrib/openzfs/config/kernel-mkdir.m4 | 11 +- sys/contrib/openzfs/config/kernel-mm-page-flags.m4 | 24 ++ sys/contrib/openzfs/config/kernel-mm-pagemap.m4 | 4 +- sys/contrib/openzfs/config/kernel-percpu.m4 | 56 --- sys/contrib/openzfs/config/kernel-put-link.m4 | 61 --- sys/contrib/openzfs/config/kernel-rename.m4 | 64 +-- sys/contrib/openzfs/config/kernel-rw.m4 | 69 --- sys/contrib/openzfs/config/kernel-rwsem.m4 | 60 --- sys/contrib/openzfs/config/kernel-sched.m4 | 53 --- .../openzfs/config/kernel-setattr-prepare.m4 | 2 + sys/contrib/openzfs/config/kernel-shrink.m4 | 163 +------ sys/contrib/openzfs/config/kernel-signal-stop.m4 | 21 - sys/contrib/openzfs/config/kernel-special-state.m4 | 21 - sys/contrib/openzfs/config/kernel-strlcpy.m4 | 25 +- sys/contrib/openzfs/config/kernel-super-userns.m4 | 25 -- sys/contrib/openzfs/config/kernel-symlink.m4 | 2 + sys/contrib/openzfs/config/kernel-timer.m4 | 75 ---- sys/contrib/openzfs/config/kernel-tmpfile.m4 | 4 - sys/contrib/openzfs/config/kernel-user-ns-inum.m4 | 23 - .../openzfs/config/kernel-userns-capabilities.m4 | 27 -- sys/contrib/openzfs/config/kernel-vfs-direct_IO.m4 | 56 +-- .../config/kernel-vfs-extended-file_range.m4 | 50 --- .../openzfs/config/kernel-vfs-file_range.m4 | 30 -- sys/contrib/openzfs/config/kernel-vfs-getattr.m4 | 86 ---- .../openzfs/config/kernel-vfs-invalidate_folio.m4 | 33 ++ sys/contrib/openzfs/config/kernel-vfs-iov_iter.m4 | 163 ++----- sys/contrib/openzfs/config/kernel-vfs-iterate.m4 | 83 ---- .../openzfs/config/kernel-vfs-release_folio.m4 | 32 ++ .../openzfs/config/kernel-vfs-rw-iterate.m4 | 80 ---- sys/contrib/openzfs/config/kernel-wait.m4 | 99 ----- sys/contrib/openzfs/config/kernel-xattr-handler.m4 | 322 +------------- sys/contrib/openzfs/config/kernel-zlib.m4 | 26 -- sys/contrib/openzfs/config/kernel.m4 | 158 +++---- sys/contrib/openzfs/configure.ac | 2 + sys/contrib/openzfs/contrib/Makefile.am | 1 + sys/contrib/openzfs/contrib/debian/Makefile.am | 48 +++ sys/contrib/openzfs/contrib/debian/not-installed | 1 - sys/contrib/openzfs/contrib/debian/rules.in | 8 +- sys/contrib/openzfs/include/cityhash.h | 7 + .../openzfs/include/os/freebsd/spl/sys/mutex.h | 1 + .../openzfs/include/os/freebsd/spl/sys/param.h | 1 + .../openzfs/include/os/freebsd/spl/sys/simd.h | 3 + .../openzfs/include/os/freebsd/spl/sys/uio.h | 31 +- .../openzfs/include/os/freebsd/zfs/sys/abd_os.h | 15 + .../include/os/freebsd/zfs/sys/zfs_ctldir.h | 2 +- .../include/os/freebsd/zfs/sys/zfs_vfsops_os.h | 3 +- .../include/os/freebsd/zfs/sys/zfs_znode_impl.h | 2 +- sys/contrib/openzfs/include/os/linux/Makefile.am | 1 - .../include/os/linux/kernel/linux/blkdev_compat.h | 229 +--------- .../include/os/linux/kernel/linux/dcache_compat.h | 6 - .../include/os/linux/kernel/linux/kmap_compat.h | 2 + .../include/os/linux/kernel/linux/mm_compat.h | 14 + .../include/os/linux/kernel/linux/page_compat.h | 56 --- .../openzfs/include/os/linux/kernel/linux/simd.h | 4 + .../include/os/linux/kernel/linux/simd_aarch64.h | 10 - .../include/os/linux/kernel/linux/simd_powerpc.h | 11 - .../include/os/linux/kernel/linux/vfs_compat.h | 235 +--------- .../include/os/linux/kernel/linux/xattr_compat.h | 106 +---- .../openzfs/include/os/linux/spl/sys/condvar.h | 4 +- .../openzfs/include/os/linux/spl/sys/cred.h | 4 - .../openzfs/include/os/linux/spl/sys/file.h | 11 - .../openzfs/include/os/linux/spl/sys/kmem_cache.h | 3 +- .../openzfs/include/os/linux/spl/sys/signal.h | 3 - .../openzfs/include/os/linux/spl/sys/string.h | 7 - .../openzfs/include/os/linux/spl/sys/taskq.h | 6 +- .../openzfs/include/os/linux/spl/sys/thread.h | 7 - .../openzfs/include/os/linux/spl/sys/time.h | 28 -- .../openzfs/include/os/linux/spl/sys/timer.h | 20 - .../openzfs/include/os/linux/spl/sys/types.h | 6 + sys/contrib/openzfs/include/os/linux/spl/sys/uio.h | 47 +- .../openzfs/include/os/linux/spl/sys/wait.h | 24 -- .../openzfs/include/os/linux/spl/sys/wmsum.h | 9 - .../openzfs/include/os/linux/zfs/sys/abd_os.h | 3 + .../include/os/linux/zfs/sys/trace_dbgmsg.h | 3 +- .../openzfs/include/os/linux/zfs/sys/trace_dbuf.h | 29 +- .../openzfs/include/os/linux/zfs/sys/zfs_ctldir.h | 2 +- .../include/os/linux/zfs/sys/zfs_vfsops_os.h | 3 +- .../include/os/linux/zfs/sys/zfs_vnops_os.h | 3 +- .../include/os/linux/zfs/sys/zfs_znode_impl.h | 31 -- sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h | 86 +--- sys/contrib/openzfs/include/sys/abd.h | 7 + sys/contrib/openzfs/include/sys/abd_impl.h | 14 +- sys/contrib/openzfs/include/sys/arc.h | 3 +- sys/contrib/openzfs/include/sys/dbuf.h | 29 +- sys/contrib/openzfs/include/sys/dmu.h | 14 +- sys/contrib/openzfs/include/sys/dmu_impl.h | 34 +- sys/contrib/openzfs/include/sys/dmu_objset.h | 1 + sys/contrib/openzfs/include/sys/fm/fs/zfs.h | 2 + sys/contrib/openzfs/include/sys/fs/zfs.h | 15 + sys/contrib/openzfs/include/sys/sa_impl.h | 4 +- sys/contrib/openzfs/include/sys/spa.h | 12 + sys/contrib/openzfs/include/sys/uio_impl.h | 37 ++ sys/contrib/openzfs/include/sys/vdev_impl.h | 10 + sys/contrib/openzfs/include/sys/zap.h | 16 +- sys/contrib/openzfs/include/sys/zap_impl.h | 7 +- sys/contrib/openzfs/include/sys/zfs_file.h | 2 +- sys/contrib/openzfs/include/sys/zfs_ioctl.h | 72 ++-- sys/contrib/openzfs/include/sys/zfs_racct.h | 7 +- sys/contrib/openzfs/include/sys/zfs_znode.h | 4 +- sys/contrib/openzfs/include/sys/zil.h | 30 +- sys/contrib/openzfs/include/sys/zio.h | 5 + sys/contrib/openzfs/include/sys/zio_compress.h | 3 +- sys/contrib/openzfs/include/sys/zio_impl.h | 7 +- sys/contrib/openzfs/include/zfeature_common.h | 3 + sys/contrib/openzfs/lib/libnvpair/libnvpair.abi | 197 ++++++++- sys/contrib/openzfs/lib/libshare/os/freebsd/nfs.c | 4 +- sys/contrib/openzfs/lib/libspl/include/sys/simd.h | 3 + sys/contrib/openzfs/lib/libspl/include/sys/uio.h | 26 ++ sys/contrib/openzfs/lib/libuutil/libuutil.abi | 200 ++++++++- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 212 ++++++++- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 8 +- sys/contrib/openzfs/lib/libzfs/libzfs_util.c | 8 +- .../openzfs/lib/libzfs_core/libzfs_core.abi | 196 ++++++++- sys/contrib/openzfs/lib/libzpool/Makefile.am | 15 +- sys/contrib/openzfs/lib/libzpool/abd_os.c | 64 +++ sys/contrib/openzfs/lib/libzpool/arc_os.c | 87 ++++ sys/contrib/openzfs/lib/libzpool/kernel.c | 30 +- .../libzpool/vdev_label_os.c} | 39 +- sys/contrib/openzfs/lib/libzpool/zfs_debug.c | 106 +++++ sys/contrib/openzfs/lib/libzpool/zfs_racct.c | 38 ++ sys/contrib/openzfs/lib/libzstd/Makefile.am | 2 + sys/contrib/openzfs/lib/libzutil/zutil_import.c | 17 +- sys/contrib/openzfs/man/man1/arcstat.1 | 166 ++++++++ sys/contrib/openzfs/man/man4/zfs.4 | 62 ++- sys/contrib/openzfs/man/man7/zfsconcepts.7 | 2 +- sys/contrib/openzfs/man/man7/zfsprops.7 | 99 ++++- sys/contrib/openzfs/man/man7/zpool-features.7 | 69 ++- sys/contrib/openzfs/man/man8/zfs-send.8 | 6 +- sys/contrib/openzfs/man/man8/zpool-events.8 | 14 +- sys/contrib/openzfs/man/man8/zpool-status.8 | 11 +- sys/contrib/openzfs/module/Kbuild.in | 5 +- sys/contrib/openzfs/module/Makefile.bsd | 4 +- sys/contrib/openzfs/module/lua/lobject.h | 21 +- sys/contrib/openzfs/module/lua/lstate.h | 2 +- sys/contrib/openzfs/module/lua/lstring.c | 2 +- sys/contrib/openzfs/module/lua/lstring.h | 2 +- .../openzfs/module/os/freebsd/spl/spl_taskq.c | 4 +- .../openzfs/module/os/freebsd/spl/spl_uio.c | 201 +++++++++ sys/contrib/openzfs/module/os/freebsd/zfs/abd_os.c | 169 +++++++- .../openzfs/module/os/freebsd/zfs/vdev_file.c | 11 +- .../openzfs/module/os/freebsd/zfs/zfs_acl.c | 2 +- .../openzfs/module/os/freebsd/zfs/zfs_debug.c | 53 +-- .../openzfs/module/os/freebsd/zfs/zfs_dir.c | 31 +- .../openzfs/module/os/freebsd/zfs/zfs_file_os.c | 26 ++ .../openzfs/module/os/freebsd/zfs/zfs_racct.c | 8 +- .../openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 13 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 95 ++++- .../os/freebsd/zfs/{zfs_znode.c => zfs_znode_os.c} | 374 +--------------- .../openzfs/module/os/freebsd/zfs/zvol_os.c | 1 + .../openzfs/module/os/linux/spl/spl-condvar.c | 47 +- sys/contrib/openzfs/module/os/linux/spl/spl-cred.c | 21 +- .../openzfs/module/os/linux/spl/spl-generic.c | 30 +- .../openzfs/module/os/linux/spl/spl-kmem-cache.c | 23 +- sys/contrib/openzfs/module/os/linux/spl/spl-kmem.c | 2 - sys/contrib/openzfs/module/os/linux/spl/spl-proc.c | 2 +- .../openzfs/module/os/linux/spl/spl-shrinker.c | 46 +- .../openzfs/module/os/linux/spl/spl-taskq.c | 22 +- .../openzfs/module/os/linux/spl/spl-thread.c | 26 +- sys/contrib/openzfs/module/os/linux/spl/spl-vmem.c | 1 - sys/contrib/openzfs/module/os/linux/spl/spl-zlib.c | 1 - sys/contrib/openzfs/module/os/linux/spl/spl-zone.c | 20 +- sys/contrib/openzfs/module/os/linux/zfs/abd_os.c | 240 +++++++++-- sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 47 -- sys/contrib/openzfs/module/os/linux/zfs/policy.c | 9 - .../openzfs/module/os/linux/zfs/vdev_disk.c | 71 +-- .../openzfs/module/os/linux/zfs/vdev_file.c | 9 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c | 2 +- .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 25 +- .../openzfs/module/os/linux/zfs/zfs_debug.c | 40 -- sys/contrib/openzfs/module/os/linux/zfs/zfs_dir.c | 32 +- .../openzfs/module/os/linux/zfs/zfs_file_os.c | 74 +--- .../openzfs/module/os/linux/zfs/zfs_ioctl_os.c | 6 + .../openzfs/module/os/linux/zfs/zfs_racct.c | 29 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c | 308 ++++++++++++- .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 117 +---- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 152 +++++-- .../os/linux/zfs/{zfs_znode.c => zfs_znode_os.c} | 411 +----------------- .../openzfs/module/os/linux/zfs/zpl_ctldir.c | 90 +--- .../openzfs/module/os/linux/zfs/zpl_export.c | 38 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 336 +++------------ .../openzfs/module/os/linux/zfs/zpl_file_range.c | 8 +- .../openzfs/module/os/linux/zfs/zpl_inode.c | 173 +++----- .../openzfs/module/os/linux/zfs/zpl_super.c | 13 +- .../openzfs/module/os/linux/zfs/zpl_xattr.c | 110 +---- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 72 +--- sys/contrib/openzfs/module/zcommon/cityhash.c | 33 +- sys/contrib/openzfs/module/zcommon/simd_stat.c | 203 +++++++++ .../openzfs/module/zcommon/zfeature_common.c | 27 +- sys/contrib/openzfs/module/zcommon/zfs_prop.c | 30 +- sys/contrib/openzfs/module/zcommon/zfs_valstr.c | 2 + sys/contrib/openzfs/module/zcommon/zpool_prop.c | 5 +- sys/contrib/openzfs/module/zfs/abd.c | 94 ++-- sys/contrib/openzfs/module/zfs/arc.c | 37 +- sys/contrib/openzfs/module/zfs/dataset_kstats.c | 6 +- sys/contrib/openzfs/module/zfs/dbuf.c | 317 ++++++++++---- sys/contrib/openzfs/module/zfs/ddt.c | 8 - sys/contrib/openzfs/module/zfs/ddt_zap.c | 14 +- sys/contrib/openzfs/module/zfs/dmu.c | 154 +++++-- sys/contrib/openzfs/module/zfs/dmu_direct.c | 395 +++++++++++++++++ sys/contrib/openzfs/module/zfs/dmu_objset.c | 78 ++-- sys/contrib/openzfs/module/zfs/dmu_recv.c | 42 +- sys/contrib/openzfs/module/zfs/dmu_redact.c | 8 +- sys/contrib/openzfs/module/zfs/dmu_send.c | 17 +- sys/contrib/openzfs/module/zfs/dmu_tx.c | 4 +- sys/contrib/openzfs/module/zfs/dsl_bookmark.c | 8 +- sys/contrib/openzfs/module/zfs/dsl_crypt.c | 6 +- sys/contrib/openzfs/module/zfs/dsl_dataset.c | 21 +- sys/contrib/openzfs/module/zfs/dsl_deadlist.c | 38 +- sys/contrib/openzfs/module/zfs/dsl_deleg.c | 36 +- sys/contrib/openzfs/module/zfs/dsl_destroy.c | 4 +- sys/contrib/openzfs/module/zfs/dsl_dir.c | 7 +- sys/contrib/openzfs/module/zfs/dsl_pool.c | 12 +- sys/contrib/openzfs/module/zfs/dsl_prop.c | 41 +- sys/contrib/openzfs/module/zfs/dsl_scan.c | 79 ++-- sys/contrib/openzfs/module/zfs/dsl_userhold.c | 4 +- sys/contrib/openzfs/module/zfs/metaslab.c | 2 +- sys/contrib/openzfs/module/zfs/sa.c | 34 +- sys/contrib/openzfs/module/zfs/spa.c | 72 ++-- sys/contrib/openzfs/module/zfs/spa_errlog.c | 84 ++-- sys/contrib/openzfs/module/zfs/spa_log_spacemap.c | 9 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 2 + sys/contrib/openzfs/module/zfs/spa_stats.c | 46 ++ sys/contrib/openzfs/module/zfs/vdev.c | 89 +++- sys/contrib/openzfs/module/zfs/vdev_label.c | 4 + sys/contrib/openzfs/module/zfs/zap.c | 30 +- sys/contrib/openzfs/module/zfs/zap_micro.c | 191 ++++++++- sys/contrib/openzfs/module/zfs/zcp_iter.c | 29 +- sys/contrib/openzfs/module/zfs/zfeature.c | 4 +- sys/contrib/openzfs/module/zfs/zfs_fm.c | 2 + sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 36 +- sys/contrib/openzfs/module/zfs/zfs_log.c | 94 ++-- sys/contrib/openzfs/module/zfs/zfs_quota.c | 12 +- sys/contrib/openzfs/module/zfs/zfs_replay.c | 143 ++++--- sys/contrib/openzfs/module/zfs/zfs_vnops.c | 294 ++++++++++++- sys/contrib/openzfs/module/zfs/zfs_znode.c | 401 +++++++++++++++++ sys/contrib/openzfs/module/zfs/zio.c | 149 ++++++- sys/contrib/openzfs/module/zfs/zio_compress.c | 14 +- sys/contrib/openzfs/module/zfs/zvol.c | 4 +- sys/contrib/openzfs/scripts/Makefile.am | 1 - sys/contrib/openzfs/scripts/enum-extract.pl | 58 --- sys/contrib/openzfs/scripts/zfs-tests.sh | 73 +++- sys/contrib/openzfs/tests/runfiles/common.run | 10 +- sys/contrib/openzfs/tests/runfiles/freebsd.run | 4 + sys/contrib/openzfs/tests/runfiles/linux.run | 15 +- .../tests/test-runner/bin/test-runner.py.in | 12 + .../openzfs/tests/test-runner/bin/zts-report.py.in | 61 +-- sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore | 1 + .../openzfs/tests/zfs-tests/cmd/Makefile.am | 2 + .../tests/zfs-tests/cmd/manipulate_user_buffer.c | 272 ++++++++++++ .../openzfs/tests/zfs-tests/cmd/mmap_sync.c | 2 +- .../openzfs/tests/zfs-tests/cmd/stride_dd.c | 237 ++++++++--- .../openzfs/tests/zfs-tests/include/commands.cfg | 8 +- .../openzfs/tests/zfs-tests/include/libtest.shlib | 39 +- .../tests/zfs-tests/include/properties.shlib | 2 +- .../openzfs/tests/zfs-tests/include/tunables.cfg | 3 + .../openzfs/tests/zfs-tests/tests/Makefile.am | 34 ++ .../tests/functional/bclone/bclone_common.kshlib | 4 +- .../functional/bclone/bclone_corner_cases.kshlib | 6 +- .../functional/block_cloning/block_cloning.kshlib | 4 +- .../block_cloning_cross_enc_dataset.ksh | 8 +- .../tests/functional/cache/cache_012_pos.ksh | 2 +- .../tests/functional/cli_root/zdb/zdb_backup.ksh | 4 +- .../zfs_receive_compressed_corrective.ksh | 4 +- .../zfs_receive/zfs_receive_corrective.ksh | 6 +- .../zfs_receive/zfs_receive_from_encrypted.ksh | 6 +- .../cli_root/zfs_receive/zfs_receive_from_zstd.ksh | 4 +- .../zfs_receive_large_block_corrective.ksh | 4 +- .../cli_root/zfs_receive/zfs_receive_raw.ksh | 6 +- .../zfs_receive/zfs_receive_raw_incremental.ksh | 4 +- .../cli_root/zpool_create/zpool_create.shlib | 5 +- .../zpool_create/zpool_create_features_005_pos.ksh | 2 +- .../functional/cli_root/zpool_get/zpool_get.cfg | 2 + .../import_cachefile_shared_device.ksh | 2 +- .../zpool_import/import_devices_missing.ksh | 8 +- .../zpool_import/import_rewind_config_changed.ksh | 4 +- .../zpool_import/import_rewind_device_replaced.ksh | 6 +- .../cli_root/zpool_import/zpool_import.cfg | 4 +- .../cli_root/zpool_import/zpool_import.kshlib | 34 +- ...ort_hostid_changed_cachefile_unclean_export.ksh | 10 +- .../zpool_import_hostid_changed_unclean_export.ksh | 9 +- .../functional/cli_root/zpool_reguid/Makefile.am | 6 - .../cli_root/zpool_reguid/zpool_reguid_001_pos.ksh | 4 +- .../cli_root/zpool_reguid/zpool_reguid_002_neg.ksh | 2 +- .../cli_root/zpool_reopen/zpool_reopen_003_pos.ksh | 4 +- .../cli_root/zpool_status/zpool_status_008_pos.ksh | 6 +- .../compression/l2arc_compressed_arc.ksh | 2 +- .../functional/compression/l2arc_encrypted.ksh | 2 +- .../l2arc_encrypted_no_compressed_arc.ksh | 2 +- .../tests/functional/cp_files/cp_files_002_pos.ksh | 4 +- .../tests/functional/deadman/deadman_sync.ksh | 8 +- .../zfs-tests/tests/functional/direct/cleanup.ksh | 37 ++ .../zfs-tests/tests/functional/direct/dio.cfg | 26 ++ .../zfs-tests/tests/functional/direct/dio.kshlib | 331 ++++++++++++++ .../tests/functional/direct/dio_aligned_block.ksh | 115 +++++ .../tests/functional/direct/dio_async_always.ksh | 68 +++ .../functional/direct/dio_async_fio_ioengines.ksh | 106 +++++ .../tests/functional/direct/dio_compression.ksh | 65 +++ .../tests/functional/direct/dio_dedup.ksh | 63 +++ .../tests/functional/direct/dio_encryption.ksh | 62 +++ .../tests/functional/direct/dio_grow_block.ksh | 86 ++++ .../tests/functional/direct/dio_max_recordsize.ksh | 64 +++ .../tests/functional/direct/dio_mixed.ksh | 107 +++++ .../zfs-tests/tests/functional/direct/dio_mmap.ksh | 92 ++++ .../tests/functional/direct/dio_overwrites.ksh | 70 +++ .../tests/functional/direct/dio_property.ksh | 127 ++++++ .../tests/functional/direct/dio_random.ksh | 82 ++++ .../tests/functional/direct/dio_recordsize.ksh | 68 +++ .../functional/direct/dio_unaligned_block.ksh | 78 ++++ .../functional/direct/dio_unaligned_filesize.ksh | 91 ++++ .../functional/direct/dio_write_stable_pages.ksh | 103 +++++ .../tests/functional/direct/dio_write_verify.ksh | 196 +++++++++ .../zfs-tests/tests/functional/direct/setup.ksh | 37 ++ .../functional/events/zed_diagnose_multiple.ksh | 168 ++++++++ .../functional/events/zed_slow_io_many_vdevs.ksh | 4 +- .../tests/functional/fault/fault_limits.ksh | 96 +++++ .../functional/fault/suspend_resume_single.ksh | 4 +- .../tests/functional/history/history_003_pos.ksh | 6 +- .../tests/zfs-tests/tests/functional/io/setup.ksh | 2 +- .../zfs-tests/tests/functional/l2arc/l2arc.cfg | 2 +- .../tests/functional/longname/cleanup.ksh | 34 ++ .../tests/functional/longname/longname_001_pos.ksh | 132 ++++++ .../tests/functional/longname/longname_002_pos.ksh | 115 +++++ .../tests/functional/longname/longname_003_pos.ksh | 113 +++++ .../zfs-tests/tests/functional/longname/setup.ksh | 35 ++ .../tests/functional/no_space/enospc_ganging.ksh | 6 +- .../functional/projectquota/projectid_003_pos.ksh | 4 +- .../functional/raidz/raidz_expand_001_pos.ksh | 3 + .../functional/raidz/raidz_expand_002_pos.ksh | 1 + .../replacement/resilver_restart_001.ksh | 11 +- .../zfs-tests/tests/functional/rsend/rsend.kshlib | 22 +- .../tests/functional/rsend/send-c_longname.ksh | 98 +++++ .../tests/functional/rsend/send-c_volume.ksh | 12 +- .../functional/rsend/send-wR_encrypted_zvol.ksh | 6 +- .../functional/rsend/send_encrypted_props.ksh | 14 +- .../rsend/send_encrypted_truncated_files.ksh | 12 +- .../tests/functional/rsend/send_hole_birth.ksh | 2 +- .../tests/functional/slog/slog_replay_fs_001.ksh | 16 +- .../tests/functional/slog/slog_replay_volume.ksh | 4 +- .../zfs-tests/tests/functional/trim/trim_l2arc.ksh | 2 +- .../tests/functional/xattr/xattr_001_pos.ksh | 2 +- .../tests/functional/xattr/xattr_002_neg.ksh | 2 +- sys/contrib/openzfs/udev/zvol_id.c | 7 +- sys/modules/zfs/Makefile | 4 +- sys/modules/zfs/zfs_config.h | 474 ++------------------- sys/modules/zfs/zfs_gitrev.h | 2 +- tools/build/depend-cleanup.sh | 3 + 444 files changed, 12924 insertions(+), 9366 deletions(-) diff --cc cddl/lib/libzdb/Makefile index 63248399b91c,000000000000..0eb30c55d107 mode 100644,000000..100644 --- a/cddl/lib/libzdb/Makefile +++ b/cddl/lib/libzdb/Makefile @@@ -1,25 -1,0 +1,26 @@@ +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzdb +.PATH: ${SRCTOP}/sys/contrib/openzfs/include + +LIB= zdb +PACKAGE= zfs + +INCS = libzdb.h + +SRCS = libzdb.c + +WARNS?= 2 +CSTD= c99 + +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd ++CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzutil +CFLAGS+= -DHAVE_ISSETUGID -DIN_BASE +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h + +.include diff --cc cddl/lib/libzfs_core/Makefile index 4cd978e99a7d,000000000000..d986c45725b3 mode 100644,000000..100644 --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@@ -1,31 -1,0 +1,32 @@@ +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core +.PATH: ${SRCTOP}/sys/contrib/openzfs/include +.PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs + + +LIB= zfs_core +LIBADD= nvpair spl zutil +PACKAGE= zfs + +INCS= libzfs_core.h +SRCS= libzfs_core.c \ + os/freebsd/libzfs_core_ioctl.c \ + zfs_ioctl_compat.c + +WARNS?= 2 +CSTD= c99 +CFLAGS+= -DIN_BASE +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core/common +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd ++CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -DHAVE_ISSETUGID +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h + +.include diff --cc cddl/lib/libzfsbootenv/Makefile index 5f5dbfb6f108,000000000000..15ee5bfaeaa4 mode 100644,000000..100644 --- a/cddl/lib/libzfsbootenv/Makefile +++ b/cddl/lib/libzfsbootenv/Makefile @@@ -1,34 -1,0 +1,35 @@@ +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfsbootenv +.PATH: ${SRCTOP}/sys/contrib/openzfs/include + +PACKAGE= zfs +LIB= zfsbootenv +SHLIB_MAJOR= 1 + +LIBADD= zfs +LIBADD+= nvpair + +INCS= libzfsbootenv.h +USER_C= \ + lzbe_device.c \ + lzbe_util.c \ + lzbe_pair.c + +SRCS= $(USER_C) + +CSTD= c99 +CFLAGS+= -DIN_BASE +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd ++CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -DHAVE_ISSETUGID +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs +CFLAGS.lzbe_device.c= -Wno-cast-qual +CFLAGS.lzbe_util.c= -Wno-cast-qual +CFLAGS.lzbe_pair.c= -Wno-cast-qual + +.include diff --cc cddl/lib/libzpool/Makefile index b80486484506,000000000000..4c8285eedb2d mode 100644,000000..100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@@ -1,341 -1,0 +1,345 @@@ +ZFSTOP= ${SRCTOP}/sys/contrib/openzfs + +.PATH: ${ZFSTOP}/lib/libzpool + +# ZFS_COMMON_SRCS +.PATH: ${ZFSTOP}/module/zfs +.PATH: ${ZFSTOP}/module/zcommon +.PATH: ${ZFSTOP}/module/unicode +# LUA_SRCS +.PATH: ${ZFSTOP}/module/lua +# ZSTD_SRCS +.PATH: ${ZFSTOP}/module/zstd +.PATH: ${ZFSTOP}/module/zstd/lib/common +.PATH: ${ZFSTOP}/module/zstd/lib/compress +.PATH: ${ZFSTOP}/module/zstd/lib/decompress + - .PATH: ${ZFSTOP}/module/os/linux/zfs - +.if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +ATOMIC_SRCS= opensolaris_atomic.S +ACFLAGS+= -Wa,--noexecstack +.else +.PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern +ATOMIC_SRCS= opensolaris_atomic.c +.endif + +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpcspe" +# Don't waste GOT entries on small data. +PICFLAG= -fPIC +.endif + +PACKAGE= zfs +LIB= zpool + +USER_C = \ - abd_os.c \ ++ arc_os.c \ + kernel.c \ + taskq.c \ - util.c ++ util.c \ ++ zfs_debug.c ++ ++.PATH: ${ZFSTOP}/module/os/linux/zfs + +KERNEL_C = \ ++ simd_stat.c \ + zfeature_common.c \ + zfs_comutil.c \ + zfs_deleg.c \ + zfs_fletcher.c \ + zfs_fletcher_superscalar.c \ + zfs_fletcher_superscalar4.c \ + zfs_namecheck.c \ + zfs_prop.c \ + zfs_zstd.c \ + zpool_prop.c \ + zprop_common.c \ + abd.c \ ++ abd_os.c \ + aggsum.c \ + arc.c \ - arc_os.c \ + blake3_zfs.c \ + blkptr.c \ + bplist.c \ + bpobj.c \ + bptree.c \ + bqueue.c \ + btree.c \ + brt.c \ + cityhash.c \ + dbuf.c \ + dbuf_stats.c \ + ddt.c \ + ddt_log.c \ + ddt_stats.c \ + ddt_zap.c \ + dmu.c \ + dmu_diff.c \ ++ dmu_direct.c \ + dmu_object.c \ + dmu_objset.c \ + dmu_recv.c \ + dmu_redact.c \ + dmu_send.c \ + dmu_traverse.c \ + dmu_tx.c \ + dmu_zfetch.c \ + dnode.c \ + dnode_sync.c \ + dsl_bookmark.c \ + dsl_dataset.c \ + dsl_deadlist.c \ + dsl_deleg.c \ + dsl_dir.c \ + dsl_crypt.c \ + dsl_pool.c \ + dsl_prop.c \ + dsl_scan.c \ + dsl_synctask.c \ + dsl_destroy.c \ + dsl_userhold.c \ + edonr_zfs.c \ + entropy_common.c \ + error_private.c \ + fm.c \ + fse_compress.c \ + fse_decompress.c \ + gzip.c \ + hist.c \ + hkdf.c \ + huf_compress.c \ + huf_decompress.c \ + lzjb.c \ + lz4.c \ + lz4_zfs.c \ + metaslab.c \ + mmp.c \ + multilist.c \ + objlist.c \ + pathname.c \ + pool.c \ + range_tree.c \ + refcount.c \ + rrwlock.c \ + sa.c \ + sha2_zfs.c \ + skein_zfs.c \ + spa.c \ + spa_checkpoint.c \ + spa_config.c \ + spa_errlog.c \ + spa_history.c \ + spa_log_spacemap.c \ + spa_misc.c \ + spa_stats.c \ + space_map.c \ + space_reftree.c \ + txg.c \ + trace.c \ + uberblock.c \ + unique.c \ + vdev.c \ + vdev_draid.c \ + vdev_draid_rand.c \ + vdev_file.c \ + vdev_indirect_births.c \ + vdev_indirect.c \ + vdev_indirect_mapping.c \ + vdev_initialize.c \ + vdev_label.c \ + vdev_label_os.c \ + vdev_mirror.c \ + vdev_missing.c \ + vdev_queue.c \ + vdev_raidz.c \ + vdev_raidz_math_aarch64_neon.c \ + vdev_raidz_math_aarch64_neonx2.c \ + vdev_raidz_math_avx2.c \ + vdev_raidz_math_avx512bw.c \ + vdev_raidz_math_avx512f.c \ + vdev_raidz_math.c \ + vdev_raidz_math_scalar.c \ + vdev_rebuild.c \ + vdev_removal.c \ + vdev_root.c \ + vdev_trim.c \ + xxhash.c \ + zap.c \ + zap_leaf.c \ + zap_micro.c \ + zcp.c \ + zcp_get.c \ + zcp_global.c \ + zcp_iter.c \ + zcp_set.c \ + zcp_synctask.c \ + zfeature.c \ + zfs_byteswap.c \ + zfs_chksum.c \ - zfs_debug.c \ + zfs_fm.c \ + zfs_fuid.c \ + zfs_sa.c \ + zfs_znode.c \ + zfs_racct.c \ + zfs_ratelimit.c \ + zfs_rlock.c \ + zil.c \ + zio.c \ + zio_checksum.c \ + zio_compress.c \ + zio_crypt.c \ + zio_inject.c \ + zle.c \ + zrlock.c \ + zstd_common.c \ + zstd_compress.c \ + zstd_compress_literals.c \ + zstd_compress_sequences.c \ + zstd_compress_superblock.c \ + zstd_ddict.c \ + zstd_decompress.c \ + zstd_decompress_block.c \ + zstd_double_fast.c \ + zstd_fast.c \ + zstd_lazy.c \ + zstd_ldm.c \ + zstd_opt.c \ + zthr.c + +ARCH_C = +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +ARCH_C += vdev_raidz_math_sse2.c \ + vdev_raidz_math_ssse3.c \ + zfs_fletcher_intel.c \ + zfs_fletcher_sse.c +CFLAGS += -DHAVE_SSE2 -DHAVE_SSE3 +.endif +.if ${MACHINE_ARCH} == "amd64" +ARCH_C += zfs_fletcher_avx512.c +CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F \ + -DHAVE_AVX512BW +.endif +.if ${MACHINE_CPUARCH} == "aarch64" +ARCH_C += zfs_fletcher_aarch64_neon.c +.endif + +LUA_C = \ + lapi.c \ + lauxlib.c \ + lbaselib.c \ + lcode.c \ + lcompat.c \ + lcorolib.c \ + lctype.c \ + ldebug.c \ + ldo.c \ + lfunc.c \ + lgc.c \ + llex.c \ + lmem.c \ + lobject.c \ + lopcodes.c \ + lparser.c \ + lstate.c \ + lstring.c \ + lstrlib.c \ + ltable.c \ + ltablib.c \ + ltm.c \ + lvm.c \ + lzio.c + +UNICODE_C = u8_textprep.c uconv.c + - SRCS= ${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C} ++SRCS+= ${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C} ++ + +WARNS?= 2 +CFLAGS+= \ + -DIN_BASE \ + -I${ZFSTOP}/include \ + -I${ZFSTOP}/lib/libspl/include \ + -I${ZFSTOP}/lib/libspl/include/os/freebsd \ + -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \ + -I${SRCTOP}/sys \ + -I${ZFSTOP}/include/os/freebsd/zfs \ + -I${SRCTOP}/cddl/compat/opensolaris/include \ + -I${ZFSTOP}/module/icp/include \ ++ -I${SRCTOP}/compat/linuxkpi/common/include/linux \ + -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ + -DHAVE_ISSETUGID \ + -include ${SRCTOP}/sys/modules/zfs/zfs_config.h \ + -I${SRCTOP}/sys/modules/zfs \ + -I${ZFSTOP}/include/os/freebsd/zfs \ + -DLIB_ZPOOL_BUILD -DZFS_DEBUG \ + +# XXX: pthread doesn't have mutex_owned() equivalent, so we need to look +# into libthr private structures. That's sooo evil, but it's only for +# ZFS debugging tools needs. +CFLAGS+= -DWANTS_MUTEX_OWNED +CFLAGS+= -I${SRCTOP}/lib/libpthread/thread +CFLAGS+= -I${SRCTOP}/lib/libpthread/sys +CFLAGS+= -I${SRCTOP}/lib/libthr/arch/${MACHINE_CPUARCH}/include +CFLAGS.gcc+= -fms-extensions + +LIBADD= md pthread z spl icp nvpair avl umem + +# atomic.S doesn't like profiling. +MK_PROFILE= no + +CSTD= c99 + +# Since there are many asserts in this library, it makes no sense to compile +# it without debugging. + +CFLAGS+= -g -DDEBUG=1 + +CFLAGS.gcc+= -Wno-pointer-to-int-cast + +# Pointer values are used as debugging "tags" to mark reference count +# ownerships and in some cases the tag reference is dropped after an +# object is freed. +CFLAGS.dbuf.c= ${NO_WUSE_AFTER_FREE} +CFLAGS.entropy_common.c= -fno-tree-vectorize +CFLAGS.entropy_common.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.error_private.c= -fno-tree-vectorize +CFLAGS.error_private.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.fse_compress.c= -fno-tree-vectorize +CFLAGS.fse_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.fse_decompress.c= -fno-tree-vectorize +CFLAGS.fse_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.hist.c= -fno-tree-vectorize +CFLAGS.hist.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.huf_compress.c= -fno-tree-vectorize +CFLAGS.huf_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.huf_decompress.c= -fno-tree-vectorize +CFLAGS.huf_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.pool.c= -fno-tree-vectorize +CFLAGS.pool.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.xxhash.c= -fno-tree-vectorize +CFLAGS.xxhash.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_compress.c= -fno-tree-vectorize +CFLAGS.zstd_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_compress_literals.c= -fno-tree-vectorize +CFLAGS.zstd_compress_literals.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_compress_sequences.c= -fno-tree-vectorize +CFLAGS.zstd_compress_sequences.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_compress_superblock.c= -fno-tree-vectorize +CFLAGS.zstd_compress_superblock.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_double_fast.c= -fno-tree-vectorize +CFLAGS.zstd_double_fast.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_fast.c= -fno-tree-vectorize +CFLAGS.zstd_fast.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_lazy.c= -fno-tree-vectorize +CFLAGS.zstd_lazy.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_ldm.c= -fno-tree-vectorize +CFLAGS.zstd_ldm.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_opt.c= -fno-tree-vectorize +CFLAGS.zstd_opt.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_ddict.c= -fno-tree-vectorize +CFLAGS.zstd_ddict.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_decompress.c= -fno-tree-vectorize +CFLAGS.zstd_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_decompress_block.c= -fno-tree-vectorize +CFLAGS.zstd_decompress_block.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} + +.include diff --cc cddl/lib/libzutil/Makefile index 4d9794c32dda,000000000000..d1a943b25005 mode 100644,000000..100644 --- a/cddl/lib/libzutil/Makefile +++ b/cddl/lib/libzutil/Makefile @@@ -1,39 -1,0 +1,40 @@@ +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs + +LIB= zutil +LIBADD= avl geom m tpool +PACKAGE= zfs + +INCS = zutil_import.h + +SRCS = \ + zutil_device_path.c \ + zutil_import.c \ + zutil_import.h \ + zutil_nicenum.c \ *** 8197 LINES SKIPPED *** From nobody Fri Oct 11 07:12:54 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPyXD3l2Yz5YPd1; Fri, 11 Oct 2024 07:13:32 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp6.goneo.de (smtp6.goneo.de [IPv6:2001:1640:5::8:31]) (using TLSv1.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 mx1.freebsd.org (Postfix) with ESMTPS id 4XPyXC58PMz4j6G; Fri, 11 Oct 2024 07:13:31 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub1.goneo.de (hub1.goneo.de [IPv6:2001:1640:5::8:52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp6.goneo.de (Postfix) with ESMTPS id 505CB240EDB; Fri, 11 Oct 2024 09:13:24 +0200 (CEST) Received: from hub1.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPS id 60569240564; Fri, 11 Oct 2024 09:13:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1728630802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hcEy3HKFKelfqzkCGUJba1B7fxp1AaJ3QxbeBi8+o60=; b=FNUaF85hEL55yolZajsXYNGmSL/DZvZ50ugl8kToqIJdWRa+ZOEdcGb8q5ctlepwAHqGXx /VYPoD6AqGWQy5m8KSYE0W3EXXAB9Abk/gaPHnF2FgngdDgqIybfdm4kFWElxb1tM1jRnR Og1JTXgjqMwLZJ9jHLBTKCBXkm+BsqlIAKIvzCG7Cz33UTUp8WzIB5YzOo3t4ncSGpsmjd 3p4nf2MVVdIJB7+9NSl2YQ+LhOTKKEKIAaw+76l3rdmOPECyK7G1We6IwLaXYqHw1xAmAv H5GESTSnxtrL3Qb5PHL3qG/rDydh8DD1N0uIOVITDLW/1bfUrXit97jz1ARDIw== Received: from thor.intern.walstatt.dynvpn.de (dynamic-077-191-124-224.77.191.pool.telefonica.de [77.191.124.224]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPSA id 159652402D6; Fri, 11 Oct 2024 09:13:22 +0200 (CEST) Date: Fri, 11 Oct 2024 09:12:54 +0200 From: FreeBSD User To: Martin Matuska Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 7a7741af18d6 - main - zfs: merge openzfs/zfs@b10992582 Message-ID: <20241011091321.34f09b24@thor.intern.walstatt.dynvpn.de> In-Reply-To: <202410110648.49B6maOr055929@gitrepo.freebsd.org> References: <202410110648.49B6maOr055929@gitrepo.freebsd.org> Organization: walstatt-de.de List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-UID: 4fb847 X-Rspamd-UID: 99485b X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25394, ipnet:2001:1640::/32, country:DE] X-Rspamd-Queue-Id: 4XPyXC58PMz4j6G X-Spamd-Bar: ---- Am Fri, 11 Oct 2024 06:48:36 GMT Martin Matuska schrieb: This commit break buildworld: [...] ===> cddl/lib/libzfsbootenv (all) --- all_subdir_cddl/lib/libzpool --- --- arc_os.pico --- /usr/src/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c:45:10: fatal error: 'sys/shrinker.h' file not found 45 | #include Kind regards, oh > The branch main has been updated by mm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=7a7741af18d6c8a804cc643cb7ecda9d730c6aa6 > > commit 7a7741af18d6c8a804cc643cb7ecda9d730c6aa6 > Merge: 3e501ef89667 3a9fca901b44 > Author: Martin Matuska > AuthorDate: 2024-10-11 06:39:18 +0000 > Commit: Martin Matuska > CommitDate: 2024-10-11 06:43:49 +0000 > > zfs: merge openzfs/zfs@b10992582 > > Notable upstream pull request merges: > #9416 -multiple zio_compress: introduce max size threshold > #10018 a10e552b9 Adding Direct IO Support > #15147 e419a63bf xattr dataset prop: change defaults to sa > #15454 7e957fde7 send/recv: open up additional stream feature flags > #15810 0d77e738e Defer resilver only when progress is above a threshold > #15921 3cf2bfa57 Allocate zap_attribute_t from kmem instead of stack > #16483 -multiple dmu_objset: replace dnode_hash impl with cityhash4 > #16485 8be2f4c3d zio_resume: log when unsuspending the pool > #16491 88433e640 sys/types32.h: Remove struct timeval32 from libspl header > #16496 f245541e2 zfs_file: implement zfs_file_deallocate for FreeBSD 14 > #16511 308f7c2f1 Fix an uninitialized data access > #16529 29c9e6c32 Fix handling of DNS names with '-' in them for sharenfs > #16531 ddf5f34f0 Avoid fault diagnosis if multiple vdevs have errors > #16539 6f50f8e16 zfs_log: add flex array fields to log record structs > #16546 d40d40913 Evicting too many bytes from MFU metadata > #16551 3014dcb76 Reduce and handle EAGAIN errors on AIO label reads > #16554 80645d658 FreeBSD: restore zfs_znode_update_vfs() > #16565 832f66b21 FreeBSD: Sync taskq_cancel_id() returns with Linux > #16567 48d1be254 Properly release key in spa_keystore_dsl_key_hold_dd() > #16569 141368a4b Restrict raidz faulted vdev count > #16583 c84a37ae9 lua: add flex array field to TString type > #16584 86737c592 Avoid computing strlen() inside loops > #16587 d34d4f97a snapdir: add 'disabled' value to make .zfs inaccessible > #16593 224393a32 feature: large_microzap > #16597 412105977 Temporarily disable Direct IO by default > #16605 4ebe674d9 ARC: Cache arc_c value during arc_evict() > > Backported pull request merges: > #16613 ab777f436 Return boolean_t in inline functions of > lib/libspl/include/sys/uio.h > #16616 efeb60b86 FreeBSD: ignore some includes when not building kernel > #16635 ---TBD--- zdb: fix printf format in dump_zap() > > Obtained from: OpenZFS > OpenZFS commit: b109925820fb79db3e37670c159977f03edd950f > OpenZFS tag: 2.3.0-rc1 > > cddl/lib/libzdb/Makefile | 1 + > cddl/lib/libzfs_core/Makefile | 1 + > cddl/lib/libzfsbootenv/Makefile | 1 + > cddl/lib/libzpool/Makefile | 18 +- > cddl/lib/libzutil/Makefile | 1 + > cddl/lib/pam_zfs_key/Makefile | 1 + > cddl/share/zfs/compatibility.d/Makefile | 12 +- > stand/libsa/zfs/Makefile.inc | 2 +- > sys/conf/files | 4 +- > sys/contrib/openzfs/.github/CONTRIBUTING.md | 18 +- > .../.github/workflows/build-dependencies.txt | 57 --- > .../.github/workflows/checkstyle-dependencies.txt | 5 - > .../openzfs/.github/workflows/checkstyle.yaml | 23 +- > sys/contrib/openzfs/.github/workflows/codeql.yml | 10 +- > .../openzfs/.github/workflows/scripts/README.md | 14 + > .../.github/workflows/scripts/generate-ci-type.py | 107 +++++ > .../.github/workflows/scripts/generate-summary.sh | 119 ------ > .../.github/workflows/scripts/merge_summary.awk | 109 +++++ > .../.github/workflows/scripts/qemu-1-setup.sh | 91 ++++ > .../.github/workflows/scripts/qemu-2-start.sh | 213 +++++++++ > .../.github/workflows/scripts/qemu-3-deps.sh | 221 ++++++++++ > .../.github/workflows/scripts/qemu-4-build.sh | 153 +++++++ > .../.github/workflows/scripts/qemu-5-setup.sh | 121 ++++++ > .../.github/workflows/scripts/qemu-6-tests.sh | 105 +++++ > .../.github/workflows/scripts/qemu-7-prepare.sh | 123 ++++++ > .../.github/workflows/scripts/qemu-8-summary.sh | 71 +++ > .../workflows/scripts/qemu-9-summary-page.sh | 57 +++ > .../workflows/scripts/setup-dependencies.sh | 88 ---- > .../.github/workflows/scripts/setup-functional.sh | 24 -- > .../openzfs/.github/workflows/zfs-linux-tests.yml | 124 ------ > .../openzfs/.github/workflows/zfs-linux.yml | 64 --- > sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 175 ++++++++ > sys/contrib/openzfs/.github/workflows/zloop.yml | 77 ++++ > sys/contrib/openzfs/.mailmap | 1 + > sys/contrib/openzfs/AUTHORS | 4 + > sys/contrib/openzfs/META | 8 +- > sys/contrib/openzfs/cmd/arc_summary | 2 +- > sys/contrib/openzfs/cmd/arcstat.in | 297 +++++++++---- > sys/contrib/openzfs/cmd/zdb/zdb.c | 144 ++++--- > sys/contrib/openzfs/cmd/zdb/zdb_il.c | 6 +- > sys/contrib/openzfs/cmd/zed/agents/zfs_diagnosis.c | 101 +++-- > sys/contrib/openzfs/cmd/zhack.c | 17 +- > sys/contrib/openzfs/cmd/zpool/Makefile.am | 9 +- > .../openzfs/cmd/zpool/compatibility.d/grub2-2.06 | 23 + > .../zpool/compatibility.d/{grub2 => grub2-2.12} | 2 +- > .../openzfs/cmd/zpool/compatibility.d/openzfs-2.3 | 45 ++ > sys/contrib/openzfs/cmd/zpool/zpool_main.c | 30 +- > .../openzfs/cmd/zstream/zstream_recompress.c | 3 +- > sys/contrib/openzfs/cmd/zstream/zstream_redup.c | 4 +- > sys/contrib/openzfs/cmd/ztest.c | 78 +++- > sys/contrib/openzfs/config/ax_compare_version.m4 | 177 ++++++++ > sys/contrib/openzfs/config/deb.am | 2 + > sys/contrib/openzfs/config/intlmacosx.m4 | 72 ---- > sys/contrib/openzfs/config/kernel-acl.m4 | 215 +--------- > sys/contrib/openzfs/config/kernel-aio-fsync.m4 | 23 - > sys/contrib/openzfs/config/kernel-assign_str.m4 | 62 +++ > sys/contrib/openzfs/config/kernel-bdi.m4 | 81 ---- > sys/contrib/openzfs/config/kernel-bio.m4 | 313 +------------- > sys/contrib/openzfs/config/kernel-blk-queue.m4 | 183 +------- > sys/contrib/openzfs/config/kernel-blkdev.m4 | 22 +- > sys/contrib/openzfs/config/kernel-clear-inode.m4 | 39 -- > .../openzfs/config/kernel-config-defined.m4 | 15 - > sys/contrib/openzfs/config/kernel-current-time.m4 | 26 -- > sys/contrib/openzfs/config/kernel-dentry-alias.m4 | 30 -- > .../openzfs/config/kernel-dentry-operations.m4 | 135 ------ > sys/contrib/openzfs/config/kernel-dirty-inode.m4 | 29 -- > .../openzfs/config/kernel-encode-fh-inode.m4 | 27 -- > sys/contrib/openzfs/config/kernel-evict-inode.m4 | 24 -- > sys/contrib/openzfs/config/kernel-fadvise.m4 | 23 - > sys/contrib/openzfs/config/kernel-fallocate.m4 | 44 -- > sys/contrib/openzfs/config/kernel-file-dentry.m4 | 24 -- > sys/contrib/openzfs/config/kernel-file-inode.m4 | 23 - > sys/contrib/openzfs/config/kernel-file.m4 | 31 ++ > sys/contrib/openzfs/config/kernel-filemap.m4 | 27 -- > sys/contrib/openzfs/config/kernel-fsync.m4 | 53 --- > .../openzfs/config/kernel-generic_fillattr.m4 | 4 + > .../openzfs/config/kernel-generic_io_acct.m4 | 29 -- > .../openzfs/config/kernel-generic_readlink.m4 | 25 -- > sys/contrib/openzfs/config/kernel-genhd-flags.m4 | 21 +- > sys/contrib/openzfs/config/kernel-get-link.m4 | 104 ----- > .../openzfs/config/kernel-global_page_state.m4 | 128 ------ > sys/contrib/openzfs/config/kernel-group-info.m4 | 22 - > sys/contrib/openzfs/config/kernel-hotplug.m4 | 26 -- > .../openzfs/config/kernel-in-compat-syscall.m4 | 24 -- > sys/contrib/openzfs/config/kernel-inode-getattr.m4 | 26 -- > sys/contrib/openzfs/config/kernel-inode-lock.m4 | 24 -- > .../openzfs/config/kernel-inode-permission.m4 | 2 + > .../openzfs/config/kernel-inode-set-flags.m4 | 22 - > .../openzfs/config/kernel-inode-set-iversion.m4 | 23 - > sys/contrib/openzfs/config/kernel-inode-setattr.m4 | 22 - > sys/contrib/openzfs/config/kernel-inode-times.m4 | 23 - > sys/contrib/openzfs/config/kernel-kmem-cache.m4 | 41 -- > sys/contrib/openzfs/config/kernel-kmem.m4 | 27 +- > sys/contrib/openzfs/config/kernel-kstrtoul.m4 | 21 - > sys/contrib/openzfs/config/kernel-kthread.m4 | 37 +- > sys/contrib/openzfs/config/kernel-ktime.m4 | 55 --- > sys/contrib/openzfs/config/kernel-lseek-execute.m4 | 27 -- > .../openzfs/config/kernel-make-request-fn.m4 | 42 +- > sys/contrib/openzfs/config/kernel-mkdir.m4 | 11 +- > sys/contrib/openzfs/config/kernel-mm-page-flags.m4 | 24 ++ > sys/contrib/openzfs/config/kernel-mm-pagemap.m4 | 4 +- > sys/contrib/openzfs/config/kernel-percpu.m4 | 56 --- > sys/contrib/openzfs/config/kernel-put-link.m4 | 61 --- > sys/contrib/openzfs/config/kernel-rename.m4 | 64 +-- > sys/contrib/openzfs/config/kernel-rw.m4 | 69 --- > sys/contrib/openzfs/config/kernel-rwsem.m4 | 60 --- > sys/contrib/openzfs/config/kernel-sched.m4 | 53 --- > .../openzfs/config/kernel-setattr-prepare.m4 | 2 + > sys/contrib/openzfs/config/kernel-shrink.m4 | 163 +------ > sys/contrib/openzfs/config/kernel-signal-stop.m4 | 21 - > sys/contrib/openzfs/config/kernel-special-state.m4 | 21 - > sys/contrib/openzfs/config/kernel-strlcpy.m4 | 25 +- > sys/contrib/openzfs/config/kernel-super-userns.m4 | 25 -- > sys/contrib/openzfs/config/kernel-symlink.m4 | 2 + > sys/contrib/openzfs/config/kernel-timer.m4 | 75 ---- > sys/contrib/openzfs/config/kernel-tmpfile.m4 | 4 - > sys/contrib/openzfs/config/kernel-user-ns-inum.m4 | 23 - > .../openzfs/config/kernel-userns-capabilities.m4 | 27 -- > sys/contrib/openzfs/config/kernel-vfs-direct_IO.m4 | 56 +-- > .../config/kernel-vfs-extended-file_range.m4 | 50 --- > .../openzfs/config/kernel-vfs-file_range.m4 | 30 -- > sys/contrib/openzfs/config/kernel-vfs-getattr.m4 | 86 ---- > .../openzfs/config/kernel-vfs-invalidate_folio.m4 | 33 ++ > sys/contrib/openzfs/config/kernel-vfs-iov_iter.m4 | 163 ++----- > sys/contrib/openzfs/config/kernel-vfs-iterate.m4 | 83 ---- > .../openzfs/config/kernel-vfs-release_folio.m4 | 32 ++ > .../openzfs/config/kernel-vfs-rw-iterate.m4 | 80 ---- > sys/contrib/openzfs/config/kernel-wait.m4 | 99 ----- > sys/contrib/openzfs/config/kernel-xattr-handler.m4 | 322 +------------- > sys/contrib/openzfs/config/kernel-zlib.m4 | 26 -- > sys/contrib/openzfs/config/kernel.m4 | 158 +++---- > sys/contrib/openzfs/configure.ac | 2 + > sys/contrib/openzfs/contrib/Makefile.am | 1 + > sys/contrib/openzfs/contrib/debian/Makefile.am | 48 +++ > sys/contrib/openzfs/contrib/debian/not-installed | 1 - > sys/contrib/openzfs/contrib/debian/rules.in | 8 +- > sys/contrib/openzfs/include/cityhash.h | 7 + > .../openzfs/include/os/freebsd/spl/sys/mutex.h | 1 + > .../openzfs/include/os/freebsd/spl/sys/param.h | 1 + > .../openzfs/include/os/freebsd/spl/sys/simd.h | 3 + > .../openzfs/include/os/freebsd/spl/sys/uio.h | 31 +- > .../openzfs/include/os/freebsd/zfs/sys/abd_os.h | 15 + > .../include/os/freebsd/zfs/sys/zfs_ctldir.h | 2 +- > .../include/os/freebsd/zfs/sys/zfs_vfsops_os.h | 3 +- > .../include/os/freebsd/zfs/sys/zfs_znode_impl.h | 2 +- > sys/contrib/openzfs/include/os/linux/Makefile.am | 1 - > .../include/os/linux/kernel/linux/blkdev_compat.h | 229 +--------- > .../include/os/linux/kernel/linux/dcache_compat.h | 6 - > .../include/os/linux/kernel/linux/kmap_compat.h | 2 + > .../include/os/linux/kernel/linux/mm_compat.h | 14 + > .../include/os/linux/kernel/linux/page_compat.h | 56 --- > .../openzfs/include/os/linux/kernel/linux/simd.h | 4 + > .../include/os/linux/kernel/linux/simd_aarch64.h | 10 - > .../include/os/linux/kernel/linux/simd_powerpc.h | 11 - > .../include/os/linux/kernel/linux/vfs_compat.h | 235 +--------- > .../include/os/linux/kernel/linux/xattr_compat.h | 106 +---- > .../openzfs/include/os/linux/spl/sys/condvar.h | 4 +- > .../openzfs/include/os/linux/spl/sys/cred.h | 4 - > .../openzfs/include/os/linux/spl/sys/file.h | 11 - > .../openzfs/include/os/linux/spl/sys/kmem_cache.h | 3 +- > .../openzfs/include/os/linux/spl/sys/signal.h | 3 - > .../openzfs/include/os/linux/spl/sys/string.h | 7 - > .../openzfs/include/os/linux/spl/sys/taskq.h | 6 +- > .../openzfs/include/os/linux/spl/sys/thread.h | 7 - > .../openzfs/include/os/linux/spl/sys/time.h | 28 -- > .../openzfs/include/os/linux/spl/sys/timer.h | 20 - > .../openzfs/include/os/linux/spl/sys/types.h | 6 + > sys/contrib/openzfs/include/os/linux/spl/sys/uio.h | 47 +- > .../openzfs/include/os/linux/spl/sys/wait.h | 24 -- > .../openzfs/include/os/linux/spl/sys/wmsum.h | 9 - > .../openzfs/include/os/linux/zfs/sys/abd_os.h | 3 + > .../include/os/linux/zfs/sys/trace_dbgmsg.h | 3 +- > .../openzfs/include/os/linux/zfs/sys/trace_dbuf.h | 29 +- > .../openzfs/include/os/linux/zfs/sys/zfs_ctldir.h | 2 +- > .../include/os/linux/zfs/sys/zfs_vfsops_os.h | 3 +- > .../include/os/linux/zfs/sys/zfs_vnops_os.h | 3 +- > .../include/os/linux/zfs/sys/zfs_znode_impl.h | 31 -- > sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h | 86 +--- > sys/contrib/openzfs/include/sys/abd.h | 7 + > sys/contrib/openzfs/include/sys/abd_impl.h | 14 +- > sys/contrib/openzfs/include/sys/arc.h | 3 +- > sys/contrib/openzfs/include/sys/dbuf.h | 29 +- > sys/contrib/openzfs/include/sys/dmu.h | 14 +- > sys/contrib/openzfs/include/sys/dmu_impl.h | 34 +- > sys/contrib/openzfs/include/sys/dmu_objset.h | 1 + > sys/contrib/openzfs/include/sys/fm/fs/zfs.h | 2 + > sys/contrib/openzfs/include/sys/fs/zfs.h | 15 + > sys/contrib/openzfs/include/sys/sa_impl.h | 4 +- > sys/contrib/openzfs/include/sys/spa.h | 12 + > sys/contrib/openzfs/include/sys/uio_impl.h | 37 ++ > sys/contrib/openzfs/include/sys/vdev_impl.h | 10 + > sys/contrib/openzfs/include/sys/zap.h | 16 +- > sys/contrib/openzfs/include/sys/zap_impl.h | 7 +- > sys/contrib/openzfs/include/sys/zfs_file.h | 2 +- > sys/contrib/openzfs/include/sys/zfs_ioctl.h | 72 ++-- > sys/contrib/openzfs/include/sys/zfs_racct.h | 7 +- > sys/contrib/openzfs/include/sys/zfs_znode.h | 4 +- > sys/contrib/openzfs/include/sys/zil.h | 30 +- > sys/contrib/openzfs/include/sys/zio.h | 5 + > sys/contrib/openzfs/include/sys/zio_compress.h | 3 +- > sys/contrib/openzfs/include/sys/zio_impl.h | 7 +- > sys/contrib/openzfs/include/zfeature_common.h | 3 + > sys/contrib/openzfs/lib/libnvpair/libnvpair.abi | 197 ++++++++- > sys/contrib/openzfs/lib/libshare/os/freebsd/nfs.c | 4 +- > sys/contrib/openzfs/lib/libspl/include/sys/simd.h | 3 + > sys/contrib/openzfs/lib/libspl/include/sys/uio.h | 26 ++ > sys/contrib/openzfs/lib/libuutil/libuutil.abi | 200 ++++++++- > sys/contrib/openzfs/lib/libzfs/libzfs.abi | 212 ++++++++- > sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 8 +- > sys/contrib/openzfs/lib/libzfs/libzfs_util.c | 8 +- > .../openzfs/lib/libzfs_core/libzfs_core.abi | 196 ++++++++- > sys/contrib/openzfs/lib/libzpool/Makefile.am | 15 +- > sys/contrib/openzfs/lib/libzpool/abd_os.c | 64 +++ > sys/contrib/openzfs/lib/libzpool/arc_os.c | 87 ++++ > sys/contrib/openzfs/lib/libzpool/kernel.c | 30 +- > .../libzpool/vdev_label_os.c} | 39 +- > sys/contrib/openzfs/lib/libzpool/zfs_debug.c | 106 +++++ > sys/contrib/openzfs/lib/libzpool/zfs_racct.c | 38 ++ > sys/contrib/openzfs/lib/libzstd/Makefile.am | 2 + > sys/contrib/openzfs/lib/libzutil/zutil_import.c | 17 +- > sys/contrib/openzfs/man/man1/arcstat.1 | 166 ++++++++ > sys/contrib/openzfs/man/man4/zfs.4 | 62 ++- > sys/contrib/openzfs/man/man7/zfsconcepts.7 | 2 +- > sys/contrib/openzfs/man/man7/zfsprops.7 | 99 ++++- > sys/contrib/openzfs/man/man7/zpool-features.7 | 69 ++- > sys/contrib/openzfs/man/man8/zfs-send.8 | 6 +- > sys/contrib/openzfs/man/man8/zpool-events.8 | 14 +- > sys/contrib/openzfs/man/man8/zpool-status.8 | 11 +- > sys/contrib/openzfs/module/Kbuild.in | 5 +- > sys/contrib/openzfs/module/Makefile.bsd | 4 +- > sys/contrib/openzfs/module/lua/lobject.h | 21 +- > sys/contrib/openzfs/module/lua/lstate.h | 2 +- > sys/contrib/openzfs/module/lua/lstring.c | 2 +- > sys/contrib/openzfs/module/lua/lstring.h | 2 +- > .../openzfs/module/os/freebsd/spl/spl_taskq.c | 4 +- > .../openzfs/module/os/freebsd/spl/spl_uio.c | 201 +++++++++ > sys/contrib/openzfs/module/os/freebsd/zfs/abd_os.c | 169 +++++++- > .../openzfs/module/os/freebsd/zfs/vdev_file.c | 11 +- > .../openzfs/module/os/freebsd/zfs/zfs_acl.c | 2 +- > .../openzfs/module/os/freebsd/zfs/zfs_debug.c | 53 +-- > .../openzfs/module/os/freebsd/zfs/zfs_dir.c | 31 +- > .../openzfs/module/os/freebsd/zfs/zfs_file_os.c | 26 ++ > .../openzfs/module/os/freebsd/zfs/zfs_racct.c | 8 +- > .../openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 13 +- > .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 95 ++++- > .../os/freebsd/zfs/{zfs_znode.c => zfs_znode_os.c} | 374 +--------------- > .../openzfs/module/os/freebsd/zfs/zvol_os.c | 1 + > .../openzfs/module/os/linux/spl/spl-condvar.c | 47 +- > sys/contrib/openzfs/module/os/linux/spl/spl-cred.c | 21 +- > .../openzfs/module/os/linux/spl/spl-generic.c | 30 +- > .../openzfs/module/os/linux/spl/spl-kmem-cache.c | 23 +- > sys/contrib/openzfs/module/os/linux/spl/spl-kmem.c | 2 - > sys/contrib/openzfs/module/os/linux/spl/spl-proc.c | 2 +- > .../openzfs/module/os/linux/spl/spl-shrinker.c | 46 +- > .../openzfs/module/os/linux/spl/spl-taskq.c | 22 +- > .../openzfs/module/os/linux/spl/spl-thread.c | 26 +- > sys/contrib/openzfs/module/os/linux/spl/spl-vmem.c | 1 - > sys/contrib/openzfs/module/os/linux/spl/spl-zlib.c | 1 - > sys/contrib/openzfs/module/os/linux/spl/spl-zone.c | 20 +- > sys/contrib/openzfs/module/os/linux/zfs/abd_os.c | 240 +++++++++-- > sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 47 -- > sys/contrib/openzfs/module/os/linux/zfs/policy.c | 9 - > .../openzfs/module/os/linux/zfs/vdev_disk.c | 71 +-- > .../openzfs/module/os/linux/zfs/vdev_file.c | 9 +- > sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c | 2 +- > .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 25 +- > .../openzfs/module/os/linux/zfs/zfs_debug.c | 40 -- > sys/contrib/openzfs/module/os/linux/zfs/zfs_dir.c | 32 +- > .../openzfs/module/os/linux/zfs/zfs_file_os.c | 74 +--- > .../openzfs/module/os/linux/zfs/zfs_ioctl_os.c | 6 + > .../openzfs/module/os/linux/zfs/zfs_racct.c | 29 +- > sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c | 308 ++++++++++++- > .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 117 +---- > .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 152 +++++-- > .../os/linux/zfs/{zfs_znode.c => zfs_znode_os.c} | 411 +----------------- > .../openzfs/module/os/linux/zfs/zpl_ctldir.c | 90 +--- > .../openzfs/module/os/linux/zfs/zpl_export.c | 38 +- > sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 336 +++------------ > .../openzfs/module/os/linux/zfs/zpl_file_range.c | 8 +- > .../openzfs/module/os/linux/zfs/zpl_inode.c | 173 +++----- > .../openzfs/module/os/linux/zfs/zpl_super.c | 13 +- > .../openzfs/module/os/linux/zfs/zpl_xattr.c | 110 +---- > sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 72 +--- > sys/contrib/openzfs/module/zcommon/cityhash.c | 33 +- > sys/contrib/openzfs/module/zcommon/simd_stat.c | 203 +++++++++ > .../openzfs/module/zcommon/zfeature_common.c | 27 +- > sys/contrib/openzfs/module/zcommon/zfs_prop.c | 30 +- > sys/contrib/openzfs/module/zcommon/zfs_valstr.c | 2 + > sys/contrib/openzfs/module/zcommon/zpool_prop.c | 5 +- > sys/contrib/openzfs/module/zfs/abd.c | 94 ++-- > sys/contrib/openzfs/module/zfs/arc.c | 37 +- > sys/contrib/openzfs/module/zfs/dataset_kstats.c | 6 +- > sys/contrib/openzfs/module/zfs/dbuf.c | 317 ++++++++++---- > sys/contrib/openzfs/module/zfs/ddt.c | 8 - > sys/contrib/openzfs/module/zfs/ddt_zap.c | 14 +- > sys/contrib/openzfs/module/zfs/dmu.c | 154 +++++-- > sys/contrib/openzfs/module/zfs/dmu_direct.c | 395 +++++++++++++++++ > sys/contrib/openzfs/module/zfs/dmu_objset.c | 78 ++-- > sys/contrib/openzfs/module/zfs/dmu_recv.c | 42 +- > sys/contrib/openzfs/module/zfs/dmu_redact.c | 8 +- > sys/contrib/openzfs/module/zfs/dmu_send.c | 17 +- > sys/contrib/openzfs/module/zfs/dmu_tx.c | 4 +- > sys/contrib/openzfs/module/zfs/dsl_bookmark.c | 8 +- > sys/contrib/openzfs/module/zfs/dsl_crypt.c | 6 +- > sys/contrib/openzfs/module/zfs/dsl_dataset.c | 21 +- > sys/contrib/openzfs/module/zfs/dsl_deadlist.c | 38 +- > sys/contrib/openzfs/module/zfs/dsl_deleg.c | 36 +- > sys/contrib/openzfs/module/zfs/dsl_destroy.c | 4 +- > sys/contrib/openzfs/module/zfs/dsl_dir.c | 7 +- > sys/contrib/openzfs/module/zfs/dsl_pool.c | 12 +- > sys/contrib/openzfs/module/zfs/dsl_prop.c | 41 +- > sys/contrib/openzfs/module/zfs/dsl_scan.c | 79 ++-- > sys/contrib/openzfs/module/zfs/dsl_userhold.c | 4 +- > sys/contrib/openzfs/module/zfs/metaslab.c | 2 +- > sys/contrib/openzfs/module/zfs/sa.c | 34 +- > sys/contrib/openzfs/module/zfs/spa.c | 72 ++-- > sys/contrib/openzfs/module/zfs/spa_errlog.c | 84 ++-- > sys/contrib/openzfs/module/zfs/spa_log_spacemap.c | 9 +- > sys/contrib/openzfs/module/zfs/spa_misc.c | 2 + > sys/contrib/openzfs/module/zfs/spa_stats.c | 46 ++ > sys/contrib/openzfs/module/zfs/vdev.c | 89 +++- > sys/contrib/openzfs/module/zfs/vdev_label.c | 4 + > sys/contrib/openzfs/module/zfs/zap.c | 30 +- > sys/contrib/openzfs/module/zfs/zap_micro.c | 191 ++++++++- > sys/contrib/openzfs/module/zfs/zcp_iter.c | 29 +- > sys/contrib/openzfs/module/zfs/zfeature.c | 4 +- > sys/contrib/openzfs/module/zfs/zfs_fm.c | 2 + > sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 36 +- > sys/contrib/openzfs/module/zfs/zfs_log.c | 94 ++-- > sys/contrib/openzfs/module/zfs/zfs_quota.c | 12 +- > sys/contrib/openzfs/module/zfs/zfs_replay.c | 143 ++++--- > sys/contrib/openzfs/module/zfs/zfs_vnops.c | 294 ++++++++++++- > sys/contrib/openzfs/module/zfs/zfs_znode.c | 401 +++++++++++++++++ > sys/contrib/openzfs/module/zfs/zio.c | 149 ++++++- > sys/contrib/openzfs/module/zfs/zio_compress.c | 14 +- > sys/contrib/openzfs/module/zfs/zvol.c | 4 +- > sys/contrib/openzfs/scripts/Makefile.am | 1 - > sys/contrib/openzfs/scripts/enum-extract.pl | 58 --- > sys/contrib/openzfs/scripts/zfs-tests.sh | 73 +++- > sys/contrib/openzfs/tests/runfiles/common.run | 10 +- > sys/contrib/openzfs/tests/runfiles/freebsd.run | 4 + > sys/contrib/openzfs/tests/runfiles/linux.run | 15 +- > .../tests/test-runner/bin/test-runner.py.in | 12 + > .../openzfs/tests/test-runner/bin/zts-report.py.in | 61 +-- > sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore | 1 + > .../openzfs/tests/zfs-tests/cmd/Makefile.am | 2 + > .../tests/zfs-tests/cmd/manipulate_user_buffer.c | 272 ++++++++++++ > .../openzfs/tests/zfs-tests/cmd/mmap_sync.c | 2 +- > .../openzfs/tests/zfs-tests/cmd/stride_dd.c | 237 ++++++++--- > .../openzfs/tests/zfs-tests/include/commands.cfg | 8 +- > .../openzfs/tests/zfs-tests/include/libtest.shlib | 39 +- > .../tests/zfs-tests/include/properties.shlib | 2 +- > .../openzfs/tests/zfs-tests/include/tunables.cfg | 3 + > .../openzfs/tests/zfs-tests/tests/Makefile.am | 34 ++ > .../tests/functional/bclone/bclone_common.kshlib | 4 +- > .../functional/bclone/bclone_corner_cases.kshlib | 6 +- > .../functional/block_cloning/block_cloning.kshlib | 4 +- > .../block_cloning_cross_enc_dataset.ksh | 8 +- > .../tests/functional/cache/cache_012_pos.ksh | 2 +- > .../tests/functional/cli_root/zdb/zdb_backup.ksh | 4 +- > .../zfs_receive_compressed_corrective.ksh | 4 +- > .../zfs_receive/zfs_receive_corrective.ksh | 6 +- > .../zfs_receive/zfs_receive_from_encrypted.ksh | 6 +- > .../cli_root/zfs_receive/zfs_receive_from_zstd.ksh | 4 +- > .../zfs_receive_large_block_corrective.ksh | 4 +- > .../cli_root/zfs_receive/zfs_receive_raw.ksh | 6 +- > .../zfs_receive/zfs_receive_raw_incremental.ksh | 4 +- > .../cli_root/zpool_create/zpool_create.shlib | 5 +- > .../zpool_create/zpool_create_features_005_pos.ksh | 2 +- > .../functional/cli_root/zpool_get/zpool_get.cfg | 2 + > .../import_cachefile_shared_device.ksh | 2 +- > .../zpool_import/import_devices_missing.ksh | 8 +- > .../zpool_import/import_rewind_config_changed.ksh | 4 +- > .../zpool_import/import_rewind_device_replaced.ksh | 6 +- > .../cli_root/zpool_import/zpool_import.cfg | 4 +- > .../cli_root/zpool_import/zpool_import.kshlib | 34 +- > ...ort_hostid_changed_cachefile_unclean_export.ksh | 10 +- > .../zpool_import_hostid_changed_unclean_export.ksh | 9 +- > .../functional/cli_root/zpool_reguid/Makefile.am | 6 - > .../cli_root/zpool_reguid/zpool_reguid_001_pos.ksh | 4 +- > .../cli_root/zpool_reguid/zpool_reguid_002_neg.ksh | 2 +- > .../cli_root/zpool_reopen/zpool_reopen_003_pos.ksh | 4 +- > .../cli_root/zpool_status/zpool_status_008_pos.ksh | 6 +- > .../compression/l2arc_compressed_arc.ksh | 2 +- > .../functional/compression/l2arc_encrypted.ksh | 2 +- > .../l2arc_encrypted_no_compressed_arc.ksh | 2 +- > .../tests/functional/cp_files/cp_files_002_pos.ksh | 4 +- > .../tests/functional/deadman/deadman_sync.ksh | 8 +- > .../zfs-tests/tests/functional/direct/cleanup.ksh | 37 ++ > .../zfs-tests/tests/functional/direct/dio.cfg | 26 ++ > .../zfs-tests/tests/functional/direct/dio.kshlib | 331 ++++++++++++++ > .../tests/functional/direct/dio_aligned_block.ksh | 115 +++++ > .../tests/functional/direct/dio_async_always.ksh | 68 +++ > .../functional/direct/dio_async_fio_ioengines.ksh | 106 +++++ > .../tests/functional/direct/dio_compression.ksh | 65 +++ > .../tests/functional/direct/dio_dedup.ksh | 63 +++ > .../tests/functional/direct/dio_encryption.ksh | 62 +++ > .../tests/functional/direct/dio_grow_block.ksh | 86 ++++ > .../tests/functional/direct/dio_max_recordsize.ksh | 64 +++ > .../tests/functional/direct/dio_mixed.ksh | 107 +++++ > .../zfs-tests/tests/functional/direct/dio_mmap.ksh | 92 ++++ > .../tests/functional/direct/dio_overwrites.ksh | 70 +++ > .../tests/functional/direct/dio_property.ksh | 127 ++++++ > .../tests/functional/direct/dio_random.ksh | 82 ++++ > .../tests/functional/direct/dio_recordsize.ksh | 68 +++ > .../functional/direct/dio_unaligned_block.ksh | 78 ++++ > .../functional/direct/dio_unaligned_filesize.ksh | 91 ++++ > .../functional/direct/dio_write_stable_pages.ksh | 103 +++++ > .../tests/functional/direct/dio_write_verify.ksh | 196 +++++++++ > .../zfs-tests/tests/functional/direct/setup.ksh | 37 ++ > .../functional/events/zed_diagnose_multiple.ksh | 168 ++++++++ > .../functional/events/zed_slow_io_many_vdevs.ksh | 4 +- > .../tests/functional/fault/fault_limits.ksh | 96 +++++ > .../functional/fault/suspend_resume_single.ksh | 4 +- > .../tests/functional/history/history_003_pos.ksh | 6 +- > .../tests/zfs-tests/tests/functional/io/setup.ksh | 2 +- > .../zfs-tests/tests/functional/l2arc/l2arc.cfg | 2 +- > .../tests/functional/longname/cleanup.ksh | 34 ++ > .../tests/functional/longname/longname_001_pos.ksh | 132 ++++++ > .../tests/functional/longname/longname_002_pos.ksh | 115 +++++ > .../tests/functional/longname/longname_003_pos.ksh | 113 +++++ > .../zfs-tests/tests/functional/longname/setup.ksh | 35 ++ > .../tests/functional/no_space/enospc_ganging.ksh | 6 +- > .../functional/projectquota/projectid_003_pos.ksh | 4 +- > .../functional/raidz/raidz_expand_001_pos.ksh | 3 + > .../functional/raidz/raidz_expand_002_pos.ksh | 1 + > .../replacement/resilver_restart_001.ksh | 11 +- > .../zfs-tests/tests/functional/rsend/rsend.kshlib | 22 +- > .../tests/functional/rsend/send-c_longname.ksh | 98 +++++ > .../tests/functional/rsend/send-c_volume.ksh | 12 +- > .../functional/rsend/send-wR_encrypted_zvol.ksh | 6 +- > .../functional/rsend/send_encrypted_props.ksh | 14 +- > .../rsend/send_encrypted_truncated_files.ksh | 12 +- > .../tests/functional/rsend/send_hole_birth.ksh | 2 +- > .../tests/functional/slog/slog_replay_fs_001.ksh | 16 +- > .../tests/functional/slog/slog_replay_volume.ksh | 4 +- > .../zfs-tests/tests/functional/trim/trim_l2arc.ksh | 2 +- > .../tests/functional/xattr/xattr_001_pos.ksh | 2 +- > .../tests/functional/xattr/xattr_002_neg.ksh | 2 +- > sys/contrib/openzfs/udev/zvol_id.c | 7 +- > sys/modules/zfs/Makefile | 4 +- > sys/modules/zfs/zfs_config.h | 474 ++------------------- > sys/modules/zfs/zfs_gitrev.h | 2 +- > tools/build/depend-cleanup.sh | 3 + > 444 files changed, 12924 insertions(+), 9366 deletions(-) > > diff --cc cddl/lib/libzdb/Makefile > index 63248399b91c,000000000000..0eb30c55d107 > mode 100644,000000..100644 > --- a/cddl/lib/libzdb/Makefile > +++ b/cddl/lib/libzdb/Makefile > @@@ -1,25 -1,0 +1,26 @@@ > +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzdb > +.PATH: ${SRCTOP}/sys/contrib/openzfs/include > + > +LIB= zdb > +PACKAGE= zfs > + > +INCS = libzdb.h > + > +SRCS = libzdb.c > + > +WARNS?= 2 > +CSTD= c99 > + > +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include > +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include > +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd > ++CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include > +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs > +CFLAGS+= -I${SRCTOP}/sys > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h > +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzutil > +CFLAGS+= -DHAVE_ISSETUGID -DIN_BASE > +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h > + > +.include > diff --cc cddl/lib/libzfs_core/Makefile > index 4cd978e99a7d,000000000000..d986c45725b3 > mode 100644,000000..100644 > --- a/cddl/lib/libzfs_core/Makefile > +++ b/cddl/lib/libzfs_core/Makefile > @@@ -1,31 -1,0 +1,32 @@@ > +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core > +.PATH: ${SRCTOP}/sys/contrib/openzfs/include > +.PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs > +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs > + > + > +LIB= zfs_core > +LIBADD= nvpair spl zutil > +PACKAGE= zfs > + > +INCS= libzfs_core.h > +SRCS= libzfs_core.c \ > + os/freebsd/libzfs_core_ioctl.c \ > + zfs_ioctl_compat.c > + > +WARNS?= 2 > +CSTD= c99 > +CFLAGS+= -DIN_BASE > +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include > +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core/common > +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ > +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd > ++CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include > +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs > +CFLAGS+= -I${SRCTOP}/sys > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include > +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h > +CFLAGS+= -DHAVE_ISSETUGID > +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h > + > +.include > diff --cc cddl/lib/libzfsbootenv/Makefile > index 5f5dbfb6f108,000000000000..15ee5bfaeaa4 > mode 100644,000000..100644 > --- a/cddl/lib/libzfsbootenv/Makefile > +++ b/cddl/lib/libzfsbootenv/Makefile > @@@ -1,34 -1,0 +1,35 @@@ > +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfsbootenv > +.PATH: ${SRCTOP}/sys/contrib/openzfs/include > + > +PACKAGE= zfs > +LIB= zfsbootenv > +SHLIB_MAJOR= 1 > + > +LIBADD= zfs > +LIBADD+= nvpair > + > +INCS= libzfsbootenv.h > +USER_C= \ > + lzbe_device.c \ > + lzbe_util.c \ > + lzbe_pair.c > + > +SRCS= $(USER_C) > + > +CSTD= c99 > +CFLAGS+= -DIN_BASE > +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include > +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ > +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd > ++CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include > +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h > +CFLAGS+= -DHAVE_ISSETUGID > +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h > +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs > +CFLAGS.lzbe_device.c= -Wno-cast-qual > +CFLAGS.lzbe_util.c= -Wno-cast-qual > +CFLAGS.lzbe_pair.c= -Wno-cast-qual > + > +.include > diff --cc cddl/lib/libzpool/Makefile > index b80486484506,000000000000..4c8285eedb2d > mode 100644,000000..100644 > --- a/cddl/lib/libzpool/Makefile > +++ b/cddl/lib/libzpool/Makefile > @@@ -1,341 -1,0 +1,345 @@@ > +ZFSTOP= ${SRCTOP}/sys/contrib/openzfs > + > +.PATH: ${ZFSTOP}/lib/libzpool > + > +# ZFS_COMMON_SRCS > +.PATH: ${ZFSTOP}/module/zfs > +.PATH: ${ZFSTOP}/module/zcommon > +.PATH: ${ZFSTOP}/module/unicode > +# LUA_SRCS > +.PATH: ${ZFSTOP}/module/lua > +# ZSTD_SRCS > +.PATH: ${ZFSTOP}/module/zstd > +.PATH: ${ZFSTOP}/module/zstd/lib/common > +.PATH: ${ZFSTOP}/module/zstd/lib/compress > +.PATH: ${ZFSTOP}/module/zstd/lib/decompress > + > - .PATH: ${ZFSTOP}/module/os/linux/zfs > - > +.if > exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} > +ATOMIC_SRCS= opensolaris_atomic.S +ACFLAGS+= -Wa,--noexecstack > +.else > +.PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern > +ATOMIC_SRCS= opensolaris_atomic.c > +.endif > + > +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpcspe" > +# Don't waste GOT entries on small data. > +PICFLAG= -fPIC > +.endif > + > +PACKAGE= zfs > +LIB= zpool > + > +USER_C = \ > - abd_os.c \ > ++ arc_os.c \ > + kernel.c \ > + taskq.c \ > - util.c > ++ util.c \ > ++ zfs_debug.c > ++ > ++.PATH: ${ZFSTOP}/module/os/linux/zfs > + > +KERNEL_C = \ > ++ simd_stat.c \ > + zfeature_common.c \ > + zfs_comutil.c \ > + zfs_deleg.c \ > + zfs_fletcher.c \ > + zfs_fletcher_superscalar.c \ > + zfs_fletcher_superscalar4.c \ > + zfs_namecheck.c \ > + zfs_prop.c \ > + zfs_zstd.c \ > + zpool_prop.c \ > + zprop_common.c \ > + abd.c \ > ++ abd_os.c \ > + aggsum.c \ > + arc.c \ > - arc_os.c \ > + blake3_zfs.c \ > + blkptr.c \ > + bplist.c \ > + bpobj.c \ > + bptree.c \ > + bqueue.c \ > + btree.c \ > + brt.c \ > + cityhash.c \ > + dbuf.c \ > + dbuf_stats.c \ > + ddt.c \ > + ddt_log.c \ > + ddt_stats.c \ > + ddt_zap.c \ > + dmu.c \ > + dmu_diff.c \ > ++ dmu_direct.c \ > + dmu_object.c \ > + dmu_objset.c \ > + dmu_recv.c \ > + dmu_redact.c \ > + dmu_send.c \ > + dmu_traverse.c \ > + dmu_tx.c \ > + dmu_zfetch.c \ > + dnode.c \ > + dnode_sync.c \ > + dsl_bookmark.c \ > + dsl_dataset.c \ > + dsl_deadlist.c \ > + dsl_deleg.c \ > + dsl_dir.c \ > + dsl_crypt.c \ > + dsl_pool.c \ > + dsl_prop.c \ > + dsl_scan.c \ > + dsl_synctask.c \ > + dsl_destroy.c \ > + dsl_userhold.c \ > + edonr_zfs.c \ > + entropy_common.c \ > + error_private.c \ > + fm.c \ > + fse_compress.c \ > + fse_decompress.c \ > + gzip.c \ > + hist.c \ > + hkdf.c \ > + huf_compress.c \ > + huf_decompress.c \ > + lzjb.c \ > + lz4.c \ > + lz4_zfs.c \ > + metaslab.c \ > + mmp.c \ > + multilist.c \ > + objlist.c \ > + pathname.c \ > + pool.c \ > + range_tree.c \ > + refcount.c \ > + rrwlock.c \ > + sa.c \ > + sha2_zfs.c \ > + skein_zfs.c \ > + spa.c \ > + spa_checkpoint.c \ > + spa_config.c \ > + spa_errlog.c \ > + spa_history.c \ > + spa_log_spacemap.c \ > + spa_misc.c \ > + spa_stats.c \ > + space_map.c \ > + space_reftree.c \ > + txg.c \ > + trace.c \ > + uberblock.c \ > + unique.c \ > + vdev.c \ > + vdev_draid.c \ > + vdev_draid_rand.c \ > + vdev_file.c \ > + vdev_indirect_births.c \ > + vdev_indirect.c \ > + vdev_indirect_mapping.c \ > + vdev_initialize.c \ > + vdev_label.c \ > + vdev_label_os.c \ > + vdev_mirror.c \ > + vdev_missing.c \ > + vdev_queue.c \ > + vdev_raidz.c \ > + vdev_raidz_math_aarch64_neon.c \ > + vdev_raidz_math_aarch64_neonx2.c \ > + vdev_raidz_math_avx2.c \ > + vdev_raidz_math_avx512bw.c \ > + vdev_raidz_math_avx512f.c \ > + vdev_raidz_math.c \ > + vdev_raidz_math_scalar.c \ > + vdev_rebuild.c \ > + vdev_removal.c \ > + vdev_root.c \ > + vdev_trim.c \ > + xxhash.c \ > + zap.c \ > + zap_leaf.c \ > + zap_micro.c \ > + zcp.c \ > + zcp_get.c \ > + zcp_global.c \ > + zcp_iter.c \ > + zcp_set.c \ > + zcp_synctask.c \ > + zfeature.c \ > + zfs_byteswap.c \ > + zfs_chksum.c \ > - zfs_debug.c \ > + zfs_fm.c \ > + zfs_fuid.c \ > + zfs_sa.c \ > + zfs_znode.c \ > + zfs_racct.c \ > + zfs_ratelimit.c \ > + zfs_rlock.c \ > + zil.c \ > + zio.c \ > + zio_checksum.c \ > + zio_compress.c \ > + zio_crypt.c \ > + zio_inject.c \ > + zle.c \ > + zrlock.c \ > + zstd_common.c \ > + zstd_compress.c \ > + zstd_compress_literals.c \ > + zstd_compress_sequences.c \ > + zstd_compress_superblock.c \ > + zstd_ddict.c \ > + zstd_decompress.c \ > + zstd_decompress_block.c \ > + zstd_double_fast.c \ > + zstd_fast.c \ > + zstd_lazy.c \ > + zstd_ldm.c \ > + zstd_opt.c \ > + zthr.c > + > +ARCH_C = > +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" > +ARCH_C += vdev_raidz_math_sse2.c \ > + vdev_raidz_math_ssse3.c \ > + zfs_fletcher_intel.c \ > + zfs_fletcher_sse.c > +CFLAGS += -DHAVE_SSE2 -DHAVE_SSE3 > +.endif > +.if ${MACHINE_ARCH} == "amd64" > +ARCH_C += zfs_fletcher_avx512.c > +CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F \ > + -DHAVE_AVX512BW > +.endif > +.if ${MACHINE_CPUARCH} == "aarch64" > +ARCH_C += zfs_fletcher_aarch64_neon.c > +.endif > + > +LUA_C = \ > + lapi.c \ > + lauxlib.c \ > + lbaselib.c \ > + lcode.c \ > + lcompat.c \ > + lcorolib.c \ > + lctype.c \ > + ldebug.c \ > + ldo.c \ > + lfunc.c \ > + lgc.c \ > + llex.c \ > + lmem.c \ > + lobject.c \ > + lopcodes.c \ > + lparser.c \ > + lstate.c \ > + lstring.c \ > + lstrlib.c \ > + ltable.c \ > + ltablib.c \ > + ltm.c \ > + lvm.c \ > + lzio.c > + > +UNICODE_C = u8_textprep.c uconv.c > + > - SRCS= ${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C} > ++SRCS+= ${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C} > ++ > + > +WARNS?= 2 > +CFLAGS+= \ > + -DIN_BASE \ > + -I${ZFSTOP}/include \ > + -I${ZFSTOP}/lib/libspl/include \ > + -I${ZFSTOP}/lib/libspl/include/os/freebsd \ > + -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \ > + -I${SRCTOP}/sys \ > + -I${ZFSTOP}/include/os/freebsd/zfs \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > + -I${ZFSTOP}/module/icp/include \ > ++ -I${SRCTOP}/compat/linuxkpi/common/include/linux \ > + -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ > + -DHAVE_ISSETUGID \ > + -include ${SRCTOP}/sys/modules/zfs/zfs_config.h \ > + -I${SRCTOP}/sys/modules/zfs \ > + -I${ZFSTOP}/include/os/freebsd/zfs \ > + -DLIB_ZPOOL_BUILD -DZFS_DEBUG \ > + > +# XXX: pthread doesn't have mutex_owned() equivalent, so we need to look > +# into libthr private structures. That's sooo evil, but it's only for > +# ZFS debugging tools needs. > +CFLAGS+= -DWANTS_MUTEX_OWNED > +CFLAGS+= -I${SRCTOP}/lib/libpthread/thread > +CFLAGS+= -I${SRCTOP}/lib/libpthread/sys > +CFLAGS+= -I${SRCTOP}/lib/libthr/arch/${MACHINE_CPUARCH}/include > +CFLAGS.gcc+= -fms-extensions > + > +LIBADD= md pthread z spl icp nvpair avl umem > + > +# atomic.S doesn't like profiling. > +MK_PROFILE= no > + > +CSTD= c99 > + > +# Since there are many asserts in this library, it makes no sense to compile > +# it without debugging. > + > +CFLAGS+= -g -DDEBUG=1 > + > +CFLAGS.gcc+= -Wno-pointer-to-int-cast > + > +# Pointer values are used as debugging "tags" to mark reference count > +# ownerships and in some cases the tag reference is dropped after an > +# object is freed. > +CFLAGS.dbuf.c= ${NO_WUSE_AFTER_FREE} > +CFLAGS.entropy_common.c= -fno-tree-vectorize > +CFLAGS.entropy_common.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.error_private.c= -fno-tree-vectorize > +CFLAGS.error_private.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.fse_compress.c= -fno-tree-vectorize > +CFLAGS.fse_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.fse_decompress.c= -fno-tree-vectorize > +CFLAGS.fse_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.hist.c= -fno-tree-vectorize > +CFLAGS.hist.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.huf_compress.c= -fno-tree-vectorize > +CFLAGS.huf_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.huf_decompress.c= -fno-tree-vectorize > +CFLAGS.huf_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.pool.c= -fno-tree-vectorize > +CFLAGS.pool.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.xxhash.c= -fno-tree-vectorize > +CFLAGS.xxhash.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.zstd_compress.c= -fno-tree-vectorize > +CFLAGS.zstd_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.zstd_compress_literals.c= -fno-tree-vectorize > +CFLAGS.zstd_compress_literals.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.zstd_compress_sequences.c= -fno-tree-vectorize > +CFLAGS.zstd_compress_sequences.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.zstd_compress_superblock.c= -fno-tree-vectorize > +CFLAGS.zstd_compress_superblock.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.zstd_double_fast.c= -fno-tree-vectorize > +CFLAGS.zstd_double_fast.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.zstd_fast.c= -fno-tree-vectorize > +CFLAGS.zstd_fast.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.zstd_lazy.c= -fno-tree-vectorize > +CFLAGS.zstd_lazy.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.zstd_ldm.c= -fno-tree-vectorize > +CFLAGS.zstd_ldm.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.zstd_opt.c= -fno-tree-vectorize > +CFLAGS.zstd_opt.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.zstd_ddict.c= -fno-tree-vectorize > +CFLAGS.zstd_ddict.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.zstd_decompress.c= -fno-tree-vectorize > +CFLAGS.zstd_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > +CFLAGS.zstd_decompress_block.c= -fno-tree-vectorize > +CFLAGS.zstd_decompress_block.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} > + > +.include > diff --cc cddl/lib/libzutil/Makefile > index 4d9794c32dda,000000000000..d1a943b25005 > mode 100644,000000..100644 > --- a/cddl/lib/libzutil/Makefile > +++ b/cddl/lib/libzutil/Makefile > @@@ -1,39 -1,0 +1,40 @@@ > +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil > +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd > +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs > + > +LIB= zutil > +LIBADD= avl geom m tpool > +PACKAGE= zfs > + > +INCS = zutil_import.h > + > +SRCS = \ > + zutil_device_path.c \ > + zutil_import.c \ > + zutil_import.h \ > + zutil_nicenum.c \ > *** 8197 LINES SKIPPED *** > -- O. Hartmann From nobody Fri Oct 11 07:19:05 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPyfk4n0Pz5YQ7q; Fri, 11 Oct 2024 07:19:10 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from www541.your-server.de (www541.your-server.de [213.133.107.7]) (using TLSv1.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 mx1.freebsd.org (Postfix) with ESMTPS id 4XPyfj6Lf3z4jV3; Fri, 11 Oct 2024 07:19:09 +0000 (UTC) (envelope-from mm@FreeBSD.org) Authentication-Results: mx1.freebsd.org; none Received: from sslproxy07.your-server.de ([78.47.199.104]) by www541.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sz9vX-000Mr9-GY; Fri, 11 Oct 2024 09:19:07 +0200 Received: from [188.167.171.2] (helo=[10.0.9.101]) by sslproxy07.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sz9vW-0003jR-1J; Fri, 11 Oct 2024 09:19:06 +0200 Message-ID: <07210c99-2aa3-4553-8619-f7f8136db430@FreeBSD.org> Date: Fri, 11 Oct 2024 09:19:05 +0200 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 7a7741af18d6 - main - zfs: merge openzfs/zfs@b10992582 To: FreeBSD User Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202410110648.49B6maOr055929@gitrepo.freebsd.org> <20241011091321.34f09b24@thor.intern.walstatt.dynvpn.de> Content-Language: en-US From: Martin Matuska Autocrypt: addr=mm@FreeBSD.org; keydata= xsDNBGOTSakBDADYnE8uP/uR+viUTGNdMG8tWtoopvEEACFOwqx6NPb9sXvip5z20ochmO+j NqbV+OiS/6gjpd2f2fmJ241ooqbqZrWklabohbr2ros25bmi1C/77FEKsGulay334p1LXPxQ A3kjEQSINMresnt8FYCO5q50VHgmnhSNaom8jPAy9S06fWqPyXAXoJ53hwzYN6Bgb2CnU5FT wC9O4v5sI4wjQYq5JC9cbl1hM5PzC5bIse79l5NqYTsSuSY2RhOQ7w6L6V295l7C6TPkPBcq kg4Q+AYzdTTZagMN9NcchembtR/aMbuExg1PiUMdPOu99uW605XikwwYTy0ZGlz7GZE9Ecpo BaoSX5m3haM5k59e5839YtnCVbS0XOLCDp8uPMbLElGsLH6J1f1RxxV+h4r6ZypDSC0vTi54 qI1nxsdJm1n21iwQ0zP77oLUaIc+Nb0Mmh61+YFPLMgeHlfEsnsYzTWJU/tt6rlFFECKSlBG kiIXy1IeyKx2D+OlCZJ7FQMAEQEAAc0fTWFydGluIE1hdHVza2EgPG1tQEZyZWVCU0Qub3Jn PsLBFAQTAQoAPhYhBNssfPG0wmX671bj/FhIoYuPFBhLBQJjk0mpAhsDBQkFo5qABQsJCAcC BhUKCQgLAgQWAgMBAh4BAheAAAoJEFhIoYuPFBhLbPkMAM3tMymnbjprFzY1hhPOYczWI3f0 QREf+BdPt2X5325j2LV09mu3O4uiH/JBfzPc/9Z5HZzNJFaGTGpnhHrihiI6rZUDVon1CikU oiIMDWbNOMO+4WK6FVHTjziDFd/g3ql5WESgZm9SEtpHWfgvnKQAbAovKrA5CrAr8FePENKA zjlsJaEiYTrK7HrI2s5hMZkDQixFKFGgNuZe89k8HEy9ARrxGfMj1CrFtlHXts0K3hVFhdRS kPW8BxwlwuXVQYrXY5Ih6+5R2/XtjTkNrgg6EYfP11eyiN4Vfi5LuHUmwZkVXg7tfJWmcXmr Cpi6Q39JxiDZAkiSb8izebYBXHnzGHa3CgV8F7DqogO2e5a3MqUio6UVJPmeFIJogCgaJUMS KxcxjVl99Qmy6Boorpy58LDXp1T0Lcp7PhNqnmPW+Qh0/KUvuLrfWDtSc2+mL/llrEAHfIHT QbQsqpNEaOpEBpecIO5cDz1ussX/AurCw5E7DoHWJD87IOFM9LTPqM7AzQRjk0mpAQwAuz9d wJX5d7fhMD945bJDhB6ps0x2M0HFdbeClqkIbmkwq2Ws396XJhM8kd5qzrdVZZjJYSGl9vni AhLJk6uTBTZLqRG01LDh0AMsNsyN9yUH4QwqQXeui+GUHPnjzc8LkNvDgpUi9k+B1ZsDNQRE F7Jc6U3afkRCNwpym4CVeWBHhm032fU+jlKALKMlu58gHECGj4SbVChf6Gd7h4Z8p/yjx94d sqJsGog2PnwakLPKjIMNDg1X6BHFTcBHzmnaM0mtKsUQuHtmcctNC8TUP1v8NGFEcOyFNFOI BUcauUK+EhAvU2ew6qplTPjO/TcKw/Mw1++DGXDyu+3VIgBl5wIv3HPo/nNVvSy9Wrz1JztL kBjvFDtiEx/5+4baKGkkUwAQEALKlyqcuPSl0bVxmK93Hs/DgZ3+xqDm5SJGP6bI/M6jkul9 tTxpyYYSh6Z1k6w7Vc7UAEkU6FcdjpzIuAPGTuxC+eU7a1O7Wq/A/MpKvRdfox+pSC0fCQQt KcRVABEBAAHCwPwEGAEKACYWIQTbLHzxtMJl+u9W4/xYSKGLjxQYSwUCY5NJqQIbDAUJBaOa gAAKCRBYSKGLjxQYS04fC/4uG3TaACwvF2qgyzmAGEL+NjYowmHH+OuEJ4i91lYBmIEn3CyW omRuHAXq023/HUFjylqbiPl6cuQsJbLKnfCbRBaIkwTQ3f603lAwWk7mQxsXKAIIhdI536R+ sDXEV9C3zjQtNXWvO+n5hbxJgEWNa1qdbgrj0Ltx7Bpxltj7PCxZn8VXVtsRkacHuUvSGLA6 Jd+ObGDR9WUSMvLtu3/ynEnrDjBCybvxriXcPY6jW7H3spxv7KYm8AGYbtctz3S4tskUGJJv HFtVxu8fHnmQa0TO2035jMm45MOBcegVcvjAxOzJWWTMLDWb+pa5brw87tG1daXgLVpror/E LaOCIVPwjCmmQQg15vaUjL3qLI48oP43OhwcEJxvHhZ/3Je57zHwGm2vk/O/UbjbbJEu/g30 d1vd9IAuzUUKNUkW6i/cU+OkrPpiHJjS8uM81xip6FCmG0WzStrz46S6lw0GIBiw9SUwaEVB qQ/GkSXj8gzl2fLRiu1O5gkB2sgdcMs= In-Reply-To: <20241011091321.34f09b24@thor.intern.walstatt.dynvpn.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated-Sender: martin@matuska.de X-Virus-Scanned: Clear (ClamAV 0.103.10/27423/Thu Oct 10 10:56:03 2024) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:24940, ipnet:213.133.96.0/19, country:DE] X-Rspamd-Queue-Id: 4XPyfj6Lf3z4jV3 X-Spamd-Bar: ---- It builds fine with me. Looks like arc_os.c is read from the wrong place if depend is not cleaned and has to be added to tools/build/depend-cleanup.sh as well On 11. 10. 2024 9:12, FreeBSD User wrote: > Am Fri, 11 Oct 2024 06:48:36 GMT > Martin Matuska schrieb: > > This commit break buildworld: > > [...] > ===> cddl/lib/libzfsbootenv (all) > --- all_subdir_cddl/lib/libzpool --- > --- arc_os.pico --- > /usr/src/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c:45:10: fatal error: 'sys/shrinker.h' > file not found 45 | #include > > > > Kind regards, > oh > >> The branch main has been updated by mm: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=7a7741af18d6c8a804cc643cb7ecda9d730c6aa6 >> >> commit 7a7741af18d6c8a804cc643cb7ecda9d730c6aa6 >> Merge: 3e501ef89667 3a9fca901b44 >> Author: Martin Matuska >> AuthorDate: 2024-10-11 06:39:18 +0000 >> Commit: Martin Matuska >> CommitDate: 2024-10-11 06:43:49 +0000 >> >> zfs: merge openzfs/zfs@b10992582 >> >> Notable upstream pull request merges: >> #9416 -multiple zio_compress: introduce max size threshold >> #10018 a10e552b9 Adding Direct IO Support >> #15147 e419a63bf xattr dataset prop: change defaults to sa >> #15454 7e957fde7 send/recv: open up additional stream feature flags >> #15810 0d77e738e Defer resilver only when progress is above a threshold >> #15921 3cf2bfa57 Allocate zap_attribute_t from kmem instead of stack >> #16483 -multiple dmu_objset: replace dnode_hash impl with cityhash4 >> #16485 8be2f4c3d zio_resume: log when unsuspending the pool >> #16491 88433e640 sys/types32.h: Remove struct timeval32 from libspl header >> #16496 f245541e2 zfs_file: implement zfs_file_deallocate for FreeBSD 14 >> #16511 308f7c2f1 Fix an uninitialized data access >> #16529 29c9e6c32 Fix handling of DNS names with '-' in them for sharenfs >> #16531 ddf5f34f0 Avoid fault diagnosis if multiple vdevs have errors >> #16539 6f50f8e16 zfs_log: add flex array fields to log record structs >> #16546 d40d40913 Evicting too many bytes from MFU metadata >> #16551 3014dcb76 Reduce and handle EAGAIN errors on AIO label reads >> #16554 80645d658 FreeBSD: restore zfs_znode_update_vfs() >> #16565 832f66b21 FreeBSD: Sync taskq_cancel_id() returns with Linux >> #16567 48d1be254 Properly release key in spa_keystore_dsl_key_hold_dd() >> #16569 141368a4b Restrict raidz faulted vdev count >> #16583 c84a37ae9 lua: add flex array field to TString type >> #16584 86737c592 Avoid computing strlen() inside loops >> #16587 d34d4f97a snapdir: add 'disabled' value to make .zfs inaccessible >> #16593 224393a32 feature: large_microzap >> #16597 412105977 Temporarily disable Direct IO by default >> #16605 4ebe674d9 ARC: Cache arc_c value during arc_evict() >> >> Backported pull request merges: >> #16613 ab777f436 Return boolean_t in inline functions of >> lib/libspl/include/sys/uio.h >> #16616 efeb60b86 FreeBSD: ignore some includes when not building kernel >> #16635 ---TBD--- zdb: fix printf format in dump_zap() >> >> Obtained from: OpenZFS >> OpenZFS commit: b109925820fb79db3e37670c159977f03edd950f >> OpenZFS tag: 2.3.0-rc1 >> >> cddl/lib/libzdb/Makefile | 1 + >> cddl/lib/libzfs_core/Makefile | 1 + >> cddl/lib/libzfsbootenv/Makefile | 1 + >> cddl/lib/libzpool/Makefile | 18 +- >> cddl/lib/libzutil/Makefile | 1 + >> cddl/lib/pam_zfs_key/Makefile | 1 + >> cddl/share/zfs/compatibility.d/Makefile | 12 +- >> stand/libsa/zfs/Makefile.inc | 2 +- >> sys/conf/files | 4 +- >> sys/contrib/openzfs/.github/CONTRIBUTING.md | 18 +- >> .../.github/workflows/build-dependencies.txt | 57 --- >> .../.github/workflows/checkstyle-dependencies.txt | 5 - >> .../openzfs/.github/workflows/checkstyle.yaml | 23 +- >> sys/contrib/openzfs/.github/workflows/codeql.yml | 10 +- >> .../openzfs/.github/workflows/scripts/README.md | 14 + >> .../.github/workflows/scripts/generate-ci-type.py | 107 +++++ >> .../.github/workflows/scripts/generate-summary.sh | 119 ------ >> .../.github/workflows/scripts/merge_summary.awk | 109 +++++ >> .../.github/workflows/scripts/qemu-1-setup.sh | 91 ++++ >> .../.github/workflows/scripts/qemu-2-start.sh | 213 +++++++++ >> .../.github/workflows/scripts/qemu-3-deps.sh | 221 ++++++++++ >> .../.github/workflows/scripts/qemu-4-build.sh | 153 +++++++ >> .../.github/workflows/scripts/qemu-5-setup.sh | 121 ++++++ >> .../.github/workflows/scripts/qemu-6-tests.sh | 105 +++++ >> .../.github/workflows/scripts/qemu-7-prepare.sh | 123 ++++++ >> .../.github/workflows/scripts/qemu-8-summary.sh | 71 +++ >> .../workflows/scripts/qemu-9-summary-page.sh | 57 +++ >> .../workflows/scripts/setup-dependencies.sh | 88 ---- >> .../.github/workflows/scripts/setup-functional.sh | 24 -- >> .../openzfs/.github/workflows/zfs-linux-tests.yml | 124 ------ >> .../openzfs/.github/workflows/zfs-linux.yml | 64 --- >> sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 175 ++++++++ >> sys/contrib/openzfs/.github/workflows/zloop.yml | 77 ++++ >> sys/contrib/openzfs/.mailmap | 1 + >> sys/contrib/openzfs/AUTHORS | 4 + >> sys/contrib/openzfs/META | 8 +- >> sys/contrib/openzfs/cmd/arc_summary | 2 +- >> sys/contrib/openzfs/cmd/arcstat.in | 297 +++++++++---- >> sys/contrib/openzfs/cmd/zdb/zdb.c | 144 ++++--- >> sys/contrib/openzfs/cmd/zdb/zdb_il.c | 6 +- >> sys/contrib/openzfs/cmd/zed/agents/zfs_diagnosis.c | 101 +++-- >> sys/contrib/openzfs/cmd/zhack.c | 17 +- >> sys/contrib/openzfs/cmd/zpool/Makefile.am | 9 +- >> .../openzfs/cmd/zpool/compatibility.d/grub2-2.06 | 23 + >> .../zpool/compatibility.d/{grub2 => grub2-2.12} | 2 +- >> .../openzfs/cmd/zpool/compatibility.d/openzfs-2.3 | 45 ++ >> sys/contrib/openzfs/cmd/zpool/zpool_main.c | 30 +- >> .../openzfs/cmd/zstream/zstream_recompress.c | 3 +- >> sys/contrib/openzfs/cmd/zstream/zstream_redup.c | 4 +- >> sys/contrib/openzfs/cmd/ztest.c | 78 +++- >> sys/contrib/openzfs/config/ax_compare_version.m4 | 177 ++++++++ >> sys/contrib/openzfs/config/deb.am | 2 + >> sys/contrib/openzfs/config/intlmacosx.m4 | 72 ---- >> sys/contrib/openzfs/config/kernel-acl.m4 | 215 +--------- >> sys/contrib/openzfs/config/kernel-aio-fsync.m4 | 23 - >> sys/contrib/openzfs/config/kernel-assign_str.m4 | 62 +++ >> sys/contrib/openzfs/config/kernel-bdi.m4 | 81 ---- >> sys/contrib/openzfs/config/kernel-bio.m4 | 313 +------------- >> sys/contrib/openzfs/config/kernel-blk-queue.m4 | 183 +------- >> sys/contrib/openzfs/config/kernel-blkdev.m4 | 22 +- >> sys/contrib/openzfs/config/kernel-clear-inode.m4 | 39 -- >> .../openzfs/config/kernel-config-defined.m4 | 15 - >> sys/contrib/openzfs/config/kernel-current-time.m4 | 26 -- >> sys/contrib/openzfs/config/kernel-dentry-alias.m4 | 30 -- >> .../openzfs/config/kernel-dentry-operations.m4 | 135 ------ >> sys/contrib/openzfs/config/kernel-dirty-inode.m4 | 29 -- >> .../openzfs/config/kernel-encode-fh-inode.m4 | 27 -- >> sys/contrib/openzfs/config/kernel-evict-inode.m4 | 24 -- >> sys/contrib/openzfs/config/kernel-fadvise.m4 | 23 - >> sys/contrib/openzfs/config/kernel-fallocate.m4 | 44 -- >> sys/contrib/openzfs/config/kernel-file-dentry.m4 | 24 -- >> sys/contrib/openzfs/config/kernel-file-inode.m4 | 23 - >> sys/contrib/openzfs/config/kernel-file.m4 | 31 ++ >> sys/contrib/openzfs/config/kernel-filemap.m4 | 27 -- >> sys/contrib/openzfs/config/kernel-fsync.m4 | 53 --- >> .../openzfs/config/kernel-generic_fillattr.m4 | 4 + >> .../openzfs/config/kernel-generic_io_acct.m4 | 29 -- >> .../openzfs/config/kernel-generic_readlink.m4 | 25 -- >> sys/contrib/openzfs/config/kernel-genhd-flags.m4 | 21 +- >> sys/contrib/openzfs/config/kernel-get-link.m4 | 104 ----- >> .../openzfs/config/kernel-global_page_state.m4 | 128 ------ >> sys/contrib/openzfs/config/kernel-group-info.m4 | 22 - >> sys/contrib/openzfs/config/kernel-hotplug.m4 | 26 -- >> .../openzfs/config/kernel-in-compat-syscall.m4 | 24 -- >> sys/contrib/openzfs/config/kernel-inode-getattr.m4 | 26 -- >> sys/contrib/openzfs/config/kernel-inode-lock.m4 | 24 -- >> .../openzfs/config/kernel-inode-permission.m4 | 2 + >> .../openzfs/config/kernel-inode-set-flags.m4 | 22 - >> .../openzfs/config/kernel-inode-set-iversion.m4 | 23 - >> sys/contrib/openzfs/config/kernel-inode-setattr.m4 | 22 - >> sys/contrib/openzfs/config/kernel-inode-times.m4 | 23 - >> sys/contrib/openzfs/config/kernel-kmem-cache.m4 | 41 -- >> sys/contrib/openzfs/config/kernel-kmem.m4 | 27 +- >> sys/contrib/openzfs/config/kernel-kstrtoul.m4 | 21 - >> sys/contrib/openzfs/config/kernel-kthread.m4 | 37 +- >> sys/contrib/openzfs/config/kernel-ktime.m4 | 55 --- >> sys/contrib/openzfs/config/kernel-lseek-execute.m4 | 27 -- >> .../openzfs/config/kernel-make-request-fn.m4 | 42 +- >> sys/contrib/openzfs/config/kernel-mkdir.m4 | 11 +- >> sys/contrib/openzfs/config/kernel-mm-page-flags.m4 | 24 ++ >> sys/contrib/openzfs/config/kernel-mm-pagemap.m4 | 4 +- >> sys/contrib/openzfs/config/kernel-percpu.m4 | 56 --- >> sys/contrib/openzfs/config/kernel-put-link.m4 | 61 --- >> sys/contrib/openzfs/config/kernel-rename.m4 | 64 +-- >> sys/contrib/openzfs/config/kernel-rw.m4 | 69 --- >> sys/contrib/openzfs/config/kernel-rwsem.m4 | 60 --- >> sys/contrib/openzfs/config/kernel-sched.m4 | 53 --- >> .../openzfs/config/kernel-setattr-prepare.m4 | 2 + >> sys/contrib/openzfs/config/kernel-shrink.m4 | 163 +------ >> sys/contrib/openzfs/config/kernel-signal-stop.m4 | 21 - >> sys/contrib/openzfs/config/kernel-special-state.m4 | 21 - >> sys/contrib/openzfs/config/kernel-strlcpy.m4 | 25 +- >> sys/contrib/openzfs/config/kernel-super-userns.m4 | 25 -- >> sys/contrib/openzfs/config/kernel-symlink.m4 | 2 + >> sys/contrib/openzfs/config/kernel-timer.m4 | 75 ---- >> sys/contrib/openzfs/config/kernel-tmpfile.m4 | 4 - >> sys/contrib/openzfs/config/kernel-user-ns-inum.m4 | 23 - >> .../openzfs/config/kernel-userns-capabilities.m4 | 27 -- >> sys/contrib/openzfs/config/kernel-vfs-direct_IO.m4 | 56 +-- >> .../config/kernel-vfs-extended-file_range.m4 | 50 --- >> .../openzfs/config/kernel-vfs-file_range.m4 | 30 -- >> sys/contrib/openzfs/config/kernel-vfs-getattr.m4 | 86 ---- >> .../openzfs/config/kernel-vfs-invalidate_folio.m4 | 33 ++ >> sys/contrib/openzfs/config/kernel-vfs-iov_iter.m4 | 163 ++----- >> sys/contrib/openzfs/config/kernel-vfs-iterate.m4 | 83 ---- >> .../openzfs/config/kernel-vfs-release_folio.m4 | 32 ++ >> .../openzfs/config/kernel-vfs-rw-iterate.m4 | 80 ---- >> sys/contrib/openzfs/config/kernel-wait.m4 | 99 ----- >> sys/contrib/openzfs/config/kernel-xattr-handler.m4 | 322 +------------- >> sys/contrib/openzfs/config/kernel-zlib.m4 | 26 -- >> sys/contrib/openzfs/config/kernel.m4 | 158 +++---- >> sys/contrib/openzfs/configure.ac | 2 + >> sys/contrib/openzfs/contrib/Makefile.am | 1 + >> sys/contrib/openzfs/contrib/debian/Makefile.am | 48 +++ >> sys/contrib/openzfs/contrib/debian/not-installed | 1 - >> sys/contrib/openzfs/contrib/debian/rules.in | 8 +- >> sys/contrib/openzfs/include/cityhash.h | 7 + >> .../openzfs/include/os/freebsd/spl/sys/mutex.h | 1 + >> .../openzfs/include/os/freebsd/spl/sys/param.h | 1 + >> .../openzfs/include/os/freebsd/spl/sys/simd.h | 3 + >> .../openzfs/include/os/freebsd/spl/sys/uio.h | 31 +- >> .../openzfs/include/os/freebsd/zfs/sys/abd_os.h | 15 + >> .../include/os/freebsd/zfs/sys/zfs_ctldir.h | 2 +- >> .../include/os/freebsd/zfs/sys/zfs_vfsops_os.h | 3 +- >> .../include/os/freebsd/zfs/sys/zfs_znode_impl.h | 2 +- >> sys/contrib/openzfs/include/os/linux/Makefile.am | 1 - >> .../include/os/linux/kernel/linux/blkdev_compat.h | 229 +--------- >> .../include/os/linux/kernel/linux/dcache_compat.h | 6 - >> .../include/os/linux/kernel/linux/kmap_compat.h | 2 + >> .../include/os/linux/kernel/linux/mm_compat.h | 14 + >> .../include/os/linux/kernel/linux/page_compat.h | 56 --- >> .../openzfs/include/os/linux/kernel/linux/simd.h | 4 + >> .../include/os/linux/kernel/linux/simd_aarch64.h | 10 - >> .../include/os/linux/kernel/linux/simd_powerpc.h | 11 - >> .../include/os/linux/kernel/linux/vfs_compat.h | 235 +--------- >> .../include/os/linux/kernel/linux/xattr_compat.h | 106 +---- >> .../openzfs/include/os/linux/spl/sys/condvar.h | 4 +- >> .../openzfs/include/os/linux/spl/sys/cred.h | 4 - >> .../openzfs/include/os/linux/spl/sys/file.h | 11 - >> .../openzfs/include/os/linux/spl/sys/kmem_cache.h | 3 +- >> .../openzfs/include/os/linux/spl/sys/signal.h | 3 - >> .../openzfs/include/os/linux/spl/sys/string.h | 7 - >> .../openzfs/include/os/linux/spl/sys/taskq.h | 6 +- >> .../openzfs/include/os/linux/spl/sys/thread.h | 7 - >> .../openzfs/include/os/linux/spl/sys/time.h | 28 -- >> .../openzfs/include/os/linux/spl/sys/timer.h | 20 - >> .../openzfs/include/os/linux/spl/sys/types.h | 6 + >> sys/contrib/openzfs/include/os/linux/spl/sys/uio.h | 47 +- >> .../openzfs/include/os/linux/spl/sys/wait.h | 24 -- >> .../openzfs/include/os/linux/spl/sys/wmsum.h | 9 - >> .../openzfs/include/os/linux/zfs/sys/abd_os.h | 3 + >> .../include/os/linux/zfs/sys/trace_dbgmsg.h | 3 +- >> .../openzfs/include/os/linux/zfs/sys/trace_dbuf.h | 29 +- >> .../openzfs/include/os/linux/zfs/sys/zfs_ctldir.h | 2 +- >> .../include/os/linux/zfs/sys/zfs_vfsops_os.h | 3 +- >> .../include/os/linux/zfs/sys/zfs_vnops_os.h | 3 +- >> .../include/os/linux/zfs/sys/zfs_znode_impl.h | 31 -- >> sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h | 86 +--- >> sys/contrib/openzfs/include/sys/abd.h | 7 + >> sys/contrib/openzfs/include/sys/abd_impl.h | 14 +- >> sys/contrib/openzfs/include/sys/arc.h | 3 +- >> sys/contrib/openzfs/include/sys/dbuf.h | 29 +- >> sys/contrib/openzfs/include/sys/dmu.h | 14 +- >> sys/contrib/openzfs/include/sys/dmu_impl.h | 34 +- >> sys/contrib/openzfs/include/sys/dmu_objset.h | 1 + >> sys/contrib/openzfs/include/sys/fm/fs/zfs.h | 2 + >> sys/contrib/openzfs/include/sys/fs/zfs.h | 15 + >> sys/contrib/openzfs/include/sys/sa_impl.h | 4 +- >> sys/contrib/openzfs/include/sys/spa.h | 12 + >> sys/contrib/openzfs/include/sys/uio_impl.h | 37 ++ >> sys/contrib/openzfs/include/sys/vdev_impl.h | 10 + >> sys/contrib/openzfs/include/sys/zap.h | 16 +- >> sys/contrib/openzfs/include/sys/zap_impl.h | 7 +- >> sys/contrib/openzfs/include/sys/zfs_file.h | 2 +- >> sys/contrib/openzfs/include/sys/zfs_ioctl.h | 72 ++-- >> sys/contrib/openzfs/include/sys/zfs_racct.h | 7 +- >> sys/contrib/openzfs/include/sys/zfs_znode.h | 4 +- >> sys/contrib/openzfs/include/sys/zil.h | 30 +- >> sys/contrib/openzfs/include/sys/zio.h | 5 + >> sys/contrib/openzfs/include/sys/zio_compress.h | 3 +- >> sys/contrib/openzfs/include/sys/zio_impl.h | 7 +- >> sys/contrib/openzfs/include/zfeature_common.h | 3 + >> sys/contrib/openzfs/lib/libnvpair/libnvpair.abi | 197 ++++++++- >> sys/contrib/openzfs/lib/libshare/os/freebsd/nfs.c | 4 +- >> sys/contrib/openzfs/lib/libspl/include/sys/simd.h | 3 + >> sys/contrib/openzfs/lib/libspl/include/sys/uio.h | 26 ++ >> sys/contrib/openzfs/lib/libuutil/libuutil.abi | 200 ++++++++- >> sys/contrib/openzfs/lib/libzfs/libzfs.abi | 212 ++++++++- >> sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 8 +- >> sys/contrib/openzfs/lib/libzfs/libzfs_util.c | 8 +- >> .../openzfs/lib/libzfs_core/libzfs_core.abi | 196 ++++++++- >> sys/contrib/openzfs/lib/libzpool/Makefile.am | 15 +- >> sys/contrib/openzfs/lib/libzpool/abd_os.c | 64 +++ >> sys/contrib/openzfs/lib/libzpool/arc_os.c | 87 ++++ >> sys/contrib/openzfs/lib/libzpool/kernel.c | 30 +- >> .../libzpool/vdev_label_os.c} | 39 +- >> sys/contrib/openzfs/lib/libzpool/zfs_debug.c | 106 +++++ >> sys/contrib/openzfs/lib/libzpool/zfs_racct.c | 38 ++ >> sys/contrib/openzfs/lib/libzstd/Makefile.am | 2 + >> sys/contrib/openzfs/lib/libzutil/zutil_import.c | 17 +- >> sys/contrib/openzfs/man/man1/arcstat.1 | 166 ++++++++ >> sys/contrib/openzfs/man/man4/zfs.4 | 62 ++- >> sys/contrib/openzfs/man/man7/zfsconcepts.7 | 2 +- >> sys/contrib/openzfs/man/man7/zfsprops.7 | 99 ++++- >> sys/contrib/openzfs/man/man7/zpool-features.7 | 69 ++- >> sys/contrib/openzfs/man/man8/zfs-send.8 | 6 +- >> sys/contrib/openzfs/man/man8/zpool-events.8 | 14 +- >> sys/contrib/openzfs/man/man8/zpool-status.8 | 11 +- >> sys/contrib/openzfs/module/Kbuild.in | 5 +- >> sys/contrib/openzfs/module/Makefile.bsd | 4 +- >> sys/contrib/openzfs/module/lua/lobject.h | 21 +- >> sys/contrib/openzfs/module/lua/lstate.h | 2 +- >> sys/contrib/openzfs/module/lua/lstring.c | 2 +- >> sys/contrib/openzfs/module/lua/lstring.h | 2 +- >> .../openzfs/module/os/freebsd/spl/spl_taskq.c | 4 +- >> .../openzfs/module/os/freebsd/spl/spl_uio.c | 201 +++++++++ >> sys/contrib/openzfs/module/os/freebsd/zfs/abd_os.c | 169 +++++++- >> .../openzfs/module/os/freebsd/zfs/vdev_file.c | 11 +- >> .../openzfs/module/os/freebsd/zfs/zfs_acl.c | 2 +- >> .../openzfs/module/os/freebsd/zfs/zfs_debug.c | 53 +-- >> .../openzfs/module/os/freebsd/zfs/zfs_dir.c | 31 +- >> .../openzfs/module/os/freebsd/zfs/zfs_file_os.c | 26 ++ >> .../openzfs/module/os/freebsd/zfs/zfs_racct.c | 8 +- >> .../openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 13 +- >> .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 95 ++++- >> .../os/freebsd/zfs/{zfs_znode.c => zfs_znode_os.c} | 374 +--------------- >> .../openzfs/module/os/freebsd/zfs/zvol_os.c | 1 + >> .../openzfs/module/os/linux/spl/spl-condvar.c | 47 +- >> sys/contrib/openzfs/module/os/linux/spl/spl-cred.c | 21 +- >> .../openzfs/module/os/linux/spl/spl-generic.c | 30 +- >> .../openzfs/module/os/linux/spl/spl-kmem-cache.c | 23 +- >> sys/contrib/openzfs/module/os/linux/spl/spl-kmem.c | 2 - >> sys/contrib/openzfs/module/os/linux/spl/spl-proc.c | 2 +- >> .../openzfs/module/os/linux/spl/spl-shrinker.c | 46 +- >> .../openzfs/module/os/linux/spl/spl-taskq.c | 22 +- >> .../openzfs/module/os/linux/spl/spl-thread.c | 26 +- >> sys/contrib/openzfs/module/os/linux/spl/spl-vmem.c | 1 - >> sys/contrib/openzfs/module/os/linux/spl/spl-zlib.c | 1 - >> sys/contrib/openzfs/module/os/linux/spl/spl-zone.c | 20 +- >> sys/contrib/openzfs/module/os/linux/zfs/abd_os.c | 240 +++++++++-- >> sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 47 -- >> sys/contrib/openzfs/module/os/linux/zfs/policy.c | 9 - >> .../openzfs/module/os/linux/zfs/vdev_disk.c | 71 +-- >> .../openzfs/module/os/linux/zfs/vdev_file.c | 9 +- >> sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c | 2 +- >> .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 25 +- >> .../openzfs/module/os/linux/zfs/zfs_debug.c | 40 -- >> sys/contrib/openzfs/module/os/linux/zfs/zfs_dir.c | 32 +- >> .../openzfs/module/os/linux/zfs/zfs_file_os.c | 74 +--- >> .../openzfs/module/os/linux/zfs/zfs_ioctl_os.c | 6 + >> .../openzfs/module/os/linux/zfs/zfs_racct.c | 29 +- >> sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c | 308 ++++++++++++- >> .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 117 +---- >> .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 152 +++++-- >> .../os/linux/zfs/{zfs_znode.c => zfs_znode_os.c} | 411 +----------------- >> .../openzfs/module/os/linux/zfs/zpl_ctldir.c | 90 +--- >> .../openzfs/module/os/linux/zfs/zpl_export.c | 38 +- >> sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 336 +++------------ >> .../openzfs/module/os/linux/zfs/zpl_file_range.c | 8 +- >> .../openzfs/module/os/linux/zfs/zpl_inode.c | 173 +++----- >> .../openzfs/module/os/linux/zfs/zpl_super.c | 13 +- >> .../openzfs/module/os/linux/zfs/zpl_xattr.c | 110 +---- >> sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 72 +--- >> sys/contrib/openzfs/module/zcommon/cityhash.c | 33 +- >> sys/contrib/openzfs/module/zcommon/simd_stat.c | 203 +++++++++ >> .../openzfs/module/zcommon/zfeature_common.c | 27 +- >> sys/contrib/openzfs/module/zcommon/zfs_prop.c | 30 +- >> sys/contrib/openzfs/module/zcommon/zfs_valstr.c | 2 + >> sys/contrib/openzfs/module/zcommon/zpool_prop.c | 5 +- >> sys/contrib/openzfs/module/zfs/abd.c | 94 ++-- >> sys/contrib/openzfs/module/zfs/arc.c | 37 +- >> sys/contrib/openzfs/module/zfs/dataset_kstats.c | 6 +- >> sys/contrib/openzfs/module/zfs/dbuf.c | 317 ++++++++++---- >> sys/contrib/openzfs/module/zfs/ddt.c | 8 - >> sys/contrib/openzfs/module/zfs/ddt_zap.c | 14 +- >> sys/contrib/openzfs/module/zfs/dmu.c | 154 +++++-- >> sys/contrib/openzfs/module/zfs/dmu_direct.c | 395 +++++++++++++++++ >> sys/contrib/openzfs/module/zfs/dmu_objset.c | 78 ++-- >> sys/contrib/openzfs/module/zfs/dmu_recv.c | 42 +- >> sys/contrib/openzfs/module/zfs/dmu_redact.c | 8 +- >> sys/contrib/openzfs/module/zfs/dmu_send.c | 17 +- >> sys/contrib/openzfs/module/zfs/dmu_tx.c | 4 +- >> sys/contrib/openzfs/module/zfs/dsl_bookmark.c | 8 +- >> sys/contrib/openzfs/module/zfs/dsl_crypt.c | 6 +- >> sys/contrib/openzfs/module/zfs/dsl_dataset.c | 21 +- >> sys/contrib/openzfs/module/zfs/dsl_deadlist.c | 38 +- >> sys/contrib/openzfs/module/zfs/dsl_deleg.c | 36 +- >> sys/contrib/openzfs/module/zfs/dsl_destroy.c | 4 +- >> sys/contrib/openzfs/module/zfs/dsl_dir.c | 7 +- >> sys/contrib/openzfs/module/zfs/dsl_pool.c | 12 +- >> sys/contrib/openzfs/module/zfs/dsl_prop.c | 41 +- >> sys/contrib/openzfs/module/zfs/dsl_scan.c | 79 ++-- >> sys/contrib/openzfs/module/zfs/dsl_userhold.c | 4 +- >> sys/contrib/openzfs/module/zfs/metaslab.c | 2 +- >> sys/contrib/openzfs/module/zfs/sa.c | 34 +- >> sys/contrib/openzfs/module/zfs/spa.c | 72 ++-- >> sys/contrib/openzfs/module/zfs/spa_errlog.c | 84 ++-- >> sys/contrib/openzfs/module/zfs/spa_log_spacemap.c | 9 +- >> sys/contrib/openzfs/module/zfs/spa_misc.c | 2 + >> sys/contrib/openzfs/module/zfs/spa_stats.c | 46 ++ >> sys/contrib/openzfs/module/zfs/vdev.c | 89 +++- >> sys/contrib/openzfs/module/zfs/vdev_label.c | 4 + >> sys/contrib/openzfs/module/zfs/zap.c | 30 +- >> sys/contrib/openzfs/module/zfs/zap_micro.c | 191 ++++++++- >> sys/contrib/openzfs/module/zfs/zcp_iter.c | 29 +- >> sys/contrib/openzfs/module/zfs/zfeature.c | 4 +- >> sys/contrib/openzfs/module/zfs/zfs_fm.c | 2 + >> sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 36 +- >> sys/contrib/openzfs/module/zfs/zfs_log.c | 94 ++-- >> sys/contrib/openzfs/module/zfs/zfs_quota.c | 12 +- >> sys/contrib/openzfs/module/zfs/zfs_replay.c | 143 ++++--- >> sys/contrib/openzfs/module/zfs/zfs_vnops.c | 294 ++++++++++++- >> sys/contrib/openzfs/module/zfs/zfs_znode.c | 401 +++++++++++++++++ >> sys/contrib/openzfs/module/zfs/zio.c | 149 ++++++- >> sys/contrib/openzfs/module/zfs/zio_compress.c | 14 +- >> sys/contrib/openzfs/module/zfs/zvol.c | 4 +- >> sys/contrib/openzfs/scripts/Makefile.am | 1 - >> sys/contrib/openzfs/scripts/enum-extract.pl | 58 --- >> sys/contrib/openzfs/scripts/zfs-tests.sh | 73 +++- >> sys/contrib/openzfs/tests/runfiles/common.run | 10 +- >> sys/contrib/openzfs/tests/runfiles/freebsd.run | 4 + >> sys/contrib/openzfs/tests/runfiles/linux.run | 15 +- >> .../tests/test-runner/bin/test-runner.py.in | 12 + >> .../openzfs/tests/test-runner/bin/zts-report.py.in | 61 +-- >> sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore | 1 + >> .../openzfs/tests/zfs-tests/cmd/Makefile.am | 2 + >> .../tests/zfs-tests/cmd/manipulate_user_buffer.c | 272 ++++++++++++ >> .../openzfs/tests/zfs-tests/cmd/mmap_sync.c | 2 +- >> .../openzfs/tests/zfs-tests/cmd/stride_dd.c | 237 ++++++++--- >> .../openzfs/tests/zfs-tests/include/commands.cfg | 8 +- >> .../openzfs/tests/zfs-tests/include/libtest.shlib | 39 +- >> .../tests/zfs-tests/include/properties.shlib | 2 +- >> .../openzfs/tests/zfs-tests/include/tunables.cfg | 3 + >> .../openzfs/tests/zfs-tests/tests/Makefile.am | 34 ++ >> .../tests/functional/bclone/bclone_common.kshlib | 4 +- >> .../functional/bclone/bclone_corner_cases.kshlib | 6 +- >> .../functional/block_cloning/block_cloning.kshlib | 4 +- >> .../block_cloning_cross_enc_dataset.ksh | 8 +- >> .../tests/functional/cache/cache_012_pos.ksh | 2 +- >> .../tests/functional/cli_root/zdb/zdb_backup.ksh | 4 +- >> .../zfs_receive_compressed_corrective.ksh | 4 +- >> .../zfs_receive/zfs_receive_corrective.ksh | 6 +- >> .../zfs_receive/zfs_receive_from_encrypted.ksh | 6 +- >> .../cli_root/zfs_receive/zfs_receive_from_zstd.ksh | 4 +- >> .../zfs_receive_large_block_corrective.ksh | 4 +- >> .../cli_root/zfs_receive/zfs_receive_raw.ksh | 6 +- >> .../zfs_receive/zfs_receive_raw_incremental.ksh | 4 +- >> .../cli_root/zpool_create/zpool_create.shlib | 5 +- >> .../zpool_create/zpool_create_features_005_pos.ksh | 2 +- >> .../functional/cli_root/zpool_get/zpool_get.cfg | 2 + >> .../import_cachefile_shared_device.ksh | 2 +- >> .../zpool_import/import_devices_missing.ksh | 8 +- >> .../zpool_import/import_rewind_config_changed.ksh | 4 +- >> .../zpool_import/import_rewind_device_replaced.ksh | 6 +- >> .../cli_root/zpool_import/zpool_import.cfg | 4 +- >> .../cli_root/zpool_import/zpool_import.kshlib | 34 +- >> ...ort_hostid_changed_cachefile_unclean_export.ksh | 10 +- >> .../zpool_import_hostid_changed_unclean_export.ksh | 9 +- >> .../functional/cli_root/zpool_reguid/Makefile.am | 6 - >> .../cli_root/zpool_reguid/zpool_reguid_001_pos.ksh | 4 +- >> .../cli_root/zpool_reguid/zpool_reguid_002_neg.ksh | 2 +- >> .../cli_root/zpool_reopen/zpool_reopen_003_pos.ksh | 4 +- >> .../cli_root/zpool_status/zpool_status_008_pos.ksh | 6 +- >> .../compression/l2arc_compressed_arc.ksh | 2 +- >> .../functional/compression/l2arc_encrypted.ksh | 2 +- >> .../l2arc_encrypted_no_compressed_arc.ksh | 2 +- >> .../tests/functional/cp_files/cp_files_002_pos.ksh | 4 +- >> .../tests/functional/deadman/deadman_sync.ksh | 8 +- >> .../zfs-tests/tests/functional/direct/cleanup.ksh | 37 ++ >> .../zfs-tests/tests/functional/direct/dio.cfg | 26 ++ >> .../zfs-tests/tests/functional/direct/dio.kshlib | 331 ++++++++++++++ >> .../tests/functional/direct/dio_aligned_block.ksh | 115 +++++ >> .../tests/functional/direct/dio_async_always.ksh | 68 +++ >> .../functional/direct/dio_async_fio_ioengines.ksh | 106 +++++ >> .../tests/functional/direct/dio_compression.ksh | 65 +++ >> .../tests/functional/direct/dio_dedup.ksh | 63 +++ >> .../tests/functional/direct/dio_encryption.ksh | 62 +++ >> .../tests/functional/direct/dio_grow_block.ksh | 86 ++++ >> .../tests/functional/direct/dio_max_recordsize.ksh | 64 +++ >> .../tests/functional/direct/dio_mixed.ksh | 107 +++++ >> .../zfs-tests/tests/functional/direct/dio_mmap.ksh | 92 ++++ >> .../tests/functional/direct/dio_overwrites.ksh | 70 +++ >> .../tests/functional/direct/dio_property.ksh | 127 ++++++ >> .../tests/functional/direct/dio_random.ksh | 82 ++++ >> .../tests/functional/direct/dio_recordsize.ksh | 68 +++ >> .../functional/direct/dio_unaligned_block.ksh | 78 ++++ >> .../functional/direct/dio_unaligned_filesize.ksh | 91 ++++ >> .../functional/direct/dio_write_stable_pages.ksh | 103 +++++ >> .../tests/functional/direct/dio_write_verify.ksh | 196 +++++++++ >> .../zfs-tests/tests/functional/direct/setup.ksh | 37 ++ >> .../functional/events/zed_diagnose_multiple.ksh | 168 ++++++++ >> .../functional/events/zed_slow_io_many_vdevs.ksh | 4 +- >> .../tests/functional/fault/fault_limits.ksh | 96 +++++ >> .../functional/fault/suspend_resume_single.ksh | 4 +- >> .../tests/functional/history/history_003_pos.ksh | 6 +- >> .../tests/zfs-tests/tests/functional/io/setup.ksh | 2 +- >> .../zfs-tests/tests/functional/l2arc/l2arc.cfg | 2 +- >> .../tests/functional/longname/cleanup.ksh | 34 ++ >> .../tests/functional/longname/longname_001_pos.ksh | 132 ++++++ >> .../tests/functional/longname/longname_002_pos.ksh | 115 +++++ >> .../tests/functional/longname/longname_003_pos.ksh | 113 +++++ >> .../zfs-tests/tests/functional/longname/setup.ksh | 35 ++ >> .../tests/functional/no_space/enospc_ganging.ksh | 6 +- >> .../functional/projectquota/projectid_003_pos.ksh | 4 +- >> .../functional/raidz/raidz_expand_001_pos.ksh | 3 + >> .../functional/raidz/raidz_expand_002_pos.ksh | 1 + >> .../replacement/resilver_restart_001.ksh | 11 +- >> .../zfs-tests/tests/functional/rsend/rsend.kshlib | 22 +- >> .../tests/functional/rsend/send-c_longname.ksh | 98 +++++ >> .../tests/functional/rsend/send-c_volume.ksh | 12 +- >> .../functional/rsend/send-wR_encrypted_zvol.ksh | 6 +- >> .../functional/rsend/send_encrypted_props.ksh | 14 +- >> .../rsend/send_encrypted_truncated_files.ksh | 12 +- >> .../tests/functional/rsend/send_hole_birth.ksh | 2 +- >> .../tests/functional/slog/slog_replay_fs_001.ksh | 16 +- >> .../tests/functional/slog/slog_replay_volume.ksh | 4 +- >> .../zfs-tests/tests/functional/trim/trim_l2arc.ksh | 2 +- >> .../tests/functional/xattr/xattr_001_pos.ksh | 2 +- >> .../tests/functional/xattr/xattr_002_neg.ksh | 2 +- >> sys/contrib/openzfs/udev/zvol_id.c | 7 +- >> sys/modules/zfs/Makefile | 4 +- >> sys/modules/zfs/zfs_config.h | 474 ++------------------- >> sys/modules/zfs/zfs_gitrev.h | 2 +- >> tools/build/depend-cleanup.sh | 3 + >> 444 files changed, 12924 insertions(+), 9366 deletions(-) >> >> diff --cc cddl/lib/libzdb/Makefile >> index 63248399b91c,000000000000..0eb30c55d107 >> mode 100644,000000..100644 >> --- a/cddl/lib/libzdb/Makefile >> +++ b/cddl/lib/libzdb/Makefile >> @@@ -1,25 -1,0 +1,26 @@@ >> +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzdb >> +.PATH: ${SRCTOP}/sys/contrib/openzfs/include >> + >> +LIB= zdb >> +PACKAGE= zfs >> + >> +INCS = libzdb.h >> + >> +SRCS = libzdb.c >> + >> +WARNS?= 2 >> +CSTD= c99 >> + >> +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include >> +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include >> +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd >> ++CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include >> +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs >> +CFLAGS+= -I${SRCTOP}/sys >> +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include >> +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h >> +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzutil >> +CFLAGS+= -DHAVE_ISSETUGID -DIN_BASE >> +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h >> + >> +.include >> diff --cc cddl/lib/libzfs_core/Makefile >> index 4cd978e99a7d,000000000000..d986c45725b3 >> mode 100644,000000..100644 >> --- a/cddl/lib/libzfs_core/Makefile >> +++ b/cddl/lib/libzfs_core/Makefile >> @@@ -1,31 -1,0 +1,32 @@@ >> +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core >> +.PATH: ${SRCTOP}/sys/contrib/openzfs/include >> +.PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs >> +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs >> + >> + >> +LIB= zfs_core >> +LIBADD= nvpair spl zutil >> +PACKAGE= zfs >> + >> +INCS= libzfs_core.h >> +SRCS= libzfs_core.c \ >> + os/freebsd/libzfs_core_ioctl.c \ >> + zfs_ioctl_compat.c >> + >> +WARNS?= 2 >> +CSTD= c99 >> +CFLAGS+= -DIN_BASE >> +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include >> +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core/common >> +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ >> +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd >> ++CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include >> +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs >> +CFLAGS+= -I${SRCTOP}/sys >> +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include >> +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include >> +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h >> +CFLAGS+= -DHAVE_ISSETUGID >> +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h >> + >> +.include >> diff --cc cddl/lib/libzfsbootenv/Makefile >> index 5f5dbfb6f108,000000000000..15ee5bfaeaa4 >> mode 100644,000000..100644 >> --- a/cddl/lib/libzfsbootenv/Makefile >> +++ b/cddl/lib/libzfsbootenv/Makefile >> @@@ -1,34 -1,0 +1,35 @@@ >> +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfsbootenv >> +.PATH: ${SRCTOP}/sys/contrib/openzfs/include >> + >> +PACKAGE= zfs >> +LIB= zfsbootenv >> +SHLIB_MAJOR= 1 >> + >> +LIBADD= zfs >> +LIBADD+= nvpair >> + >> +INCS= libzfsbootenv.h >> +USER_C= \ >> + lzbe_device.c \ >> + lzbe_util.c \ >> + lzbe_pair.c >> + >> +SRCS= $(USER_C) >> + >> +CSTD= c99 >> +CFLAGS+= -DIN_BASE >> +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include >> +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ >> +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd >> ++CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include >> +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include >> +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include >> +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h >> +CFLAGS+= -DHAVE_ISSETUGID >> +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h >> +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs >> +CFLAGS.lzbe_device.c= -Wno-cast-qual >> +CFLAGS.lzbe_util.c= -Wno-cast-qual >> +CFLAGS.lzbe_pair.c= -Wno-cast-qual >> + >> +.include >> diff --cc cddl/lib/libzpool/Makefile >> index b80486484506,000000000000..4c8285eedb2d >> mode 100644,000000..100644 >> --- a/cddl/lib/libzpool/Makefile >> +++ b/cddl/lib/libzpool/Makefile >> @@@ -1,341 -1,0 +1,345 @@@ >> +ZFSTOP= ${SRCTOP}/sys/contrib/openzfs >> + >> +.PATH: ${ZFSTOP}/lib/libzpool >> + >> +# ZFS_COMMON_SRCS >> +.PATH: ${ZFSTOP}/module/zfs >> +.PATH: ${ZFSTOP}/module/zcommon >> +.PATH: ${ZFSTOP}/module/unicode >> +# LUA_SRCS >> +.PATH: ${ZFSTOP}/module/lua >> +# ZSTD_SRCS >> +.PATH: ${ZFSTOP}/module/zstd >> +.PATH: ${ZFSTOP}/module/zstd/lib/common >> +.PATH: ${ZFSTOP}/module/zstd/lib/compress >> +.PATH: ${ZFSTOP}/module/zstd/lib/decompress >> + >> - .PATH: ${ZFSTOP}/module/os/linux/zfs >> - >> +.if >> exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) >> +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} >> +ATOMIC_SRCS= opensolaris_atomic.S +ACFLAGS+= -Wa,--noexecstack >> +.else >> +.PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern >> +ATOMIC_SRCS= opensolaris_atomic.c >> +.endif >> + >> +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpcspe" >> +# Don't waste GOT entries on small data. >> +PICFLAG= -fPIC >> +.endif >> + >> +PACKAGE= zfs >> +LIB= zpool >> + >> +USER_C = \ >> - abd_os.c \ >> ++ arc_os.c \ >> + kernel.c \ >> + taskq.c \ >> - util.c >> ++ util.c \ >> ++ zfs_debug.c >> ++ >> ++.PATH: ${ZFSTOP}/module/os/linux/zfs >> + >> +KERNEL_C = \ >> ++ simd_stat.c \ >> + zfeature_common.c \ >> + zfs_comutil.c \ >> + zfs_deleg.c \ >> + zfs_fletcher.c \ >> + zfs_fletcher_superscalar.c \ >> + zfs_fletcher_superscalar4.c \ >> + zfs_namecheck.c \ >> + zfs_prop.c \ >> + zfs_zstd.c \ >> + zpool_prop.c \ >> + zprop_common.c \ >> + abd.c \ >> ++ abd_os.c \ >> + aggsum.c \ >> + arc.c \ >> - arc_os.c \ >> + blake3_zfs.c \ >> + blkptr.c \ >> + bplist.c \ >> + bpobj.c \ >> + bptree.c \ >> + bqueue.c \ >> + btree.c \ >> + brt.c \ >> + cityhash.c \ >> + dbuf.c \ >> + dbuf_stats.c \ >> + ddt.c \ >> + ddt_log.c \ >> + ddt_stats.c \ >> + ddt_zap.c \ >> + dmu.c \ >> + dmu_diff.c \ >> ++ dmu_direct.c \ >> + dmu_object.c \ >> + dmu_objset.c \ >> + dmu_recv.c \ >> + dmu_redact.c \ >> + dmu_send.c \ >> + dmu_traverse.c \ >> + dmu_tx.c \ >> + dmu_zfetch.c \ >> + dnode.c \ >> + dnode_sync.c \ >> + dsl_bookmark.c \ >> + dsl_dataset.c \ >> + dsl_deadlist.c \ >> + dsl_deleg.c \ >> + dsl_dir.c \ >> + dsl_crypt.c \ >> + dsl_pool.c \ >> + dsl_prop.c \ >> + dsl_scan.c \ >> + dsl_synctask.c \ >> + dsl_destroy.c \ >> + dsl_userhold.c \ >> + edonr_zfs.c \ >> + entropy_common.c \ >> + error_private.c \ >> + fm.c \ >> + fse_compress.c \ >> + fse_decompress.c \ >> + gzip.c \ >> + hist.c \ >> + hkdf.c \ >> + huf_compress.c \ >> + huf_decompress.c \ >> + lzjb.c \ >> + lz4.c \ >> + lz4_zfs.c \ >> + metaslab.c \ >> + mmp.c \ >> + multilist.c \ >> + objlist.c \ >> + pathname.c \ >> + pool.c \ >> + range_tree.c \ >> + refcount.c \ >> + rrwlock.c \ >> + sa.c \ >> + sha2_zfs.c \ >> + skein_zfs.c \ >> + spa.c \ >> + spa_checkpoint.c \ >> + spa_config.c \ >> + spa_errlog.c \ >> + spa_history.c \ >> + spa_log_spacemap.c \ >> + spa_misc.c \ >> + spa_stats.c \ >> + space_map.c \ >> + space_reftree.c \ >> + txg.c \ >> + trace.c \ >> + uberblock.c \ >> + unique.c \ >> + vdev.c \ >> + vdev_draid.c \ >> + vdev_draid_rand.c \ >> + vdev_file.c \ >> + vdev_indirect_births.c \ >> + vdev_indirect.c \ >> + vdev_indirect_mapping.c \ >> + vdev_initialize.c \ >> + vdev_label.c \ >> + vdev_label_os.c \ >> + vdev_mirror.c \ >> + vdev_missing.c \ >> + vdev_queue.c \ >> + vdev_raidz.c \ >> + vdev_raidz_math_aarch64_neon.c \ >> + vdev_raidz_math_aarch64_neonx2.c \ >> + vdev_raidz_math_avx2.c \ >> + vdev_raidz_math_avx512bw.c \ >> + vdev_raidz_math_avx512f.c \ >> + vdev_raidz_math.c \ >> + vdev_raidz_math_scalar.c \ >> + vdev_rebuild.c \ >> + vdev_removal.c \ >> + vdev_root.c \ >> + vdev_trim.c \ >> + xxhash.c \ >> + zap.c \ >> + zap_leaf.c \ >> + zap_micro.c \ >> + zcp.c \ >> + zcp_get.c \ >> + zcp_global.c \ >> + zcp_iter.c \ >> + zcp_set.c \ >> + zcp_synctask.c \ >> + zfeature.c \ >> + zfs_byteswap.c \ >> + zfs_chksum.c \ >> - zfs_debug.c \ >> + zfs_fm.c \ >> + zfs_fuid.c \ >> + zfs_sa.c \ >> + zfs_znode.c \ >> + zfs_racct.c \ >> + zfs_ratelimit.c \ >> + zfs_rlock.c \ >> + zil.c \ >> + zio.c \ >> + zio_checksum.c \ >> + zio_compress.c \ >> + zio_crypt.c \ >> + zio_inject.c \ >> + zle.c \ >> + zrlock.c \ >> + zstd_common.c \ >> + zstd_compress.c \ >> + zstd_compress_literals.c \ >> + zstd_compress_sequences.c \ >> + zstd_compress_superblock.c \ >> + zstd_ddict.c \ >> + zstd_decompress.c \ >> + zstd_decompress_block.c \ >> + zstd_double_fast.c \ >> + zstd_fast.c \ >> + zstd_lazy.c \ >> + zstd_ldm.c \ >> + zstd_opt.c \ >> + zthr.c >> + >> +ARCH_C = >> +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" >> +ARCH_C += vdev_raidz_math_sse2.c \ >> + vdev_raidz_math_ssse3.c \ >> + zfs_fletcher_intel.c \ >> + zfs_fletcher_sse.c >> +CFLAGS += -DHAVE_SSE2 -DHAVE_SSE3 >> +.endif >> +.if ${MACHINE_ARCH} == "amd64" >> +ARCH_C += zfs_fletcher_avx512.c >> +CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F \ >> + -DHAVE_AVX512BW >> +.endif >> +.if ${MACHINE_CPUARCH} == "aarch64" >> +ARCH_C += zfs_fletcher_aarch64_neon.c >> +.endif >> + >> +LUA_C = \ >> + lapi.c \ >> + lauxlib.c \ >> + lbaselib.c \ >> + lcode.c \ >> + lcompat.c \ >> + lcorolib.c \ >> + lctype.c \ >> + ldebug.c \ >> + ldo.c \ >> + lfunc.c \ >> + lgc.c \ >> + llex.c \ >> + lmem.c \ >> + lobject.c \ >> + lopcodes.c \ >> + lparser.c \ >> + lstate.c \ >> + lstring.c \ >> + lstrlib.c \ >> + ltable.c \ >> + ltablib.c \ >> + ltm.c \ >> + lvm.c \ >> + lzio.c >> + >> +UNICODE_C = u8_textprep.c uconv.c >> + >> - SRCS= ${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C} >> ++SRCS+= ${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C} >> ++ >> + >> +WARNS?= 2 >> +CFLAGS+= \ >> + -DIN_BASE \ >> + -I${ZFSTOP}/include \ >> + -I${ZFSTOP}/lib/libspl/include \ >> + -I${ZFSTOP}/lib/libspl/include/os/freebsd \ >> + -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \ >> + -I${SRCTOP}/sys \ >> + -I${ZFSTOP}/include/os/freebsd/zfs \ >> + -I${SRCTOP}/cddl/compat/opensolaris/include \ >> + -I${ZFSTOP}/module/icp/include \ >> ++ -I${SRCTOP}/compat/linuxkpi/common/include/linux \ >> + -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ >> + -DHAVE_ISSETUGID \ >> + -include ${SRCTOP}/sys/modules/zfs/zfs_config.h \ >> + -I${SRCTOP}/sys/modules/zfs \ >> + -I${ZFSTOP}/include/os/freebsd/zfs \ >> + -DLIB_ZPOOL_BUILD -DZFS_DEBUG \ >> + >> +# XXX: pthread doesn't have mutex_owned() equivalent, so we need to look >> +# into libthr private structures. That's sooo evil, but it's only for >> +# ZFS debugging tools needs. >> +CFLAGS+= -DWANTS_MUTEX_OWNED >> +CFLAGS+= -I${SRCTOP}/lib/libpthread/thread >> +CFLAGS+= -I${SRCTOP}/lib/libpthread/sys >> +CFLAGS+= -I${SRCTOP}/lib/libthr/arch/${MACHINE_CPUARCH}/include >> +CFLAGS.gcc+= -fms-extensions >> + >> +LIBADD= md pthread z spl icp nvpair avl umem >> + >> +# atomic.S doesn't like profiling. >> +MK_PROFILE= no >> + >> +CSTD= c99 >> + >> +# Since there are many asserts in this library, it makes no sense to compile >> +# it without debugging. >> + >> +CFLAGS+= -g -DDEBUG=1 >> + >> +CFLAGS.gcc+= -Wno-pointer-to-int-cast >> + >> +# Pointer values are used as debugging "tags" to mark reference count >> +# ownerships and in some cases the tag reference is dropped after an >> +# object is freed. >> +CFLAGS.dbuf.c= ${NO_WUSE_AFTER_FREE} >> +CFLAGS.entropy_common.c= -fno-tree-vectorize >> +CFLAGS.entropy_common.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.error_private.c= -fno-tree-vectorize >> +CFLAGS.error_private.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.fse_compress.c= -fno-tree-vectorize >> +CFLAGS.fse_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.fse_decompress.c= -fno-tree-vectorize >> +CFLAGS.fse_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.hist.c= -fno-tree-vectorize >> +CFLAGS.hist.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.huf_compress.c= -fno-tree-vectorize >> +CFLAGS.huf_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.huf_decompress.c= -fno-tree-vectorize >> +CFLAGS.huf_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.pool.c= -fno-tree-vectorize >> +CFLAGS.pool.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.xxhash.c= -fno-tree-vectorize >> +CFLAGS.xxhash.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.zstd_compress.c= -fno-tree-vectorize >> +CFLAGS.zstd_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.zstd_compress_literals.c= -fno-tree-vectorize >> +CFLAGS.zstd_compress_literals.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.zstd_compress_sequences.c= -fno-tree-vectorize >> +CFLAGS.zstd_compress_sequences.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.zstd_compress_superblock.c= -fno-tree-vectorize >> +CFLAGS.zstd_compress_superblock.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.zstd_double_fast.c= -fno-tree-vectorize >> +CFLAGS.zstd_double_fast.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.zstd_fast.c= -fno-tree-vectorize >> +CFLAGS.zstd_fast.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.zstd_lazy.c= -fno-tree-vectorize >> +CFLAGS.zstd_lazy.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.zstd_ldm.c= -fno-tree-vectorize >> +CFLAGS.zstd_ldm.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.zstd_opt.c= -fno-tree-vectorize >> +CFLAGS.zstd_opt.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.zstd_ddict.c= -fno-tree-vectorize >> +CFLAGS.zstd_ddict.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.zstd_decompress.c= -fno-tree-vectorize >> +CFLAGS.zstd_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> +CFLAGS.zstd_decompress_block.c= -fno-tree-vectorize >> +CFLAGS.zstd_decompress_block.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} >> + >> +.include >> diff --cc cddl/lib/libzutil/Makefile >> index 4d9794c32dda,000000000000..d1a943b25005 >> mode 100644,000000..100644 >> --- a/cddl/lib/libzutil/Makefile >> +++ b/cddl/lib/libzutil/Makefile >> @@@ -1,39 -1,0 +1,40 @@@ >> +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil >> +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd >> +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs >> + >> +LIB= zutil >> +LIBADD= avl geom m tpool >> +PACKAGE= zfs >> + >> +INCS = zutil_import.h >> + >> +SRCS = \ >> + zutil_device_path.c \ >> + zutil_import.c \ >> + zutil_import.h \ >> + zutil_nicenum.c \ >> *** 8197 LINES SKIPPED *** >> > > From nobody Fri Oct 11 07:24:24 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XPymn4dDtz5YQnY; Fri, 11 Oct 2024 07:24: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XPymn2FDGz4kZ9; Fri, 11 Oct 2024 07:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728631465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q8PX0Wg5gVaOYw+gxphZiDaI48BaRHSGVb5jXMm72p4=; b=Nw+tkf1WA+TdpD3QdspNVIX2LLqk4sIP9/FGsLXyr6EXPWLvdXVt0zOVq02KoVVqjyCSHP YwHy6q8q1RCCaC484vDoUgE0BLWwG0Lsv0MRJm6SVWq8tF6iFwmydt/wz5nQeGfTaWSIZq TEotQ1/vateSbQ4L6e+PDJwVSL9nq0gj1vNcMJ8OG9471De4Fa6HsH6Q53+vUhDy3xWNa9 8HmT2Yq3EfwikPVpnmU2IdmzkjwD5dqEYAXd9nfE5ba94EWZR2bRbcjXoo7BA6Y87LcekD SgzVKjbLTMIt6CHjxIaLrsGqmEUwA0Sf0MyVoCTYWeuxKLZZE75kxL2GRCC2RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728631465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q8PX0Wg5gVaOYw+gxphZiDaI48BaRHSGVb5jXMm72p4=; b=Et1wcBmk1KGm7iLrGPmUQdGGURa8j5G2xX9nJtGDbsIhDWKxzEvaXc+lPzVNaYZoxpXm6P OX79vyTe6SUoTvrpc3OwVv9UqzCZ7PUqIUyx88tJYaAdtkqjsHj0k1OuhfLlfbmzxeSCNu bSQL5ap4s2UXeg0kzYvoSNvnOhdpkaeSZURplUg/KTB7M/FyVPQgYX2ZVKFDaFXuV92Q36 MrGL9VAZsHgGst8UpRoWy7IKyvPNmt/byPUpW8jPreQWwnV/Ot/QUtfeawkSaIPxpMXE9D l6U3lcWC31TdFNyN0f3quVxrSzAl31sBdctDPElZr3pwUpKJGZEBA9XYhAAeiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728631465; a=rsa-sha256; cv=none; b=VJuDXrAOJwG1yEZcEQc17ffftx/pGrjrDmkgY8v8bEssQmk8u0rIE6F2wfy7PHDIKEav8G jrcvy24Uyt4ZaJ+P041J+dAxhAWHf0hU1FRz3i+f8+16SgJW9pEyEY7443Si0kN6f4BarY 69L1i1s+pafHIRjabePf/kAsZyL3U0RC9/3jZYzJUjqAJWPkltStkwdZ50Dh+g6evfTreQ 1tH8PWbH2451axfaNF8WWxuVrDnM7cuc9Jn3k9tYGBkAx+wAw5w/u90YdOX/C764+pFdRF Qcuq8awaLmcj3LRmwCQ1qvg5/L4Qu9T/4VeC1BImVnPo2RIeR3/205TU0Ea3Uw== 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 4XPymn0VNQzY81; Fri, 11 Oct 2024 07:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49B7OOOs023815; Fri, 11 Oct 2024 07:24:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49B7OOl6023812; Fri, 11 Oct 2024 07:24:24 GMT (envelope-from git) Date: Fri, 11 Oct 2024 07:24:24 GMT Message-Id: <202410110724.49B7OOl6023812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 73c7cb57a4d7 - main - depend-cleanup.sh: Add a rule to work around zfs arc_os.c dependency changes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73c7cb57a4d79caa1c6b3f27b49a623d16490b7a Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=73c7cb57a4d79caa1c6b3f27b49a623d16490b7a commit 73c7cb57a4d79caa1c6b3f27b49a623d16490b7a Author: Martin Matuska AuthorDate: 2024-10-11 07:22:15 +0000 Commit: Martin Matuska CommitDate: 2024-10-11 07:23:30 +0000 depend-cleanup.sh: Add a rule to work around zfs arc_os.c dependency changes --- tools/build/depend-cleanup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index efffbeded84f..94cafbd9a8d6 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -196,3 +196,6 @@ clean_dep cddl/lib/libzpool abd_os c "linux/zfs/abd_os\.c" # 20241007 clean_dep cddl/lib/libzpool zfs_debug c "linux/zfs/zfs_debug\.c" + +# 20241011 +clean_dep cddl/lib/libzpool arc_os c "linux/zfs/arc_os\.c" From nobody Fri Oct 11 09:53:13 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQ24T4CtLz5YcQ0; Fri, 11 Oct 2024 09:53: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQ24T25jjz4DKy; Fri, 11 Oct 2024 09:53:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728640393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=udRsS6edLEgS2YEwzv3ec66D+UyeENi3Gw1SOmGQGSM=; b=s8wg0ZIEVpSU0xwAjVvsnoMIShlngmZFB4Jai4pt+P9OeImM9s9e76akEED0Kzj6os9HtB InuSSGFf1ADBs8NQSyst5RYzonKFOAScWSNPUYWfiT1LCyepOzc6839xF3rNlafY/QIH8j smd8oT2OJYSwK3n8MatxrB5iDw6sPScvghkuiQ8dkLiYaeTDdpH0yFcXF9Q8+EtRMCeRgi uintZ7+6UJX3369qUPbKrNZmYEWmntchQqf4XWC9+lPy4Xi2n43FdiPZKS8QcFCF74xVxy OeIUKzBR7/b7JrIdFa1qUXpQH1GGcJPMssDnALShiduD23cK401Zw9HcdXeolQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728640393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=udRsS6edLEgS2YEwzv3ec66D+UyeENi3Gw1SOmGQGSM=; b=qfQsSa7DRdOIiSAiQF4eDnNur5RXeTAe0ScMVKSIf/0odOxy7CJNWfmuh+ilqvw9pP2b7y vQM4O1oapmqgsKDAmft0LvzKfLA0RInbZ5q58uGYOo8WBAY06sVa/gjQI+F5xa+h/9KwNi oCDF2UweaqDQ8TmXiSc24Blwxol01msk40XItgBLRwvzMrWaQMuL0WRpnl1pkIyP7USbGa pNprh/p2q8Fujo6HPT4Jyrl0E8dahcV91DbzVuTB9fp7GqG19xvnCtV31zncO+3vX8OpXm TgCteKngV83zmfVRX/8OgXYPolLjwmthE6r1N5cpu/utM7i8fn6Rpw9wKk99PQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728640393; a=rsa-sha256; cv=none; b=Zt43xavx+OH/3neZX56YyhlgHoQa2kLIERJd9b+KjZsR6xipJzc9L0L1xYHY4/R7LNgE7e ZuwHi2iCGcdguOoXzN3uP7P1R+M48t7BrT6cA4w5g3rDJCHmU0xB4HhEAIdR/Ft4CWNzuZ Blw+EbOIWUBEvetuAJKgaXdRLo7Fs8W/gGuvZaOpSLhb8h/scI505d02tvR09p10fPEK/y Fyk8BOddZsuAWn8xvxwNpHXs9dw57QWTazk+xYQjI+bgTWxa8ZbUqJ3oCwbSwO1G5Zsy5a 8HyQTiF1hVqBp+0t2i5E3zBQ++yVm9o1UMuGIP5acizUM3WoimIFDUOor4VYtg== 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 4XQ24T1jnSzcnP; Fri, 11 Oct 2024 09:53:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49B9rDxB077225; Fri, 11 Oct 2024 09:53:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49B9rDLf077222; Fri, 11 Oct 2024 09:53:13 GMT (envelope-from git) Date: Fri, 11 Oct 2024 09:53:13 GMT Message-Id: <202410110953.49B9rDLf077222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: d80d7a8e4643 - main - rc.conf.5: Clarify wording List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d80d7a8e46433b90dc5e7ae69144664b9a6e35df Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=d80d7a8e46433b90dc5e7ae69144664b9a6e35df commit d80d7a8e46433b90dc5e7ae69144664b9a6e35df Author: Andrew Stevenson AuthorDate: 2024-10-11 09:49:42 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-11 09:52:56 +0000 rc.conf.5: Clarify wording PR: 196736 MFC after: 3 days --- share/man/man5/rc.conf.5 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 2897efffd780..62707e7f13d6 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 22, 2024 +.Dd October 11, 2024 .Dt RC.CONF 5 .Os .Sh NAME @@ -103,9 +103,8 @@ and will be loaded. If .Ao Ar dir Ac Ns Pa /rc.conf.d/ Ns Ao Ar name Ac -is a directory, -all of the files in the directory will be loaded. -Also see the +is a directory then all of files in the directory will be loaded. +See also the .Va rc_conf_files variable below. .Pp From nobody Fri Oct 11 10:15:08 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQ2Ym5xLcz5Yf0P; Fri, 11 Oct 2024 10:15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQ2Ym3Kw3z4GX9; Fri, 11 Oct 2024 10:15:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728641708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JTRadKkQYIMOs8OOluy3VbF1XX4nfBWnPWraLC4dEuU=; b=HX/HkZRxJZdrqR9gEPf8x1tKxVL4NX+epSobTkLxkKV6hTYKYallOnljWfTrvRdVE9v68J AoktknmUaomqhSVMsbazFDzbnlgy64MDVcPW3nE4/kH8B7gWTsfJ5+m+/Dr5nY2y2RGj0X o+5/M4+zfuA1POze8xF2ufb6RSL/1zss1AWmeuNnt8qA/fPPYN2l5q3DOjqp5YbEVRuG44 nGN7tKuiWWd9yDIU/fbhcKqjhbmEfu7kWWWyhGkKH5wJbeKCp+Uy+XIH5dTnYVzY+qIfSB t/hbpJWP6aWhjDxxZIdKn1pmZJeJcBIE0j1cMPZCC0ko3Iw3Ap2i+HJj4P8S/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728641708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JTRadKkQYIMOs8OOluy3VbF1XX4nfBWnPWraLC4dEuU=; b=d/PybmYS39aQo0Nw7ort2WOnTxWdj0LTuCzxdtladCmJKp7v7PEuyG+NEIcyQu0rGxaHyT AoKOoUSkEQ1L13PnBI0XGa4DqcFcoB7Z9AKQs3YWqNPGsb6CnAIqWtythPD+wPFMMdX4ud TgXXog8N6c/+PzRc8hkU7LJ45rKw9MfSaEXhbx3iEx3EkpWClyFwXJVZoosJDj3y0U61a5 3QqkUppyoK2W/iGdL6d9td6oG+zsofypPbci29egF1Poasumm/3l51L60zqbrxaG+Cl84M BAK9/dD0cZyoRXmIR01Sj7zg9trEW01VR3MgdG2HdzqaSKbyaA1ypLXHE6KzCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728641708; a=rsa-sha256; cv=none; b=Ufzo2+22uFDCrsBO6r/54XZWVEoHmkWAJO0kKwSn1gHhfyGxehOZZ1ikDdhpz5pbhQilqP NLMQ0EOQ19nPxN8KQBDzQ5ndFQcu1sFgeuHsq9JfYmFRt4nVXMLYPrDHGW1KZwmqyyIkpc Ij+lF2iHneFT3gTNCUkhH1DtJ8zxXRd4t1vS6RP+a3gFp+wM0/hWc+Pcv48q/s5Rc25W6V lRH1ZBBvgObi4bUcGZpipQSo5NTZujFT2BrXFB/536xj27oBYdrwsXQbvaoSALJI1Vcu5c VNBB+QzLMzGl0W+fsuRTwbV8UNyX3ASsW3FquG7x+BbRkpPUkqm4O7tMjPaX+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 4XQ2Ym2mQbzdYw; Fri, 11 Oct 2024 10:15:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BAF8gE011943; Fri, 11 Oct 2024 10:15:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BAF89M011940; Fri, 11 Oct 2024 10:15:08 GMT (envelope-from git) Date: Fri, 11 Oct 2024 10:15:08 GMT Message-Id: <202410111015.49BAF89M011940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ac9b565b1aa1 - main - kinfo_vmentry: report cdev name for device mappings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac9b565b1aa1adc359a5b0a0d83d0aea63643d62 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ac9b565b1aa1adc359a5b0a0d83d0aea63643d62 commit ac9b565b1aa1adc359a5b0a0d83d0aea63643d62 Author: Konstantin Belousov AuthorDate: 2024-10-10 09:31:37 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-11 10:14:04 +0000 kinfo_vmentry: report cdev name for device mappings Reviewed by: emaste, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D47038 --- sys/kern/kern_proc.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 1e90116f1cb0..f3ecaf4e2547 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -2614,9 +2615,11 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) struct ucred *cred; struct vnode *vp; struct vmspace *vm; + struct cdev *cdev; + struct cdevsw *csw; vm_offset_t addr; unsigned int last_timestamp; - int error; + int error, ref; key_t key; unsigned short seq; bool guard, super; @@ -2714,6 +2717,19 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) kve->kve_ref_count = obj->ref_count; kve->kve_shadow_count = obj->shadow_count; + if (obj->type == OBJT_DEVICE || + obj->type == OBJT_MGTDEVICE) { + cdev = obj->un_pager.devp.dev; + if (cdev != NULL) { + csw = dev_refthread(cdev, &ref); + if (csw != NULL) { + strlcpy(kve->kve_path, + cdev->si_name, sizeof( + kve->kve_path)); + dev_relthread(cdev, ref); + } + } + } VM_OBJECT_RUNLOCK(obj); if ((lobj->flags & OBJ_SYSVSHM) != 0) { kve->kve_flags |= KVME_FLAG_SYSVSHM; From nobody Fri Oct 11 10:15:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQ2Yp1gKnz5YfF7; Fri, 11 Oct 2024 10:15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQ2Yn5RsGz4GXB; Fri, 11 Oct 2024 10:15:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728641709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X5Q8+OubPWB5xWXfy/VyFk25LkhCHPF2Ukeh+3H42r8=; b=Ryw89V+bGG/gTyBFbGeoVGjdu8GqcLDhAUs/Ot8TzW64f1x9R6flA+TQvY4jDsP7F2FUIW K1162t0Ek+1P/UNSrxia/KaNi6tTAo+BDaNrTK2KwSi+tNA6NQ+z3mqg8z0gi6xZ4A/Q2L bvbKY8cNFARxFKNyohCuttvcx6Tb/M5U6npM7iXbYNe3sGy0EYhgnXaEtzHGLN+ZNEj5dK bFmdnVuExZi7usKPZotdt9u2FP7G6EbabwSoYIn7/B1W2scybCAYfAl5J3hToNWf3TXLSR IwAghe+/7VOtFygyZNAOWHlvwcX2RFLsIhMonYn/eukOg6MCPouvy6olvfdHVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728641709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X5Q8+OubPWB5xWXfy/VyFk25LkhCHPF2Ukeh+3H42r8=; b=hoQ30zR4j8Qt786fEghNBZ7DmcQOkbNa7MHnKvMZz68U6d63/MfoAeoSPmGDrpGMWwuFPp AfyjGTgjXZfOCF1Ux2/kaIUrsAdlwFqvJ+hHm/N56vOASfOjoBX2EwvkTDZNyiQg2YIlN6 jnV11uvzm1gLpCFlq8JoTGzTeeiLFbbEwsUbPx3eCEyX9avwasg6uSBbaiE+D9I4XUvWzO w2M5VhHT90/+L/cZsB8VWq4yUBMyffRF5dHuJuEutD+peQf1JrFECXFGiaDy8c4IjeyASx xIJtitprwAV/Zsje2Si2JRZHCD0gm4Ds941jnwlJ8nozNjmSpdcfYvmEq7z+IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728641709; a=rsa-sha256; cv=none; b=vgc9hKPh3cDNfZ032ym7zB9sbz+zlFAA/s6NOhDMwq1H5MxeXz6y1a3HUh3boUQa7D9Omt dOsd+dC7ZRMvwRLVzbwmAFX22hM7H0M3LkF1sdJy5dZZdTK0KwT0QQ7b3YuPyyhoXgdeNZ 8fpKx4GamLZYAZ2c0CH9j8dz91StjXFWyYgpPR6pA2QC7NAVEL7ICAYabNK2OyB8cVYRdL 72uJFn5Re85WOosuBd2IbfLToBzV5klxnBQbZYdpk3hN1cN2Pa4hyPwfxmJJ5Ow1DowzCk RJuz0j8ODW9lT5kuzYYTZXK1hH9axeuh1t0Pl1RxVXGo/xKK5cJCPsftf/yppA== 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 4XQ2Yn3n4wzdr8; Fri, 11 Oct 2024 10:15:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BAF9LN011996; Fri, 11 Oct 2024 10:15:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BAF9gY011993; Fri, 11 Oct 2024 10:15:09 GMT (envelope-from git) Date: Fri, 11 Oct 2024 10:15:09 GMT Message-Id: <202410111015.49BAF9gY011993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d9daa28c364d - main - sysctl vm.vm_objects: report cdev name for device-backed objects List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9daa28c364d0b1189ab616d8d697b4c9f748038 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d9daa28c364d0b1189ab616d8d697b4c9f748038 commit d9daa28c364d0b1189ab616d8d697b4c9f748038 Author: Konstantin Belousov AuthorDate: 2024-10-10 09:37:19 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-11 10:14:15 +0000 sysctl vm.vm_objects: report cdev name for device-backed objects Reviewed by: emaste. markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D47038 --- sys/vm/vm_object.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 0b9a8af2ccb1..83d6b709e277 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -66,6 +66,7 @@ #include #include +#include #include #include #include @@ -2506,8 +2507,10 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) struct vattr va; vm_object_t obj; vm_page_t m; + struct cdev *cdev; + struct cdevsw *csw; u_long sp; - int count, error; + int count, error, ref; key_t key; unsigned short seq; bool want_path; @@ -2594,6 +2597,17 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) sp = swap_pager_swapped_pages(obj); kvo->kvo_swapped = sp > UINT32_MAX ? UINT32_MAX : sp; } + if (obj->type == OBJT_DEVICE || obj->type == OBJT_MGTDEVICE) { + cdev = obj->un_pager.devp.dev; + if (cdev != NULL) { + csw = dev_refthread(cdev, &ref); + if (csw != NULL) { + strlcpy(kvo->kvo_path, cdev->si_name, + sizeof(kvo->kvo_path)); + dev_relthread(cdev, ref); + } + } + } VM_OBJECT_RUNLOCK(obj); if ((obj->flags & OBJ_SYSVSHM) != 0) { kvo->kvo_flags |= KVMO_FLAG_SYSVSHM; From nobody Fri Oct 11 11:56:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQ4q06tgdz5Ym9p; Fri, 11 Oct 2024 11:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQ4q0621Lz4Qj6; Fri, 11 Oct 2024 11:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728647804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c4r7vi/kTWqBeUzwVL0wXfp0Lawls+zSnRAJhuk8XQE=; b=dDOL6UM8M0zVr2OS5y9BHBRxepQWfm4ufWsGzHJpwF4FzQ9LMM6h8pJbpzqFTqSzd8QMl+ UJgOCEN0iaqoTf4z0LBjrJsGCaI2skt3Qu/sc4EpLEBflmenSQ9+RTsauRcq+BJ01rdYYL 3tv6zZ4qU3ZE30JTxiqQCoWOI8/FleG+66loolQAzoTr/xzYfVTW6+fvf6j+dPjmbXfX+Q 8eCt7WpHQ6/tU6v0oE4wDH8gAW00OnusFkjuwUiNmtE8b8ZBm2SvX0b4R0YzyE2F9lTBWQ RbNP2wHBlPgd/rKZWWX7VdIX6Hp+z32vmmkwomXEtRbodVWMxWB5FegB6RHOXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728647804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c4r7vi/kTWqBeUzwVL0wXfp0Lawls+zSnRAJhuk8XQE=; b=UyH+3qKKUUC2/LmwMsEs05wo68WllADFcVMJXGSrjw1fVC6wk24yNbWWE07BoEEJ1EBco9 YRE8dOiLXHh1HiHEaUj8TydvYugHXlG4kUKiBYOcTobBoDuhY1FLslVdA+/hxcnv2At2FL eughjnH0X8NBmRXI73C9ldpWpy7EudApVV8VbCoyej8MXPctvQPJabnyxLjwRpRmnDXKUw OnnHNXvlfWcZAQ7ODeflUDitnTKXqxq0QF3qnpikiX9G28iS9TKBWg/3aRfx8CZmpG4548 ftgBWW/Fsba5zH+xvsZRUp81XuAfAfwVsFLa0j7KuiKZM+7lk+3ZCmk3xOMwlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728647804; a=rsa-sha256; cv=none; b=Dcp3/zO/h9+rvkf7wZ7LTMtY3BsSoV+3u/TPMSmSxPzh+ZDz9Z8AkHraW9mDcsihk9vwd4 D+9rWG0cIodLtHYxZJ3bBxit3ye9JozedtQI6TcRq/ZW1fY891r/PxWKGGJ7NDBTgnrGG+ S22kjRDPkJq09iuUDfoRjtYkzOxAIY9V7H+lZ2FjoKBtWzmVVJcRYGfP8ob9bwo19bLxlp 0v87EAtkekz07dKr8N+PihSWvHdM7TUAAOW3malPXnBM2WXZqqDM69kg1N6SLQTxjtTIri Vy5DCDy1FtW+bwOMDS6P+83HzzEHnfGH+sCRoEoPtLk42adLdlhyhaX9swBmtg== 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 4XQ4q05d3JzgXv; Fri, 11 Oct 2024 11:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BBuirw081498; Fri, 11 Oct 2024 11:56:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BBuiNE081495; Fri, 11 Oct 2024 11:56:44 GMT (envelope-from git) Date: Fri, 11 Oct 2024 11:56:44 GMT Message-Id: <202410111156.49BBuiNE081495@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 440f4ba18e3a - main - tcp: fix duplicate retransmissions when RTO happens during SACK loss recovery List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 440f4ba18e3ab7be912858bbcb96a419fcf14809 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=440f4ba18e3ab7be912858bbcb96a419fcf14809 commit 440f4ba18e3ab7be912858bbcb96a419fcf14809 Author: Richard Scheffenegger AuthorDate: 2024-10-10 10:50:22 +0000 Commit: Richard Scheffenegger CommitDate: 2024-10-10 11:02:47 +0000 tcp: fix duplicate retransmissions when RTO happens during SACK loss recovery When snd_nxt doesn't track snd_max, partial SACK ACKs may elicit unexpected duplicate retransmissions. This is usually masked by LRO not necessarily ACKing every individual segment, and prior to RFC6675 SACK loss recovery, harder to trigger even when an RTO happens while SACK loss recovery is ongoing. Address this by improving the logic when to start a SACK loss recovery and how to deal with a RTO, as well as improvements to the adjusted congestion window during transmission selection. Reviewed By: tuexen, cc, #transport Sponsored by: NetApp, Inc. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43355 --- sys/netinet/tcp_input.c | 18 ++++++++++-------- sys/netinet/tcp_output.c | 25 ++++++++++++++++--------- sys/netinet/tcp_sack.c | 22 ++++++++++++++-------- sys/netinet/tcp_var.h | 2 +- 4 files changed, 41 insertions(+), 26 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index b64a71837ab4..5d14664f3fc0 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -444,10 +444,7 @@ cc_cong_signal(struct tcpcb *tp, struct tcphdr *th, uint32_t type) case CC_RTO: tp->t_dupacks = 0; tp->t_bytes_acked = 0; - if ((tp->t_rxtshift > 1) || - !((tp->t_flags & TF_SACK_PERMIT) && - (!TAILQ_EMPTY(&tp->snd_holes)))) - EXIT_RECOVERY(tp->t_flags); + EXIT_RECOVERY(tp->t_flags); if (tp->t_flags2 & TF2_ECN_PERMIT) tp->t_flags2 |= TF2_ECN_SND_CWR; break; @@ -2747,7 +2744,6 @@ enter_recovery: } if (tcp_is_sack_recovery(tp, &to)) { TCPSTAT_INC(tcps_sack_recovery_episode); - tp->snd_recover = tp->snd_nxt; tp->snd_cwnd = maxseg; (void) tcp_output(tp); if (SEQ_GT(th->th_ack, tp->snd_una)) { @@ -2790,8 +2786,12 @@ enter_recovery: __func__)); if (tp->t_dupacks == 1) tp->snd_limited = 0; - tp->snd_cwnd = - (tp->snd_nxt - tp->snd_una) + + if ((tp->snd_nxt == tp->snd_max) && + (tp->t_rxtshift == 0)) + tp->snd_cwnd = + SEQ_SUB(tp->snd_nxt, + tp->snd_una); + tp->snd_cwnd += (tp->t_dupacks - tp->snd_limited) * maxseg; /* @@ -2840,7 +2840,9 @@ enter_recovery: * counted as dupacks here. */ if (tcp_is_sack_recovery(tp, &to) && - (sack_changed != SACK_NOCHANGE)) { + (((tp->t_rxtshift == 0) && (sack_changed != SACK_NOCHANGE)) || + ((tp->t_rxtshift > 0) && (sack_changed == SACK_NEWLOSS))) && + (tp->snd_nxt == tp->snd_max)) { tp->t_dupacks++; /* limit overhead by setting maxseg last */ if (!IN_FASTRECOVERY(tp->t_flags) && diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 78ecfe5289b6..a048abf5f97a 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -259,6 +259,7 @@ tcp_default_output(struct tcpcb *tp) } } again: + sendwin = 0; /* * If we've recently taken a timeout, snd_max will be greater than * snd_nxt. There may be SACK information that allows us to avoid @@ -266,12 +267,12 @@ again: */ if ((tp->t_flags & TF_SACK_PERMIT) && SEQ_LT(tp->snd_nxt, tp->snd_max)) - tcp_sack_adjust(tp); + sendwin = tcp_sack_adjust(tp); sendalot = 0; tso = 0; mtu = 0; off = tp->snd_nxt - tp->snd_una; - sendwin = min(tp->snd_wnd, tp->snd_cwnd); + sendwin = min(tp->snd_wnd, tp->snd_cwnd + sendwin); flags = tcp_outflags[tp->t_state]; /* @@ -288,7 +289,8 @@ again: sack_bytes_rxmt = 0; len = 0; p = NULL; - if ((tp->t_flags & TF_SACK_PERMIT) && IN_FASTRECOVERY(tp->t_flags) && + if ((tp->t_flags & TF_SACK_PERMIT) && + (IN_FASTRECOVERY(tp->t_flags) || SEQ_LT(tp->snd_nxt, tp->snd_max)) && (p = tcp_sack_output(tp, &sack_bytes_rxmt))) { uint32_t cwin; @@ -387,7 +389,7 @@ after_sack_rexmit: * in which case len is already set. */ if (sack_rxmit == 0) { - if (sack_bytes_rxmt == 0) { + if ((sack_bytes_rxmt == 0) || SEQ_LT(tp->snd_nxt, tp->snd_max)) { len = ((int32_t)min(sbavail(&so->so_snd), sendwin) - off); } else { @@ -1636,11 +1638,16 @@ timer: tp->snd_max = tp->snd_nxt + xlen; } if ((error == 0) && - (TCPS_HAVEESTABLISHED(tp->t_state) && - (tp->t_flags & TF_SACK_PERMIT) && - tp->rcv_numsacks > 0)) { - /* Clean up any DSACK's sent */ - tcp_clean_dsack_blocks(tp); + (tp->rcv_numsacks > 0) && + TCPS_HAVEESTABLISHED(tp->t_state) && + (tp->t_flags & TF_SACK_PERMIT)) { + /* Clean up any DSACK's sent */ + tcp_clean_dsack_blocks(tp); + } + if ((error == 0) && + sack_rxmit && + SEQ_LT(tp->snd_nxt, SEQ_MIN(p->rxmit, p->end))) { + tp->snd_nxt = SEQ_MIN(p->rxmit, p->end); } if (error) { /* diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index 53a181703fe9..09e172ad4601 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -1006,7 +1006,7 @@ tcp_sack_partialack(struct tcpcb *tp, struct tcphdr *th, u_int *maxsegp) highdata--; highdata = SEQ_MIN(highdata, tp->snd_recover); if (SEQ_LT(th->th_ack, highdata)) { - tp->snd_fack = th->th_ack; + tp->snd_fack = SEQ_MAX(th->th_ack, tp->snd_fack); if ((temp = tcp_sackhole_insert(tp, SEQ_MAX(th->th_ack, highdata - maxseg), highdata, NULL)) != NULL) { tp->sackhint.hole_bytes += @@ -1076,41 +1076,47 @@ tcp_sack_output(struct tcpcb *tp, int *sack_bytes_rexmt) * After a timeout, the SACK list may be rebuilt. This SACK information * should be used to avoid retransmitting SACKed data. This function * traverses the SACK list to see if snd_nxt should be moved forward. + * In addition, cwnd will be inflated by the sacked bytes traversed when + * moving snd_nxt forward. This prevents a traffic burst after the final + * full ACK, and also keeps ACKs coming back. */ -void +int tcp_sack_adjust(struct tcpcb *tp) { + int sacked = 0; struct sackhole *p, *cur = TAILQ_FIRST(&tp->snd_holes); INP_WLOCK_ASSERT(tptoinpcb(tp)); if (cur == NULL) { /* No holes */ - return; + return (0); } if (SEQ_GEQ(tp->snd_nxt, tp->snd_fack)) { /* We're already beyond any SACKed blocks */ - return; + return (tp->sackhint.sacked_bytes); } - /*- + /* * Two cases for which we want to advance snd_nxt: * i) snd_nxt lies between end of one hole and beginning of another * ii) snd_nxt lies between end of last hole and snd_fack */ while ((p = TAILQ_NEXT(cur, scblink)) != NULL) { if (SEQ_LT(tp->snd_nxt, cur->end)) { - return; + return (sacked); } + sacked += p->start - cur->end; if (SEQ_GEQ(tp->snd_nxt, p->start)) { cur = p; } else { tp->snd_nxt = p->start; - return; + return (sacked); } } if (SEQ_LT(tp->snd_nxt, cur->end)) { - return; + return (sacked); } tp->snd_nxt = tp->snd_fack; + return (tp->sackhint.sacked_bytes); } /* diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 8ff015b90f89..3fd6edccf365 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -1508,7 +1508,7 @@ void tcp_update_sack_list(struct tcpcb *tp, tcp_seq rcv_laststart, tcp_seq rcv_lastend); void tcp_clean_dsack_blocks(struct tcpcb *tp); void tcp_clean_sackreport(struct tcpcb *tp); -void tcp_sack_adjust(struct tcpcb *tp); +int tcp_sack_adjust(struct tcpcb *tp); struct sackhole *tcp_sack_output(struct tcpcb *tp, int *sack_bytes_rexmt); void tcp_do_prr_ack(struct tcpcb *, struct tcphdr *, struct tcpopt *, sackstatus_t, u_int *); From nobody Fri Oct 11 13:23:52 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQ6lX5cxwz5YsKY; Fri, 11 Oct 2024 13:23: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQ6lX4nBMz4b0h; Fri, 11 Oct 2024 13:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728653032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kvce2cB25UMvr0IzP8JRs6FEbma1iR1AO/yL8zATcK0=; b=cc6TWdAE+7LRyKL8xA6X5v1w1g8pfbEE5fwN30CLjoR+wNFEfWn/2VvBWmTu9sDiR/8GWv kbqEPUk5BmbaHouflqCGE/MdVOEC/zZRri2SDRutrEZp3znOOxDwQcNxJ5n0CiEx4BEDbX HHMch0Fb3DeJilAeeBojH5K254iqgzuXJhhxaw0EDjjijXJVcSzMDF8cS3WimBS0yenmvS t8u2JXSBaqjy4pLCuYDxUQTXv97FXsNcxpyjvJSIJ4/RkO3LdWd+DnQ2W0l6NPfExxwZhQ I9B0E/vz7/QjSMAa0XfgmjNgRtRc4GTPmDAGWo70lQ/abnXxlHfp3R+J2Y4P+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728653032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kvce2cB25UMvr0IzP8JRs6FEbma1iR1AO/yL8zATcK0=; b=pc7xgIJ8gQgKek5C4D14ziDgAe2AW4EPkj5v/IcXylV9AevlFRpTCjdQ04kfQ+QSi/n6AR FT8dn7zMTSUoINhxKP4ioUBox/RqQuXfrk/Vy9VDUwMRJ7P87Dhwd09t7uWLgytXpDps0T j9UFtr5e9okHF5rEt+iwyTdSBJLawqqJqlCKuDDmgLwBIUCaH3xOBpP9IMOzlRNc3V0Vms cJt6u6CJfkBsnxJ9uxTdmGLbQO3H8gXCEF7sU4n1f5A4uvQ5LidjtBiGOj5hWxxYnvSymS MnwKnlzAWsreaNkLQdiU/WXzjGBXsMNegIoHkVA2EIDE8xrmTfdnsUGKHAuhlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728653032; a=rsa-sha256; cv=none; b=S4N+pv6kKjHLH52XlFsotX1Oj476xFxhfTttaklE/HH3x4qubAGDGrY90cpK+AAEEzlWjr NtzmfYdRucfVmb5LftTiZ3E44X5mB5PvKqpfCYWXAQphWM2jTPHZvxGDY6hULMsUbVUq/v J1wbTKUG6XxKk2hf0OmHD+4FWKNWebRDHeELtZwVfzhW6+k/L3h8AQV9pP5DAs6B2ZEWEC i/PjZ6792NVZyoUuqUpVaJ+O2EGq1Zo2nCZWwCRVqbU4QjSJcMeMrZ1E2LQQphXoIyXfB0 4Z/WkZ9X9j1MfYx6LOSDnH3KQuhRgLNm+NGNAz/uZWjahzOChjf+t8VCEzLj6A== 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 4XQ6lX4NMXzjvm; Fri, 11 Oct 2024 13:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BDNqmN034196; Fri, 11 Oct 2024 13:23:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BDNqJ7034193; Fri, 11 Oct 2024 13:23:52 GMT (envelope-from git) Date: Fri, 11 Oct 2024 13:23:52 GMT Message-Id: <202410111323.49BDNqJ7034193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5c385a54fe9c - main - debugnet: Use precise types when accessing mbuf contents List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5c385a54fe9ccbd3f28f20b5a025a856d229fa05 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5c385a54fe9ccbd3f28f20b5a025a856d229fa05 commit 5c385a54fe9ccbd3f28f20b5a025a856d229fa05 Author: Mark Johnston AuthorDate: 2024-10-09 15:28:57 +0000 Commit: Mark Johnston CommitDate: 2024-10-11 13:23:25 +0000 debugnet: Use precise types when accessing mbuf contents This might be useful when adding bounds checks to mtod(). No functional change intended. MFC after: 1 week --- sys/net/debugnet.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/net/debugnet.c b/sys/net/debugnet.c index 8b1419bcaa28..32a91256f51d 100644 --- a/sys/net/debugnet.c +++ b/sys/net/debugnet.c @@ -199,7 +199,7 @@ debugnet_udp_output(struct debugnet_pcb *pcb, struct mbuf *m) return (ENOBUFS); } - udp = mtod(m, void *); + udp = mtod(m, struct udphdr *); udp->uh_ulen = htons(m->m_pkthdr.len); /* Use this src port so that the server can connect() the socket */ udp->uh_sport = htons(pcb->dp_client_port); @@ -226,7 +226,7 @@ debugnet_ack_output(struct debugnet_pcb *pcb, uint32_t seqno /* net endian */) m->m_len = sizeof(*dn_ack); m->m_pkthdr.len = sizeof(*dn_ack); MH_ALIGN(m, sizeof(*dn_ack)); - dn_ack = mtod(m, void *); + dn_ack = mtod(m, struct debugnet_ack *); dn_ack->da_seqno = seqno; return (debugnet_udp_output(pcb, m)); @@ -400,7 +400,7 @@ debugnet_handle_rx_msg(struct debugnet_pcb *pcb, struct mbuf **mb) } } - dnh = mtod(m, const void *); + dnh = mtod(m, const struct debugnet_msg_hdr *); if (ntohl(dnh->mh_len) + sizeof(*dnh) > m->m_pkthdr.len) { DNETDEBUG("Dropping short packet.\n"); return; @@ -459,7 +459,7 @@ debugnet_handle_ack(struct debugnet_pcb *pcb, struct mbuf **mb, uint16_t sport) return; } } - dn_ack = mtod(m, const void *); + dn_ack = mtod(m, const struct debugnet_ack *); /* Debugnet processing. */ /* @@ -503,7 +503,7 @@ debugnet_handle_udp(struct debugnet_pcb *pcb, struct mbuf **mb) return; } } - udp = mtod(m, const void *); + udp = mtod(m, const struct udphdr *); /* We expect to receive UDP packets on the configured client port. */ if (ntohs(udp->uh_dport) != pcb->dp_client_port) { From nobody Fri Oct 11 13:48:22 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQ7Hp46cbz5Yv8B; Fri, 11 Oct 2024 13:48: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQ7Hp3cjCz4cWP; Fri, 11 Oct 2024 13:48:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728654502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=furv+xYbBqrI00VLxH7xwln/3pCTBvbOJFRuYmWeUd8=; b=BTX7E0AKP+PuVl1ZGzfEnvMNbURoksVlRu+1eW11dJr8VfcDUfnDEqJbA7iV5T863TazrT qjq2ZDKcmk0yNvStfe5joCbBRL8Wo6V1B6Ra1vB5r5PeXUmdKREia5dQ1JExsl8YycSlPj lD0Hr1gPYFw5i1NdMX9ganL4UU8+dzY6NaqYjarXjyHP6KW5lIoki7kkq2SEXOqgvlTOpR Le+0ez1zKyzVbhhDLRTzbVwFEdI4f1preMY1itazgoSTNWZL3Qh+NzClT3nwGqrF9ted3Q 6TXdstnUOMP/5D6vpRuLKX99NIYA0h/o43zIxpqGifMassZZgL2iyc/7Y8Qavw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728654502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=furv+xYbBqrI00VLxH7xwln/3pCTBvbOJFRuYmWeUd8=; b=g5dCQAG0h//QtcO66g/l/TPpu1SKgPVWgqfOO1HdZxxUwBbJKd6u06eyK0rNd3EELmznP6 NNei9eXfcyqw5UkMC+CqfPK5QSatXUJCyMnuYoeS+mBIIGhEle0V+Oh/erzUUW+mEBYXwA FMRggVoTEK94uS2+SwxXKINc84ei+MkEzdUTyec/9T5VDZYVix/N6g5rp8EphxZHhmiSpx Ou8UWJcHuXchTRzaxKqnKTqzwbzGnxPavmHjixM06RGACrxeOkTHZGBUqHebn9Jlcc/+F3 pyA1pSOjwu59BgijpB8pBhvqEuAZghw0tL5FPC5eWgnw4t5sLdjaFJbdIeGfGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728654502; a=rsa-sha256; cv=none; b=ZgRoaUWfw0cL0zu5Mf0un46AvmOLy7+vapXR9C3c6ERRuK4GZoiXbOnJzB4VeU7De64xc+ xI50AFYskOUv3cwznmFPmAya0N5qKZi2pbKtO5PoVwYKJPgScG8pux2DXzsaTRW6pgh2WT +/RlLuJdewuXYflKu6H45tF/8VXwebLhFcLZVIpOKBPoby9ZSJ48pMAqFbI8QpUbThVK4l x+WtKbQbKm2RZ22PpB9LC6YSHSEBgM2mLeUsbzm1fTo8P9seD4PtK22aWouxOT74Df6f1M QFVf/3gKknvOIaU0I0NLRKACDorXL3vqyLNvbZad7esLX4u2EwJrox0bR/Aetg== 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 4XQ7Hp30XFzkX2; Fri, 11 Oct 2024 13:48:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BDmM1I068042; Fri, 11 Oct 2024 13:48:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BDmMi6068039; Fri, 11 Oct 2024 13:48:22 GMT (envelope-from git) Date: Fri, 11 Oct 2024 13:48:22 GMT Message-Id: <202410111348.49BDmMi6068039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7ff12dd25ada - main - rtw8xfw: remove module build dirs for firmware long gone List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ff12dd25ada486c4d33e854977514b2db690e7f Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7ff12dd25ada486c4d33e854977514b2db690e7f commit 7ff12dd25ada486c4d33e854977514b2db690e7f Author: Bjoern A. Zeeb AuthorDate: 2024-10-10 22:43:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-10-11 13:40:15 +0000 rtw8xfw: remove module build dirs for firmware long gone rtw88 and rtw89 firmware files were removed from main a year ago after core members asked to not import more biinary blobs into main. Also remove the module build framework for them being long gone. People are asked to use fwget(8) to automatically install firmware from ports according to the man page. A solution for the install media is still pending. Fixes: cf94672363d6638b7268c05b4628b62bbfc8dbe5 MFC after: 3 days (rtw89 only) Sponsored by: The FreeBSD Foundation --- sys/modules/rtw88fw/Makefile | 8 -------- sys/modules/rtw88fw/Makefile.inc | 16 ---------------- sys/modules/rtw88fw/rtw8723d/Makefile | 4 ---- sys/modules/rtw88fw/rtw8821c/Makefile | 4 ---- sys/modules/rtw88fw/rtw8822b/Makefile | 4 ---- sys/modules/rtw88fw/rtw8822c/Makefile | 4 ---- sys/modules/rtw88fw/rtw8822c_wow/Makefile | 4 ---- sys/modules/rtw89fw/Makefile | 5 ----- sys/modules/rtw89fw/Makefile.inc | 16 ---------------- sys/modules/rtw89fw/rtw8852a/Makefile | 4 ---- sys/modules/rtw89fw/rtw8852c/Makefile | 4 ---- 11 files changed, 73 deletions(-) diff --git a/sys/modules/rtw88fw/Makefile b/sys/modules/rtw88fw/Makefile deleted file mode 100644 index 928c80fbff95..000000000000 --- a/sys/modules/rtw88fw/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -SUBDIR= \ - rtw8723d \ - rtw8821c \ - rtw8822b \ - rtw8822c \ - rtw8822c_wow - -.include diff --git a/sys/modules/rtw88fw/Makefile.inc b/sys/modules/rtw88fw/Makefile.inc deleted file mode 100644 index b03298a7d563..000000000000 --- a/sys/modules/rtw88fw/Makefile.inc +++ /dev/null @@ -1,16 +0,0 @@ -# -# Common rules for building firmware. Note this gets auto-included -# by the subdir Makefile's as a consequence of included bsd.kmod.mk. - -_NAME= rtw${NAME}_fw.bin - -IMG= ${_NAME} -KMOD= ${_NAME} - -CLEANFILES+= ${IMG} - -FIRMWS= ${IMG}:${IMG}:${VERSION} - -${IMG}: ${SRCTOP}/sys/contrib/dev/rtw88fw/${IMG} - cp ${.ALLSRC} ${.TARGET} - diff --git a/sys/modules/rtw88fw/rtw8723d/Makefile b/sys/modules/rtw88fw/rtw8723d/Makefile deleted file mode 100644 index e60918ea8457..000000000000 --- a/sys/modules/rtw88fw/rtw8723d/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -VERSION= 48 -NAME= 8723d - -.include diff --git a/sys/modules/rtw88fw/rtw8821c/Makefile b/sys/modules/rtw88fw/rtw8821c/Makefile deleted file mode 100644 index d71aaa7d8669..000000000000 --- a/sys/modules/rtw88fw/rtw8821c/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -VERSION= 2408 -NAME= 8821c - -.include diff --git a/sys/modules/rtw88fw/rtw8822b/Makefile b/sys/modules/rtw88fw/rtw8822b/Makefile deleted file mode 100644 index 1b428c30a3fb..000000000000 --- a/sys/modules/rtw88fw/rtw8822b/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -VERSION= 0 -NAME= 8822b - -.include diff --git a/sys/modules/rtw88fw/rtw8822c/Makefile b/sys/modules/rtw88fw/rtw8822c/Makefile deleted file mode 100644 index 06676b5a0fa4..000000000000 --- a/sys/modules/rtw88fw/rtw8822c/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -VERSION= 9910 -NAME= 8822c - -.include diff --git a/sys/modules/rtw88fw/rtw8822c_wow/Makefile b/sys/modules/rtw88fw/rtw8822c_wow/Makefile deleted file mode 100644 index d03b5c7d05a6..000000000000 --- a/sys/modules/rtw88fw/rtw8822c_wow/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -VERSION= 994 -NAME= 8822c_wow - -.include diff --git a/sys/modules/rtw89fw/Makefile b/sys/modules/rtw89fw/Makefile deleted file mode 100644 index 62340479737d..000000000000 --- a/sys/modules/rtw89fw/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -SUBDIR= \ - rtw8852a \ - rtw8852c - -.include diff --git a/sys/modules/rtw89fw/Makefile.inc b/sys/modules/rtw89fw/Makefile.inc deleted file mode 100644 index 349041ea5fff..000000000000 --- a/sys/modules/rtw89fw/Makefile.inc +++ /dev/null @@ -1,16 +0,0 @@ -# -# Common rules for building firmware. Note this gets auto-included -# by the subdir Makefile's as a consequence of included bsd.kmod.mk. - -_NAME= rtw${NAME}_fw.bin - -IMG= ${_NAME} -KMOD= ${_NAME} - -CLEANFILES+= ${IMG} - -FIRMWS= ${IMG}:${IMG}:${VERSION} - -${IMG}: ${SRCTOP}/sys/contrib/dev/rtw89fw/${IMG} - cp ${.ALLSRC} ${.TARGET} - diff --git a/sys/modules/rtw89fw/rtw8852a/Makefile b/sys/modules/rtw89fw/rtw8852a/Makefile deleted file mode 100644 index 876e8145759b..000000000000 --- a/sys/modules/rtw89fw/rtw8852a/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -VERSION= 013360 -NAME= 8852a - -.include diff --git a/sys/modules/rtw89fw/rtw8852c/Makefile b/sys/modules/rtw89fw/rtw8852c/Makefile deleted file mode 100644 index 1479e43b7072..000000000000 --- a/sys/modules/rtw89fw/rtw8852c/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -VERSION= 027200 -NAME= 8852c - -.include From nobody Fri Oct 11 13:48:23 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQ7Hq66nCz5YvBp; Fri, 11 Oct 2024 13:48: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQ7Hq3gZlz4crY; Fri, 11 Oct 2024 13:48:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728654503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0eG3d03liXtbITZeb6Yj1NLmmF0CM0zz/D2/rKTgKmk=; b=EuovCETCywOX+lWjJTvSXD06Sye2Uen90itJxd2F7OSMYaCWbAo3OSPl20O5CdkZiph5P8 jWzt7xdrdZCnPM77wneUtsJf5ZnQrAmgwvwIP7mhYMK/clLqU4Qmq3g0fDVxVEsH0jckrn yfYPLbCE3etGAqf+N59vOcJdreoIy7WNbp9RkawHuJZzg+mMwcznTM+l1wc/MtS2QbXVGT xohiWaSnVXi6OMks5VZVxV2sOY8CtCu2qVdVXOaw7LwQ0/cXHq+bKm3cQlwxVQsAS2+l0x lxYYHAnGe1gk97RB0nXYZwbUBWhOgrcONF6r50apJKeOMJaZnxQnNAZIFY3QOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728654503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0eG3d03liXtbITZeb6Yj1NLmmF0CM0zz/D2/rKTgKmk=; b=hJ0eLW7a4Z8HBPGGc88gOdH/tWZIPfAHsLupw6xbVz1fn+Q5ltXLf/SBDsKXyOaHAhhCz4 gR2NI7mxqWWJoEDbD3rOPUBmKFxPX/WrGEEO7DJe0J03CkJtsocrYgecdKzlaF5P1KjolH mOLFGHQsy8EaXGuG7s0WLVj4TWs3vWadWJRBZdzGK8IlqQtQjjZioRVIx6Ryu3HGXDubSA wBSQqdYEevuWPAw4fmExoqcRTYUlI1LCzMHSow3YJsom/b0//GwU24GdVSjEvtCUUd5pQ4 9+74qLZPuxisocEC1uaAyc6Z1Ufox+ZqFbhX1E9TWz2eQeYbt6PHVtnb7Qgx2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728654503; a=rsa-sha256; cv=none; b=ie7e7xFHFdl+9qgBVx5S8oV35dCZJgK49qJj4Yq1N1QXyo7BiN3n6G/2tuK/uRdMJOM8vy i1cf3fVQMpjoiB0lfBPmmyNqvz5ORWiY7sfcsjTbk0Qndjz2Zr9rCPM9kDvZlTtwqH4nAS vh5WtJS+/CxezcJRoEL/IJ691yIhd5jvFrePtG72itOs7APsdgJUQkSQTMVbJXXxtTEK1K j11S/HuUAS8H8VrC/0l+SRskgFV0zOVhlWqYFiLyLfO5FadEPCS9dEGjHygrXxhzzGtYr4 4xGkEXye9v9j/rtn7ukyJgjO2QoNRVaqcFiUlZ6QCNtgR6e1UA4GvIB+oeS9ig== 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 4XQ7Hq3GxSzkq2; Fri, 11 Oct 2024 13:48:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BDmNtc068096; Fri, 11 Oct 2024 13:48:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BDmNIS068093; Fri, 11 Oct 2024 13:48:23 GMT (envelope-from git) Date: Fri, 11 Oct 2024 13:48:23 GMT Message-Id: <202410111348.49BDmNIS068093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: ce15215befa1 - main - rtw89: add missing bsddriver.name assignments for two chipsets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce15215befa1022d9a20ec15bdb0739dbe55f10f Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ce15215befa1022d9a20ec15bdb0739dbe55f10f commit ce15215befa1022d9a20ec15bdb0739dbe55f10f Author: Bjoern A. Zeeb AuthorDate: 2024-10-10 23:07:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-10-11 13:40:15 +0000 rtw89: add missing bsddriver.name assignments for two chipsets On FreeBSDs we locally set bsddriver.name in struct pci_driver to have the same name for all chipsets. This helps with, e.g., device enumeration. For two chipsets the manual entry was missing. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/rtw89/rtw8851be.c | 3 +++ sys/contrib/dev/rtw89/rtw8852be.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sys/contrib/dev/rtw89/rtw8851be.c b/sys/contrib/dev/rtw89/rtw8851be.c index 0f7711c50bd1..76216b790450 100644 --- a/sys/contrib/dev/rtw89/rtw8851be.c +++ b/sys/contrib/dev/rtw89/rtw8851be.c @@ -78,6 +78,9 @@ static struct pci_driver rtw89_8851be_driver = { .probe = rtw89_pci_probe, .remove = rtw89_pci_remove, .driver.pm = &rtw89_pm_ops, +#if defined(__FreeBSD__) + .bsddriver.name = KBUILD_MODNAME, +#endif }; module_pci_driver(rtw89_8851be_driver); diff --git a/sys/contrib/dev/rtw89/rtw8852be.c b/sys/contrib/dev/rtw89/rtw8852be.c index ecf39d2d9f81..be96ff56d699 100644 --- a/sys/contrib/dev/rtw89/rtw8852be.c +++ b/sys/contrib/dev/rtw89/rtw8852be.c @@ -82,6 +82,9 @@ static struct pci_driver rtw89_8852be_driver = { .probe = rtw89_pci_probe, .remove = rtw89_pci_remove, .driver.pm = &rtw89_pm_ops, +#if defined(__FreeBSD__) + .bsddriver.name = KBUILD_MODNAME, +#endif }; module_pci_driver(rtw89_8852be_driver); From nobody Fri Oct 11 13:48:24 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQ7Hs1mqYz5YvSR; Fri, 11 Oct 2024 13:48: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQ7Hr5kqRz4ctX; Fri, 11 Oct 2024 13:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728654504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yxaKtkPYjzWQ2Sj6PnKz6Q9uKbpJARIp5Rf4pGuFj4I=; b=wv8bCnMvyUOxwa94NJeOA4tjeUkox1hL8fYSA985k2wZJz849ED/D9Z7Jwk6YN16G+fCQG +rWB+fsrOtt9mHCZLfbInA2NDkPR+P25pxMsYvaAx0w/3o+YHgjO3GWpvfQZd/EO6LqDmn FG7jPDBK8tX4BWEHDq8fZmPcmVrRiUIhIGYtUKDlxh1gsb8+3qx+rRCP0YrtnbGJBuyoB5 Vj6up8yUbO9EUhFODGIp6026fpHHEgapVNrRDGVt4b7yywmj7JpmwBWJ6D6uweHqwzGv2M shQnYcOHzcpLYlYQ6SPGr9GS2x+C+ymSR1/c5hgRpncZqqoZJ0im8QzEWs44wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728654504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yxaKtkPYjzWQ2Sj6PnKz6Q9uKbpJARIp5Rf4pGuFj4I=; b=aYdIzYCsEd7fmlYmQEqG7/OQ25FcQnVYGFe8oT+NI90ulcRh20bEYwJKCUX0IoJlIy3W5b IU9vpPCGCFp+jHNQskzrERnuDqclhrNWSTW2J3Po3dJISckDKDz2cv4H88g9kR6L89hRht /mXAdIPaNRzry3wfudoMVl6acwYNcQa12pOm8gQ8XsBmyNn/71uT2kl80glVZpX8yLH1Wt iCwiBVRKJuDz6qfoBr67OAWnVoGHmshh3mxeU4+LioviPyUo8tQPen87+3vxflhKaluLP1 hPBrdx2T6mNT4HJltO9dYfXiaCchYsctIPvNvn8E0Cz7X1vzbwuP5WOQ75d+Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728654504; a=rsa-sha256; cv=none; b=g4KK23mpXPAlNwDgviBWk7izh46zw2iA9NuLq9nQL59SaktrZYrYkMGjt4drKCxU6i9szb 2m1xniGBJuIvrRhrkgu9KkUOCfqFMafrGDHFWZ3ynkMRFTL9neygPXO8DjlkSKUaCLfG6r vPZvYuAUrmMnfZ9OynXO90RIUjRiyq208Lv6qxf6HbmUd41QL7ND/J3ca71IQYmuACBfK3 sGxj0hLXOTcCpk+rw67htSc5CGWNIOMiviyh8yvNVCX9GsIw1Y53heN8fzDm4PYHxVA2SF HVGKE2+8h/GSREQu5h/EBmOmEhUWbkU+mrm3Mw4Gzk0tDPH2EDe5oUvkMYPDoA== 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 4XQ7Hr4KnZzkq3; Fri, 11 Oct 2024 13:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BDmODW068168; Fri, 11 Oct 2024 13:48:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BDmOMU068165; Fri, 11 Oct 2024 13:48:24 GMT (envelope-from git) Date: Fri, 11 Oct 2024 13:48:24 GMT Message-Id: <202410111348.49BDmOMU068165@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 310c31d3f04e - main - rtw89: add man page and hook driver up to the build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 310c31d3f04ef9d3ebe598fd076d017a48d0ca0d Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=310c31d3f04ef9d3ebe598fd076d017a48d0ca0d commit 310c31d3f04ef9d3ebe598fd076d017a48d0ca0d Author: Bjoern A. Zeeb AuthorDate: 2023-04-18 15:17:41 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-10-11 13:47:11 +0000 rtw89: add man page and hook driver up to the build After two years, add the initial man page and hook Realteks rtw89 driver up to the build for more people to test given successful reports. devd.conf is already providing support based on the rtw regex. The driver uses the LinuxKPI compat layer. Firmware is provided by ports: net/wifi-firmware-rtw89-kmod or one of the flavours. People are advised to used fwget(8) to automatically install the correct firmware for their chipset. Please note that for the moment the driver requires a tunable to be set in loader.conf: compat.linuxkpi.skb.mem_limit=1 Many thanks to everyone who in the last two years helped testing, debugged, submitted patches to get the driver to this stage where initial functionality seems working. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- share/man/man4/Makefile | 1 + share/man/man4/rtw89.4 | 126 ++++++++++++++++++++++++++++++++++++++++++++++++ sys/modules/Makefile | 2 + 3 files changed, 129 insertions(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index e2448660a112..6f7eefe734f7 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -494,6 +494,7 @@ MAN= aac.4 \ rtnetlink.4 \ rtsx.4 \ rtw88.4 \ + rtw89.4 \ rtwn.4 \ rtwnfw.4 \ rtwn_pci.4 \ diff --git a/share/man/man4/rtw89.4 b/share/man/man4/rtw89.4 new file mode 100644 index 000000000000..2e1f2676eb8e --- /dev/null +++ b/share/man/man4/rtw89.4 @@ -0,0 +1,126 @@ +.\"- +.\" Copyright (c) 2023-2024 Bjoern A. Zeeb +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd October 10, 2024 +.Dt RTW89 4 +.Os +.Sh NAME +.Nm rtw89 +.Nd Realtek IEEE 802.11ax wireless network driver +.Sh SYNOPSIS +The driver will auto-load without any user interaction using +.Xr devmatch 8 +if enabled in +.Xr rc.conf 5 . +.Pp +Only if auto-loading is explicitly disabled, place the following +lines in +.Xr rc.conf 5 +to manually load the driver as a module at boot time: +.Bd -literal -offset indent +kld_list="${kld_list} if_rtw89" +.Ed +.Pp +It is discouraged to load the driver from +.Xr loader 8 . +.Sh DESCRIPTION +The +.Nm +driver is derived from Realtek's Linux rtw89 driver. +.Pp +This driver requires firmware to be loaded before it will work. +The package +.Pa wifi-firmware-rtw89-kmod +from the +.Pa ports/net/wifi-firmware-rtw89-kmod +port needs to be installed before the driver is loaded. +Otherwise no +.Xr wlan 4 +interface can be created using +.Xr ifconfig 8 . +One should use +.Xr fwget 8 +to install the correct firmware package. +.Pp +The driver uses the +.\" No LinuxKPI man pages so no .Xr here. +.Em linuxkpi_wlan +and +.Em linuxkpi +compat framework to bridge between the Linux and +native +.Fx +driver code as well as to the native +.Xr net80211 4 +wireless stack. +.Pp +While +.Nm +supports all 802.11 a/b/g/n/ac and ax +the compatibility code currently only supports 802.11 a/b/g modes. +Support for 802.11 n/ac is to come. +.Sh LOADER TUNABLES +.Bl -tag -width indent +.It Va compat.linuxkpi.skb.mem_limit +If you are running a 64bit system with more than 4GB of main memory +you need to set this tunable to +.Sy 1 +in +.Xr loader.conf 5 +and reboot once to make it effective. +This tunable will work around a problem with DMA and limit allocations +for network buffer memory to the lower 32bit of physical memory and +make the driver work. +.El +.Sh HARDWARE +The +.Nm +driver supports PCIe devices with the following chipsets: +.Pp +.Bl -tag -width Ds -offset indent -compact +.It Realtek 802.11ax wireless 8851be (RTL8851BE) +.It Realtek 802.11ax wireless 8852ae (RTL8852AE) +.It Realtek 802.11ax wireless 8852be (RTL8852BE) +.It Realtek 802.11ax wireless 8852ce (RTL8852CE) +.El +.Sh BUGS +Certainly. +.Pp +Does not seem to work (reliably) on machines with more than 4GB of +main memory. +See in the +.Sx LOADER TUNABLES +section above. +.Sh SEE ALSO +.Xr wlan 4 , +.Xr fwget 8 , +.Xr ifconfig 8 , +.Xr wpa_supplicant 8 +.Sh HISTORY +The +.Nm +driver first appeared in +.Fx 14.2 . diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 84d1735e8e07..d76e16b1da1b 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -347,6 +347,7 @@ SUBDIR= \ ${_rockchip} \ rtsx \ ${_rtw88} \ + ${_rtw89} \ rtwn \ rtwn_pci \ rtwn_usb \ @@ -573,6 +574,7 @@ _iwlwifi= iwlwifi _iwlwififw= iwlwififw .endif _rtw88= rtw88 +_rtw89= rtw89 _vmware= vmware .endif From nobody Fri Oct 11 14:14:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQ7sw1Gz6z5YxCF; Fri, 11 Oct 2024 14:14:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQ7sw0gwwz4g7G; Fri, 11 Oct 2024 14:14:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728656068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qZzJHbPillcv3m1Ff6CDpTiW6YoVIJb0dj8M3jAzheo=; b=xmy2TTP8LVJ8jL9gPtX/n6moXSHOPFMwuZAEV+TqfEAvBCQbCmPfpYPyIiO51AjhVd7qeN 1MtNWjE2iBdljisF0dptqHNGiH0mU5OV882hSV4Pu6AkrK/pImKp6azILcHHDRFyYoxpho mq0v4a4yOAcy52WHwawbYoC416RGRxTXbP8ECZZuxNCzz1+6R2qQdIXYv6b5C1dK6SaBIA bgb0+UCGg9omH/+CUoW50ga0cWfjMCG6sJbfX/I4jAXlA2UUs535gxC4IWRpLazQeavTkD Fvpg5AcsPyf8fyXsugNt4hwZpN/l02LGzZXwm2rlUbX4+V2X3lE1wEGeVIB+Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728656068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qZzJHbPillcv3m1Ff6CDpTiW6YoVIJb0dj8M3jAzheo=; b=HbJNcuNwRi4CFlprEuRpX0t9oSofOJ/axd0OOkhkT5SQn8z2OmrO3cbl4sGIT1B2w0Vnv1 QBldiHlsoy81E+kPILadciPsvIaBQVYAaHvSnCotYceEC515E9DxVF0SKIBEFVFPBl9jtw 9AiP3zWnoes+tWb7JBJayFuzBzD5sLLaF5Znn3vXYEaL9kv6VAEWQcIw2z3EHRjmyo/3s/ m+awIbdxyK1Hzi0RVaIwM+9JPsl5TOMEdjzg/lvFh9UfJjye5HtqRx8zf2A0N9ime3EXqg eZS0G05NDf9jmoW251PnM9a+4C9YorfyUEJQyf9a4aaA75v//rDQRSfLwOCYYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728656068; a=rsa-sha256; cv=none; b=GtFFqf1jD+V1L8mCb2BWNy7KgjhTrGcdkMowp1BCd8ie2NO8lAEFy245B9okeE/8VjZYNd EuoCUao94WSsqzRFu0JDV0qz0zW/MOTwuRnA7jz2NGPcdeqriuGbJ9n6Cp3OjqsCqM8Vv6 iaSIMJsjA9ySX+a28RS4LoV+8W+YN0EJ7j+9oVHZczZvO7a83ZrkA6ewH3s9HXqmwSWxHW 1aU2/hn8Wjop1Tj5+LEtZQTMqAESd5JkTFex/+m1Nah1+52Mj2uISbaPL2JKKUkUO4rIRf HF0cLF29aaSH6tWfcrkd9kehwfECSBuUZAVf3Jpb+j+x4rT1KvBH6XHs8jzIzA== 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 4XQ7sw0Gw5zlSs; Fri, 11 Oct 2024 14:14:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BEERsA019012; Fri, 11 Oct 2024 14:14:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BEERus019009; Fri, 11 Oct 2024 14:14:27 GMT (envelope-from git) Date: Fri, 11 Oct 2024 14:14:27 GMT Message-Id: <202410111414.49BEERus019009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 21d9853ed553 - main - arm64/gicv3: Skip programming vPE GITS_BASERs to avoid a boot crash List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21d9853ed5533a87f59937b564a53a2d6ac3c637 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=21d9853ed5533a87f59937b564a53a2d6ac3c637 commit 21d9853ed5533a87f59937b564a53a2d6ac3c637 Author: D Scott Phillips AuthorDate: 2024-10-11 14:12:15 +0000 Commit: Ed Maste CommitDate: 2024-10-11 14:13:04 +0000 arm64/gicv3: Skip programming vPE GITS_BASERs to avoid a boot crash On AmpereOne, the current programming of GITS_BASER2 to individual allocations per ITS causes a: panic: APEI Fatal Hardware Error! This is due to the ITS reporting a BASER2_DATA_ERR error. The GIC-700 expects all GITS_BASER2.Physical_Address fields to match system-wide. Skip programming any vPE GITS_BASER registers to avoid this crash. Sponsored by: Ampere Computing LLC Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D46094 --- sys/arm64/arm64/gicv3_its.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index a79706526c80..5ecd9b8c0e94 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -586,11 +586,20 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) its_tbl_size = l1_esize * l1_nidents; its_tbl_size = roundup2(its_tbl_size, page_size); break; - case GITS_BASER_TYPE_VP: case GITS_BASER_TYPE_PP: /* Undocumented? */ case GITS_BASER_TYPE_IC: its_tbl_size = page_size; break; + case GITS_BASER_TYPE_VP: + /* + * If GITS_TYPER.SVPET != 0, the pending table is + * shared amongst the redistibutors and ther other + * ITSes. Requiring sharing across the ITSes when none + * of the redistributors have GICR_VPROPBASER.Valid==1 + * isn't specified in the architecture, but that's how + * the GIC-700 behaves. We don't handle vPE tables at + * all yet, so just skip this base register. + */ default: if (bootverbose) device_printf(dev, "Unhandled table type %lx\n", From nobody Fri Oct 11 15:15:07 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQ9Cv2bWcz5Z17F; Fri, 11 Oct 2024 15:15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQ9Cv2088z4lQ8; Fri, 11 Oct 2024 15:15:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728659707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r2FLo2wCjs+MyNU6j6m3xBMR1j9eqTo5eg0IqYq7K0I=; b=Y40jPakkz2SvWxqcP9YDXdC2pAtwecfK/RvjWVF1KPOGzZZiF2qpfKEsApnqHPRdo3om+N BWN8YluRc/vD41QeTjGi+lbGzXLXzrxg8eXdj899PCBjvyk0AmbAfxJjoYUyFOSXCyuWDE ulz8ULsGo7einq7i8/nUUREMoA56yZaT/HjpNFrb8JWhaWekchI2UVydp77kn+J02pcBzc iUMXebY/svUd1BiwA5nF/9XYtQroBYFr3q9C9V62jVV1lCRM91N2th3KrKqDguJdtto0A8 VDmIDpnmRfujU9RAwawsKCMVe0PpBD6Ximc66Bn14rEqKKiRSYJkOXjCbTfA3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728659707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r2FLo2wCjs+MyNU6j6m3xBMR1j9eqTo5eg0IqYq7K0I=; b=mImR9/ptV6zGuiMIRoofYczP2afuKjJ4EfXBfvmcRtUS33i5U0sU/9YSot3W8yKvhyMwJZ NsKR7uQR9OJ/Js4FxQ2AqYX1jpDjqGHgFeDp+xH+f1CfhD4X/iGN7GQzpcgWxF+mmIVD8R Gg96QbOGcJcdJwuAwAgabKGLm0rcEYeV8fwxU14F0g0fskUT/v7HMlGGG0fXiVEfq3zKO5 EJfnbzZaphrk+BxLKy39m774CaK+Nkyg5bOHMn44CDzcWyD+s1Hh/lY9wFz61/7nShJ3Ca LNppwGCpo6V4/XVN6QvtKW83gmrESCx/kNFLPpK6lq5N3GZ0MnNg2owRmOQxhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728659707; a=rsa-sha256; cv=none; b=dTcD8f3Kr6ewLvvHMTEYbIbniaTPfdXdFhtCuxgkcZS28U875p2bqglYrcqeO/oAd1yRhn mBfIcasGHzW67jiyQTW9Y6sQHX+gcSBDuXz6H2F5J08s3QSHUVVMuO4+Nl9mvd+WXovyPl kTOajXZGoTiLdVcyo/4T1iSFemGtMSZl7oAyQCKz3VRuH4XxBori/c+CTrUAvdsV53nQrr pkyFD5VPJbG46mUfTWr8d9PI5PIfgb+jGaRQyO/citzAe740FwoMfBfRdtDi8qRLEFyXkL SKUBQ3GfBeKaJ8l/8ddmdzMl5crlJe2txT+b7RwpYB58K5q7Gc37nWdm65C76Q== 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 4XQ9Cv1bwXzmrX; Fri, 11 Oct 2024 15:15:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BFF77w020495; Fri, 11 Oct 2024 15:15:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BFF70L020492; Fri, 11 Oct 2024 15:15:07 GMT (envelope-from git) Date: Fri, 11 Oct 2024 15:15:07 GMT Message-Id: <202410111515.49BFF70L020492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c008b8f585b6 - main - git-arc: minor manpage edits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c008b8f585b62bb93271500f3307383731661d6e Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c008b8f585b62bb93271500f3307383731661d6e commit c008b8f585b62bb93271500f3307383731661d6e Author: Ed Maste AuthorDate: 2024-10-11 14:52:14 +0000 Commit: Ed Maste CommitDate: 2024-10-11 15:14:43 +0000 git-arc: minor manpage edits Explicitly mention that it requires the arcanist port or package, and edit some grammar and markup. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47060 --- tools/tools/git/git-arc.1 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/tools/git/git-arc.1 b/tools/tools/git/git-arc.1 index 10662899f5fc..587b304dd794 100644 --- a/tools/tools/git/git-arc.1 +++ b/tools/tools/git/git-arc.1 @@ -59,8 +59,11 @@ The utility creates and manages .Fx Phabricator reviews based on git commits. +It requires the +.Pa devel/arcanist +port or package. .Pp -Git +.Nm assumes a one-to-one relationship between git commits and Differential Revisions, and the Differential Revision title must match the summary line of the corresponding commit. @@ -79,13 +82,13 @@ Before processing commit(s) display list of commits to be processed and wait for confirmation. .It Fl r Ar reviewer Add one or more reviewers, separated by commas, to revision(s) being created. -Argument(s) must be existing Phabricator user or group. +Each argument must be an existing Phabricator user or group. .It Fl s Ar subscriber Add one or more subscribers, separated by commas, to revision(s) being created. Each argument must be an existing Phabricator user or group. .It Fl p Ar parent Specify the parent of the first commit in the list. -This is useful when adding more commits on top of the already existing +This is useful when adding more commits on top of an already existing stack in Phabricator. .El .It Cm list From nobody Fri Oct 11 15:55:32 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQB6Y3wxrz5Z4GJ; Fri, 11 Oct 2024 15:55: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQB6Y1PWXz4w80; Fri, 11 Oct 2024 15:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728662133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a55L9UJAMhHJKwHxRIGD0/ZZ/zH8+Ccymd3/1MVbXj0=; b=fzxqTtrEz00mXIL1qybGqKzYrW8uMJPrrdcL4ZDWCKNDjB2YuBEKjpsY7SBY/i7mAWh0XY zKnZz14KZ055/vxwtK4IuAv1bY57weu5ihUCoJqvzXM1nYrw7JpvlrqVowHfi6ViIM5nzM VwKKjMzLw+5eNb1mRLZbQnhjw/xj4zEgQc47JsedNTLGDq/5T/Z3VxPVK37sdn1HpsSH7v Wxz2N5Jdu6IUcC82g+DAMs8jbHLC1ez478AF+c2WNI5YTzovVoWYEijMN3Ll4vpK6Av4Yi mlGPAuLGEcwePAX9D38KKaEw3KNOyavWYS+0cr3pCj4GZVAEMTjcVxlqV7m1Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728662133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a55L9UJAMhHJKwHxRIGD0/ZZ/zH8+Ccymd3/1MVbXj0=; b=KC1tNUhZ4lUzoOgcydgwt45IhwVDhiJb0kY3z5Flu1tOFMIlzZuXDnDr5EGMBj0yuSQQK7 eciDujhF5aHAAoSwa5gxqOK+HXm8FV/TBEDXmrKIIvVV5WHzwqpi/Pt3Zy7k+6UEMXesZ0 K4VOxUbQPgKjjQfdDwMaFhPp5NuA/q/ubR+r6VaYKRt0EMjsyVqSQSD4q/AI9Vd0Rad8L2 +3M94UuXqLP66UmbZE4pjrLUhM/jK7Vk3ih0gz/VHHfmmzPDR7MxlvrWNYP+vG11WsWmCY YF07F0OT0jHUl7fn7RA/xGPJuwO2p8cAouRedWS6K2GU36YoZOmT/nIGosrG1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728662133; a=rsa-sha256; cv=none; b=nCTG6gZsiNIgf/VSx7FJc3dBq7vJdy+6aVc4Pl6MzvKHDgDV1rRJlMEtSF7mgWNprRIhZZ y8La+Vb/roKF7gFRCpxIcofafMVm5Ift6Xu5C3zxkFvri8gF4mrT8UZeYlYg0sGm1HKmce 7BVati8+dGWOE8FM0+87uYQjLZmh/NBOoOZHvIKqpYKwWth8HiDRQGtcEWq2MCrztroUjl acrpbq4Nan7w4LXU5jd42k/0QV3/wgHrBfGCuXJsPtTEF3s2G/wDraMec2tIv4SFkCSim0 1XLD/lAiRTMzJWbIz2AR+f1yMONYNYdl1BLdygCxk6FsfnCWJ8a8AMo6ZWDRrA== 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 4XQB6Y0tcxzp6V; Fri, 11 Oct 2024 15:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BFtW0Z088290; Fri, 11 Oct 2024 15:55:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BFtWZ7088287; Fri, 11 Oct 2024 15:55:32 GMT (envelope-from git) Date: Fri, 11 Oct 2024 15:55:32 GMT Message-Id: <202410111555.49BFtWZ7088287@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 6cde8f3ef7cd - main - lpd: Tighten permissions on /var/run/printer List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6cde8f3ef7cd060be39d78055eaf982b06b19a3b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6cde8f3ef7cd060be39d78055eaf982b06b19a3b commit 6cde8f3ef7cd060be39d78055eaf982b06b19a3b Author: Stanislav Shalunov AuthorDate: 2024-10-11 15:49:02 +0000 Commit: Warner Losh CommitDate: 2024-10-11 15:50:08 +0000 lpd: Tighten permissions on /var/run/printer Exclude group read/write permissions as well. Otherwise, group wheel can submit things w/o the normal accounting. While group wheel is generally trusted on the machine, submitting jobs w/o checks is not one of the functions we document for that group. PR: 17289 Differential Revision: https://reviews.freebsd.org/D47040 --- usr.sbin/lpr/lpd/lpd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c index b78077dfa225..089b8fedc2d5 100644 --- a/usr.sbin/lpr/lpd/lpd.c +++ b/usr.sbin/lpr/lpd/lpd.c @@ -314,7 +314,7 @@ main(int argc, char **argv) sigaddset(&nmask, SIGTERM); sigprocmask(SIG_BLOCK, &nmask, &omask); - (void) umask(07); + (void) umask(077); signal(SIGHUP, mcleanup); signal(SIGINT, mcleanup); signal(SIGQUIT, mcleanup); From nobody Fri Oct 11 15:55:34 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQB6Z32qWz5Z4GK; Fri, 11 Oct 2024 15:55: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQB6Z21mgz4wMd; Fri, 11 Oct 2024 15:55:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728662134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+HNMk5wzQIa4yMzys+ZiHlYh7CrqVSYrTuR5ihrJY2c=; b=ugvVpJJSmM9GYx3ynI69AmRN5GEutv8NjNc8kZQwT1i2ciMtz4S0D5L/2/KJlqEdPHUs76 MIIn5l3EXyTcmCBTp+btHK2GxMh2n3Uj2IIvoEqphGPQz0RpFE/dg3LGoZCQyq4FkLJX9i pGjeRwecsmMP1o87f3KycCEBBCSL9+AUP6NfElcJuRLajUVB2Paqc/76L+AwCYkyxkf+0w 0RrihoY7m45Bb7DqaRAaLwROpbGFbMfjDd3B2KJ04ayZyoo3VHf4LbxmoQcBbTRnz+/kF4 enfYuJuzRR6x3Q6wSnJOS0948podW8Pa+Ye6DAZNK+MJo+nwHbP5sOoabBKexg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728662134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+HNMk5wzQIa4yMzys+ZiHlYh7CrqVSYrTuR5ihrJY2c=; b=nOtumi+iJu3TxB1hHnmpG21rGZafBhvfzhPpPwXTZHLrxz2Ip4uGDnZxhDVse8gAgy7mUp HktLas6XoHyRH63EpxzK8jjZWJ8GGg+e/GIZrrgzc2NWMHi7Zj27o2W0VFkfDxgmrXPv1x NHd9SnVY7yBcgmr9lukoY1TqBoAVPlr0UHnmTbbpw2KegSSN9X532D8n1rD+ZcoQfqj1bA 8TlCzFRMOr2sURLj7Taz/JqG9i2kbMXnHe2PRvafb4mXxObzglKVs2E4pVo8LblumnIszp gHwxn8JMKVo1/KGlgv2SfKgGEbiVofpcVK1M0B1fYpu+t9RGdLIgmqXF4l2UMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728662134; a=rsa-sha256; cv=none; b=m4U6APe+27bnoAUc2QgmclA8J9i/cGzwRSvGxSQSV9vJ/bKnMaVD/qL4xszKJUhHotle7Z ZH6SCkqJoHkzhJwhBfZD8dx6wYF1SyctplC8yqM6J7iUjnkDvfV3eCXa5b1OGCYI48uzV0 jjpE20OvKns3VbqA/9efFUeUKV17XCW6+mSpYNUG0GskRoIJSjHX/yY4deVIRgmEUVlU+K L7hZ7K6zLxviA2HXFO2Ie2tKoFHAA1V2Hy1L7CQdd4OF9Kr3xvHat9WZV77LG48jPE/4Lx fUq6+Jf/RQDqpgg8nNDl2GtU/7e3roHClkRhl9XX93r2xuV7WY0MoaLmCMdNHQ== 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 4XQB6Z1f0Hznrc; Fri, 11 Oct 2024 15:55:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BFtYZa088335; Fri, 11 Oct 2024 15:55:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BFtY88088332; Fri, 11 Oct 2024 15:55:34 GMT (envelope-from git) Date: Fri, 11 Oct 2024 15:55:34 GMT Message-Id: <202410111555.49BFtY88088332@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 818c7b769a4f - main - uncompress: Avoid reading an extra byte List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 818c7b769a4f7d3c8fecc4cf491f4e22ef816eba Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=818c7b769a4f7d3c8fecc4cf491f4e22ef816eba commit 818c7b769a4f7d3c8fecc4cf491f4e22ef816eba Author: David Jones AuthorDate: 2024-10-11 15:49:17 +0000 Commit: Warner Losh CommitDate: 2024-10-11 15:50:09 +0000 uncompress: Avoid reading an extra byte When reading the next code in a stream, avoid reading an extra byte if we're going to throw it away. When there's no more bits to extract from the stream, bits will be 0 and we'll mask the read byte with 0 anyway. At worst, this will avoid reading one past the end of gbuf array (which is not possible in well formed streams). PR: 127912 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D47041 --- usr.bin/compress/zopen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c index be66358884ca..cb7e6e9eb10a 100644 --- a/usr.bin/compress/zopen.c +++ b/usr.bin/compress/zopen.c @@ -620,7 +620,8 @@ getcode(struct s_zstate *zs) } /* High order bits. */ - gcode |= (*bp & rmask[bits]) << r_off; + if (bits > 0) + gcode |= (*bp & rmask[bits]) << r_off; roffset += n_bits; return (gcode); From nobody Fri Oct 11 16:53:42 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQCPg24w5z5Z7RT; Fri, 11 Oct 2024 16:53: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQCPg0HB0z56lN; Fri, 11 Oct 2024 16:53:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728665623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hX6AXWGWH5nUPXVG9sZHbVdKdw2HKwhcDy0CIkm5/6U=; b=ZFj6GehJHNZFIwawyn1v+gu+eEL4WczeIEyLl/QXqyz4BuQjyzWfMs7AltvvqnYguJ5CGR AXhGrdvwUw+uijmmfHJPVppSczuZMw7geJQRLqvueb5KLZIZOuj74QKfz8kCP7pK+0C3V8 vo1cbsfBGtihWBbD7wxmBtcxtueJ0r4OWtGOp1V3cqq7xF/mbfCBlGrUlxqjLbraoX1rRJ TAchVsOo6e/St9Cc/IrFD8olPn5F3TgNgtpjRvx3IkyR8odcbhohSTSVZ0szyraLYoHx4F WebRhh4rqxkBG993Nb9KHWKlKrz5Y91N/Qe/hXcY+/8NUlzpYxvLjgWqKxRzoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728665623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hX6AXWGWH5nUPXVG9sZHbVdKdw2HKwhcDy0CIkm5/6U=; b=UR2+fwNgQnJEHZ+vHbHgfylUMOXq5oY79WV5lySdOhcG+AsfBeBRbfWO8vy6/lomG8sq0P O8VXtwwguD2WqS1/4P/j46CyfHMn//edj1qZcj3GHCbbNlDJBvJVe+jdUK1b879UZOTk1M wEjSH2RUQlaP4Rwewmfu4d2/rtAA+BZd8XAc1uN1kZtZ5XwK0OXie9tthojX4+UMNITuDx d24D9RUTF+CuCGXuXdzw+b3V/z/iPnlJAj/RI60ORteDuZD11wirwW1LawuFUZigB8jGQr 86C7kfeJ4rOvYNX84V27rqieV4QtHB94qCEF1h6hj0X2DBazxmLvoYbyv0VHNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728665623; a=rsa-sha256; cv=none; b=Z5ruuvwFQpZM+QyETxM4/VjbywHoVwns9loCWHRxklMqjShhSlaxt1YkvZA5icxdASLiS9 vyubl6UlJCQQXqk+Z1M50XkvF6XkSqxr4nlrolbxN7MNR84nhatBFCr7CzSadV5IkcHK03 fWhglYE9TAUhQPKEXE2RCc6Pg5fgyu7wHOXh6HboBXo9WgkaPlsMDgRJXncn+htPjUi77O JQskZ6n9GG78N0FXRgULaWGi7JU8xrE2fYloh7sX/PM8qYcN7NGaqLOgawWXJv5HI09N5X PXfReDSitCXD4Igi7tgzPCBoxYDOg2iByM1OT7E8motGI8RhRKNSmIr8jXbv3A== 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 4XQCPf700bzq9q; Fri, 11 Oct 2024 16:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BGrgVZ091003; Fri, 11 Oct 2024 16:53:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BGrgTl091000; Fri, 11 Oct 2024 16:53:42 GMT (envelope-from git) Date: Fri, 11 Oct 2024 16:53:42 GMT Message-Id: <202410111653.49BGrgTl091000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a78bacf3b0ec - main - cdefs: Add __nosanitizecoverage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: a78bacf3b0ec0526e38f299fe4e17557f0930303 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a78bacf3b0ec0526e38f299fe4e17557f0930303 commit a78bacf3b0ec0526e38f299fe4e17557f0930303 Author: Mark Johnston AuthorDate: 2024-10-11 16:51:13 +0000 Commit: Mark Johnston CommitDate: 2024-10-11 16:52:53 +0000 cdefs: Add __nosanitizecoverage Obtained from: CheriBSD MFC after: 1 week --- sys/sys/cdefs.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index a56839d57c7a..9c4c8e0a324a 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -719,9 +719,11 @@ #define __nosanitizeaddress __attribute__((no_sanitize("address"))) #define __nosanitizememory __attribute__((no_sanitize("memory"))) #endif +#define __nosanitizecoverage __attribute__((no_sanitize("coverage"))) #define __nosanitizethread __attribute__((no_sanitize("thread"))) #else #define __nosanitizeaddress +#define __nosanitizecoverage #define __nosanitizememory #define __nosanitizethread #endif From nobody Fri Oct 11 16:53:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQCPh3bnZz5Z7Ln; Fri, 11 Oct 2024 16:53: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQCPh1ZkBz56rT; Fri, 11 Oct 2024 16:53:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728665624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QExtNj/sIRuSy+yGReVDBqE+sY/zZK5VMcJu+zZEi0c=; b=oLOb7x/mjrXxLBZhEx2FmmnwB98bdcUidNCWWdEG+xj2zTqgW0ugTUIZ45UEKOUnP3vV0r XvBDTiGPI971HNH8/hQNZ8uBJPeG2aYSszCGQ43hDGQjmA7vnZ/8CFW9+Sv71tfH7B4rxf thp+2CxcMojbD/1SM1NtWOnPnsW0dugkycdHvQ0BO/zL/4k39ESVf8yIQH5yJJEYyPjpTX rYOwtyKezvevl12ERfFCKye+4Ob4CX6c6NRP7GWYTWL+8dYGMJ4OEkqWL3EQe4PVSTcWpG 8Al7EINKFLILw0AD05Fr3dPStccsG8MLu6/MfBqlDAg8z4g2NA1H7oNkJwyeHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728665624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QExtNj/sIRuSy+yGReVDBqE+sY/zZK5VMcJu+zZEi0c=; b=QzC/tnS+tKqGgDoMOdIznnQM8pHYx6MqATVdz7Y4XkYzPOhBGxVDZwx3JANFQQDwU3Qjpb a6dLPeLLTsHdVZ0GcKrsbavYBn36o0sOiyyKK0EPsmYSBaIx3OQRWSnF67QfeQHToTKUdl 6hV3GVD+fT55BVqwOJzAl/lNu766OL3t8+LtsDZfAfmr5LmTyakEs4InuOff2NL10eU84u P9ESnPn6MTbT0/TCxSI8v/AfYUWWQjRPDJTXKg8E7jk+OLr/TqDlWf2XX6vlEY9TCCzGTm e3KxiHQK8NvClpTahOz5wb2IMTASNCyM9Rv0WK1+x382NRCr+J5nIfRne2Qw8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728665624; a=rsa-sha256; cv=none; b=NUv1E2r39KAVhrYXx6aCChGUq7SM+hVPbWHQ0hB+8qyK7YrRJsxRfIP52R5JJ89gH6o8pw d/99E/AIV4E1e/hok3BxVWiH4ZM3Rr4BbXEgHxSd7Sa9Yg2CI8eKuTjFnriv7l1c5aP9op GXk22NavqViueg7j5shVvGuM/jJphA8L5rMIkM80FJZlxXB09MJtCivbkOiUUR+Wvr+EHc QrQYXyvdA/AihI6Fec909fJi7uOm41gkCuxgSG37xRPbmkGJYxhhzdMcEpkgT7C9r6C+K2 txpv11KOgmxWaj0ZK0hsni9vuSlIMUwCCG2uvwdNDn3JBIxY+ywr2+aR9/g7GQ== 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 4XQCPh1Bndzqbf; Fri, 11 Oct 2024 16:53:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BGrimc091048; Fri, 11 Oct 2024 16:53:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BGrin3091045; Fri, 11 Oct 2024 16:53:44 GMT (envelope-from git) Date: Fri, 11 Oct 2024 16:53:44 GMT Message-Id: <202410111653.49BGrin3091045@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 4f2ca36c7bec - main - arm64: Disable coverage sanitization of `pmap_update_strided` List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4f2ca36c7becd20b21ce5ef7256bbd42f732dafe Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4f2ca36c7becd20b21ce5ef7256bbd42f732dafe commit 4f2ca36c7becd20b21ce5ef7256bbd42f732dafe Author: Zhuo Ying Jiang Li AuthorDate: 2024-10-11 16:41:49 +0000 Commit: Mark Johnston CommitDate: 2024-10-11 16:52:53 +0000 arm64: Disable coverage sanitization of `pmap_update_strided` The break-before-make update invalidates PTEs, including the PTE pointing to curthread, causing a fault in `trace_pc`. This addresses a similar issue in 01bb9a2a3557bc9389f628d301cd691e08266f1d. Reviewed by: markj MFC after: 1 week --- sys/arm64/arm64/pmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 6f758b7ff10c..2c8f8b416a9e 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -4618,7 +4618,7 @@ pmap_update_entry(pmap_t pmap, pd_entry_t *ptep, pd_entry_t newpte, /* * Performs a break-before-make update of an ATTR_CONTIGUOUS mapping. */ -static void +static void __nosanitizecoverage pmap_update_strided(pmap_t pmap, pd_entry_t *ptep, pd_entry_t *ptep_end, pd_entry_t newpte, vm_offset_t va, vm_offset_t stride, vm_size_t size) { From nobody Fri Oct 11 17:48:19 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQDch1DkPz5ZBdQ; Fri, 11 Oct 2024 17:48: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQDch0l7Dz3xZL; Fri, 11 Oct 2024 17:48:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728668900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TmiDNzRjtgm8A6dCFwG5rgO6SlchpS/AJM+uTQsZS4A=; b=iDsO5TirZJjpbr9OCwaxLmIeX54cYC+43pSHLsDmXXs1mVN5RemeDEGhb6rB0QctW67svZ EUu2WUfzFYtG+8N7RNYZNdkCH5CEeHsVHO3QnNclAniIot3WgbIhpnlHyZxI4NDdu81trd HlMfBXmTGbHiKuAPzzkUmS5SFiPKc1qHQQPBiczAnnFskH3q8//qoLmGLio3Gnm9Dsdnta DK4d8wE1psfyDkkLsTdPuovb9Lk6yvNirXqL+xFozP23H3WOfVeCLCZ77YNKY9JuX5/HgU HBdqPjA5XA+UmmPEjh+vyoIsa3DV1yjx6V8Av7IUwvL+lxa6RZzo4Os3wC+X2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728668900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TmiDNzRjtgm8A6dCFwG5rgO6SlchpS/AJM+uTQsZS4A=; b=YrK2XSua22SgUU9W/nnmf9/9kHkLjjXwRclpNCsRISaoVzOpQUYrlQbl2AVFKYZ5nxfgdd GqPEVogxDmqFDeBFkwjZgUlvkDnMYL7p74eW6sZVICI06CwxteaqmQoVU62SRZbWU2mK0E 8NW7EIxXJvvAUS3gUauNGj5esjSFhGMfe1tqQMwJzElfHyhWDsVjyVAM5bPivG7rnAf9Uu dm+hKXdPenBCSrM/wDCEvhM1a0LaKXTNrZTy3jmrnquzg/SHgD89xijdkVLR2eoDGohsEH 3cPOuP+6+qi6+eJfknO+U9SPkivyiG7vkYlLuHpOXlDFuYWc8stidFe4+AkAVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728668900; a=rsa-sha256; cv=none; b=mo0fapiSjHClqIhR+l+Efv14by3eCMa8u2ViGc30trkLo56bQEd7pD6I7P98x0RsLKdFcT rAeB4aqm0BZjgkRp8InXio43q432zjFphx2QLa8Lozu9k+Q91CjTEWBnnqEB1eIo/Ty7wK lCzegaTqP63/+zkHEdJcz0t0p8gVgtT4oPzWmkBdf/HwmPWrmrDhG+aZv2/rgHKim2MxwP nrUQ470lEygEvCfK3m7TWJeTs6bWm0RxhYSix3zapFrGkU5XLkVFzyy/LEpIuVKfFJjvWi VYf2Zn5GcPC2dFj/GqhZ4z05gCb7h0ySH3/SPFSAcbIcqTfbP94t059Uh+RhBA== 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 4XQDch09twzrD9; Fri, 11 Oct 2024 17:48:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BHmJRL077035; Fri, 11 Oct 2024 17:48:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BHmJAp077032; Fri, 11 Oct 2024 17:48:19 GMT (envelope-from git) Date: Fri, 11 Oct 2024 17:48:19 GMT Message-Id: <202410111748.49BHmJAp077032@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 1107834090be - main - swap_pager: swapoff detecting object death List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1107834090be4df01070028f6a8cdb37ff1f51f1 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=1107834090be4df01070028f6a8cdb37ff1f51f1 commit 1107834090be4df01070028f6a8cdb37ff1f51f1 Author: Doug Moore AuthorDate: 2024-10-11 17:45:54 +0000 Commit: Doug Moore CommitDate: 2024-10-11 17:45:54 +0000 swap_pager: swapoff detecting object death In swap_pager_swapoff_object, the object is initially not dead, and can only become dead while the object lock is not held. Move the test for object-death so that it is right after the early loop-break that happens after lock re-acquisition, and before the iterator is re-initialized, which fails an assertion when the object is dead, and not swap. Addresses a problem produced in testing by @pho and diagnosed by @kib. Reported by: pho Reviewed by: alc, kib Differential Revision: https://reviews.freebsd.org/D47064 --- sys/vm/swap_pager.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index f4db46a32dee..23b5e1c34b07 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -1910,6 +1910,8 @@ swap_pager_swapoff_object(struct swdevt *sp, vm_object_t object) VM_OBJECT_ASSERT_WLOCKED(object); KASSERT((object->flags & OBJ_SWAP) != 0, ("%s: Object not swappable", __func__)); + KASSERT((object->flags & OBJ_DEAD) == 0, + ("%s: Object already dead", __func__)); KASSERT((sp->sw_flags & SW_CLOSING) != 0, ("%s: Device not blocking further allocations", __func__)); @@ -1917,15 +1919,6 @@ swap_pager_swapoff_object(struct swdevt *sp, vm_object_t object) swp_pager_init_freerange(&range); sb = swblk_iter_init(&blks, object, 0); while (sb != NULL) { - if ((object->flags & OBJ_DEAD) != 0) { - /* - * Make sure that pending writes finish before - * returning. - */ - vm_object_pip_wait(object, "swpoff"); - swp_pager_meta_free_all(object); - break; - } sb_empty = true; for (i = 0; i < SWAP_META_PAGES; i++) { /* Skip an invalid block. */ @@ -1983,8 +1976,21 @@ swap_pager_swapoff_object(struct swdevt *sp, vm_object_t object) } if (i < SWAP_META_PAGES) { /* - * With the object lock released and regained, the - * swapblk could have been freed, so reset the pages + * The object lock has been released and regained. + * Perhaps the object is now dead. + */ + if ((object->flags & OBJ_DEAD) != 0) { + /* + * Make sure that pending writes finish before + * returning. + */ + vm_object_pip_wait(object, "swpoff"); + swp_pager_meta_free_all(object); + break; + } + + /* + * The swapblk could have been freed, so reset the pages * iterator and search again for the first swblk at or * after blks.index. */ From nobody Fri Oct 11 18:06:58 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQF2B2LBDz5ZCJ7; Fri, 11 Oct 2024 18:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQF2B1t4Yz41DS; Fri, 11 Oct 2024 18:06:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728670018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZJjU0gEuXUsQaI8LIqm+xqFCCdEK9DIQ9gwseJ9qUPo=; b=FmGLxHhK2Z2wfHGvVQiBnBkBZGSTKb3VwUr3zZXYDcj0jGl97Ky8KdGPe/3aN76PEquLe7 Zs3WM/SB3rwpk9L0lEzNHPTebx63GmmKJmvrOeTZrXYWVb4CA4duu9DISt/fiOHEjI18eX DVApPRs3rb4PbXCYi1dGDdUfxm1CZLEqhWmsE1QtMwwJwmsXMsCmecdWqHM2C349B6Wl90 SWkAKjZUof2ep/mlgZ6B/mIRCBhRDo/SV9Qe3gUMyWmFn1EVTrrk29SS2q+QMKOu173Aen XFHRMseT2ONc9nxoIwLv4zUqqUh0ZxnNA92G2hU4+Qji2j8ZTsIBXpLa7CEKIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728670018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZJjU0gEuXUsQaI8LIqm+xqFCCdEK9DIQ9gwseJ9qUPo=; b=vPZO1yvIqsnHBh4aBSDEI39O1/sef3muLGQ6xbnaD5/HOjRi61WbdsOkzuOQT9jCoVdf/s XWSR6KCvm1PpxKo/nzURmIgQ+4Z04yj54w32dvg8Serm9oKXT5r609M7KxZSZMhz0MEi3A jtXpXx6Ttb7KaWvCAxfKDNMHrizl2AOzUuVdGGJiG4YdnO6YWUz5CzKko/ap4mP23qUokt L4xPBBe8GCU1dIgFVBRTSdLX7DaJCzu4qT3dQTt5c151eFvct6dJGAUMTWp8YVGDdrNlkL vgE5gtxr+8HAz7KlLF6ySqThuItWric1grlMUBv24nxPCqcg/4X8LQK32FCRZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728670018; a=rsa-sha256; cv=none; b=N22Zd1mBaPJNZzgJ7A0WHaCN7roWfeWhofqyD+ribTkZaTVx+Cw3hkZIp3dfjbUF2N/Y0y th5nMuvL8PUuV+raFkku5v1mxmM3xzElvwg+xKn20yRbIF0bz8j6PrlBeiRb2o73NYzUI0 YWfIJQcas4bdf9ChnjhQqaziLYEdyD7slrE/4PAZAqwK0gKnAp9lvHOjlDx369mSN5ep96 rRcG4BflA9rrdxNZSghQx90NItLnEyk3Fdu25ALCFimkAZfUDnWwWgbBmGZObn462dH6kY c0RmBD0Uj9gO2aLnz6aj/V4eM+wuy8xe33G+FLEnS0BW/9zodC07OBTTN4dC5g== 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 4XQF2B1TBRzrhC; Fri, 11 Oct 2024 18:06:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BI6w9M011701; Fri, 11 Oct 2024 18:06:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BI6wcQ011698; Fri, 11 Oct 2024 18:06:58 GMT (envelope-from git) Date: Fri, 11 Oct 2024 18:06:58 GMT Message-Id: <202410111806.49BI6wcQ011698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2af5769e3431 - main - fdisk: Make confusing fdisk messages a little less ambiguous List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2af5769e3431f6b5d1bc0ddaac9082e53096e308 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2af5769e3431f6b5d1bc0ddaac9082e53096e308 commit 2af5769e3431f6b5d1bc0ddaac9082e53096e308 Author: Warner Losh AuthorDate: 2024-10-11 16:13:08 +0000 Commit: Warner Losh CommitDate: 2024-10-11 18:06:33 +0000 fdisk: Make confusing fdisk messages a little less ambiguous We print an error when we can't read the MBR. Add minimal messages about continuing anyway. PR: 167036 Sponsored by: Netflix --- sbin/fdisk/fdisk.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c index 6cfa2b510f22..d9514555ae34 100644 --- a/sbin/fdisk/fdisk.c +++ b/sbin/fdisk/fdisk.c @@ -380,7 +380,8 @@ main(int argc, char *argv[]) printf("******* Working on device %s *******\n",disk); if (I_flag) { - read_s0(); + if (read_s0()) + warnx("Ignoring bad existing MBR."); reset_boot(); partp = &mboot.parts[0]; partp->dp_typ = DOSPTYP_386BSD; @@ -410,8 +411,10 @@ main(int argc, char *argv[]) else print_params(); - if (read_s0()) + if (read_s0()) { + printf("Will replace existing bad MBR\n"); init_sector0(dos_sectors); + } printf("Media sector size is %d\n", secsize); printf("Warning: BIOS sector numbering starts with sector 1\n"); From nobody Fri Oct 11 18:06:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQF2C3WQvz5ZCjC; Fri, 11 Oct 2024 18:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQF2C2GN9z41Vf; Fri, 11 Oct 2024 18:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728670019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x9MchnS2u3fu85zvN2CIepWU8QtXBvZcA+YKhI5KG+4=; b=m7VFd5Qy7D8IEeuzHbrbNCxM0C3K/n3HGLlIvwc+0mG13XLWnDjxZPwHLIfzzLCSLfcCX9 N7AoK2ZD3g2nQrh4jWZ5SSf2DtOK0L0Oa0XK+mVRmhGdsl5NhI/48tzIw9m/CvYYYQLXLy KskBJxF+62YZC2RXH/rBpuga3cECtkXwoeadM92PYuEFnUHi9WNqvfMkABWHbjfJhxtqKc 2xRdHPyQhzgZJWEoZ0T3PgOKP7fB5uAg4YmLWGRZmPTj7UFIB/IAu61h73a94ChwCXA2E6 syWk12WtQ1HmZSjcvLpVOI2G5rLga0a1VNEfVGFrC+aYOzm5s0qqwCSNzZw++w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728670019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x9MchnS2u3fu85zvN2CIepWU8QtXBvZcA+YKhI5KG+4=; b=i5rFmTFrtPdcwbBT1ZAegzZj5Mb8ZAF+17deyvRxlVpgC9Kawz3zDsrtTAEp/4kV7cIy/m VpCzx4d2cxeCNsCGOBpSmoOf9bgL7n7KQc2zyT7exXKu5x7cyFl9EcjJNCdNMGW6K0H3dR olozyd09BGdeKgUfrkH08Unx+V603hF0L7NAvnWfcgUoOOCSdsfiev2bJDRkEjBsxEf4rh Hvvvbjj9175RDcwMWrbfvdBlNqcwWNbWQdHWoQclBbkvuBoDRVg1EyYvsvnROnU3R1RMmP ZpPQ2nCQZxXb+EP5ubHbkivzjjGxTrwKHJup6wMDYmQnJLyYDPq6915bXMhNTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728670019; a=rsa-sha256; cv=none; b=JIPhAIS29c5puzs1MpL/F+5k0VFByzpLF68Ox5Z/aPGbYWfvdaGnvUjdt0sdAbYVGwS46i 9JAEUorvh5JXnmfjWTZOAimBj4ZO1o2aGqwY1HOec4UNH4zIcFa9IT9xUqRjh3QJUUXJSp PPyGd5tgnnLuP287/1oa8wjsFELwLejTPRiushjte8M8OuRC5F5QiwoOQl0BXYd5KztZ7C ppXtXAGgYGfzEAKD1baIpuNhAVBBNy6bDtJ3YIgP0Z6vSlrxelauQJdKSizBbRU9Aq6DRi Ipi0/eTRaF9atUO1N6cBr5XAsI+2WNxnOkuknpyFACXQlRIG1cZbDdvaBWdaig== 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 4XQF2C1tlgzrwd; Fri, 11 Oct 2024 18:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BI6xUI011744; Fri, 11 Oct 2024 18:06:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BI6xUj011741; Fri, 11 Oct 2024 18:06:59 GMT (envelope-from git) Date: Fri, 11 Oct 2024 18:06:59 GMT Message-Id: <202410111806.49BI6xUj011741@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ca9e31eead41 - main - Revert "apcidump: Add dumping SPCR" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca9e31eead41ff1b5d2fcf8989ab527c89485a90 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ca9e31eead41ff1b5d2fcf8989ab527c89485a90 commit ca9e31eead41ff1b5d2fcf8989ab527c89485a90 Author: Warner Losh AuthorDate: 2024-10-11 17:52:59 +0000 Commit: Warner Losh CommitDate: 2024-10-11 18:06:33 +0000 Revert "apcidump: Add dumping SPCR" This reverts commit 593d7a1634b5: In preparation for importing new SPCR definitions, back out my hack since it conflicts with the new definitions. Sponsored by: Netflix --- usr.sbin/acpi/acpidump/acpi.c | 170 +------------------------------------- usr.sbin/acpi/acpidump/acpidump.8 | 1 - 2 files changed, 3 insertions(+), 168 deletions(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index 95ecb42825eb..fe68b5062351 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -1257,180 +1257,18 @@ acpi_handle_tcpa(ACPI_TABLE_HEADER *sdp) printf(END_COMMENT); } - static void acpi_handle_tpm2(ACPI_TABLE_HEADER *sdp) { ACPI_TABLE_TPM2 *tpm2; - + printf (BEGIN_COMMENT); acpi_print_sdt(sdp); tpm2 = (ACPI_TABLE_TPM2 *) sdp; printf ("\t\tControlArea=%jx\n", tpm2->ControlAddress); - printf ("\t\tStartMethod=%x\n", tpm2->StartMethod); - printf (END_COMMENT); -} - -static int spcr_xlate_baud(uint8_t r) -{ - static int rates[] = { 9600, 19200, -1, 57600, 115200 }; - _Static_assert(nitems(rates) == 7 - 3 + 1, "rates array size incorrect"); - - if (r == 0) - return (0); - - if (r < 3 || r > 7) - return (-1); - - return (rates[r - 3]); -} - -static const char *spcr_interface_type(int ift) -{ - static const char *if_names[] = { - [0x00] = "Fully 16550-compatible", - [0x01] = "16550 subset compatible with DBGP Revision 1", - [0x02] = "MAX311xE SPI UART", - [0x03] = "Arm PL011 UART", - [0x04] = "MSM8x60 (e.g. 8960)", - [0x05] = "Nvidia 16550", - [0x06] = "TI OMAP", - [0x07] = "Reserved (Do Not Use)", - [0x08] = "APM88xxxx", - [0x09] = "MSM8974", - [0x0a] = "SAM5250", - [0x0b] = "Intel USIF", - [0x0c] = "i.MX 6", - [0x0d] = "(deprecated) Arm SBSA (2.x only) Generic UART supporting only 32-bit accesses", - [0x0e] = "Arm SBSA Generic UART", - [0x0f] = "Arm DCC", - [0x10] = "BCM2835", - [0x11] = "SDM845 with clock rate of 1.8432 MHz", - [0x12] = "16550-compatible with parameters defined in Generic Address Structure", - [0x13] = "SDM845 with clock rate of 7.372 MHz", - [0x14] = "Intel LPSS", - [0x15] = "RISC-V SBI console (any supported SBI mechanism)", - }; - - if (ift >= (int)nitems(if_names) || if_names[ift] == NULL) - return ("Reserved"); - return (if_names[ift]); -} - -static const char *spcr_interrupt_type(int ift) -{ - static char buf[100]; - -#define APPEND(b,s) \ - if ((ift & (b)) != 0) { \ - if (strlen(buf) > 0) \ - strlcat(buf, ",", sizeof(buf)); \ - strlcat(buf, s, sizeof(buf)); \ - } - - *buf = '\0'; - APPEND(0x01, "PC/AT IRQ"); - APPEND(0x02, "I/O APIC"); - APPEND(0x04, "I/O SAPIC"); - APPEND(0x08, "ARMH GIC"); - APPEND(0x10, "RISC-V PLIC/APLIC"); - -#undef APPEND - - return (buf); -} - -static const char *spcr_terminal_type(int type) -{ - static const char *term_names[] = { - [0] = "VT100", - [1] = "Extended VT100", - [2] = "VT-UTF8", - [3] = "ANSI", - }; - - if (type >= (int)nitems(term_names) || term_names[type] == NULL) - return ("Reserved"); - return (term_names[type]); -} - -/* - * Serial Port Console Redirection version 3 and 4 are too new to have proper - * definitions in ACPI headers, so provide them. - */ -#pragma pack(1) -struct SPCR_3 -{ - ACPI_TABLE_SPCR spcr2; - UINT32 UARTClockFrequency; -}; - -struct SPCR_4 -{ - struct SPCR_3 spcr3; - UINT32 PreciseBaudRate; - UINT16 NamespaceStringLength; - UINT16 NamespaceStringOffset; -}; -#pragma pack() - -static void acpi_handle_spcr(ACPI_TABLE_HEADER *sdp) -{ - ACPI_TABLE_SPCR *spcr; - - printf (BEGIN_COMMENT); - acpi_print_sdt(sdp); - - /* Rev 1 and 2 are the same size */ - spcr = (ACPI_TABLE_SPCR *) sdp; - printf ("\tInterfaceType=%d (%s)\n", spcr->InterfaceType, - spcr_interface_type(spcr->InterfaceType)); - printf ("\tSerialPort="); - acpi_print_gas(&spcr->SerialPort); - printf ("\n\tInterruptType=%#x (%s)\n", spcr->InterruptType, - spcr_interrupt_type(spcr->InterruptType)); - printf ("\tPcInterrupt=%d (%s)\n", spcr->PcInterrupt, - (spcr->InterruptType & 0x1) ? "Valid" : "Invalid"); - printf ("\tInterrupt=%d\n", spcr->Interrupt); - printf ("\tBaudRate=%d (%d)\n", spcr_xlate_baud(spcr->BaudRate), spcr->BaudRate); - printf ("\tParity=%d\n", spcr->Parity); - printf ("\tStopBits=%d\n", spcr->StopBits); - printf ("\tFlowControl=%d\n", spcr->FlowControl); - printf ("\tTerminalType=%d (%s)\n", spcr->TerminalType, - spcr_terminal_type(spcr->TerminalType)); - printf ("\tPciDeviceId=%#04x\n", spcr->PciDeviceId); - printf ("\tPciVendorId=%#04x\n", spcr->PciVendorId); - printf ("\tPciBus=%d\n", spcr->PciBus); - printf ("\tPciDevice=%d\n", spcr->PciDevice); - printf ("\tPciFunction=%d\n", spcr->PciFunction); - printf ("\tPciFlags=%d\n", spcr->PciFlags); - printf ("\tPciSegment=%d\n", spcr->PciSegment); - - /* Rev 3 added UARTClockFrequency */ - if (sdp->Revision >= 3) { - struct SPCR_3 *spcr3 = (struct SPCR_3 *)sdp; - - printf("\tUARTClockFrequency=%jd", - (uintmax_t)spcr3->UARTClockFrequency); - } - - /* Rev 4 added PreciseBaudRate and Namespace* */ - if (sdp->Revision >= 4) { - struct SPCR_4 *spcr4 = (struct SPCR_4 *)sdp; - - printf("\tPreciseBaudRate=%jd", - (uintmax_t)spcr4->PreciseBaudRate); - if (spcr4->NamespaceStringLength > 0 && - spcr4->NamespaceStringOffset >= sizeof(*spcr4) && - sdp->Length >= spcr4->NamespaceStringOffset + - spcr4->NamespaceStringLength) { - printf ("\tNamespaceString='%s'\n", - (char *)sdp + spcr4->NamespaceStringOffset); - } - } - + printf ("\t\tStartMethod=%x\n", tpm2->StartMethod); printf (END_COMMENT); } - + static const char * devscope_type2str(int type) { @@ -2630,8 +2468,6 @@ acpi_handle_rsdt(ACPI_TABLE_HEADER *rsdp) acpi_handle_lpit(sdp); else if (!memcmp(sdp->Signature, ACPI_SIG_TPM2, 4)) acpi_handle_tpm2(sdp); - else if (!memcmp(sdp->Signature, ACPI_SIG_SPCR, 4)) - acpi_handle_spcr(sdp); else { printf(BEGIN_COMMENT); acpi_print_sdt(sdp); diff --git a/usr.sbin/acpi/acpidump/acpidump.8 b/usr.sbin/acpi/acpidump/acpidump.8 index 9703741f418f..f193b9a3511a 100644 --- a/usr.sbin/acpi/acpidump/acpidump.8 +++ b/usr.sbin/acpi/acpidump/acpidump.8 @@ -112,7 +112,6 @@ utility dumps contents of the following tables: .It RSD PTR .It RSDT .It SLIT -.It SPCR Serial Port Console Redirection .It SRAT .It TCPA .It TPM2 From nobody Fri Oct 11 18:07:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQF2D6JfJz5ZClZ; Fri, 11 Oct 2024 18:07: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQF2D4CRGz41dg; Fri, 11 Oct 2024 18:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728670020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mvA/HipVC7FzWuH9IusOHKp4mDxNq+PbK7IlvOUS7JM=; b=AjdPkTeYNEXpn0zEs1zjapCyIESp7jCPkjYnCAn++Sk72xm3mFlLxibqSvjy+rnNlf/r7F YmHuzfkFXeooJRybmwGhN3A2p3uqZsj+8IQ14AophPcKD5RKuShc08cRRMdH/iIdog1Pql WoPKkSlHb6Ox+M39K1rpDJ+Y1LIT3gNuAj2sbKpk9Bp1gKAj6C2SX8Mnay6tba9B2rtosx gH0J3vzYa415z6OF84HWZaBSAQEmF8UGav8uKm7YBSngZJ5UG31yiP9+SdOCQhoSJiHt6/ 7YzAGxNEkWjnK7GjTGmPWmMXRq9FGE89BevMGpjms4suDtjG2Wi7fWAgzl8/tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728670020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mvA/HipVC7FzWuH9IusOHKp4mDxNq+PbK7IlvOUS7JM=; b=EL3LM5+ESEA61zJWdJKPKgxqiTFSjsyltAL+nSxbEn1YRPwcCS/N/BxnZc2nljOaZz6Fvc 7Pkxoh+BFEziamebMEF4DbGai67JYHkx+XVryisNa/b2NohspDYyaxfMqroik8q7Z3WtJx mhP1gGs+BFQqw3g3XfVKdAOU+g7vC5nbtBBEuMSfT2MAEZyhnbsuYohNr1jKSMkvc3YB84 uy/YhmyP2D3a5VwVDc+JSyUaEaKaWK0brCtheNDLL/NPyFPL4BXsRGVt8DXgb97oZXxNOf Wngn8/4yGTUEpmjxj5PXUGQnMlMuDMGo7UfRbIXj/qpb5Fro7vu+0AwEnI5zcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728670020; a=rsa-sha256; cv=none; b=ljyAkHrcvZNwwnWkB0V9xZgzCz99nMJC836CyKUWIvQq9SHKn5t0/30FkhpyJwitHNl7IG tM4dvY/N71oWB81ZMISPqrXnGnbkZNe3NJ+OAT+3NxAQCfq5199/h+cda90AXccVw6PVGY IrE7oEZI+hqh7eE5jtjGj6Vy6bbK+2MehaY8Psc0gP6GinPW9uBJygnJQEm/DunvFPgJNe k8RdrT2TZO2cvXzzPfsH7Q47Zmrjtv0tQlasQxVkmioyzpgN/oKfDXJivo3fJa38CzoZuw ZY0HlyOkVSLbtp+DV4LqM3RHC5xF78y+ZbL8jtllUHHHxm8CnXOUJ7Qu0ND8yQ== 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 4XQF2D3CWpzsD3; Fri, 11 Oct 2024 18:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BI70Hb011801; Fri, 11 Oct 2024 18:07:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BI70PF011798; Fri, 11 Oct 2024 18:07:00 GMT (envelope-from git) Date: Fri, 11 Oct 2024 18:07:00 GMT Message-Id: <202410111807.49BI70PF011798@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8056c665574e - main - acpica: Update the SPCR table to version 4 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8056c665574e2bca135658764773281893e8fc27 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8056c665574e2bca135658764773281893e8fc27 commit 8056c665574e2bca135658764773281893e8fc27 Author: Sia Jee Heng AuthorDate: 2024-02-29 06:39:50 +0000 Commit: Warner Losh CommitDate: 2024-10-11 18:06:33 +0000 acpica: Update the SPCR table to version 4 cherry pick 1eeff52124a45d5cd887ba5687bbad0116e4d211 from acpica: SPCR: Update the SPCR table to version 4 The Microsoft Serial Port Console Redirection (SPCR) specification revision 1.09 comprises additional fields [1]. The newly added fields are: - RISC-V SBI - Precise Baud Rate - NamespaceStringLength - NamespaceStringOffset - NamespaceString Additionaly, this code will support up to SPCR revision 1.10, as it includes only minor wording changes. [1] https://learn.microsoft.com/en-us/windows-hardware/drivers/serports/serial-port-console-redirection-table Signed-off-by: Sia Jee Heng --- sys/contrib/dev/acpica/common/dmtbinfo3.c | 8 ++++++-- sys/contrib/dev/acpica/compiler/dttemplate.h | 8 +++++--- sys/contrib/dev/acpica/include/actbl3.h | 12 ++++++++---- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/sys/contrib/dev/acpica/common/dmtbinfo3.c b/sys/contrib/dev/acpica/common/dmtbinfo3.c index 702cdc0133b3..7a482ba0ffa9 100644 --- a/sys/contrib/dev/acpica/common/dmtbinfo3.c +++ b/sys/contrib/dev/acpica/common/dmtbinfo3.c @@ -255,7 +255,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoSpcr[] = {ACPI_DMT_UINT8, ACPI_SPCR_OFFSET (StopBits), "Stop Bits", 0}, {ACPI_DMT_UINT8, ACPI_SPCR_OFFSET (FlowControl), "Flow Control", 0}, {ACPI_DMT_UINT8, ACPI_SPCR_OFFSET (TerminalType), "Terminal Type", 0}, - {ACPI_DMT_UINT8, ACPI_SPCR_OFFSET (Reserved2), "Reserved", 0}, + {ACPI_DMT_UINT8, ACPI_SPCR_OFFSET (Language), "Language", 0}, {ACPI_DMT_UINT16, ACPI_SPCR_OFFSET (PciDeviceId), "PCI Device ID", 0}, {ACPI_DMT_UINT16, ACPI_SPCR_OFFSET (PciVendorId), "PCI Vendor ID", 0}, {ACPI_DMT_UINT8, ACPI_SPCR_OFFSET (PciBus), "PCI Bus", 0}, @@ -263,7 +263,11 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoSpcr[] = {ACPI_DMT_UINT8, ACPI_SPCR_OFFSET (PciFunction), "PCI Function", 0}, {ACPI_DMT_UINT32, ACPI_SPCR_OFFSET (PciFlags), "PCI Flags", 0}, {ACPI_DMT_UINT8, ACPI_SPCR_OFFSET (PciSegment), "PCI Segment", 0}, - {ACPI_DMT_UINT32, ACPI_SPCR_OFFSET (Reserved2), "Reserved", 0}, + {ACPI_DMT_UINT32, ACPI_SPCR_OFFSET (UartClkFreq), "Uart Clock Freq", 0}, + {ACPI_DMT_UINT32, ACPI_SPCR_OFFSET (PreciseBaudrate), "Precise Baud rate", 0}, + {ACPI_DMT_UINT16, ACPI_SPCR_OFFSET (NameSpaceStringLength), "NameSpaceStringLength", 0}, + {ACPI_DMT_UINT16, ACPI_SPCR_OFFSET (NameSpaceStringOffset), "NameSpaceStringOffset", 0}, + {ACPI_DMT_STRING, ACPI_SPCR_OFFSET (NameSpaceString), "NamespaceString", 0}, ACPI_DMT_TERMINATOR }; diff --git a/sys/contrib/dev/acpica/compiler/dttemplate.h b/sys/contrib/dev/acpica/compiler/dttemplate.h index c97a8ed24eee..1560f2008cfa 100644 --- a/sys/contrib/dev/acpica/compiler/dttemplate.h +++ b/sys/contrib/dev/acpica/compiler/dttemplate.h @@ -1956,8 +1956,8 @@ const unsigned char TemplateSlit[] = const unsigned char TemplateSpcr[] = { - 0x53,0x50,0x43,0x52,0x50,0x00,0x00,0x00, /* 00000000 "SPCRP..." */ - 0x01,0xE3,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ + 0x53,0x50,0x43,0x52,0x5A,0x00,0x00,0x00, /* 00000000 "SPCRZ..." */ + 0x04,0x4E,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ 0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45, /* 00000010 "TEMPLATE" */ 0x00,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ 0x28,0x05,0x10,0x20,0x00,0x00,0x00,0x00, /* 00000020 "(.. ...." */ @@ -1965,7 +1965,9 @@ const unsigned char TemplateSpcr[] = 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000030 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000038 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000040 "........" */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 /* 00000048 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000048 "........" */ + 0x00,0x00,0x00,0x00,0x02,0x00,0x58,0x00, /* 00000050 "......X." */ + 0x2E,0x00 /* 00000058 ".." */ }; const unsigned char TemplateSpmi[] = diff --git a/sys/contrib/dev/acpica/include/actbl3.h b/sys/contrib/dev/acpica/include/actbl3.h index 1438c1db507c..81a022544a4a 100644 --- a/sys/contrib/dev/acpica/include/actbl3.h +++ b/sys/contrib/dev/acpica/include/actbl3.h @@ -243,10 +243,10 @@ typedef struct acpi_table_slit /******************************************************************************* * * SPCR - Serial Port Console Redirection table - * Version 2 + * Version 4 * * Conforms to "Serial Port Console Redirection Table", - * Version 1.03, August 10, 2015 + * Version 1.10, Jan 5, 2023 * ******************************************************************************/ @@ -264,7 +264,7 @@ typedef struct acpi_table_spcr UINT8 StopBits; UINT8 FlowControl; UINT8 TerminalType; - UINT8 Reserved1; + UINT8 Language; UINT16 PciDeviceId; UINT16 PciVendorId; UINT8 PciBus; @@ -272,7 +272,11 @@ typedef struct acpi_table_spcr UINT8 PciFunction; UINT32 PciFlags; UINT8 PciSegment; - UINT32 Reserved2; + UINT32 UartClkFreq; + UINT32 PreciseBaudrate; + UINT16 NameSpaceStringLength; + UINT16 NameSpaceStringOffset; + char NameSpaceString[]; } ACPI_TABLE_SPCR; From nobody Fri Oct 11 18:07:01 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQF2F6z6Pz5ZCcb; Fri, 11 Oct 2024 18:07: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQF2F4Tqgz41W6; Fri, 11 Oct 2024 18:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728670021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nAW3beSqTZGMO2fnsRhndESWqOwhuX8iS85oIhN/aYk=; b=JnYy9uTv5NS/hpAdCIFa2J59ofN+xijKyDnsNmXCYi6rg1YdnUTxp5jumcDWkUJchV/H+r kYS2kx/YTswbPQLvLSpi1PjFMjyjrBZjXMJMJAZ7ObiOZ5EaDXhf3XdDzZvA3v0gpMeEpq 56swLM2RRREDg77JD4v59ZbhzmbJS9jYirYZQ3/k16VXNgQ42AF1LVOa57lmESlCpnXj2/ HNcV+c1dht8LIayRTZR3BdpgIJ4qUrwuVwIu326WHcA/35Ncd4rWlfYhYZ+tYjV+pBdmfY YrLuXdZZdSO1gFOag4m5eL/VFtl0Ec7DxeaojuZ3eCDlwLzRP53Lj4T9+PYfow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728670021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nAW3beSqTZGMO2fnsRhndESWqOwhuX8iS85oIhN/aYk=; b=hcHz5M1X9DdkvAbKMpkS5IwrzPAvUQ1Z89TwZdPvE9m4s9EJdOAg0PjmKGbOsa+dWN3Wgp L54cZutNQq8O47aCcUmbw3Vo2i15agBqhU1iBDvpufOPiuaOc0Oj8KffQCYUV9i5e2G0PA 6/CuEkmnQ4QqWwAHGwkyJgb1kZ1K69xeQ6VC8+C63J49D/6XEyAw0VOgCnxYBhMYRhg4oE BsCKnp3AqH55zG8Dh6mfFQrk08wLUrEw36mokiEXRqsZot3OZ0+VYRViD2eZmc0gOSSr4w 8o0d7QUPq3exxdaSWV1tXgdD1jq7ZbDK0XMOK1ziuhKtQHKhDn5N25KaU13yOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728670021; a=rsa-sha256; cv=none; b=ywAmz+Ogxhtzm7BZt/vVvX0Fl2TnyPyqEJGPhb4mkNMw2/O9F7mFbJUZl9CKHslaRkLgmf gMsji4v9sUQ6Iq6boLHTwDVBgM8nIn7aRbGnYYP6RGqYnaoVBy1eaqNBmcVe90W4kJ0ceP Ip5TkN0F6QDKC1EfEC+KHsaozl9X/MspMHNsb1z5BwcUou/pFt3ZuVFcyL9BBSYg6fjOKh zST5Tos+wxv7oANKB6SvDuyzTw2Hy/anUrDrMIyBeFrsj6rB/H4HKCO4jXkeUyLec8BHie sLMeEg07gKx7QmPKXjj7yhiC+ROUStNqPLEfFTEhgN+XuX3PXprWbIqZHUOSfA== 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 4XQF2F3wDDzrwf; Fri, 11 Oct 2024 18:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BI71xP011851; Fri, 11 Oct 2024 18:07:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BI71mf011848; Fri, 11 Oct 2024 18:07:01 GMT (envelope-from git) Date: Fri, 11 Oct 2024 18:07:01 GMT Message-Id: <202410111807.49BI71mf011848@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5d57fad876ee - main - acpidump: Print SPCR v3 and v4 fields List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d57fad876ee6b55761a7643f5b94e3d6d54e3e0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5d57fad876ee6b55761a7643f5b94e3d6d54e3e0 commit 5d57fad876ee6b55761a7643f5b94e3d6d54e3e0 Author: Warner Losh AuthorDate: 2024-10-11 17:51:57 +0000 Commit: Warner Losh CommitDate: 2024-10-11 18:06:33 +0000 acpidump: Print SPCR v3 and v4 fields This reapplies 593d7a1634b5 to implement printing of SPCR v3 and SPCR v4 fields after ACPI actble3.h update. ACPIca used different names and didn't do the weird nesting I did in the prior commit for better co-existance. Sponsored by: Netflix --- usr.sbin/acpi/acpidump/acpi.c | 143 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index fe68b5062351..4eb361a6f479 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -1257,6 +1257,7 @@ acpi_handle_tcpa(ACPI_TABLE_HEADER *sdp) printf(END_COMMENT); } + static void acpi_handle_tpm2(ACPI_TABLE_HEADER *sdp) { ACPI_TABLE_TPM2 *tpm2; @@ -1268,7 +1269,145 @@ static void acpi_handle_tpm2(ACPI_TABLE_HEADER *sdp) printf ("\t\tStartMethod=%x\n", tpm2->StartMethod); printf (END_COMMENT); } - + +static int spcr_xlate_baud(uint8_t r) +{ + static int rates[] = { 9600, 19200, -1, 57600, 115200 }; + _Static_assert(nitems(rates) == 7 - 3 + 1, "rates array size incorrect"); + + if (r == 0) + return (0); + + if (r < 3 || r > 7) + return (-1); + + return (rates[r - 3]); +} + +static const char *spcr_interface_type(int ift) +{ + static const char *if_names[] = { + [0x00] = "Fully 16550-compatible", + [0x01] = "16550 subset compatible with DBGP Revision 1", + [0x02] = "MAX311xE SPI UART", + [0x03] = "Arm PL011 UART", + [0x04] = "MSM8x60 (e.g. 8960)", + [0x05] = "Nvidia 16550", + [0x06] = "TI OMAP", + [0x07] = "Reserved (Do Not Use)", + [0x08] = "APM88xxxx", + [0x09] = "MSM8974", + [0x0a] = "SAM5250", + [0x0b] = "Intel USIF", + [0x0c] = "i.MX 6", + [0x0d] = "(deprecated) Arm SBSA (2.x only) Generic UART supporting only 32-bit accesses", + [0x0e] = "Arm SBSA Generic UART", + [0x0f] = "Arm DCC", + [0x10] = "BCM2835", + [0x11] = "SDM845 with clock rate of 1.8432 MHz", + [0x12] = "16550-compatible with parameters defined in Generic Address Structure", + [0x13] = "SDM845 with clock rate of 7.372 MHz", + [0x14] = "Intel LPSS", + [0x15] = "RISC-V SBI console (any supported SBI mechanism)", + }; + + if (ift >= (int)nitems(if_names) || if_names[ift] == NULL) + return ("Reserved"); + return (if_names[ift]); +} + +static const char *spcr_interrupt_type(int ift) +{ + static char buf[100]; + +#define APPEND(b,s) \ + if ((ift & (b)) != 0) { \ + if (strlen(buf) > 0) \ + strlcat(buf, ",", sizeof(buf)); \ + strlcat(buf, s, sizeof(buf)); \ + } + + *buf = '\0'; + APPEND(0x01, "PC/AT IRQ"); + APPEND(0x02, "I/O APIC"); + APPEND(0x04, "I/O SAPIC"); + APPEND(0x08, "ARMH GIC"); + APPEND(0x10, "RISC-V PLIC/APLIC"); + +#undef APPEND + + return (buf); +} + +static const char *spcr_terminal_type(int type) +{ + static const char *term_names[] = { + [0] = "VT100", + [1] = "Extended VT100", + [2] = "VT-UTF8", + [3] = "ANSI", + }; + + if (type >= (int)nitems(term_names) || term_names[type] == NULL) + return ("Reserved"); + return (term_names[type]); +} + +static void acpi_handle_spcr(ACPI_TABLE_HEADER *sdp) +{ + ACPI_TABLE_SPCR *spcr; + + printf (BEGIN_COMMENT); + acpi_print_sdt(sdp); + + /* Rev 1 and 2 are the same size */ + spcr = (ACPI_TABLE_SPCR *) sdp; + printf ("\tInterfaceType=%d (%s)\n", spcr->InterfaceType, + spcr_interface_type(spcr->InterfaceType)); + printf ("\tSerialPort="); + acpi_print_gas(&spcr->SerialPort); + printf ("\n\tInterruptType=%#x (%s)\n", spcr->InterruptType, + spcr_interrupt_type(spcr->InterruptType)); + printf ("\tPcInterrupt=%d (%s)\n", spcr->PcInterrupt, + (spcr->InterruptType & 0x1) ? "Valid" : "Invalid"); + printf ("\tInterrupt=%d\n", spcr->Interrupt); + printf ("\tBaudRate=%d (%d)\n", spcr_xlate_baud(spcr->BaudRate), spcr->BaudRate); + printf ("\tParity=%d\n", spcr->Parity); + printf ("\tStopBits=%d\n", spcr->StopBits); + printf ("\tFlowControl=%d\n", spcr->FlowControl); + printf ("\tTerminalType=%d (%s)\n", spcr->TerminalType, + spcr_terminal_type(spcr->TerminalType)); + printf ("\tPciDeviceId=%#04x\n", spcr->PciDeviceId); + printf ("\tPciVendorId=%#04x\n", spcr->PciVendorId); + printf ("\tPciBus=%d\n", spcr->PciBus); + printf ("\tPciDevice=%d\n", spcr->PciDevice); + printf ("\tPciFunction=%d\n", spcr->PciFunction); + printf ("\tPciFlags=%d\n", spcr->PciFlags); + printf ("\tPciSegment=%d\n", spcr->PciSegment); + + /* Rev 3 added UartClkFrequency */ + if (sdp->Revision >= 3) { + printf("\tLanguage=%d\n", spcr->Language); + printf("\tUartClkFreq=%jd", + (uintmax_t)spcr->UartClkFreq); + } + + /* Rev 4 added PreciseBaudrate and NameSpace* */ + if (sdp->Revision >= 4) { + printf("\tPreciseBaudrate=%jd", + (uintmax_t)spcr->PreciseBaudrate); + if (spcr->NameSpaceStringLength > 0 && + spcr->NameSpaceStringOffset >= sizeof(*spcr) && + sdp->Length >= spcr->NameSpaceStringOffset + + spcr->NameSpaceStringLength) { + printf ("\tNameSpaceString='%s'\n", + (char *)sdp + spcr->NameSpaceStringOffset); + } + } + + printf (END_COMMENT); +} + static const char * devscope_type2str(int type) { @@ -2468,6 +2607,8 @@ acpi_handle_rsdt(ACPI_TABLE_HEADER *rsdp) acpi_handle_lpit(sdp); else if (!memcmp(sdp->Signature, ACPI_SIG_TPM2, 4)) acpi_handle_tpm2(sdp); + else if (!memcmp(sdp->Signature, ACPI_SIG_SPCR, 4)) + acpi_handle_spcr(sdp); else { printf(BEGIN_COMMENT); acpi_print_sdt(sdp); From nobody Fri Oct 11 20:50:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQJfV0j9bz5ZP8v; Fri, 11 Oct 2024 20:50: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQJfV05cyz4HgM; Fri, 11 Oct 2024 20:50:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728679810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wGOXQI1XIIBasHFvEKWuhVf9Mg3M5NdqTHN9dvAARak=; b=CxJyid5D9YA7rDDiEraxLwO6hUQDlxnDPGecWUy+e/McISaUhW6cPc30NAkWJCN3UAnzN4 lzca4yymHwU7jE2Uo8rOn/xNS/pRxptuLkkyOGhSdFl4cLg3sKhr6b5Z+rZGRAYBzhbIMZ MNFJ/1zRNcRdiDuewqGXo8qtdYlp+61XtUbRSlgegyYWYokndyEEVmTiQeoixweg0s/hhZ iFpe7pdCMEdMagreXSQEodN9tJyMNOi4QiWmLDPsB0USDKf133R9+nfNbXlyDWDVpivX+J dWO/YAicYGIBk95SgjV/6CFTbERD5P0sdXjl7/mFXqUhBbD8fyJhVLS0Aiv3Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728679810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wGOXQI1XIIBasHFvEKWuhVf9Mg3M5NdqTHN9dvAARak=; b=f4MOdhF8umxT9JUbntMdsBpmspSE6jVFVyurpziIlZkwAIKxFyKUmogco8wN5Q5m1LfEBF 6aPezpfHm/X3t0XVIoIIysWjee4BFzDjiLoY9oLo37aQMNz8ICQOnzZ3oPVNsIiPn6OMyY OpygNIj2is9nDet5vULKfLKQkKirzFQzn4nbjm9Ph1xe5dRd/oAwUcx/KXTC0NfCTYujcY LellnOJ4PEvN0Vw9uGwuyYfWHQwdWTHjTAQtTo1TM2fthZosuLZLmefC9RSEfYaAMdFsDy E+2p6fK+LUmE9c3i5ewv4H8Vs2XXENbunIUIclpRIAe3COv9lCrgf05hudx2AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728679810; a=rsa-sha256; cv=none; b=GhDnt6ZfAfqfAA/XErp4UqNRGMeHcMLlvm4nTgTYMWEJ+eUc3ACaNFeQ8D/yxF0m55gfyj k+gAqt9UmHtgl1G7x/XF9WqYjI+bVr6u4RqXoux5uuWr0k0oOuWB85Nz5JTybr6M+ZHWW1 FCDyW77R2i8hpHds7ko3vZ1E7n785zDzvfSMuf4NDtHRB3fwb436W9wiAlChnS3urqVnvp a0VR4LChGo5TFQ94PGua/nUHhjE3uigqpN4EyDQbbzQK6AMO1gCh8wRaBcml9ZH2Da8if5 Q0JzB5KHrXkBi7QQgQDxPkjy5nj0/7AaR0AYIvAiUVhxptihZJfhz463a+k54A== 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 4XQJfT6pZczwkc; Fri, 11 Oct 2024 20:50:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BKo9T1086154; Fri, 11 Oct 2024 20:50:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BKo9HB086145; Fri, 11 Oct 2024 20:50:09 GMT (envelope-from git) Date: Fri, 11 Oct 2024 20:50:09 GMT Message-Id: <202410112050.49BKo9HB086145@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8f9567628cb2 - main - LinuxKPI: add time_is_before_jiffies() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f9567628cb2ccb335640c4bb044df2ebf45d83a Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8f9567628cb2ccb335640c4bb044df2ebf45d83a commit 8f9567628cb2ccb335640c4bb044df2ebf45d83a Author: Bjoern A. Zeeb AuthorDate: 2024-09-28 22:32:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-10-11 20:48:58 +0000 LinuxKPI: add time_is_before_jiffies() Add time_is_before_jiffies() as needed by iwlwifi from v6.11. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D46841 --- sys/compat/linuxkpi/common/include/linux/jiffies.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linuxkpi/common/include/linux/jiffies.h b/sys/compat/linuxkpi/common/include/linux/jiffies.h index d5cb6e14860e..bd05a0db0767 100644 --- a/sys/compat/linuxkpi/common/include/linux/jiffies.h +++ b/sys/compat/linuxkpi/common/include/linux/jiffies.h @@ -52,6 +52,7 @@ (time_after_eq(a,b) && time_before_eq(a,c)) #define time_is_after_eq_jiffies(a) time_after_eq(a, jiffies) #define time_is_after_jiffies(a) time_after(a, jiffies) +#define time_is_before_jiffies(a) time_before(a, jiffies) #define HZ hz From nobody Fri Oct 11 20:51:24 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQJgw5MNXz5ZP94; Fri, 11 Oct 2024 20:51: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQJgw4tnKz4JCm; Fri, 11 Oct 2024 20:51:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728679884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=731mremlgxjlGYTvusKHLqqXshtrrZr+m9gBFjTyHLg=; b=Mu1P4D4IVfqOzjZSgpFDTgr9Kklrh5/LgJnNxLZZWP8BEHFkC1LefPK2dft8cZwRLatvzt fuV+hLh2paBsZDFjpfZJX8upYwrYSxXucWmzHE/Yk8LsDuZJZl+Ij9bav4m++X6mbyh4Ot tsebpyqXnAnMaaQyGBnT+s21pZuh2+R7K/pn0Nl7+o6T9cTJY8d+GQ0dluKYnb0EBttGsV nQFdW0k/nxOFm/U+04AbvhgtS0kzh13Bt6kuzZEGQxCWq6/eWpnAntF/4gkokslMUOJv8Z IW6bZy7VYuD89hwvmuhixL9KwsBqMOaxFGlCTLDbgPJqEYlMMNoRlMEaS1omJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728679884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=731mremlgxjlGYTvusKHLqqXshtrrZr+m9gBFjTyHLg=; b=rAc8nAGi71t8mduG4wGPHAl+hHEYwmPsR07nU5Fkm6yjY1KsYLXqM+wy71oJub0f9MN6g9 w0N99/lForAxE2t2J82dPP3bf5i5KI3F9+cUgWQX0p1YKtSXpfBv6FL5NDZ0Xsxi73EU0w rO2p4kHtJgAQz81g870mjIT2m47hEpYb47GCOnRwzZiWKnbJbSldtEJqk9/QeL2bzOzIFL F5b9SSjlwrNMDVg4kgCKUjpgvd2ehie6ix7HX5pkHm4rdNROuVvPVkamYEq2iz/mvrCl0T 2C+WLlc/u+KTkaysMTEHxkNLp50gwTx2g7JplKEaKcoqWI7szTbcxIkmejWcVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728679884; a=rsa-sha256; cv=none; b=N9G2swW9HmUWYPpKwaAXGagj+MbMf5rBgfSfhRjRmmvhNVWnBpXb82qmPlP8R4pYiZzHNs wLcERp/eQvTxS8vt6Kne3EtomzGcc1LrjBTKI6pnrksE+DzkX7w5z5wilA0yFhdXLh0bZ0 sc2t+ce8K5B+bOtlN1zhcGmSOK+xpBXCXcNdifhEKU5mXyGyKFySc2a969s5IClVEXOEGg 5Xy1vJLP0E0kHRmypx1io/irGj0A7JwafLjwYaMSYuekh/GekCiSbs5q6KFOyioOXyLwJ+ 8Afp+qS43mxPO/FcIrJTvIHrHU9/T/2xuKOCck8yqj/syzLi1RIezVxWASjd5Q== 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 4XQJgw4V7pzwyd; Fri, 11 Oct 2024 20:51:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BKpOkp091944; Fri, 11 Oct 2024 20:51:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BKpOsk091941; Fri, 11 Oct 2024 20:51:24 GMT (envelope-from git) Date: Fri, 11 Oct 2024 20:51:24 GMT Message-Id: <202410112051.49BKpOsk091941@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 41283b454b7a - main - LinuxKPI: always include linux/kconfig.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41283b454b7abd3de251ec8234d19b67dbca3916 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=41283b454b7abd3de251ec8234d19b67dbca3916 commit 41283b454b7abd3de251ec8234d19b67dbca3916 Author: Bjoern A. Zeeb AuthorDate: 2024-09-26 21:36:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-10-11 20:50:27 +0000 LinuxKPI: always include linux/kconfig.h Always include linux/kconfig.h which seems to match Linux behaviour and avoid errors compiling code expected from that file but never included. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: emaste, imp Differential Revision: https://reviews.freebsd.org/D46801 --- sys/conf/kern.pre.mk | 3 ++- sys/conf/kmod.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index c676418aca93..50a81a29d18d 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -324,7 +324,8 @@ NORMAL_CTFCONVERT= @: # Linux Kernel Programming Interface C-flags LINUXKPI_INCLUDES= -I$S/compat/linuxkpi/common/include \ - -I$S/compat/linuxkpi/dummy/include + -I$S/compat/linuxkpi/dummy/include \ + -include $S/compat/linuxkpi/common/include/linux/kconfig.h LINUXKPI_C= ${NORMAL_C} ${LINUXKPI_INCLUDES} # Infiniband C flags. Correct include paths and omit errors that linux diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 4dc66c69d67b..03bf42f5b413 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -109,7 +109,8 @@ LINUXKPI_GENSRCS+= \ LINUXKPI_INCLUDES+= \ -I${SYSDIR}/compat/linuxkpi/common/include \ - -I${SYSDIR}/compat/linuxkpi/dummy/include + -I${SYSDIR}/compat/linuxkpi/dummy/include \ + -include ${SYSDIR}/compat/linuxkpi/common/include/linux/kconfig.h CFLAGS+= ${WERROR} CFLAGS+= -D_KERNEL From nobody Fri Oct 11 20:54:33 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQJlZ1dQFz5ZP80; Fri, 11 Oct 2024 20:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQJlZ10YBz4JLg; Fri, 11 Oct 2024 20:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728680074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HyEymE5GAlRSrnQHrBDHysy4SCxEwkhBgOg4jDacYsQ=; b=NssbteV7mtXryQFXUfC+/678xV8H3Etuerc+yBYo7COCiWogWvY5WLcV9yYrtoBNZpiiT5 TxouNghAMGDupSk2QUi5c2P5KtueaBoMT6il5iMFajXbkaCEBWV4ycPTh8kvqOEP/7VR/g 4HUqIPK1UXelmaol6MseLpQ8UvNspy1kIK2F8PHLpkcCVOf7vapWJ3jP5q2pJXAbxrZF6L U5bVxz3e0IkPGCWpTpNgpRPE7IwYFAjfA5Hu/zy0Dhnk1b3EmE7zYpfaDQd7RFaW+oYFFS QQfkCcpMkSGl54rNZZK1R3sJVM/U6oIG9FII3/UXUwDcq50ep/b8f/8A3GGBNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728680074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HyEymE5GAlRSrnQHrBDHysy4SCxEwkhBgOg4jDacYsQ=; b=gi6PfSb8Co+/BpgPcYkbUCQ1IjJ63DunWuhkpAgRP4QZvyEx6o6PSDAneIYAmiHfIl6dni smIrbYet2xiaLk4sv44qr8Mvrro3ngplGnCzLV3jLQEygEP59rhaWpo1qt47ktnYDISCUy vwyqCt0644ZWxt4/FsrNHdl943iO273nudM2Rl3v5ed9/4YC1iHB82sMFrjR+9pQ9+iMa7 er91MJ3t0sW53QqnDC1t1bxwVBTh9/G5rhGbm39sVFjmGlGz8gsEG4RewslTbMOaQSEShd S0FK/ylDw8UtPtDGbwQiu1ODQKswY/e8X6qRO+sznocI5J/dme36vyRxs8lTSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728680074; a=rsa-sha256; cv=none; b=QNsBb8xGTSXoPwKOKc/OYJUwaEoIlzf7tAhM7XrJKWyiA9hT6CPsnmaSFZlsyiLYDnDTF3 KaH1nni7IQb3b1OYMZOq5IalzoFDgwlvrkvAIc65pAFAy6irzJT+Yq16EjVRMDglicGOko PvGvSziIUkoBVjTvHHd9iEn6yxk3YCb0z/BWpfz69AvATzGtVHXooDybBvRxdT8owG1+vu U+2FKosied2mrY1iH04edk612shLzwV7Ry6/Jzu5V/dA0Uax/TApJ/4InbycyNubA2FrjQ X/HcBQYn6Az4KaQVA+my90ko/NjPD49X6CB+lKpYQj6AdLZmF7RHmItVPK3GBw== 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 4XQJlZ08nVzx04; Fri, 11 Oct 2024 20:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BKsXip098506; Fri, 11 Oct 2024 20:54:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BKsX1j098503; Fri, 11 Oct 2024 20:54:33 GMT (envelope-from git) Date: Fri, 11 Oct 2024 20:54:33 GMT Message-Id: <202410112054.49BKsX1j098503@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 5dbb0b7c19cf - main - man.4: Add .Sh HARDWARE for some wireless drivers for release notes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5dbb0b7c19cf40ab6562c03396d245cf3a7374fe Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5dbb0b7c19cf40ab6562c03396d245cf3a7374fe commit 5dbb0b7c19cf40ab6562c03396d245cf3a7374fe Author: Bjoern A. Zeeb AuthorDate: 2024-09-30 20:01:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-10-11 20:52:32 +0000 man.4: Add .Sh HARDWARE for some wireless drivers for release notes iwlwifi.4 and rtw88.4 did not show up in the hardware list in the release notes for 13.4. The doc/website/tools/hardware-notes-processor.rb script parses the .Sh HARDWARE section to automagically create a note once the manual page is listed in the website/archetypes/release/hardware.adoc file. While here update the other committed man pages not yet connected to the build. Reported by: re (cperciva), grahamperrin Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: concussious.bugzilla_runbox.com (Alexander Ziaee) Differential Revision: https://reviews.freebsd.org/D46851 --- share/man/man4/ath10k.4 | 31 ++++++++++++----------- share/man/man4/iwlwifi.4 | 65 +++++++++++++++++++++++++----------------------- share/man/man4/mt7915.4 | 19 ++++++++------ share/man/man4/mt7921.4 | 19 ++++++++------ share/man/man4/rtw88.4 | 25 +++++++++++-------- 5 files changed, 87 insertions(+), 72 deletions(-) diff --git a/share/man/man4/ath10k.4 b/share/man/man4/ath10k.4 index 61c44543815f..4e23382e2450 100644 --- a/share/man/man4/ath10k.4 +++ b/share/man/man4/ath10k.4 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2022 Bjoern A. Zeeb +.\" Copyright (c) 2022-2024 Bjoern A. Zeeb .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 22, 2023 +.Dd September 30, 2024 .Dt ATH10K 4 .Os .Sh NAME @@ -47,18 +47,7 @@ It is discouraged to load the driver from .Sh DESCRIPTION The .Nm -driver is derived from Qualcomm Atheros' Linux ath10k driver and -provides support for the following PCI chipsets: -.Pp -.Bl -tag -width Ds -offset indent -compact -.It QCA6174 -.It QCA9377 -.It QCA9887 -.It QCA9888 -.It QCA988X -.It QCA9984 -.It QCA99X0 -.El +driver is derived from Qualcomm Atheros' Linux ath10k driver .Pp This driver requires firmware to be loaded before it will work. The package @@ -87,6 +76,20 @@ While supports all 802.11 a/b/g/n and ac the compatibility code currently only supports 802.11 a/b/g modes. Support for 802.11 n/ac is to come. +.Sh HARDWARE +The +.Nm +driver supports PCIe devices with the following chipsets: +.Pp +.Bl -tag -width Ds -offset indent -compact +.It QCA6174 +.It QCA9377 +.It QCA9887 +.It QCA9888 +.It QCA988X +.It QCA9984 +.It QCA99X0 +.El .Sh SEE ALSO .Xr wlan 4 , .Xr ifconfig 8 , diff --git a/share/man/man4/iwlwifi.4 b/share/man/man4/iwlwifi.4 index 1cf61c0008b5..ddeeb549d0f4 100644 --- a/share/man/man4/iwlwifi.4 +++ b/share/man/man4/iwlwifi.4 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2021-2023 The FreeBSD Foundation +.\" Copyright (c) 2021-2024 The FreeBSD Foundation .\" .\" This documentation was written by Bj\xc3\xb6rn Zeeb under sponsorship from .\" the FreeBSD Foundation. @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 21, 2023 +.Dd September 30, 2024 .Dt IWLWIFI 4 .Os .Sh NAME @@ -54,10 +54,39 @@ It is discouraged to load the driver from .Sh DESCRIPTION The .Nm -driver is derived from Intel's Linux iwlwifi driver and provides support for -all chipsets supported by the +driver is derived from Intel's Linux iwlwifi driver +.Pp +.Nm +will be a successor to +.Xr iwm 4 +and may supersede that driver in the future. +It still complements the +.Xr iwn 4 +driver which supports older chipsets. +.Pp +The driver uses the +.\" No LinuxKPI man pages so no .Xr here. +.Em linuxkpi_wlan +and +.Em linuxkpi +compat framework to bridge between the Linux and +native +.Fx +driver code as well as to the native +.Xr net80211 4 +wireless stack. +.Pp +While +.Nm +supports all 802.11 a/b/g/n/ac/ax +the compatibility code currently only supports 802.11 a/b/g modes. +Support for 802.11 n/ac is to come. 802.11ax and 6Ghz support are planned. +.Sh HARDWARE +The +.Nm +driver supports PCIe devices from the .Em mvm -part of that driver. +sub-driver with the following chipsets: .Pp .Bl -bullet -compact .\" --------------------------------------------------------------------- @@ -182,32 +211,6 @@ Intel(R) Wi-Fi 6 AX204 160MHz Intel(R) TBD Sc device .\" --------------------------------------------------------------------- .El -.Pp -.Nm -will be a successor to -.Xr iwm 4 -and may supersede that driver in the future. -It still complements the -.Xr iwn 4 -driver which supports older chipsets. -.Pp -The driver uses the -.\" No LinuxKPI man pages so no .Xr here. -.Em linuxkpi_wlan -and -.Em linuxkpi -compat framework to bridge between the Linux and -native -.Fx -driver code as well as to the native -.Xr net80211 4 -wireless stack. -.Pp -While -.Nm -supports all 802.11 a/b/g/n/ac/ax -the compatibility code currently only supports 802.11 a/b/g modes. -Support for 802.11 n/ac is to come. 802.11ax and 6Ghz support are planned. .Sh BUGS Certainly. .Sh SEE ALSO diff --git a/share/man/man4/mt7915.4 b/share/man/man4/mt7915.4 index fa5fd626d870..eece142c11a5 100644 --- a/share/man/man4/mt7915.4 +++ b/share/man/man4/mt7915.4 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2023 Bjoern A. Zeeb +.\" Copyright (c) 2023-2024 Bjoern A. Zeeb .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 18, 2023 +.Dd September 30, 2024 .Dt MT7915 4 .Os .Sh NAME @@ -50,12 +50,7 @@ It is discouraged to load the driver from .Sh DESCRIPTION The .Nm -driver is derived from MediaTek's Linux mt76 driver and provides support for -the following chipsets: -.Pp -.Bl -tag -width Ds -offset indent -compact -.It MediaTek MT7915E (PCIe) -.El +driver is derived from MediaTek's Linux mt76 driver. .Pp This driver requires firmware to be loaded before it will work. The package @@ -85,6 +80,14 @@ While supports all 802.11 a/b/g/n/ac and ax the compatibility code currently only supports 802.11 a/b/g modes. Support for 802.11 n/ac is to come. +.Sh HARDWARE +The +.Nm +driver supports PCIe devices with the following chipsets: +.Pp +.Bl -tag -width Ds -offset indent -compact +.It MediaTek MT7915E +.El .Sh BUGS Certainly. .Sh SEE ALSO diff --git a/share/man/man4/mt7921.4 b/share/man/man4/mt7921.4 index 460c90ece808..d28dc520de6b 100644 --- a/share/man/man4/mt7921.4 +++ b/share/man/man4/mt7921.4 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2023 Bjoern A. Zeeb +.\" Copyright (c) 2023-2024 Bjoern A. Zeeb .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 18, 2023 +.Dd September 30, 2024 .Dt MT7921 4 .Os .Sh NAME @@ -50,12 +50,7 @@ It is discouraged to load the driver from .Sh DESCRIPTION The .Nm -driver is derived from MediaTek's Linux mt76 driver and provides support for -the following chipsets: -.Pp -.Bl -tag -width Ds -offset indent -compact -.It MediaTek MT7921E (PCIe) -.El +driver is derived from MediaTek's Linux mt76 driver. .Pp This driver requires firmware to be loaded before it will work. The package @@ -85,6 +80,14 @@ While supports all 802.11 a/b/g/n/ac and ax the compatibility code currently only supports 802.11 a/b/g modes. Support for 802.11 n/ac is to come. +.Sh HARDWARE +The +.Nm +driver supports PCIe devices with the following chipsets: +.Pp +.Bl -tag -width Ds -offset indent -compact +.It MediaTek MT7921E +.El .Sh BUGS Certainly. .Sh SEE ALSO diff --git a/share/man/man4/rtw88.4 b/share/man/man4/rtw88.4 index a1a74db41b42..898f57beabd8 100644 --- a/share/man/man4/rtw88.4 +++ b/share/man/man4/rtw88.4 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2022 Bjoern A. Zeeb +.\" Copyright (c) 2022-2024 Bjoern A. Zeeb .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 06, 2023 +.Dd September 30, 2024 .Dt RTW88 4 .Os .Sh NAME @@ -47,15 +47,7 @@ It is discouraged to load the driver from .Sh DESCRIPTION The .Nm -driver is derived from Realtek's Linux rtw88 driver and provides support for -the following chipsets: -.Pp -.Bl -tag -width Ds -offset indent -compact -.It Realtek 802.11n wireless 8723de (RTL8723DE) -.It Realtek 802.11ac wireless 8821ce (RTL8821CE) -.It Realtek 802.11ac wireless 8822be (RTL8822BE) -.It Realtek 802.11ac wireless 8822ce (RTL8822CE) -.El +driver is derived from Realtek's Linux rtw88 driver. .Pp This driver requires firmware to be loaded before it will work. The package @@ -101,6 +93,17 @@ This tunable will work around a problem with DMA and limit allocations for network buffer memory to the lower 32bit of physical memory and make the driver work. .El +.Sh HARDWARE +The +.Nm +driver supports PCIe devices with the following chipsets: +.Pp +.Bl -tag -width Ds -offset indent -compact +.It Realtek 802.11n wireless 8723de (RTL8723DE) +.It Realtek 802.11ac wireless 8821ce (RTL8821CE) +.It Realtek 802.11ac wireless 8822be (RTL8822BE) +.It Realtek 802.11ac wireless 8822ce (RTL8822CE) +.El .Sh BUGS Certainly. .Pp From nobody Fri Oct 11 20:59:41 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQJsT2zqDz5ZPf6; Fri, 11 Oct 2024 20:59: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQJsT2RGDz4Jqp; Fri, 11 Oct 2024 20:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728680381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VcZpiOm3bgbupgg0YZjAMx6sPSSFRGXWsSaEamsh4wk=; b=FEjnW4UYdRcx4uubNt3Qf5+t1ei9bb7nbdz534uSMjG47ZRxaWIyeTk6zeH2GU4F8vaHnl rWxDN4svb9lxeEKZwQNH4DUTXZN3mXB/FcT6g3BnUXC3ClMdO4ZSyY36SywTgapxPZmMBx 3vHseP54XcmjtztmXi8voIjRLFMUYlfz4o0t9zNl+oMskTHSkvkNb9ajm1m+K/mBTlwt8B GSuKRdSzM+6p2GlpZaqqxQOYRL3CHlOF3SsRI1VsQeGKGOlgsBQaQ1yroOTe/iNKooSxcZ FVfbQgR5C9y1Zuj3E8vdaSy4EKiQgbFo4MGwJkmufTjzCbEfl976QJ+6WRfQuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728680381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VcZpiOm3bgbupgg0YZjAMx6sPSSFRGXWsSaEamsh4wk=; b=Sh9c7AYfJuCfVAScypcFd6Z92yfPMifxoq0gHY28eF9wZBcIbQoj+RxUGJfcGQcFcdC/nm 2W26L+Uzk/F+0X5p4t+FvwyYQUBNXqcgljmsQUnjLyoYxgyii/1aQa/U0tUaZ/SHcObqv8 tjXdXsTpxmadpXg2xSzzkrXGol2Tpw8Bv334ozfrwO6MJqlsCL4PLNy4qIHx+6y5GeVxnh CH69RR2xCv8c79cHKeuumUgotcYy+PGwVFX3bder/492d35+KZZ2TAeyMWAJtnkq/rPk7N CxqT78pIe8e1mejDmyU+4dcRjyUuKL53V7rqmycSCVCpQTKHvVaBOULpClcCAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728680381; a=rsa-sha256; cv=none; b=NCht1KQd+QPXkySsNTwlvxIsqMKoz2GTh+hfrEmhfXkM0NIpQs7rl+6m4Gnr7XIedsH3mU xuUg1OubUxfp1KrbYTYU5Y9sFlxoWS1ip2OiY/ZFlnfHGzLgxblchaL5XA5dTXTc4PD3Fa kT6W13sx0J/KzlZoTocRvHaA+qYSVdGT7hX2ILdKszbmLSegYJ/OZiw2LuBuBne1tUQFPQ 7x4+/hrTEt5EwTkGcJVFIhEiJsLVkWbp74D60czM0I/VbpF5G1nDh6wMfdzvJKwJeexkw+ OCX+sqSYYVc4XkwIUkNSEippcGUremfw19dvp7V+J7dAfCSS+Ut3XGZ7TvPu6g== 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 4XQJsT1ryhzxZw; Fri, 11 Oct 2024 20:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BKxfpm099392; Fri, 11 Oct 2024 20:59:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BKxfmx099389; Fri, 11 Oct 2024 20:59:41 GMT (envelope-from git) Date: Fri, 11 Oct 2024 20:59:41 GMT Message-Id: <202410112059.49BKxfmx099389@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6621842ccfb4 - main - LinuxKPI: add new dummy headers visibility.h and of_net.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6621842ccfb4dd01470e9085697b553d10634eb0 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6621842ccfb4dd01470e9085697b553d10634eb0 commit 6621842ccfb4dd01470e9085697b553d10634eb0 Author: Bjoern A. Zeeb AuthorDate: 2024-09-28 22:35:56 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-10-11 20:58:35 +0000 LinuxKPI: add new dummy headers visibility.h and of_net.h Those files are required by updated wireless drivers. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/dummy/include/kunit/visibility.h | 0 sys/compat/linuxkpi/dummy/include/linux/of_net.h | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/sys/compat/linuxkpi/dummy/include/kunit/visibility.h b/sys/compat/linuxkpi/dummy/include/kunit/visibility.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys/compat/linuxkpi/dummy/include/linux/of_net.h b/sys/compat/linuxkpi/dummy/include/linux/of_net.h new file mode 100644 index 000000000000..e69de29bb2d1 From nobody Fri Oct 11 21:16:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQKF80vPsz5ZQpN; Fri, 11 Oct 2024 21:16: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQKF76ZWdz4LGh; Fri, 11 Oct 2024 21:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728681403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yld7pz2054IS1N7GOzWTpIoVmgiomVCjdwV02a7bGYo=; b=IZoAeaeTSnbIhK/310v7e4u0Hf97T+x0TTaF1UeCBquXIxVrWMXQ+H9MYDMLqU0fQgSbam PCoRPbkznKktLDUVuG6OIgt8uQEXXP03s2o5GCjAJZInwiwW9BqcawgFEqz8wDbNsqfr15 Wxmoc9LmdL0ozYf7UAxIMfORxYgvqEHHFpgQgYfZZPX1RyKzpYnFtXCjpqw/MrJXk66Z9I WMFuW/2fxNRWortUtoPT6pFyw5BKKhxHuo4AijAgCcFlvnD7D+JY+EIVcUFL1JZxjRHPGR ftO1wnm5bvUUZynWtgBC9iGe9YgZF+bg/LZvzxWa7ACo0ziw6BPLY2TsyAGGkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728681403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yld7pz2054IS1N7GOzWTpIoVmgiomVCjdwV02a7bGYo=; b=qTGodauXx2nbYwro1iydmk/xmf2keDrr0WBYmtIKqzt9CemcrZ21anlBtjRsG6LndTD27l hXje2+RkD8FoHroMhUO+l3z+n7vPTtRkMDdlphj/2GVBzr0D10kT5KLqeku60O2TJS/sZI b1ADkucTvBH/1BKsrTjr+yR/E8tqpacXpHEQ66M3/yV1eE4RcGR9Cl628pww5gTCd68UvE G9+nzhhnlZix1wuYO/R9gAj+CXMzuDkRbBnxVnP3oLTmQiPikzA5gi7FQpBASO8/IFAU4C uvKMytyQ2+OkLrOKj/emcwDrkaKsl5A+TokkGjbnJAV7f+K3b0ysicZStG1YvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728681403; a=rsa-sha256; cv=none; b=DVu6DO2DQ8mZKL9hDG1XZihZMNV2afjPtyFvolf8vjhPJu8kEPr4sjtYIHWkDP85RUEL56 sx0tgSSlsMA4enAusj38Y1NDB98C7dnrVVmlMRmP5ZfdZWsVhYg3U8LyZvx+A//IH06VjL lAqJNNSeg1Dcyr5uomHMtLEYtI/z08oclnCSikWOe+bzxhO3CRtIx6E4pbjfByMrHuMQEw gA+AwQXNNYAg3j+5yD9+tykIA++3ZNM1InS9/aP+YjjYTrUMTC968CvjmRnOtOO4OLdRgr WreFZOiJQfrODwNVB7RBrcwnCV/W9cltBnOCG5bR+mciBEO3mYNtJ9dseVSC1g== 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 4XQKF7631DzxrS; Fri, 11 Oct 2024 21:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BLGhYk033967; Fri, 11 Oct 2024 21:16:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BLGhAm033964; Fri, 11 Oct 2024 21:16:43 GMT (envelope-from git) Date: Fri, 11 Oct 2024 21:16:43 GMT Message-Id: <202410112116.49BLGhAm033964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 87b759f0fa1f - main - Add targets/pseudo/bootstrap-packages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87b759f0fa1f7554d50ce640c40138512bbded44 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=87b759f0fa1f7554d50ce640c40138512bbded44 commit 87b759f0fa1f7554d50ce640c40138512bbded44 Author: Simon J. Gerraty AuthorDate: 2024-10-11 21:15:47 +0000 Commit: Simon J. Gerraty CommitDate: 2024-10-11 21:15:47 +0000 Add targets/pseudo/bootstrap-packages Try to compensate for the lack any origin for a DIRDEPS build. bootstrap-packages will extract the PACKAGE lines from the tree's Makefiles and use them to populate targets/packages/Makefile.depend and targets/packages/*/Makefile.depend so we can at least try to keep the Makefile.depend files throughout the tree up to date. This is far from ideal, as we cannot (easily) take into account options that affect the contents of various packages. Reviewed by: stevek Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D47065 --- targets/pseudo/bootstrap-packages/Makefile | 23 ++++++ .../bootstrap-packages/bootstrap-packages.sh | 96 ++++++++++++++++++++++ 2 files changed, 119 insertions(+) diff --git a/targets/pseudo/bootstrap-packages/Makefile b/targets/pseudo/bootstrap-packages/Makefile new file mode 100644 index 000000000000..6523e88f84db --- /dev/null +++ b/targets/pseudo/bootstrap-packages/Makefile @@ -0,0 +1,23 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Compensate (a bit) for the lack of per package makefiles or other means +# of knowing what goes in each package in the base system. +# We can derive some of the information we want from the makefiles that +# set PACKAGE. + +all: +.if ${.MAKE.LEVEL} > 0 +all: packages +.endif + +PACKAGES?= ${.CURDIR:H:H}/packages + +packages: package-makefile.list + @${.CURDIR}/bootstrap-packages.sh PACKAGES=${PACKAGES} ${.ALLSRC} + +package-makefile.list: + @(cd ${SRCTOP} && \ + find ${TOPS:U*bin etc lib*} -name 'Makefile' | \ + xargs grep '^PACKAGE[[:space:]]*=' ) | \ + sed 's/[[:space:]]*=[[:space:]]*/=/' > ${.TARGET} + diff --git a/targets/pseudo/bootstrap-packages/bootstrap-packages.sh b/targets/pseudo/bootstrap-packages/bootstrap-packages.sh new file mode 100755 index 000000000000..a2fe250d68a3 --- /dev/null +++ b/targets/pseudo/bootstrap-packages/bootstrap-packages.sh @@ -0,0 +1,96 @@ +#!/bin/sh + +# SPDX-License-Identifier: BSD-2-Clause + +# Our input is the output of something like: +# +# (cd ${SRCTOP} && +# find *bin etc lib* -name Makefile | +# xargs grep '^PACKAGE[[:space:]]*=' ) +# +# With some cleanup and looks like: +# +# usr.bin/ofed/libibverbs/Makefile:PACKAGE=FreeBSD-rdma +# usr.bin/last/Makefile:PACKAGE=acct +# usr.bin/lastcomm/Makefile:PACKAGE=acct +# usr.bin/users/Makefile:PACKAGE=acct +# usr.bin/who/Makefile:PACKAGE=acct +# usr.sbin/ac/Makefile:PACKAGE=acct +# usr.sbin/accton/Makefile:PACKAGE=acct +# usr.sbin/lastlogin/Makefile:PACKAGE=acct +# .. +# +# which we use to populate $PACKAGES/*/Makefile.depend +# and $PACKAGES/Makefile.depend to make it easier to keep +# Makefile.depend files throughout the tree up-to-date. +# +# The result is not ideal, as we do not (yet) take into account all +# the MK_* knobs that can impact DIRDEPS. +# + +Mydir=`dirname $0` + +while : +do + case "$1" in + *=*) eval "$1"; shift;; + *) break;; + esac +done + +to_reldir() { + sed "s,$SRCTOP/,," +} + +SRCTOP=${SRCTOP:-$(realpath $Mydir/../../..)} +PACKAGES=${PACKAGES:-$(realpath $Mydir/../..)} +case "$PACKAGES" in +/*) ;; +*) PACKAGES=$SRCTOP/$PACKAGES;; +esac + +script_name=$(realpath $0 | to_reldir) + +start_depend() { + depfile=$1 + + mkdir -p ${depfile%/*} + cat < $depfile +# Generated by $script_name + +DIRDEPS= \\ +EOF +} + +end_depend() { + depfile=$1 + + cat <> $depfile + +.include +EOF +} + +start_depend $PACKAGES/Makefile.depend || exit 1 +sort -t= -k2 "$@" | sed 's,/Makefile:PACKAGE=, ,' | +( + lpackage= + while read reldir package + do + case "$package" in \ + lib?{LIB}) package=${reldir##*/};; + lib?{LIB:tl}) package=`echo ${reldir##*/} | tr 'A-Z' 'a-z'`;; + esac + if test "$package" != "$lpackage"; then \ + test -z "$lpackage" || end_depend $ddeps + target=$PACKAGES/$package + ddeps=$target/Makefile.depend + start_depend $ddeps + lpackage=$package + echo " $target \\" + fi + echo " $reldir \\" >> $ddeps + done + end_depend $ddeps +) | to_reldir >> $PACKAGES/Makefile.depend +end_depend $PACKAGES/Makefile.depend From nobody Fri Oct 11 21:17:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQKGY1js5z5ZQly; Fri, 11 Oct 2024 21:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQKGY1BQlz4LpB; Fri, 11 Oct 2024 21:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728681477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F0/e7PlL4NIiH8IEo1o+OKqOs9U3TB6CoDVeSztT0J4=; b=EBpAqy+kr4qUjV/3HyT57oVlonNVTKgtmCG6ajzRoaGaeP68sobXoKEdyl1ohBmcI0wX1d CI8wCXUXYQMQB0DyBkDeIR516vbpcMgr+xZe3AqKU1JXybFCPWsDqFJ4Iv4pRscRY7gP4Q XhXo7yTay//qRDUbMxy+rvMqL9DHNAd5YxzR6xHme7z5m5/i9mUkKMVOdGNEOaXE/6ZBo9 TELOZErsXRUJgTAeWcLpdg2OWdfhZPNGkUOB9bIO9LQZiRCTSZEiZcGAUrLNUMGl5/N4YC 4nvpSw7hdhlNCgTPOlztuKVcoSDXTZqkui0oqpF9mRvTVZCJXPrNW525QGOCBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728681477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F0/e7PlL4NIiH8IEo1o+OKqOs9U3TB6CoDVeSztT0J4=; b=XZiIG2vQ90rzIzuYVSbnYjofqd4WQrVUKTauhz78pe2C5EaXgLPhJSSHkVKi5TFB2EBHVd sb2H1ub7Zz9O5rG065E8iWhBURRw9qmNYf8RQjW1qtMRCyYAf7lcXVs7QGhkUryYI7I1xM tKX0nifFjXeJ+Pfb5xabEISVxY3C9/9xE1R89txTm20GA5DCbGfyZ0a0Ls7FX7OIf2jRYQ z3O35a2dfNPWsw3QlgxTU3Y25ZAqoR++IIepsbwz/U3cjPLbTizxFR1M7D6E+NPIqiaEey VgTDnVk2UUwhfDmbH7Gx6TgXE7DzXjVsb2H279UJgEJjhHCgjsnuGRsk7grL/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728681477; a=rsa-sha256; cv=none; b=I1EEIH17u3goKEn6lsfRVcuqVX+8jB8d9zIdxwmx818YEL8hPLELOgIFc3MPQ8YylX/kPT +wWoX3Kf1KiRRiQaa4mXowpjrCpkVmAULLwOlSaz+GxlWMIw3OfRVDisZdrJzAW+eSjAfy ry0KNgq23/6kAXmJLymL01vzkxlcW5+c9mYN7FUrgWhUnV6cRtP6HZAYBfPbNMfMMiI0JB bMPwIAwtPnK+jqkERaWSvxc3RcOQmczjD44/xwPngE/14n+kUVsXibj/oFpWK5QwzNh62P KMPq6BhJcEYvDGgZsaCG0vyyGkVXxNmIahlPNTneSag3jXFDLvPP8/nu6v5k+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 4XQKGY0fv0zxcH; Fri, 11 Oct 2024 21:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BLHuwZ034308; Fri, 11 Oct 2024 21:17:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BLHuYZ034305; Fri, 11 Oct 2024 21:17:56 GMT (envelope-from git) Date: Fri, 11 Oct 2024 21:17:56 GMT Message-Id: <202410112117.49BLHuYZ034305@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 1e434da3b065 - main - powerpc: Add nominal support for POWER10 and POWER11 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e434da3b065ef96b389e5e0b604ae05a51e794e Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=1e434da3b065ef96b389e5e0b604ae05a51e794e commit 1e434da3b065ef96b389e5e0b604ae05a51e794e Author: Justin Hibbits AuthorDate: 2024-10-11 21:03:12 +0000 Commit: Justin Hibbits CommitDate: 2024-10-11 21:17:43 +0000 powerpc: Add nominal support for POWER10 and POWER11 --- sys/powerpc/include/cpu.h | 2 ++ sys/powerpc/include/spr.h | 2 ++ sys/powerpc/powerpc/cpu.c | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/sys/powerpc/include/cpu.h b/sys/powerpc/include/cpu.h index 02ff42877f0e..35b32566484c 100644 --- a/sys/powerpc/include/cpu.h +++ b/sys/powerpc/include/cpu.h @@ -90,6 +90,8 @@ extern u_long cpu_features2; #define PPC_FEATURE2_DARN 0x00200000 #define PPC_FEATURE2_SCV 0x00100000 #define PPC_FEATURE2_HTM_NOSUSPEND 0x00080000 +#define PPC_FEATURE2_ARCH_3_1 0x00040000 +#define PPC_FEATURE2_MMA 0x00020000 #define PPC_FEATURE_BITMASK \ "\20" \ diff --git a/sys/powerpc/include/spr.h b/sys/powerpc/include/spr.h index 751a9e8184b6..5bb3858b0fb5 100644 --- a/sys/powerpc/include/spr.h +++ b/sys/powerpc/include/spr.h @@ -220,7 +220,9 @@ #define IBMPOWER9 0x004e #define MPC860 0x0050 #define IBMCELLBE 0x0070 +#define IBMPOWER10 0x0080 #define MPC8240 0x0081 +#define IBMPOWER11 0x0082 #define PA6T 0x0090 #define IBM405GP 0x4011 #define IBM405L 0x4161 diff --git a/sys/powerpc/powerpc/cpu.c b/sys/powerpc/powerpc/cpu.c index 19907e3973e7..f73ed25c8924 100644 --- a/sys/powerpc/powerpc/cpu.c +++ b/sys/powerpc/powerpc/cpu.c @@ -192,6 +192,24 @@ static const struct cputab models[] = { PPC_FEATURE2_ISEL | PPC_FEATURE2_TAR | PPC_FEATURE2_HAS_VEC_CRYPTO | PPC_FEATURE2_ARCH_3_00 | PPC_FEATURE2_HAS_IEEE128 | PPC_FEATURE2_DARN, cpu_powerx_setup }, + { "IBM POWER10", IBMPOWER10, REVFMT_MAJMIN, + PPC_FEATURE_64 | PPC_FEATURE_HAS_ALTIVEC | PPC_FEATURE_HAS_FPU | + PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP | PPC_FEATURE_ARCH_2_05 | + PPC_FEATURE_ARCH_2_06 | PPC_FEATURE_HAS_VSX | PPC_FEATURE_TRUE_LE, + PPC_FEATURE2_ARCH_2_07 | PPC_FEATURE2_DSCR | PPC_FEATURE2_EBB | + PPC_FEATURE2_ISEL | PPC_FEATURE2_TAR | PPC_FEATURE2_HAS_VEC_CRYPTO | + PPC_FEATURE2_ARCH_3_00 | PPC_FEATURE2_HAS_IEEE128 | + PPC_FEATURE2_DARN | PPC_FEATURE2_ARCH_3_1 | PPC_FEATURE2_MMA, + cpu_powerx_setup }, + { "IBM POWER11", IBMPOWER11, REVFMT_MAJMIN, + PPC_FEATURE_64 | PPC_FEATURE_HAS_ALTIVEC | PPC_FEATURE_HAS_FPU | + PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP | PPC_FEATURE_ARCH_2_05 | + PPC_FEATURE_ARCH_2_06 | PPC_FEATURE_HAS_VSX | PPC_FEATURE_TRUE_LE, + PPC_FEATURE2_ARCH_2_07 | PPC_FEATURE2_DSCR | PPC_FEATURE2_EBB | + PPC_FEATURE2_ISEL | PPC_FEATURE2_TAR | PPC_FEATURE2_HAS_VEC_CRYPTO | + PPC_FEATURE2_ARCH_3_00 | PPC_FEATURE2_HAS_IEEE128 | + PPC_FEATURE2_DARN | PPC_FEATURE2_ARCH_3_1 | PPC_FEATURE2_MMA, + cpu_powerx_setup }, { "Motorola PowerPC 7400", MPC7400, REVFMT_MAJMIN, PPC_FEATURE_HAS_ALTIVEC | PPC_FEATURE_HAS_FPU, 0, cpu_6xx_setup }, { "Motorola PowerPC 7410", MPC7410, REVFMT_MAJMIN, From nobody Fri Oct 11 21:17:58 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQKGZ2x8mz5ZQpc; Fri, 11 Oct 2024 21:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQKGZ22T1z4Ltf; Fri, 11 Oct 2024 21:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728681478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n7csXopWq+036JU7y1yUCKVPjdWbHctzjxPwRv1ZkvQ=; b=TSS7Z2X0C9ScFFzK8Y1ZKw2f3b+plbtNvqG4RKS7LNdvZYCvvjM6jKXzRSmYZ6OnIlQf0c ZG06ZdLP+9FRcF4Y3abO/N5szdf/BHsH9mnor2osRdBpomUeMSkcxZZnpfPVAVgh53kmvj 9BhNH9t0jbya5JP87WkBMbWaGBUBeI2BA/NpNVdxaZtR/6nS3Xv+NQghNhsqPTLtIF3spi PgOZGRxKH7R6Gxs9YrNEQN+mnOuETfuJsijcefSqxNoXvfB00pIcrqo0Ja9WC+dzAuOaKH UPy9yP7XqvAeY6NriKoII6CDBBkhgX+iQD2aZM0gdh8Wd2hbkal0NKT1oc9tLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728681478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n7csXopWq+036JU7y1yUCKVPjdWbHctzjxPwRv1ZkvQ=; b=M55UP+Aw0pDdDLI1WFGY4excHPKHdeDLhne486+A3Xj+0j5u06zRtddNuuYMZ4emy1KUPj LkCowbeoeKJL4dBKD19FJkJ2w9QbCSvEq2pt2J6izD+e0bV2vUqtPjaRbTlau/j6jYh55R FQd+GUoM3Jjwgsk0iUwQ4RyOHGPwx+vUyqOspQtbTD1FGvmHJN3EG/B6ktHqage4i7skJa z7qb67/LJI2nisAkMONgzHuhjvvLkYn4IWaLm23v4eAXwZlDuzA/vOkd3+W3cUywX9gYaj Fkan3CQyS9ATnifZ/Sh38wpmeOQbTHiFspNoDKTLDMZ12ROCZbyEvHjgHrXNbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728681478; a=rsa-sha256; cv=none; b=v/Wg3WFz2ymos2HngSWl/JsnpZAb8X0/lZZGnM2lelfwek0xvJKByq3GE7t9O8BZZ8zpSz Y5S0BmB4M+PfLVefLc1mIpL8BI5goCMKfeDl/BM+jHbYmvmiMnPRFLOzjPs3tHsEHAYIZc hVUr/HK/O6E1CwrRgae0D+OBKPzQtks2f8HAsf4oDgriQOF7SCSekiMZV1Eb40+aT5G7KU fL7GDHNMqgTeHC5+wLO/uJtn7Qc+s0IsL/Merkf0bRJpTf8JvK+Ubps97JiHiwAoM1TB0P AkrEfsDejEpbqyp1cYLjtioQuv9JJFH6iCqGoCDrb0be0fZu93QDK2CNFK0bFg== 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 4XQKGZ1frczxcJ; Fri, 11 Oct 2024 21:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BLHwl6034364; Fri, 11 Oct 2024 21:17:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BLHw41034361; Fri, 11 Oct 2024 21:17:58 GMT (envelope-from git) Date: Fri, 11 Oct 2024 21:17:58 GMT Message-Id: <202410112117.49BLHw41034361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: f2e62e601304 - main - loader/powerpc: Add some CAS support for newer POWER CPUs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2e62e601304cea927bbeea70c484030b8e9fe45 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=f2e62e601304cea927bbeea70c484030b8e9fe45 commit f2e62e601304cea927bbeea70c484030b8e9fe45 Author: Justin Hibbits AuthorDate: 2024-10-11 21:01:15 +0000 Commit: Justin Hibbits CommitDate: 2024-10-11 21:17:43 +0000 loader/powerpc: Add some CAS support for newer POWER CPUs * Add PVR bits for POWER10 and POWER11 * Initialize the `err` outvar, in case it's not touched on success by the hypervisor, to prevent spurious errors. --- stand/powerpc/ofw/cas.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/stand/powerpc/ofw/cas.c b/stand/powerpc/ofw/cas.c index b112aae67d85..45fd4d8d567f 100644 --- a/stand/powerpc/ofw/cas.c +++ b/stand/powerpc/ofw/cas.c @@ -40,10 +40,13 @@ #define PVR_CPU_P8NVL 0x004c0000 #define PVR_CPU_P8 0x004d0000 #define PVR_CPU_P9 0x004e0000 +#define PVR_CPU_P10 0x00800000 +#define PVR_CPU_P11 0x00820000 #define PVR_CPU_MASK 0xffff0000 #define PVR_ISA_207 0x0f000004 #define PVR_ISA_300 0x0f000005 +#define PVR_ISA_31 0x0f000006 #define PVR_ISA_MASK 0xffffffff /* loader version of kernel's CPU_MAXSIZE */ @@ -122,7 +125,7 @@ struct opt_vec5 { } __packed; static struct ibm_arch_vec { - struct pvr pvr_list[7]; + struct pvr pvr_list[10]; uint8_t num_opts; struct opt_vec_ignore vec1; struct opt_vec_ignore vec2; @@ -135,8 +138,11 @@ static struct ibm_arch_vec { { htobe32(PVR_CPU_MASK), htobe32(PVR_CPU_P8E) }, { htobe32(PVR_CPU_MASK), htobe32(PVR_CPU_P8NVL) }, { htobe32(PVR_CPU_MASK), htobe32(PVR_CPU_P9) }, + { htobe32(PVR_CPU_MASK), htobe32(PVR_CPU_P10) }, + { htobe32(PVR_CPU_MASK), htobe32(PVR_CPU_P11) }, { htobe32(PVR_ISA_MASK), htobe32(PVR_ISA_207) }, { htobe32(PVR_ISA_MASK), htobe32(PVR_ISA_300) }, + { htobe32(PVR_ISA_MASK), htobe32(PVR_ISA_31) }, { 0, 0xffffffffu } /* terminator */ }, 4, /* num_opts (4 actually means 5 option vectors) */ @@ -185,7 +191,7 @@ ppc64_cas(void) { phandle_t pkg; ihandle_t inst; - cell_t err; + cell_t err = 0; uint8_t buf[16], idx, val; int i, len, rc, radix_mmu; const char *var; From nobody Fri Oct 11 21:28:13 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQKVP2hHhz5ZRXP; Fri, 11 Oct 2024 21: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQKVP1Vp3z4PQ4; Fri, 11 Oct 2024 21:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728682093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ySU8QlnJikZE0x5YzDu5vS+ElHKNcDh1iMK6Vv61ISA=; b=mwvVLsCGAkNNnLyxU584V6VgQ0ITcQBajZI57INEOcgh0NDR3jwjLyJPh+uySKFpGCM4Y1 lBxTSSr1n/fNCFwQ7qPsaplQMmPxdyYxXfJUd4cnBhVVlPzx54QCX99n5AvhedK7eEdPbS aQ62aWcd8W4NDMasYx0KkmIIezqUfqU8B75ZmdbGhlCJK3mIS+R43kOs1JmeKwtbgwk3t+ +u139+vkR2zPWuVLVkq8HDcGHGCpJHtlLYLM392BLi7VAJm9x9/wgHrZc1z14rJjZhKUd/ cQEB4vlWo9bwLytIiMiM2uZvcBY8v40BONLtPdNj2TAZ7L6VzIzwG3GcYinXvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728682093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ySU8QlnJikZE0x5YzDu5vS+ElHKNcDh1iMK6Vv61ISA=; b=deoTnI9/6p7iUBLTDUEggj/fI5IHW1oMQlIeiTpOHD+V3/6TzEbdivi9lYDlxUSk8gElDe 28p3w8XxxS5+CNc8xWSHuWlVsHcM7C5mAWmk/XnDPZS03VfOHxqeYl9dSLE0VsydLs+EH/ 8hqjLDYc4ILF8uwg3HQR71y7LACtp0fYqTimJURF3ien++WvMppmoRoTpcvcZ8V6Gi+weN kuMBlxrW+3JQhKQlPj+IGdV1sdNUgTLladY8tW5oQea8Ij53FRPxRRus0zYvIdHyR8H1IH KV6iIgCUGENImW3AZnulPj2UJLyye++ocv8K9SY6F1icQ/n63fc/RAG2Q7I6cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728682093; a=rsa-sha256; cv=none; b=ZnlWJDUgnRetgXfr56jFEdmGGjkernDavrUaHvELRK5+42LPuqCrHJWyyPBjShvp/qYnwM lKzBHcSHqvf6dcevBnA/gr5wO1o+r2p+2g+QMinOpVqcvRqUA50K0o/Og2GIS+vDExK3Fc eoccwkLahy7yEk8QiNcZj3qKRqAZq/87zsW44ApXnWwVQcemlBxjhRI2KMruJdZUwxqD2w UryBf5rDEh0Mn2Z+lSIclFSkOobEITCHNAs4sQPXM/rbPN0BoECMB+Y29iws96KLW1VATE jUEDiykEtpeFvyKcq0TEyabHk+kWf+gFprpthV5RqAR7mMgsNf1AFeF0J1X+Gg== 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 4XQKVP16XPzxxt; Fri, 11 Oct 2024 21:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BLSDR2050481; Fri, 11 Oct 2024 21:28:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BLSDi0050478; Fri, 11 Oct 2024 21:28:13 GMT (envelope-from git) Date: Fri, 11 Oct 2024 21:28:13 GMT Message-Id: <202410112128.49BLSDi0050478@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: baa7e9cd3083 - main - loader: Use Cyan instead of Blue for some menu items List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: baa7e9cd3083ccaed8f26e9ad786ff9657ab85fc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=baa7e9cd3083ccaed8f26e9ad786ff9657ab85fc commit baa7e9cd3083ccaed8f26e9ad786ff9657ab85fc Author: Warner Losh AuthorDate: 2024-10-11 19:06:24 +0000 Commit: Warner Losh CommitDate: 2024-10-11 21:27:46 +0000 loader: Use Cyan instead of Blue for some menu items BLUE often translates to DARK BLUE. On BLACK this is hard to read. Instead, use CYAN which looks good on both black and white backgrounds. Discussed with: kevans Sponsored by: Netflix --- stand/lua/menu.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index 72f5648cae91..2d92be3b7c6e 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -122,7 +122,7 @@ menu.boot_environments = { if is_default then name_color = color.escapefg(color.GREEN) else - name_color = color.escapefg(color.BLUE) + name_color = color.escapefg(color.CYAN) end bootenv_name = bootenv_name .. name_color .. choice .. color.resetfg() @@ -342,7 +342,7 @@ menu.welcome = { name_color = color.escapefg(color.GREEN) kernel_name = "default/" else - name_color = color.escapefg(color.BLUE) + name_color = color.escapefg(color.CYAN) end kernel_name = kernel_name .. name_color .. choice .. color.resetfg() From nobody Fri Oct 11 21:28:14 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQKVQ4YY0z5ZRVh; Fri, 11 Oct 2024 21:28: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQKVQ2mJ7z4PML; Fri, 11 Oct 2024 21:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728682094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M8lQEINtzevj1JGs+LULlHutsdV4YZulOoQpRQUJY1c=; b=lPzfHnd2j4dd76HZoQmPj54gCfWnSFMr+b0w6iQj6XKwEjBtML5T+XZedzIASKdPIuNUA2 OT99C2dfeKD58Vh8VJGy1hc13F7j2k16y5AWvEsqXf5JwtTiWdzJCJmpxBsp7x4vipgpT1 nLK3iAYtRV5mioqOTGG3bE/C67HFb+wFGg42MYM5ciY9mVci3aj4K1zWFUUTVKUiMlD6xw 6VN0Wl0TnGli754pNYLPHEJcLgz+IiFPEOZQqigpUh7InzcvQ/27d2QK+XGWwAdKRPBB15 2Yc5aKFr4rcWNu3uXfDZ/2746BnD0D1MlrBe8yranNkd5GZp7xy69xipdirFIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728682094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M8lQEINtzevj1JGs+LULlHutsdV4YZulOoQpRQUJY1c=; b=a68MSl1UKOCJjoRB53rSfU7gOVAMl5SfA9W4Hs+JlpW3r/06SuG5I0tZeuMR1Cnk8er8TX wbp2lsLsuzm0Tkf0u4qZPW4GrB1v5CUu5FslQVkDgJH4md+QHyr9ipwesDaZVqQosH19Mr D/3FGHo0c2lWaqtWMvHwusvpw0tOf/WSHGTqfObbkToZ3Izh76RE1UwYyPWgp/ZDmZsuYX jspALRZFSai8RMuLFZK7MGMfUZUVi7qM6Ya+Xo5vGU5zC6IcmiZ11mkv5LjY2xSazb2e5L +o16194OazEnVDEJqWbHvy6nOVheSJJisAkDkRtH4y0yQ2gWoOihWB5UhO9aFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728682094; a=rsa-sha256; cv=none; b=bADau50alYHVwG8b3EAXXL8e0E0jOaOQAwM6jKJsRoVFr7gMv5P3KKXS+B+T6jnNm+9uu7 qDibovz9h9vxFRsz1G8hzFo9wdF8yalEQhDB8dohOu69hl6y0ZZPlebRr9Zx3pb31Q1RNw 8q6l85bYzSgZhU+LzQ0/lQZDiMk21GZe8Bs6/TV+t6G15RdP9AmmQh+XPjO0F7m/53Cmaj 0myOCO95+gSdaQmEvOCZ3ceuTy+Lqlz5S3KICrawhYqZKY+UyoUs+Z1jaHbhK6WJcLuLRL gvH3swOj/EmlA0CcxWV7CbYX77QvuRbLrZVfA9KjjuQa3ydAE43PFIWSMzyYLA== 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 4XQKVQ2MlLzxpb; Fri, 11 Oct 2024 21:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BLSE4H050522; Fri, 11 Oct 2024 21:28:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BLSEnY050519; Fri, 11 Oct 2024 21:28:14 GMT (envelope-from git) Date: Fri, 11 Oct 2024 21:28:14 GMT Message-Id: <202410112128.49BLSEnY050519@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 852233cf7620 - main - uart: Small style tweak List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 852233cf7620fd98eb8b5221e662fc863750e0f7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=852233cf7620fd98eb8b5221e662fc863750e0f7 commit 852233cf7620fd98eb8b5221e662fc863750e0f7 Author: Warner Losh AuthorDate: 2024-10-11 19:26:19 +0000 Commit: Warner Losh CommitDate: 2024-10-11 21:27:46 +0000 uart: Small style tweak Use if (err == 0) rather than if (!err) to follow stlye(9) and also the rest of the file. Sponsored by: Netflix --- sys/dev/uart/uart_cpu_fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/uart/uart_cpu_fdt.c b/sys/dev/uart/uart_cpu_fdt.c index 1cc1c795f29f..fd1647cd78aa 100644 --- a/sys/dev/uart/uart_cpu_fdt.c +++ b/sys/dev/uart/uart_cpu_fdt.c @@ -81,7 +81,7 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) /* Allow overriding the FDT using the environment. */ class = &uart_ns8250_class; err = uart_getenv(devtype, di, class); - if (!err) + if (err == 0) return (0); err = uart_cpu_fdt_probe(&class, &bst, &bsh, &br, &rclk, From nobody Fri Oct 11 21:28:15 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQKVR60B7z5ZRCj; Fri, 11 Oct 2024 21:28: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQKVR3l49z4PVs; Fri, 11 Oct 2024 21:28:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728682095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eo25+JXrVv233MHRrTmpSeBG0utU0H9o9LksncGQOVY=; b=n81MO+IZdiFIYQaUPWgCMFevfPQzQBQvsewKwZAjrLz/NEXEPeAvVuuNVn9ULjeIYzuowF KorXAMgnoVD9V2ABxaMji5PKiLvkRwYcuLxWtvYZnZC76vuzMKa468jfUFTb4tBbZFvHsm W5dRPflW3OFTxYeRJP3Cm1X7nsUrfMBfFrTDRkTxCHiDUbpSaG4r3l7J5NspPvNzF28i1x b4e8a3XNjynPsSYL/jMbgxWAb5IVQnZVJ5jlhlOMtbBITQaroCVXKha1u/FyYRAmEjG2mY qSGEkmepsMQX0Jq3RM3ouuLzgF57SVR14afulxPqFYN6QFcWPFI51UGEfmrfUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728682095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eo25+JXrVv233MHRrTmpSeBG0utU0H9o9LksncGQOVY=; b=UM3y1DO644DF//hvuqTIy7Kt2PjQQ7Z57DxGCBG/Bbz0Xm34Qum6rEQFdSCzP5Uth4hyjb 84jWIFS4lvI80d0qRfIqC4j/WNFkyM9xsk+E6i6NNAdBaV0UBrrCdEgHsZ9Ko/Rg3RFBWf v0nA5VVUwblp2fCHWhh3p96vmkBuad2bPO2vAs20ODwaVoLtZs6sesu02vG1Qoi1z8LNvE IL/IAsjscOEUYqiYffmWY627bNfxXjnFx7lM4rZrLO8UxD+EL2C9mddiqoZ/ITSSuobt+C rSWkc1JiJZ5DFgVaz+qRQUF4F3npCG4b4BDD8shTVLNxRsWtyIHi0rg+1YTSuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728682095; a=rsa-sha256; cv=none; b=voBRrN5nPcbwaVLIV5KaulC4lxzeK7qg5H4fL2mLVwtpl7p+XwLPuCKuox9NDp3U4tbG7/ VYOg+iF0UHhoCl3G53wlCEw39udjq6q3aJ1VbBWRJmT23O63AmZiAW0m1t0+CW+r/hIG7O BDn/SX9FGiG2EZBZzgICgIyi4sS1au1pbkiOFbLhE8sUTis1n5w3xqfxPOslnTGEIojIdc D5lgvCAOivbvwdZfA7ukhUfJ5WSnXAv1SDL53QM91dMjI8Csb5PuTnkSL2Ofp5aCAjUHsz KiLuqlZavwIm82XU1lgQaIc+C6R5CJYbPWf3KdJRcA8bGAsf4McOnCk6xhXa9w== 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 4XQKVR3MTJzxsQ; Fri, 11 Oct 2024 21:28:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BLSFDr050567; Fri, 11 Oct 2024 21:28:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BLSFjU050564; Fri, 11 Oct 2024 21:28:15 GMT (envelope-from git) Date: Fri, 11 Oct 2024 21:28:15 GMT Message-Id: <202410112128.49BLSFjU050564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 9bb56359e6ed - main - uart: Document rw:XXX field of hw.uart.console List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9bb56359e6ed4facb18ee5575aacfe95e049f1e8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9bb56359e6ed4facb18ee5575aacfe95e049f1e8 commit 9bb56359e6ed4facb18ee5575aacfe95e049f1e8 Author: Warner Losh AuthorDate: 2024-10-11 19:31:31 +0000 Commit: Warner Losh CommitDate: 2024-10-11 21:27:46 +0000 uart: Document rw:XXX field of hw.uart.console Add a one-liner description of rw - Register Width added in eae36de826cc. Fixes: eae36de826cc Sponsored by: Netflix --- sys/dev/uart/uart_subr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/uart/uart_subr.c b/sys/dev/uart/uart_subr.c index 03c7fd8caea9..49a046f019bb 100644 --- a/sys/dev/uart/uart_subr.c +++ b/sys/dev/uart/uart_subr.c @@ -185,6 +185,7 @@ out: * mm = Memory mapped I/O address * pa = Parity * rs = Register shift + * rw = Register width * sb = Stopbits * xo = Device clock (xtal oscillator) * From nobody Fri Oct 11 21:28:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQKVS6jTvz5ZRK4; Fri, 11 Oct 2024 21:28: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQKVS4kgcz4PXc; Fri, 11 Oct 2024 21:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728682096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0O3bob+iQwV3sD5AJMg49UixkhTbkOf5EhrMRpUMsy0=; b=a2g0VHeiiKdWA/cAGPlhxXP1oHyudbfzM371Lp4iv5d9k4zidn9gDjCSiT24NE2NiUU9NL eCoz6KwGURzBqRaymz92ky6IxPY63gQ2WwgkyWAmlr5Kab7y1tCkr6I4gdJlyTnudVKCV7 DE4NsyY92nImW7/3Eo/FnB1UGi4jTP6JjhIUsZC9aZHlFFKwT5B822d+996p8Jigg/YmUc DXD4jf4KISHo38xJD2SDT/h4ytp/E0Dt+nFIf5oIqFpkgkmk3ZCqTEsLA8jTOuhbxdvwOj gipZofG+Zv6PKDRk7rLVFOD60nxaNN5vXeVPlqckCx/xluA5okX+HlLczw2leg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728682096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0O3bob+iQwV3sD5AJMg49UixkhTbkOf5EhrMRpUMsy0=; b=Euc7dsd0FkiMjUsLSmDGmuFaafsrINhA5TY/hgJiEibyNzslp0hOGmQ8eKu1SI0AY9/PKU iw86p0bzSUyYtO+StexG1eYA3GJwIEOJajvEF2ScLwU0Fj81/8/crZFk//4YBDx+rC6BvO No1epXN8dGRC0nqcdWyyJmT9OWtj+W71P/MtP67Rs2RsJxX65+I4d91D1M2dVGFHjgfYZO V76snwI/LjfJASDbyjo7BMJyL2AsiiiLWxuP577PT4FDmDqizEc7GSSMmcyS+uKS8etzgX Rq6wCcXam7NpsR58D8hPXafImS9dpYflEffQkz12q9N5S5CF3ZH23iKZMmshKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728682096; a=rsa-sha256; cv=none; b=UO79GFh01SvNzZfOb48akKY+6TU65B39FJQnDVkzE5JR3QuX2bhpZXRR0GOqii7G9ZgA+d 0O9tmw2pEjiIoECtj8zJVkBPRIyZwYLLPLKl3iOAGWbg9zwFMXj5HcYm+ytikUuy6aAuk3 hpLsq2pKs0THeGPUPpIdkAJj4D+L0xK825bQT7nQ2DqxIQZ1KDylm/riqXF4aQXBFDHSVr wS/BQSzqKq3OLUmTNKySa1KZdHRXfM2gofFlqPZd/XE9fZsi7gvlCjatngmWZydBsLakxB 4jPaAVfZE3LZI+D9/kY+SHMq+HtWUuc7fNg57mgCQ2UQYA9dyP82LypwVpgFoQ== 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 4XQKVS4ML9zxdH; Fri, 11 Oct 2024 21:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BLSGmS050610; Fri, 11 Oct 2024 21:28:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BLSGNQ050607; Fri, 11 Oct 2024 21:28:16 GMT (envelope-from git) Date: Fri, 11 Oct 2024 21:28:16 GMT Message-Id: <202410112128.49BLSGNQ050607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 9d81f99b127f - main - mac_bsdextended: Use SYSCTL VARIABLES section List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d81f99b127fe8533a6049df5d265ec8b176dfbb Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9d81f99b127fe8533a6049df5d265ec8b176dfbb commit 9d81f99b127fe8533a6049df5d265ec8b176dfbb Author: Warner Losh AuthorDate: 2024-10-11 20:06:22 +0000 Commit: Warner Losh CommitDate: 2024-10-11 21:27:46 +0000 mac_bsdextended: Use SYSCTL VARIABLES section All the other man pages, except iicbus(4), use .Sh SYSCTL VARIABLES for documentig sysctls. iicbus(4) has a legitmate reason for varying, though. Sponsored by: Netflix --- share/man/man4/mac_bsdextended.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/mac_bsdextended.4 b/share/man/man4/mac_bsdextended.4 index c96370a8175b..2131ca85282c 100644 --- a/share/man/man4/mac_bsdextended.4 +++ b/share/man/man4/mac_bsdextended.4 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 21, 2005 +.Dd October 11, 2024 .Dt MAC_BSDEXTENDED 4 .Os .Sh NAME @@ -87,7 +87,7 @@ This means that not all rules are applied, only the first matched rule; thus if Rule A allows access and Rule B blocks access, Rule B will never be applied. -.Ss Sysctls +.Sh SYSCTL VARIABLES The following sysctls may be used to tweak the behavior of .Nm : .Bl -tag -width indent From nobody Fri Oct 11 21:28:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQKVV1Pbnz5ZR6b; Fri, 11 Oct 2024 21:28: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQKVT5Y4qz4PgD; Fri, 11 Oct 2024 21:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728682097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wzsugNgpw20MzdK+H5cPzwTUhZckmYvuIuMfQgkDFdk=; b=m3bZst5hXOUet4rLwl+pRM5o6icOUFJlGCHsQB0mENcabgLjCbM2U0tB9yw/uFTZR/DlRN LcoWgy+chcaGy0RqYaj2OSEk1Lz27XSpJp1Xqi2+BSUZ4vrOtHnwUiFMHmNKxqH1lsuapy khCYEILy1DjUTMWs/91ShGKLOI6+XktdLe69+3erLmdNp/YXqBcFNrun2uAtn3con7nUwf NN/ZzZ7Jq8js7x8UbtgJUXykp9SxwAByNmUpAU9xzZi6byPhCOL0dNyR75IteNlFiEerYZ OS26iuedmhvDI9U05moXmRVFOwjRVmld0Q5ZqealskbeYFB9+umXLySJtzRSuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728682097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wzsugNgpw20MzdK+H5cPzwTUhZckmYvuIuMfQgkDFdk=; b=SFCUZcgFcBjSJoEPCxgbsgWYaAUDrErFspMZviI/I8JjbSV6juqo2Q21ZwJ9x8jToTEJDt HCUAC27AKiArzytSF/3O0VAzlZ1cbMMmq2xVIRFpuicxX/EY3TvcOFizfqi3JXpqATsjTC d2alOYwqTmMFWorxtadENnqS3cNBBfJ+80DGq9BxphIXe+vYAkBr4xAQhfGQIVf5lG2nUG rB1X1SGwQIZ2N1gLlC3AYKXt2vdLsKl4kLB5+QA93vkDmW9rkv/Z3YojHHSHSbMN7s55je 95WK3I0EdXwgmrKqWLTo/IVUiNxHNHDNikUFJUYpceQAkWfhL1s3TyggW6AZAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728682097; a=rsa-sha256; cv=none; b=vMGfSnTMp+B/tfrRjBGEDbAEyaKgse/SzOSchR3y4hE9GkhOsbOK2HNCYS/4YxG5ZiAjV9 PoViIu9dYd50L+du606GpsPwPFpbbqWR3CdBukRMBhmuwdTHk6Efo/7TORjLv37tqah66q KUhCstUPJy15TlWDusfKlwIZ/QYAbmWCEYx46tIr0/fryVoD6xhreybJcCZQH0+c1f3jMb kfISF8nDVCEznj0iBuykNFMR+wpvnvg1N3zS4Djy4Hr1tQ9/eTrRrXDYtZDKPmw/OG2gTw U0bwTPKPZ9twFDs3YIANNd1D9e9UKCxDwo6tbTkz07CNOEz4pv5dbgVvG3wtSQ== 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 4XQKVT59Mxzy76; Fri, 11 Oct 2024 21:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BLSHvv050667; Fri, 11 Oct 2024 21:28:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BLSHYi050664; Fri, 11 Oct 2024 21:28:17 GMT (envelope-from git) Date: Fri, 11 Oct 2024 21:28:17 GMT Message-Id: <202410112128.49BLSHYi050664@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 0bd23ca0ee28 - main - uart: Fix cut-n-paste error in DBG2 code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0bd23ca0ee28894c44aa7b4bdfb5609bfb1e2303 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0bd23ca0ee28894c44aa7b4bdfb5609bfb1e2303 commit 0bd23ca0ee28894c44aa7b4bdfb5609bfb1e2303 Author: Warner Losh AuthorDate: 2024-10-11 19:23:44 +0000 Commit: Warner Losh CommitDate: 2024-10-11 21:27:46 +0000 uart: Fix cut-n-paste error in DBG2 code This code is parsing the DBG2 ACPI table, not the SPCR table, so tweak the comment. Sponsored by: Netflix --- sys/dev/uart/uart_cpu_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/uart/uart_cpu_acpi.c b/sys/dev/uart/uart_cpu_acpi.c index 7892437e11de..ae22a9822aa6 100644 --- a/sys/dev/uart/uart_cpu_acpi.c +++ b/sys/dev/uart/uart_cpu_acpi.c @@ -222,7 +222,7 @@ uart_cpu_acpi_dbg2(struct uart_devinfo *di) int error; bool found; - /* Look for the SPCR table. */ + /* Look for the DBG2 table. */ dbg2_physaddr = acpi_find_table(ACPI_SIG_DBG2); if (dbg2_physaddr == 0) return (ENXIO); From nobody Fri Oct 11 21:41:03 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQKnC56N0z5ZSKJ; Fri, 11 Oct 2024 21:41: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQKnC4h6Bz4R7t; Fri, 11 Oct 2024 21:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728682863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hte7WUwufap/IVbsmosKpl9QsH2mqQXrGQVZ9MiY1R4=; b=pSHY6NeXA6PCTMD52FDrY8z0E5xImspI8qhhqY0KYYcFBIyHEAzqZ165EU8PcxXVFc9xq+ GTBoszuOPkgcmaTpE7/+kD+HRTHkiJO2d5A1/PiyEHG4sRslzUaodSAmZsAJKRXkiupIyU QGdrnGXiYoKXqaaOIeOhjBXFrZtwEowf6qY+gMICSf/WWbV0hvNiwo9ixiplTH5A3NQUNE iW5FtAPxM+gwlb0iO3fLN7QUhcNl3123cc41n1AsuJLBOG0sHCcSbBBiaEOcfWm/ODvx4u F+PlN/w/zX3GPsZCMjaJdD0mDupl+ckxv0S1e88+BUroOYXJoxJH0DP7nUDB8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728682863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hte7WUwufap/IVbsmosKpl9QsH2mqQXrGQVZ9MiY1R4=; b=ZCkGqD/Pf76GzvfqdGv8CF1k16MM0QvxftEqP3CHrUDrPyYllF8tdvgyrASKNq/fJjphiW pmEMBlk8s0VqV96FUa/UwtWvUDMO2xo1QMhrbMir2L001z1sixd8kn/IUhoa0K90UB0Dqy jQBrgm7x6oyAbA6ml3onktW/CgWvaTlHyHoiWUmqT2aeAVm1C3QWJQc+VloL8hI89LF7/e i83POSsuCVTeMxV7xZOfFIXIvHcd9uthAPLAp/xRLKBQadjJX962YMyPWCppLPNSQZwA/e c+f/ettOl6OGvS8LmNJWGjzt2CkhabhWCYyjHnOoJnt0q4NzDQv8kRMFKJtW9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728682863; a=rsa-sha256; cv=none; b=xWU5ZK2dSzaLJXgvl9dsZLj2Nc6fkje7hK4MnxWMyHbYreus2Tjd73qvEITu8RzLPoo/jR psXGGHxo1qNUWl4/BqxtYa1I69H9YKJITckCg+YVtC9ndNsKEjb2eRbsMQobn9EegSchSa fT4MtoMY+P4VhBZXI3RWcGcI+t46Btyalqb5itgReegmhvIm4iXLyJ0HPYydylEStOt5OS tEPgDH+syl6s2eTZQTPCqpLMnTxWRMN8F1Yz80tcZFJsR1CkghNPuu0/uYLbCfoTqZp8cJ 63ozIsCJ85GoGcNFKapqltim/6dCIE/JZdxgUWqo7qVmqREfGowue6Z4SVh4Og== 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 4XQKnC4HWlzyJ6; Fri, 11 Oct 2024 21:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BLf310081043; Fri, 11 Oct 2024 21:41:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BLf3YS081040; Fri, 11 Oct 2024 21:41:03 GMT (envelope-from git) Date: Fri, 11 Oct 2024 21:41:03 GMT Message-Id: <202410112141.49BLf3YS081040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 37798b1d5dd1 - main - loader/4th: Move from hint.acpi.0.rsdp to acpi.rsdp List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37798b1d5dd12cd5e842b6f99135a2e4af8cf9e0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=37798b1d5dd12cd5e842b6f99135a2e4af8cf9e0 commit 37798b1d5dd12cd5e842b6f99135a2e4af8cf9e0 Author: Warner Losh AuthorDate: 2024-10-04 04:50:50 +0000 Commit: Warner Losh CommitDate: 2024-10-11 21:40:53 +0000 loader/4th: Move from hint.acpi.0.rsdp to acpi.rsdp Use acpi.rsdp to test for ACPI. 4th wasn't updated with the old compat was dropped a while ago. MFC After: 1 week Sponsored by: Netflix --- stand/forth/menu.4th | 2 +- stand/forth/menu.4th.8 | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stand/forth/menu.4th b/stand/forth/menu.4th index 87b4efb8c185..cc9b0c867e87 100644 --- a/stand/forth/menu.4th +++ b/stand/forth/menu.4th @@ -147,7 +147,7 @@ only forth definitions ; : acpipresent? ( -- flag ) \ Returns TRUE if ACPI is present, FALSE otherwise - s" hint.acpi.0.rsdp" getenv + s" acpi.rsdp" getenv dup -1 = if drop false exit then diff --git a/stand/forth/menu.4th.8 b/stand/forth/menu.4th.8 index bd066a8b706f..2421fe03be0c 100644 --- a/stand/forth/menu.4th.8 +++ b/stand/forth/menu.4th.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 6, 2013 +.Dd October 4, 2024 .Dt MENU.4TH 8 .Os .Sh NAME @@ -210,8 +210,8 @@ is enabled When set to a number .Dq Li x associated with a given menuitem, that menuitem will only appear when -running on i386-compatible hardware, -.Va hint.acpi.0.rsdp +running on ACPI-compatible hardware, +.Va acpi.rsdp is set (indicating the presence of hardware ACPI support as detected by .Xr loader 8 ) , and @@ -224,10 +224,10 @@ but continue to function as expected. On i386-compatible hardware lacking ACPI support (as detected by .Xr loader 8 ) , subsequent menuitems will retain their associated numbers. -.It Va hint.acpi.0.rsdp +.It Va acpi.rsdp Set automatically by .Xr loader 8 -on i386-compatible hardware when ACPI support is detected at boot time. +on ACPI-compatible hardware when ACPI support is detected at boot time. Effects the display of the .Dq Li menu_acpi menuitem (if configured). From nobody Sat Oct 12 07:37:45 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQb1j55zcz5YxrR; Sat, 12 Oct 2024 07:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQb1j4fZXz4KSk; Sat, 12 Oct 2024 07:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728718665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PS6r987aMuBMmARqi8YYEo/gr6YVIOXBXDhz8GYRESc=; b=v4WHPXIFMZyLshsCg0kftohrDzA4Ca/DqCjYTlQmwwASddvGdBHv2/hJywFzZLb2XVvLn1 i7wkQGmlPQgg86aity7avKvrjglRpkRFeHbs82IJBmO3reQXfXsWS4iXsQzRdmySyjmIu6 jRDfa44eP4wVwaxTuzz6g2/yykBqf2DN9o2zc4S1O9mQpPwyD6jUJHRrQDBfEvfYTtNSXy OWYMmpsMs1xAhLsOsVF5zNt6qxWIQZW+P7b5sxY8XSiZ9dxHEAte7exw+V3Msd5/M1AsjP 0XWM/f6oIzeBADqYD3vgyfw+voXNIPPWt2PLUtRsyndoUGF1EFCj/aGgx8yRnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728718665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PS6r987aMuBMmARqi8YYEo/gr6YVIOXBXDhz8GYRESc=; b=gkrri4+ujWaQqDF62ZN43sZro5EBvr9m7H6tFlU4d/SRsQZlRIOvwln0lnr1Ddg5ZUODvF Q2FgchrUezsK0XwkPWZMlosKJhcq9RthnteCP+1PQ3Co/Ja+OFcFB6jI8vuqVpkoBnVQsf jBTddRBUS91LheRzHhELZU6loldZjQ4rpHP3H/Ut4uyFLgG+CkBNBDZjS2+Go5RJaez4EY ptFKFdh8+UXZ1aZatO0TxzRyD6d+3Ak1nxyEal+dWVc4VbYTkWMeSAVOPAH4SIM9BaB7rW mXpEtGS9fDgAYEWwg5ylKvO2LVhVmY+KPTpRhT2EIx4L54L/SR/XAS8G4WVJrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728718665; a=rsa-sha256; cv=none; b=bzK/OlwJRVRqrG4V/ahAbVMY3i5TsH4wbU9H+UfdIRdek/DqE8449UFAo+IHGy6R+pkABt c5tKWGu47yw3/bLGugHt5ID4hrLojn72i9FZHYoWOmU+3WVr2kPgiY163qu+VAmx/f9HIc 5jAECiX22vvNdY1ZdONmyYiVj/5eXYdwKoUiGNY/xHO4JIS9X70E+msWsbGmRXmupAnyZg RN/swO1sWpr/YdsTiOxXrYFO53drB2GjxIxuke9zAo2ykXT9Ol3pw34rmETDw/vEj3jHOF Y5afjDAcH2NDuaga133F3L4/CQYnnaOKN+Ffh6KHbJHCmfbi4pwEa9qZw9837Q== 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 4XQb1j46PQz1GbL; Sat, 12 Oct 2024 07:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49C7bjeK083692; Sat, 12 Oct 2024 07:37:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49C7bjSW083689; Sat, 12 Oct 2024 07:37:45 GMT (envelope-from git) Date: Sat, 12 Oct 2024 07:37:45 GMT Message-Id: <202410120737.49C7bjSW083689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: bc9402abdd11 - main - igc: Add AIM List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc9402abdd11630ced33cbecb79b0d72f203f08a Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=bc9402abdd11630ced33cbecb79b0d72f203f08a commit bc9402abdd11630ced33cbecb79b0d72f203f08a Author: Kevin Bowling AuthorDate: 2024-10-11 01:20:13 +0000 Commit: Kevin Bowling CommitDate: 2024-10-12 07:36:39 +0000 igc: Add AIM igc is derived from igb and has never had an AIM implementation. The same algorithm from e1000 is appropriate here. Upon more detailed study of the Linux driver which has a newer AIM implementation, it finally became clear to me this is actually a holdoff timer and not an interrupt limit as it is conventionally (statically) programmed and displayed as an interrupt rate. The data sheets also make this somewhat clear. Thus, AIM accomplishes two beneficial things for a wide variety of workloads[1]: 1. At low throughput/packet rates, it will significantly lower latency (by counter-intuitively "increasing" the interrupt rate.. better thought of as decreasing the holdoff timer because you will modulate down before coming anywhere near these interrupt rates). 2. At bulk data rates, it is tuned to achieve a lower interrupt rate (by increasing the holdoff timer) than the current static 8000/s. This decreases processing overhead and yields more headroom for other work such as packet filters or userland. For a single NIC this might be worth a few sys% on common CPUs, but may be meaningful when multiplied such as if_lagg, if_bridge and forwarding setups. The AIM algorithm was re-introduced from the older igb or out of tree driver, and then modernized with permission to use Intel code from other drivers. [1]: http://iommu.com/datasheets/ethernet/controllers-nics/intel/e1000/gbe-controllers-interrupt-moderation-appl-note.pdf MFC after: 1 week Relnotes: yes Sponsored by: Rubicon Communications, LLC ("Netgate") Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D47053 --- sys/dev/igc/if_igc.c | 232 +++++++++++++++++++++++++++++++++++++++++++++++-- sys/dev/igc/if_igc.h | 27 +++++- sys/dev/igc/igc_txrx.c | 4 + 3 files changed, 256 insertions(+), 7 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 006fecdab7b0..c4f5e82ff8c8 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -1,9 +1,9 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * + * Copyright (c) 2001-2024, Intel Corporation * Copyright (c) 2016 Nicole Graziano - * All rights reserved. - * Copyright (c) 2021 Rubicon Communications, LLC (Netgate) + * Copyright (c) 2021-2024 Rubicon Communications, LLC (Netgate) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -125,6 +125,8 @@ static int igc_sysctl_debug_info(SYSCTL_HANDLER_ARGS); static int igc_get_rs(SYSCTL_HANDLER_ARGS); static void igc_print_debug_info(struct igc_adapter *); static int igc_is_valid_ether_addr(u8 *); +static void igc_neweitr(struct igc_adapter *, struct igc_rx_queue *, + struct tx_ring *, struct rx_ring *); /* Management and WOL Support */ static void igc_get_hw_control(struct igc_adapter *); static void igc_release_hw_control(struct igc_adapter *); @@ -238,10 +240,19 @@ static int igc_eee_setting = 1; SYSCTL_INT(_hw_igc, OID_AUTO, eee_setting, CTLFLAG_RDTUN, &igc_eee_setting, 0, "Enable Energy Efficient Ethernet"); +/* + * AIM: Adaptive Interrupt Moderation + * which means that the interrupt rate is varied over time based on the + * traffic for that interrupt vector + */ +static int igc_enable_aim = 1; +SYSCTL_INT(_hw_igc, OID_AUTO, enable_aim, CTLFLAG_RWTUN, &igc_enable_aim, + 0, "Enable adaptive interrupt moderation (1=normal, 2=lowlatency)"); + /* ** Tuneable Interrupt rate */ -static int igc_max_interrupt_rate = 20000; +static int igc_max_interrupt_rate = IGC_INTS_DEFAULT; SYSCTL_INT(_hw_igc, OID_AUTO, max_interrupt_rate, CTLFLAG_RDTUN, &igc_max_interrupt_rate, 0, "Maximum interrupts per second"); @@ -444,6 +455,13 @@ igc_if_attach_pre(if_ctx_t ctx) OID_AUTO, "nvm", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, adapter, 0, igc_sysctl_nvm_info, "I", "NVM Information"); + adapter->enable_aim = igc_enable_aim; + SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, "enable_aim", CTLFLAG_RW, + &adapter->enable_aim, 0, + "Interrupt Moderation (1=normal, 2=lowlatency)"); + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "fw_version", CTLTYPE_STRING | CTLFLAG_RD, @@ -816,6 +834,142 @@ igc_if_init(if_ctx_t ctx) igc_set_eee_i225(&adapter->hw, true, true, true); } +enum eitr_latency_target { + eitr_latency_disabled = 0, + eitr_latency_lowest = 1, + eitr_latency_low = 2, + eitr_latency_bulk = 3 +}; +/********************************************************************* + * + * Helper to calculate next EITR value for AIM + * + *********************************************************************/ +static void +igc_neweitr(struct igc_adapter *sc, struct igc_rx_queue *que, + struct tx_ring *txr, struct rx_ring *rxr) +{ + struct igc_hw *hw = &sc->hw; + u32 neweitr; + u32 bytes; + u32 bytes_packets; + u32 packets; + u8 nextlatency; + + /* Idle, do nothing */ + if ((txr->tx_bytes == 0) && (rxr->rx_bytes == 0)) + return; + + neweitr = 0; + + if (sc->enable_aim) { + nextlatency = rxr->rx_nextlatency; + + /* Use half default (4K) ITR if sub-gig */ + if (sc->link_speed != 1000) { + neweitr = IGC_INTS_4K; + goto igc_set_next_eitr; + } + /* Want at least enough packet buffer for two frames to AIM */ + if (sc->shared->isc_max_frame_size * 2 > (sc->pba << 10)) { + neweitr = igc_max_interrupt_rate; + sc->enable_aim = 0; + goto igc_set_next_eitr; + } + + /* Get the largest values from the associated tx and rx ring */ + if (txr->tx_bytes && txr->tx_packets) { + bytes = txr->tx_bytes; + bytes_packets = txr->tx_bytes/txr->tx_packets; + packets = txr->tx_packets; + } + if (rxr->rx_bytes && rxr->rx_packets) { + bytes = max(bytes, rxr->rx_bytes); + bytes_packets = max(bytes_packets, rxr->rx_bytes/rxr->rx_packets); + packets = max(packets, rxr->rx_packets); + } + + /* Latency state machine */ + switch (nextlatency) { + case eitr_latency_disabled: /* Bootstrapping */ + nextlatency = eitr_latency_low; + break; + case eitr_latency_lowest: /* 70k ints/s */ + /* TSO and jumbo frames */ + if (bytes_packets > 8000) + nextlatency = eitr_latency_bulk; + else if ((packets < 5) && (bytes > 512)) + nextlatency = eitr_latency_low; + break; + case eitr_latency_low: /* 20k ints/s */ + if (bytes > 10000) { + /* Handle TSO */ + if (bytes_packets > 8000) + nextlatency = eitr_latency_bulk; + else if ((packets < 10) || (bytes_packets > 1200)) + nextlatency = eitr_latency_bulk; + else if (packets > 35) + nextlatency = eitr_latency_lowest; + } else if (bytes_packets > 2000) { + nextlatency = eitr_latency_bulk; + } else if (packets < 3 && bytes < 512) { + nextlatency = eitr_latency_lowest; + } + break; + case eitr_latency_bulk: /* 4k ints/s */ + if (bytes > 25000) { + if (packets > 35) + nextlatency = eitr_latency_low; + } else if (bytes < 1500) + nextlatency = eitr_latency_low; + break; + default: + nextlatency = eitr_latency_low; + device_printf(sc->dev, "Unexpected neweitr transition %d\n", + nextlatency); + break; + } + + /* Trim itr_latency_lowest for default AIM setting */ + if (sc->enable_aim == 1 && nextlatency == eitr_latency_lowest) + nextlatency = eitr_latency_low; + + /* Request new latency */ + rxr->rx_nextlatency = nextlatency; + } else { + /* We may have toggled to AIM disabled */ + nextlatency = eitr_latency_disabled; + rxr->rx_nextlatency = nextlatency; + } + + /* ITR state machine */ + switch(nextlatency) { + case eitr_latency_lowest: + neweitr = IGC_INTS_70K; + break; + case eitr_latency_low: + neweitr = IGC_INTS_20K; + break; + case eitr_latency_bulk: + neweitr = IGC_INTS_4K; + break; + case eitr_latency_disabled: + default: + neweitr = igc_max_interrupt_rate; + break; + } + +igc_set_next_eitr: + neweitr = IGC_INTS_TO_EITR(neweitr); + + neweitr |= IGC_EITR_CNT_IGNR; + + if (neweitr != que->eitr_setting) { + que->eitr_setting = neweitr; + IGC_WRITE_REG(hw, IGC_EITR(que->msix), que->eitr_setting); + } +} + /********************************************************************* * * Fast Legacy/MSI Combined Interrupt Service routine @@ -825,10 +979,14 @@ int igc_intr(void *arg) { struct igc_adapter *adapter = arg; + struct igc_hw *hw = &adapter->hw; + struct igc_rx_queue *que = &adapter->rx_queues[0]; + struct tx_ring *txr = &adapter->tx_queues[0].txr; + struct rx_ring *rxr = &que->rxr; if_ctx_t ctx = adapter->ctx; u32 reg_icr; - reg_icr = IGC_READ_REG(&adapter->hw, IGC_ICR); + reg_icr = IGC_READ_REG(hw, IGC_ICR); /* Hot eject? */ if (reg_icr == 0xffffffff) @@ -856,6 +1014,14 @@ igc_intr(void *arg) if (reg_icr & IGC_ICR_RXO) adapter->rx_overruns++; + igc_neweitr(adapter, que, txr, rxr); + + /* Reset state */ + txr->tx_bytes = 0; + txr->tx_packets = 0; + rxr->rx_bytes = 0; + rxr->rx_packets = 0; + return (FILTER_SCHEDULE_THREAD); } @@ -888,9 +1054,20 @@ static int igc_msix_que(void *arg) { struct igc_rx_queue *que = arg; + struct igc_adapter *sc = que->adapter; + struct tx_ring *txr = &sc->tx_queues[que->msix].txr; + struct rx_ring *rxr = &que->rxr; ++que->irqs; + igc_neweitr(sc, que, txr, rxr); + + /* Reset state */ + txr->tx_bytes = 0; + txr->tx_packets = 0; + rxr->rx_bytes = 0; + rxr->rx_packets = 0; + return (FILTER_SCHEDULE_THREAD); } @@ -1395,7 +1572,7 @@ igc_configure_queues(struct igc_adapter *adapter) /* Set the starting interrupt rate */ if (igc_max_interrupt_rate > 0) - newitr = (4000000 / igc_max_interrupt_rate) & 0x7FFC; + newitr = IGC_INTS_TO_EITR(igc_max_interrupt_rate); newitr |= IGC_EITR_CNT_IGNR; @@ -1608,6 +1785,9 @@ igc_reset(if_ctx_t ctx) /* Setup DMA Coalescing */ igc_init_dmac(adapter, pba); + /* Save the final PBA off if it needs to be used elsewhere i.e. AIM */ + adapter->pba = pba; + IGC_WRITE_REG(hw, IGC_VET, ETHERTYPE_VLAN); igc_get_phy_info(hw); igc_check_for_link(hw); @@ -2380,6 +2560,40 @@ igc_sysctl_reg_handler(SYSCTL_HANDLER_ARGS) return (sysctl_handle_int(oidp, &val, 0, req)); } +/* Per queue holdoff interrupt rate handler */ +static int +igc_sysctl_interrupt_rate_handler(SYSCTL_HANDLER_ARGS) +{ + struct igc_rx_queue *rque; + struct igc_tx_queue *tque; + struct igc_hw *hw; + int error; + u32 reg, usec, rate; + + bool tx = oidp->oid_arg2; + + if (tx) { + tque = oidp->oid_arg1; + hw = &tque->adapter->hw; + reg = IGC_READ_REG(hw, IGC_EITR(tque->me)); + } else { + rque = oidp->oid_arg1; + hw = &rque->adapter->hw; + reg = IGC_READ_REG(hw, IGC_EITR(rque->msix)); + } + + usec = (reg & IGC_QVECTOR_MASK); + if (usec > 0) + rate = IGC_INTS_TO_EITR(usec); + else + rate = 0; + + error = sysctl_handle_int(oidp, &rate, 0, req); + if (error || !req->newptr) + return error; + return 0; +} + /* * Add sysctl variables, one per statistic, to the system. */ @@ -2436,6 +2650,10 @@ igc_add_hw_stats(struct igc_adapter *adapter) CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "TX Queue Name"); queue_list = SYSCTL_CHILDREN(queue_node); + SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "interrupt_rate", + CTLTYPE_UINT | CTLFLAG_RD, tx_que, + true, igc_sysctl_interrupt_rate_handler, "IU", + "Interrupt Rate"); SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "txd_head", CTLTYPE_UINT | CTLFLAG_RD | CTLFLAG_NEEDGIANT, adapter, IGC_TDH(txr->me), igc_sysctl_reg_handler, "IU", @@ -2456,6 +2674,10 @@ igc_add_hw_stats(struct igc_adapter *adapter) CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "RX Queue Name"); queue_list = SYSCTL_CHILDREN(queue_node); + SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "interrupt_rate", + CTLTYPE_UINT | CTLFLAG_RD, rx_que, + false, igc_sysctl_interrupt_rate_handler, "IU", + "Interrupt Rate"); SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "rxd_head", CTLTYPE_UINT | CTLFLAG_RD | CTLFLAG_NEEDGIANT, adapter, IGC_RDH(rxr->me), igc_sysctl_reg_handler, "IU", diff --git a/sys/dev/igc/if_igc.h b/sys/dev/igc/if_igc.h index 727699baee5f..57949c3ad38a 100644 --- a/sys/dev/igc/if_igc.h +++ b/sys/dev/igc/if_igc.h @@ -1,8 +1,8 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * + * Copyright (c) 2001-2024, Intel Corporation * Copyright (c) 2016 Nicole Graziano - * All rights reserved. * Copyright (c) 2021 Rubicon Communications, LLC (Netgate) * * Redistribution and use in source and binary forms, with or without @@ -163,6 +163,17 @@ #define IGC_TX_PTHRESH 8 #define IGC_TX_HTHRESH 1 +/* Define the interrupt rates and EITR helpers */ +#define IGC_INTS_4K 4000 +#define IGC_INTS_20K 20000 +#define IGC_INTS_70K 70000 +#define IGC_INTS_DEFAULT 8000 +#define IGC_EITR_DIVIDEND 1000000 +#define IGC_EITR_SHIFT 2 +#define IGC_QVECTOR_MASK 0x7FFC +#define IGC_INTS_TO_EITR(i) (((IGC_EITR_DIVIDEND/i) & IGC_QVECTOR_MASK) << \ + IGC_EITR_SHIFT) + /* * TDBA/RDBA should be aligned on 16 byte boundary. But TDLEN/RDLEN should be * multiple of 128 bytes. So we align TDBA/RDBA on 128 byte boundary. This will @@ -218,7 +229,12 @@ struct tx_ring { /* Interrupt resources */ void *tag; struct resource *res; - unsigned long tx_irq; + + /* Soft stats */ + unsigned long tx_irq; + unsigned long tx_packets; + unsigned long tx_bytes; + /* Saved csum offloading context information */ int csum_flags; @@ -253,6 +269,9 @@ struct rx_ring { unsigned long rx_discarded; unsigned long rx_packets; unsigned long rx_bytes; + + /* Next requested ITR latency */ + u8 rx_nextlatency; }; struct igc_tx_queue { @@ -268,6 +287,7 @@ struct igc_rx_queue { u32 me; u32 msix; u32 eims; + u32 eitr_setting; struct rx_ring rxr; u64 irqs; struct if_irq que_irq; @@ -315,6 +335,8 @@ struct igc_adapter { u32 rx_mbuf_sz; + int enable_aim; + /* Management and WOL features */ u32 wol; @@ -328,6 +350,7 @@ struct igc_adapter { u16 link_duplex; u32 smartspeed; u32 dmac; + u32 pba; int link_mask; u64 que_mask; diff --git a/sys/dev/igc/igc_txrx.c b/sys/dev/igc/igc_txrx.c index 7601513a709e..cd7175f45f34 100644 --- a/sys/dev/igc/igc_txrx.c +++ b/sys/dev/igc/igc_txrx.c @@ -316,6 +316,10 @@ igc_isc_txd_encap(void *arg, if_pkt_info_t pi) txd->read.cmd_type_len |= htole32(IGC_ADVTXD_DCMD_EOP | txd_flags); pi->ipi_new_pidx = i; + /* Sent data accounting for AIM */ + txr->tx_bytes += pi->ipi_len; + ++txr->tx_packets; + return (0); } From nobody Sat Oct 12 07:54:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQbP86r8bz5YynH; Sat, 12 Oct 2024 07:54:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQbP85yJSz4Lqv; Sat, 12 Oct 2024 07:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728719676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CKvYa8VIzmsZmWUI08SFiJH+gcQlT+YZiCd20bhk6qw=; b=P5UbPtzndtUtv5FW4j7K4PhbuhjrGuVVQUMFEfBmlpMNeNzygTjObX5Micwomhv4/7MdMx dK6/jCpgQPm7T8IUdVzxMe4yKB2jB/uM3sSASfjhzfZMYowpQTkHl3cfp46wsKxXJcUug1 vH9Ozf3CadMU6/KYGG+bkjrplUUxtKEvVGet3N+80WXzqwhm+ZmxQrvKNhJOQN9iDhIyw5 89fNTfivfVZx3AWvfXDPBPO6/5nMm2Twhyuzr29fr3yunmDbdciApmK8AqHA6Vb6TFOVAd 1FUte9gwqH5jfU1JC1vWBflfx3/9jaK9piagM5jarnMmER8gWe6muL8xGjj4gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728719676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CKvYa8VIzmsZmWUI08SFiJH+gcQlT+YZiCd20bhk6qw=; b=NM9pMS3vAfQ0YKWygin+4Rgk49POZIeDA1glzJnrRU7Yl9npN62pljrDhk3vrjc1GZ9kip PGbVSQN1N48x3dxwRED7NrjpiCV/ZnWD2wWjv5SwRLCSanMc4sM1nBzuSaY5Kes+1cJgMT m4fwX/AnVGnJtN8EC+FJ1nmJATy2hfTyi1LO10bYHQSI4TdjRGITeeKCm6i4UV1LQEbupD xXDRC8vKhUt0J5FopHOFuhvWFA15CnyK/VPgpwIiNmikz1nl7btyLEfp34/s930eGjqEJg omc4qfD5HEIzZvhrl+5uUrCJNGAwySVyPmpSZBbXODIBsSqxyFBTMOQPh/7BNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728719676; a=rsa-sha256; cv=none; b=cRaX2P+d9lwGrqMrUAVNnlZDITI8sraRHvkPxifBLGQBrUxkl/zwEE9HmG3z3tTEOd+x8D WzV9djRm7NPy5hZwelK/tEJrzePTmMo/kd/Nlzk0Yd3/s6RFfBzfwxbt9d5fTGzXCtGdnC tFp6VsIzTJmS5VOFEi1K4OErdJomzrMuWcWwOJUyhxqroNDEhgsxbFvBXdwxocoz7ZhgD4 LpJ6UzgONvRy7lJTsaBun5fqlfXRAvtLjH8qrOnFRlJ0uIU39EWuh6ysdy4mOgdKQoMUrY jIqVTKsW2g5GiLYK/ybbyseys9N0mOr/dISN6gkwjNe5Z+TxGN8o3smOL//lfA== 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 4XQbP85YS9z1GBG; Sat, 12 Oct 2024 07:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49C7sa4p017407; Sat, 12 Oct 2024 07:54:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49C7saU3017404; Sat, 12 Oct 2024 07:54:36 GMT (envelope-from git) Date: Sat, 12 Oct 2024 07:54:36 GMT Message-Id: <202410120754.49C7saU3017404@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 516d92304a7f - main - igc: Improve a comment and update copyright dates MFC after: 1 week List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 516d92304a7fa9b869c934436aa3e1c5202f03c9 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=516d92304a7fa9b869c934436aa3e1c5202f03c9 commit 516d92304a7fa9b869c934436aa3e1c5202f03c9 Author: Kevin Bowling AuthorDate: 2024-10-12 07:53:57 +0000 Commit: Kevin Bowling CommitDate: 2024-10-12 07:53:57 +0000 igc: Improve a comment and update copyright dates MFC after: 1 week --- sys/dev/igc/if_igc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/igc/if_igc.h b/sys/dev/igc/if_igc.h index 57949c3ad38a..94e41104f28e 100644 --- a/sys/dev/igc/if_igc.h +++ b/sys/dev/igc/if_igc.h @@ -3,7 +3,7 @@ * * Copyright (c) 2001-2024, Intel Corporation * Copyright (c) 2016 Nicole Graziano - * Copyright (c) 2021 Rubicon Communications, LLC (Netgate) + * Copyright (c) 2021-2024 Rubicon Communications, LLC (Netgate) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -270,7 +270,7 @@ struct rx_ring { unsigned long rx_packets; unsigned long rx_bytes; - /* Next requested ITR latency */ + /* Next requested EITR latency */ u8 rx_nextlatency; }; From nobody Sat Oct 12 13:38:45 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQl2F35fpz5YQ1g; Sat, 12 Oct 2024 13:38: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQl2F2Y2Kz4kQQ; Sat, 12 Oct 2024 13:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728740325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SlIlcEIKUSM9GomrxHyThhyKNm596AsgeZbenOSzROs=; b=wrxZSi2zfk86+jic3B1GoX6kJVJeHy72FrKehOH9h65zj4eu94a/I2B5e7IHqTn+4HVOkw hOzyzobxdtJptzZW5fmloKPrbPX86Mpe8EWErpBisfhgsVGKy4JEbxzmReameciqm5PawP SLgpngTXTKDGLxbBuLr3SkrbVCOp885ykKn3qopNeGorNsXjA1xsSTGFP2VaNA+PcROGsj LegpTsOvr1oM/Ix5xOudbIPU5waxDTBqa5ClvzcWUufIirZ30qC9LxqmosaynsoSFhDg0I cwwaVoKWisaqVPM6Fi2k9xV8ek8CblrfV8jmDAXl812oTWdD2+S7wmwB35ryHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728740325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SlIlcEIKUSM9GomrxHyThhyKNm596AsgeZbenOSzROs=; b=ehh+x1CqeLx8Ukx60JadKTce5nt+ZiQEJTHRklkD8WSm6EPz9uydn+LqGkV63y0BPTZXF8 anpl5kdQTLM4qLgXn5IOGbkBjRZ/qTG3lF1I97JFR1kCNwuxRrZtNgTMcHQQAR6s7h5ZuN BS1UjzcmW5XnyjROmQ/2SMFETKtAPR0jpoDof9enbhbRWznyJFlIVSX3NLpoRDA4dbfufn WWDnI/0e2v2pURliN0xxn8Gn7d0P8EC4Y5B5LaCWJ0KBXQ11k8jEnDMuLrvxIlZX1sX8ND xpJNhzaHHhh9urR/PwdV6fH8YkdUA4dSt0831XE/k4pHA2qKI20XHUahjV5swg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728740325; a=rsa-sha256; cv=none; b=wPCMRPGejMMGau64WbnUIVMPUZwCz6MGW3JuR9BEull5kRrQ51u9Z7CMqmdx+Jd9Z4PWpC Km68Vv2twcnk5KA8RglHhCxtcBFRjk64dNVuS7zkbYwOY4cMys3yZ+TkEs9TApi4tOBMC2 xSNMIvG3GsItpu0Xpds7oUauAJWBYMTReRBLGt/Sg00xO9CozUoVrOeQ89AnRVzC0keEdV 1KVgdsDAagMZx0sH5ugH2ifk/oO9CGDSbyLZF0+xgeX4UZJXqRqetlFB6SFOZOUIvSSAp3 Mm1ZFuwX3EBG8s5lXNAk1htN/271Ew29JDHYzYl+0r146bLnSJnFntUz8M6yjg== 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 4XQl2F1wdMz1QsP; Sat, 12 Oct 2024 13:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CDcjcp092296; Sat, 12 Oct 2024 13:38:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CDcjqV092293; Sat, 12 Oct 2024 13:38:45 GMT (envelope-from git) Date: Sat, 12 Oct 2024 13:38:45 GMT Message-Id: <202410121338.49CDcjqV092293@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: eacad82f3ad0 - main - if_enc(4): Use new KPI to create enc interface List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: eacad82f3ad0af7d74968e73ed383fc4531d1924 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=eacad82f3ad0af7d74968e73ed383fc4531d1924 commit eacad82f3ad0af7d74968e73ed383fc4531d1924 Author: Zhenlei Huang AuthorDate: 2024-06-27 09:22:37 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-12 13:37:53 +0000 if_enc(4): Use new KPI to create enc interface This driver allows only exactly one instance to be created. Clone creating additional interfaces, e.g. `ifconfig enc1 create`, will get error EEXIST which is somewhat confusing. Convert to new KPI for less confusing error ENOSPC. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45758 --- sys/net/if_enc.c | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c index 3c7ae38324c3..3c3f19661063 100644 --- a/sys/net/if_enc.c +++ b/sys/net/if_enc.c @@ -94,8 +94,9 @@ VNET_DEFINE_STATIC(struct if_clone *, enc_cloner); static int enc_ioctl(struct ifnet *, u_long, caddr_t); static int enc_output(struct ifnet *, struct mbuf *, const struct sockaddr *, struct route *); -static int enc_clone_create(struct if_clone *, int, caddr_t); -static void enc_clone_destroy(struct ifnet *); +static int enc_clone_create(struct if_clone *, char *, size_t, + struct ifc_data *, struct ifnet **); +static int enc_clone_destroy(struct if_clone *, struct ifnet *, uint32_t); static void enc_add_hhooks(struct enc_softc *); static void enc_remove_hhooks(struct enc_softc *); @@ -139,11 +140,14 @@ SYSCTL_INT(_net_enc_out, OID_AUTO, ipsec_bpf_mask, CTLFLAG_RW | CTLFLAG_VNET, &VNET_NAME(bpf_mask_out), 0, "IPsec output bpf mask"); -static void -enc_clone_destroy(struct ifnet *ifp) +static int +enc_clone_destroy(struct if_clone *ifc, struct ifnet *ifp, uint32_t flags) { struct enc_softc *sc; + if (ifp->if_dunit == 0 && (flags & IFC_F_FORCE) == 0) + return (EINVAL); + sc = ifp->if_softc; KASSERT(sc == V_enc_sc, ("sc != ifp->if_softc")); @@ -151,31 +155,26 @@ enc_clone_destroy(struct ifnet *ifp) if_detach(ifp); if_free(ifp); free(sc, M_DEVBUF); - V_enc_sc = NULL; + return (0); } static int -enc_clone_create(struct if_clone *ifc, int unit, caddr_t params) +enc_clone_create(struct if_clone *ifc, char *name, size_t len, + struct ifc_data *ifd, struct ifnet **ifpp) { struct ifnet *ifp; struct enc_softc *sc; - sc = malloc(sizeof(struct enc_softc), M_DEVBUF, - M_WAITOK | M_ZERO); + sc = malloc(sizeof(struct enc_softc), M_DEVBUF, M_WAITOK | M_ZERO); ifp = sc->sc_ifp = if_alloc(IFT_ENC); - if (V_enc_sc != NULL) { - if_free(ifp); - free(sc, M_DEVBUF); - return (EEXIST); - } - V_enc_sc = sc; - if_initname(ifp, encname, unit); + if_initname(ifp, encname, ifd->unit); ifp->if_mtu = ENCMTU; ifp->if_ioctl = enc_ioctl; ifp->if_output = enc_output; ifp->if_softc = sc; if_attach(ifp); bpfattach(ifp, DLT_ENC, sizeof(struct enchdr)); + *ifpp = ifp; return (0); } @@ -375,10 +374,18 @@ enc_remove_hhooks(struct enc_softc *sc) static void vnet_enc_init(const void *unused __unused) { + struct ifnet *ifp; - V_enc_sc = NULL; - V_enc_cloner = if_clone_simple(encname, enc_clone_create, - enc_clone_destroy, 1); + struct if_clone_addreq req = { + .create_f = enc_clone_create, + .destroy_f = enc_clone_destroy, + .flags = IFC_F_AUTOUNIT | IFC_F_LIMITUNIT, + .maxunit = 0, + }; + V_enc_cloner = ifc_attach_cloner(encname, &req); + struct ifc_data ifd = { .unit = 0 }; + ifc_create_ifp(encname, &ifd, &ifp); + V_enc_sc = ifp->if_softc; } VNET_SYSINIT(vnet_enc_init, SI_SUB_PSEUDO, SI_ORDER_ANY, vnet_enc_init, NULL); @@ -398,7 +405,8 @@ vnet_enc_uninit(const void *unused __unused) { KASSERT(V_enc_sc != NULL, ("%s: V_enc_sc is %p\n", __func__, V_enc_sc)); - if_clone_detach(V_enc_cloner); + ifc_detach_cloner(V_enc_cloner); + V_enc_sc = NULL; } VNET_SYSUNINIT(vnet_enc_uninit, SI_SUB_INIT_IF, SI_ORDER_ANY, vnet_enc_uninit, NULL); From nobody Sat Oct 12 13:58:38 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQlTC17XPz5YQwG; Sat, 12 Oct 2024 13:58: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQlTC0bKzz4m6Q; Sat, 12 Oct 2024 13:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728741519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UyQkZqmuPwWYWzMloVq6NwmrKJo6mbnccfhmrSKHXc4=; b=ikYrAzknA4SJGt6x1OE7a3fIW0waDtS0Wxz/zp2itUgNq+Qjwvp7nPZMI3+ouB21srRe2q xpqz0S7BlhRo7cDh/8WFd7SJ3tYtzFvuh6rbOKnVXF3KDJmR8P64LAc49enw7uHB4WUEjD PGUKKYFZhXwJ09K/+8CND3I6oS9R+N31E4SyeOfl1dWrxsJHO+iTyWI0sk5/mfcMQbC6Pi nNbvYE1S0qpRzgkKq6tPotiWEYLWf5+rMGOL01lqKf+k6q9ofY2Sz9fkZxX+vFHe8FjaRe v+jtCrKYKr0MdCV3NsTyMHgGgf7Xa+dbH+kWZRprewpvPa0i6w42QG4r9tIvGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728741519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UyQkZqmuPwWYWzMloVq6NwmrKJo6mbnccfhmrSKHXc4=; b=UH/OoKlTl4KzqBrQqIYs4Mpc9SNcYADVa2XpTr4aapbI+1HeSwl2BKVcNoYl31I0yY2Mp8 rHaYaoUvECdEhGnVXKVrmeBYG4n7AtsDABy5cYWHBqWakU6LEKhFgoTox2FIhb7rYOvPY+ TKVfOV3fxJhfaic0MZ6mxCAxwbcXVD9bd9hzg2cCK8vA9cF75qdCxMIodEUmCtNWKqKvHF Jc8hMUCjmlWJnjLQ8IkZhgNsnbgXtZAtIgQCG5U341yqYtk9QT1kvEPomAjMaBDDycHw4V MxHir79KZk21koV7KTlHZMNwzHA8q2dRpH+ngxAXb5eyl4+IrcoVXFXuejmkLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728741519; a=rsa-sha256; cv=none; b=cLQH8C9Lgb7Ebzlf++qnecQwMF0NUu4SlQzXAGUqCiGn0f4Edd2ZYgbolqbEDH9fIHg3BU iEH91KJwL1V/2L9NCzGlL5RQtolU0TRdohiPcMnqKWco0VAtdwON979lwZGKDUcrkxBncR XVhonvPy9O8fqNMfb4nhMNYxgo+ZXK/QsLYAOu1LiUW9QHbLX1C+hDJVeCsQvJZdbcOopi piJn8Cz1WO79Ucdypky3PTil94fhgfHSbgUcUypUfJoxB9PovyWpIFqhzg3UejgaeViWzr xKop256U71RoSOl9VYTYivtbhnrEIVFEp+gsu2EtC+zf6nZZgtiiJk5aOY3zaw== 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 4XQlTC08lHz1RHb; Sat, 12 Oct 2024 13:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CDwcpo026222; Sat, 12 Oct 2024 13:58:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CDwcRH026219; Sat, 12 Oct 2024 13:58:38 GMT (envelope-from git) Date: Sat, 12 Oct 2024 13:58:38 GMT Message-Id: <202410121358.49CDwcRH026219@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: c7a2636889a6 - main - axgbe: Fix setting promisc mode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c7a2636889a649985e323de23fe495608b6fe483 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c7a2636889a649985e323de23fe495608b6fe483 commit c7a2636889a649985e323de23fe495608b6fe483 Author: Zhenlei Huang AuthorDate: 2024-10-12 13:56:56 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-12 13:56:56 +0000 axgbe: Fix setting promisc mode Ethernet drivers should respect IFF_PROMISC rather than IFF_PPROMISC. The latter is for user-requested promisc mode, it implies the former but not vice versa. Some in-kernel components such as if_bridge(4) and bpf(4) will set promisc mode for interfaces on-demand. While here, update the debugging message to be not confusing. This was spotted while reviewing markj@ 's work D46524. Test from Franco shows that the interface seems to be unconditionally initialized to promisc mode regardless of this fix. That needs further investigation. Reviewed by: markj, Franco Fichtner Tested by: Franco Fichtner MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46794 --- sys/dev/axgbe/if_axgbe_pci.c | 10 ++++++---- sys/dev/axgbe/xgbe-dev.c | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/axgbe/if_axgbe_pci.c b/sys/dev/axgbe/if_axgbe_pci.c index d3078a1c33c1..290156ff11ca 100644 --- a/sys/dev/axgbe/if_axgbe_pci.c +++ b/sys/dev/axgbe/if_axgbe_pci.c @@ -2363,11 +2363,11 @@ axgbe_if_promisc_set(if_ctx_t ctx, int flags) axgbe_printf(1, "%s: MAC_PFR 0x%x drv_flags 0x%x if_flags 0x%x\n", __func__, XGMAC_IOREAD(pdata, MAC_PFR), if_getdrvflags(ifp), - if_getflags(ifp)); + flags); - if (if_getflags(ifp) & IFF_PPROMISC) { + if (flags & IFF_PROMISC) { - axgbe_printf(1, "User requested to enter promisc mode\n"); + axgbe_printf(1, "Requested to enter promisc mode\n"); if (XGMAC_IOREAD_BITS(pdata, MAC_PFR, PR) == 1) { axgbe_printf(1, "Already in promisc mode\n"); @@ -2376,10 +2376,11 @@ axgbe_if_promisc_set(if_ctx_t ctx, int flags) axgbe_printf(1, "Entering promisc mode\n"); XGMAC_IOWRITE_BITS(pdata, MAC_PFR, PR, 1); + /* Disable VLAN filtering */ XGMAC_IOWRITE_BITS(pdata, MAC_PFR, VTFE, 0); } else { - axgbe_printf(1, "User requested to leave promisc mode\n"); + axgbe_printf(1, "Requested to leave promisc mode\n"); if (XGMAC_IOREAD_BITS(pdata, MAC_PFR, PR) == 0) { axgbe_printf(1, "Already not in promisc mode\n"); @@ -2388,6 +2389,7 @@ axgbe_if_promisc_set(if_ctx_t ctx, int flags) axgbe_printf(1, "Leaving promisc mode\n"); XGMAC_IOWRITE_BITS(pdata, MAC_PFR, PR, 0); + /* Enable VLAN filtering */ XGMAC_IOWRITE_BITS(pdata, MAC_PFR, VTFE, 1); } diff --git a/sys/dev/axgbe/xgbe-dev.c b/sys/dev/axgbe/xgbe-dev.c index 3a7d683ea5a9..48f3f2b587f0 100644 --- a/sys/dev/axgbe/xgbe-dev.c +++ b/sys/dev/axgbe/xgbe-dev.c @@ -970,7 +970,7 @@ xgbe_config_rx_mode(struct xgbe_prv_data *pdata) { unsigned int pr_mode, am_mode; - pr_mode = ((if_getflags(pdata->netdev) & IFF_PPROMISC) != 0); + pr_mode = ((if_getflags(pdata->netdev) & IFF_PROMISC) != 0); am_mode = ((if_getflags(pdata->netdev) & IFF_ALLMULTI) != 0); xgbe_set_promiscuous_mode(pdata, pr_mode); From nobody Sat Oct 12 18:15:20 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQs9N6ZRZz5Ymjv; Sat, 12 Oct 2024 18:15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQs9N5xWvz4C9b; Sat, 12 Oct 2024 18:15:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728756920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SMFdblNK+RqoNnd541hEG3/UPSg4EfGeBiGddquVdQ8=; b=rorb9KHru02iasyn9dHnWtXfM/DxA9cY1RfLcqlDh7d70B/VrUFnw6U101ZlQe62Fo98k1 rX2qyhFV0+iC71l9VvCCUWT89i4Bzi2gP102ZVK2wHNR2dy72QNKgfRpCAhstq7zy9T51r 2eZjtNGVVgFKE0ZCKhyGbXwakRA0T+lxJTC7Fa3YJGWxJOzrKAsq8LGxkTT4iLusERDZa2 VKwr7Za1B7rUwTBnDIrPW2/Rs3GA3vWnq7BBGYyRCT1TswUGmGl5ZmTfjiEQH4Jst9gsbP 7tvebm+XnnfIM6Vcw8VoXN6CjXMnU+8btPWeODYAwB7jTPyh1xH1XcEMcOksCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728756920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SMFdblNK+RqoNnd541hEG3/UPSg4EfGeBiGddquVdQ8=; b=faIANP2sZ1OCwvHAMqLuUr47lhIDyJBe/yABjZIIFkqcrIm1R02JUo+IM3jAOJjkrymJ3A YaBQ+Eojr0lMHvH5j3am0O/o4kxxBStdpCUoA9QzbuE9aCVoRFxJqApG/sBCLkBgwY1avD /cuCLO0C3nfV1Cv8CbozU1jstd7WX0C7drzf0r0ngORzcQ3Y0EOIKNJi7+ILMVXKmHh4+p SnWxHvxnpIYqgY8/ZZ4A1e5GsTTesflam8KZtcTKxxwbUM/un4jWAvB1qSzBrZHNK8lYWz ERi+pR/N/Uy4ptzvLQP1UUViu59XkBiyQmQmC02T/JPiAPz5JPisIFlYe9TnOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728756920; a=rsa-sha256; cv=none; b=KcstQa2B8MRO8pFRgEM88PDAsNZjDhhIrOETT8wOINcK2gV0B4j62mAKcpxghn1Xne+uaP u4jTaEdutpFzo2I83xm4KpnuZjnAL7md/EkkFgXCcYw6Wsa1j0JPutZ3Hgy9wA5XJ8Erqo ZiEwAeq7Lb/hcrNnPRF1yWDj9FKACAeyrsuEbbsku9DuqRC7RPb1UZFAfMXiEE3qX69/R7 JgptrzdTMsKgV9gj/cTiftG5EX/RwT8J6CkCAw79NgywkDl+zRRc/XDoGwwLgKDZ0mH+NS J97WoYIqTr6VT4jVGw+OXCDvo944POdgtb/8mSumD3w1Alc/0bAW54MUxXIjdg== 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 4XQs9N5XJGzKh3; Sat, 12 Oct 2024 18:15:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CIFKol066146; Sat, 12 Oct 2024 18:15:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CIFKdF066143; Sat, 12 Oct 2024 18:15:20 GMT (envelope-from git) Date: Sat, 12 Oct 2024 18:15:20 GMT Message-Id: <202410121815.49CIFKdF066143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: c808132731aa - main - acpi_gpiobus: OR GPIO_PIN_(IN|OUT)PUT into flags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c808132731aa999947f4f7810157d7d8d9aaf61e Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c808132731aa999947f4f7810157d7d8d9aaf61e commit c808132731aa999947f4f7810157d7d8d9aaf61e Author: Colin Percival AuthorDate: 2024-10-12 18:12:15 +0000 Commit: Colin Percival CommitDate: 2024-10-12 18:14:25 +0000 acpi_gpiobus: OR GPIO_PIN_(IN|OUT)PUT into flags Right now flags is set to 0 before this "=" -> "|=" change, but it will matter when the NOT_YET section above becomes effective. MFC after: 2 weeks Sponsored by: Amazon --- sys/dev/gpio/acpi_gpiobus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/gpio/acpi_gpiobus.c b/sys/dev/gpio/acpi_gpiobus.c index eafa1c07fab1..3b6fc6dde674 100644 --- a/sys/dev/gpio/acpi_gpiobus.c +++ b/sys/dev/gpio/acpi_gpiobus.c @@ -75,10 +75,10 @@ acpi_gpiobus_convflags(ACPI_RESOURCE_GPIO *gpio_res) #endif switch (gpio_res->IoRestriction) { case ACPI_IO_RESTRICT_INPUT: - flags = GPIO_PIN_INPUT; + flags |= GPIO_PIN_INPUT; break; case ACPI_IO_RESTRICT_OUTPUT: - flags = GPIO_PIN_OUTPUT; + flags |= GPIO_PIN_OUTPUT; break; } From nobody Sat Oct 12 18:30:13 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQsVY26Zrz5YnX5; Sat, 12 Oct 2024 18:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQsVY1bmZz4Dbl; Sat, 12 Oct 2024 18:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5l6mNV90/Derdbc+5IAV4IOtDfqQMW2T18yJssexedk=; b=gYBRsVHux0HeYNtgcurVewPA+auEI9l35zI8IlFcGdAsqBKUJhR3WvyCRGNhzILBkkBBZf KuviiLRzo6cqsEZjUnEx8P3XqN/wVAMcwnV6/I5FGxTsigcDMrgw0a398TrEgVMYwoZsQU d6vPe06ws8oj9Yt5Y4qnmOgVrDAo4x4cQFZRnMQS9fEU4xxfB7XM8sA5x/T8e6jJ/b7nBX zV3p7LDQzT58GKGwjoSKhQexypvmGJ4zj/PySDgU5wRukaHZEtlxDjsAz6wOKsIUTK28So ESv1K7hSZH0xXDSKKEIT0QPG6ohG7qQL4GKZp60Jr/PHzLHmsrjajAvuSY1wsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5l6mNV90/Derdbc+5IAV4IOtDfqQMW2T18yJssexedk=; b=gOD5kk1HxZGOUB6Z8Be++jYp21PlXWD3pjEsVwryUJVWjIIfSc/UYGIAtE7MAwlRLzziog CIQcpoc2uyW0ZMyUhN68IbjQ7oz36lu1VxA/njfcbYJcVy8QqQeSFhEDg3Al+coRtnlliM SFAg5OTWVdMQ15dXpnE7VtOSzgXaKFbxuNtCCKmCM+Kq5QCLNxf1nnUn2E+zQ+JRr1/AIy g6vrA7irfPXgPs8azT8GE5Js4PvqMrXcpeWhjHq4fn+NacsQKYGbfQitENrinq4hz6nyku kFbVV/o8c4OrxI1kzqAfUCXN2ZynDhzHpKkL7g+DzVboc7F83p6fs168K2aA3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728757813; a=rsa-sha256; cv=none; b=XOnDYnhlFIt8Ef2K9t8kC8yfVczBevphv5qQkF3XUdIIctpytEFA2101McX39nXstghzV6 m38ESnGWAAUc2cbqjKLYxQ4SU59uTS2wqUpU4uhAiXYIYmZSrfaX79BL8/97V9bAMgECGG RB+stadrSc9JtkxqwffB7Nx2NYdK7ewErad7P0R2vEMUafwI3i7Dl0qgYiS1SWpzXkeymg tv0Pnuamc/wGrNUt7v7Td0MN7GqQOnpqMWAzbQzpKqw0i9fE9FbqiUs8up2pLbjtxnR4vK sQacdCNBMyqRghJ6P/H59Z/+lerWE+o+ig4fhDuBIUyQxw/x5ONpvImVsHSZ0A== 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 4XQsVY11HfzLmt; Sat, 12 Oct 2024 18:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CIUDAc089137; Sat, 12 Oct 2024 18:30:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CIUDdl089132; Sat, 12 Oct 2024 18:30:13 GMT (envelope-from git) Date: Sat, 12 Oct 2024 18:30:13 GMT Message-Id: <202410121830.49CIUDdl089132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: aaa302d17fe1 - main - last(1): Complete libxo transition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aaa302d17fe1ac0e7075ce9189c1452fe49dce36 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=aaa302d17fe1ac0e7075ce9189c1452fe49dce36 commit aaa302d17fe1ac0e7075ce9189c1452fe49dce36 Author: Yan-Hao Wang AuthorDate: 2024-10-12 14:05:14 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-12 18:21:45 +0000 last(1): Complete libxo transition Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41424 --- usr.bin/last/last.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c index c6b1b646ab70..69848f359d79 100644 --- a/usr.bin/last/last.c +++ b/usr.bin/last/last.c @@ -36,7 +36,6 @@ #include #include -#include #include #include #include @@ -106,7 +105,7 @@ usage(void) xo_error( "usage: last [-swy] [-d [[CC]YY][MMDD]hhmm[.SS]] [-f file] [-h host]\n" " [-n maxrec] [-t tty] [user ...]\n"); - exit(1); + exit(EXIT_FAILURE); } int @@ -120,8 +119,7 @@ main(int argc, char *argv[]) argc = xo_parse_args(argc, argv); if (argc < 0) - exit(1); - atexit(xo_finish_atexit); + exit(EXIT_FAILURE); maxrec = -1; snaptime = 0; @@ -138,8 +136,11 @@ main(int argc, char *argv[]) if (p == NULL) p = strchr(argv[optind], ch); maxrec = atol(p); - if (!maxrec) - exit(0); + if (!maxrec) { + if (xo_finish() < 0) + xo_err(EXIT_FAILURE, "stdout"); + exit(EXIT_SUCCESS); + } } break; case 'd': @@ -205,7 +206,9 @@ main(int argc, char *argv[]) } } wtmp(); - exit(0); + if (xo_finish() < 0) + xo_err(EXIT_FAILURE, "stdout"); + exit(EXIT_SUCCESS); } /* @@ -278,8 +281,11 @@ doentry(struct utmpx *bp) * shutdown/reboot appears while we are tracking the * active range */ - if (snaptime && snapfound) - exit(0); + if (snaptime && snapfound) { + if (xo_finish() < 0) + xo_err(EXIT_FAILURE, "stdout"); + exit(EXIT_SUCCESS); + } /* * don't print shutdown/reboot entries unless flagged for */ @@ -340,8 +346,11 @@ printentry(struct utmpx *bp, struct idtab *tt) time_t delta; /* time difference */ time_t t; - if (maxrec != -1 && !maxrec--) - exit(0); + if (maxrec != -1 && !maxrec--) { + if (xo_finish() < 0) + xo_err(EXIT_FAILURE, "stdout"); + exit(EXIT_SUCCESS); + } xo_open_instance("last"); t = bp->ut_tv.tv_sec; tm = localtime(&t); From nobody Sat Oct 12 18:30:14 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQsVZ2LT5z5YnSx; Sat, 12 Oct 2024 18:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQsVZ1mPJz4Dbm; Sat, 12 Oct 2024 18:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DPUafvtrYVPmDH1tOXAJfrhkj8QaC8bA1GqVEsOaaTE=; b=DJHXRCOKVkLvc2wp1EGlOrNDTyKPmJrQz6YwohI075HXO29Aba9+GQGB/FFk9EBxtL871B virLdnNBzXOk9YWIgx7xKwgee3bW6NrI1/XHPgc6U+W2SfRy5ae7h7ke6NqBcSbGG/Sd27 DKY8r2CGeVHKjKOv3pQRjGCE30HVjQ4DrtFb3PhpQ9W24xQS77H99JnEQcSMMKvy3Vbv06 P6/gdcngwMhkb3JebU7Z8KW3ys0/uvYkBhTRzUqATLVeSWWyeyN6Wdpdd1NR4clAFjAWtc InkM0kSNd5W0FLAeMM58skmjOec9aJBOzBEkaIYBSS3RDr6gMiIB1ThRTAiwoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DPUafvtrYVPmDH1tOXAJfrhkj8QaC8bA1GqVEsOaaTE=; b=KXFUunoLk4OvH6iceDrJb9eOFJKbZJmyoRc6ccdL/aOO4xy5reciFRFGtdGZK0J+TVl8eL mLeLH6bz+amjTwy7kE4cg3USbJOYD42sqoDzbgKKMi4gS6WkDtWlQ6Ptp5EgWcifnnwZzj ldMSVzYcU4k6mY5cg1SHxKlQKbY1cr9MUdQ5IBS50r7/yjTMin6lx/stulCBKES4mSLy57 eucESM7rfHvpSbXMV2XW9xSvF4qbkQEW4FGDS+DfyRsmtvoKzJccs1ASueXDJkNtRjY72n 7BNOVWuC1XXEDncP1FCS3q43X6EoZUJLY5MQ9JtJhWNc7rm01X2HGe+bxPtotQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728757814; a=rsa-sha256; cv=none; b=ZCJ6PWah4IjKkhUJSC/x/lQsfKhSL9lxp9YI5vmfwwPuVt5iiOzPROOWa3aMvmD5B5FmEC PCYgriAW96ZiYSZOmZlTOAtw015xFbFXLticARlYRJG61kuI13djER0h0FgQe0989PQ0lG r0R/D/zuQ2LvSMAI5IRA9ScOkLVp9kzhqXKYFio/GsoOcBbSMoNzD8oCgUrkJ1js9+bgQC xjzT6RSZ2qnPXIV6D98vUMeKYym9nY7lj5MH+Qo/SdTqsjOPDcby+ThgXDItqCIgEpTlPZ WBvguWWcTZ2MLtcvaNRIiE/oMut6xYAh8vDQVZu6yG3USl6Rzza6f4SRmZRLWw== 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 4XQsVZ1MFQzLSK; Sat, 12 Oct 2024 18:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CIUE56089817; Sat, 12 Oct 2024 18:30:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CIUEcc089812; Sat, 12 Oct 2024 18:30:14 GMT (envelope-from git) Date: Sat, 12 Oct 2024 18:30:14 GMT Message-Id: <202410121830.49CIUEcc089812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 417842f90861 - main - arp(8): Complete libxo transition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 417842f908619336dd4c739a92c326ade2c35770 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=417842f908619336dd4c739a92c326ade2c35770 commit 417842f908619336dd4c739a92c326ade2c35770 Author: Yan-Hao Wang AuthorDate: 2024-10-12 14:38:45 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-12 18:21:45 +0000 arp(8): Complete libxo transition Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41408 --- usr.sbin/arp/arp.c | 11 ++++++----- usr.sbin/arp/arp_netlink.c | 5 ++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c index 8cd18d875820..ee4236b5299b 100644 --- a/usr.sbin/arp/arp.c +++ b/usr.sbin/arp/arp.c @@ -55,7 +55,6 @@ #include #include -#include #include #include #include @@ -169,7 +168,8 @@ main(int argc, char *argv[]) xo_close_list("arp-cache"); xo_close_container("arp"); - xo_finish(); + if (xo_finish() < 0) + xo_err(1, "stdout"); } else { if (argc != 1) usage(); @@ -206,7 +206,7 @@ main(int argc, char *argv[]) if (ifnameindex != NULL) if_freenameindex(ifnameindex); - return (rtn); + exit(rtn); } /* @@ -446,7 +446,8 @@ get(char *host) xo_close_list("arp-cache"); xo_close_container("arp"); - xo_finish(); + if (xo_finish() < 0) + xo_err(1, "stdout"); return (found == 0); } @@ -723,7 +724,7 @@ nuke_entries(uint32_t ifindex, struct in_addr addr) static void usage(void) { - fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n", + xo_error("%s\n%s\n%s\n%s\n%s\n%s\n%s\n", "usage: arp [-n] [-i interface] hostname", " arp [-n] [-i interface] -a", " arp -d hostname [pub]", diff --git a/usr.sbin/arp/arp_netlink.c b/usr.sbin/arp/arp_netlink.c index 24e01126044b..db1ef775dea2 100644 --- a/usr.sbin/arp/arp_netlink.c +++ b/usr.sbin/arp/arp_netlink.c @@ -2,7 +2,6 @@ #include #include #include -#include #include #include @@ -43,12 +42,12 @@ nl_init_socket(struct snl_state *ss) if (modfind("netlink") == -1 && errno == ENOENT) { /* Try to load */ if (kldload("netlink") == -1) - err(1, "netlink is not loaded and load attempt failed"); + xo_err(1, "netlink is not loaded and load attempt failed"); if (snl_init(ss, NETLINK_ROUTE)) return; } - err(1, "unable to open netlink socket"); + xo_err(1, "unable to open netlink socket"); } static bool From nobody Sat Oct 12 18:30:15 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQsVb47wtz5Ynfk; Sat, 12 Oct 2024 18:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQsVb2jPqz4Dfc; Sat, 12 Oct 2024 18:30:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=evHBiyx9qvJ5AxXG0aJaF6/vUR9Kqm1SxTEfKcF+NgE=; b=Ye0fd2nNBMJPUc3rsVqdq1XvyVjkkvpBICNG1j1qF00RI6HHmFNMRv+unjuAE0Pr2UPuYW a1tYMXm5pFBn9J3fSfU4oVta8wFyV927hc+VVf43KwMhfqSxoJoXCGwQ78+HfBTuJeSv5W Hj3OHgL/GqYsRmpnREe2OJlpm70ER9/FbWCwOgoTJ9wCIbkpD1p7G+2WvJGE68TMt4tu28 SNtq4gglQxzowPUR/bv2O6GhC2ul4cH0b8JCczcvbw7nxW1ItlwqqyqrhPfqSxcFeWJ5rN jo9Aa2F9ExDLj9hR7UkKdh+azAS5ZO4jIeYdC7dGDh0xp2VnP+l683grLD+X9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=evHBiyx9qvJ5AxXG0aJaF6/vUR9Kqm1SxTEfKcF+NgE=; b=Cz0uiuv4l8yvkbCeZxAQpLSOsP4J/a8JDBNGHe03u+VJTzWs22N0mIhmp+mVyqoy6UAD9M 3mFNZCtNOa/HRxuwT6t1Uw55gQZUNUNlTida5+FL4F4x/G8CcbQgVKzquhZ24oYSE4Bvgr ByPMV18P1IZsNv/Z3nAY8yuYyuIEl1DCjwDn++/NAraHF05utS5F1r+Y2tgpSbxkvenUFI +tMGo766bmzzqC6Acdce9s14UDI+Jue2c8lUxgpqd6Ca2V11+YujV6D0kcikk2ewy/7erS YqgqEs7jl0U3qKMlu7WuE2vaoK+VXGKVhWSzVSHLXXA4bVeffYrmnp3vrmO0NA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728757815; a=rsa-sha256; cv=none; b=BPtqHqGmAw18fiK9LA7pJ6qL1XWRlw8UaVRl0WnaHkeIwv3McfeO44qu/fWhIwSn7cHenm WftR3N2UvjsXYha98yD9PCpwmTx3nNFupueYz9Zfm4bxhbjEBJqQpT0unWx3q0WYMoaU62 iLipni/9+YOEzgCUXDE91Ss+wFII/R6jbJVZhFzbseS5GMF7Lk+HzamPhBFsQ1IyOYw8WH yC4FOxZ1ti4coiM4oRNHPlh4+/jIa4HWPcMQaeGlH0IitJE4mYjzHcmjVS+vswaFJeRnrn /or68dMOzsnBQhSUE9zCXJMefHFkkcn9AxD2O2WS4pcbxEIrExf0rwkYrKo73g== 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 4XQsVb1mk1zLgD; Sat, 12 Oct 2024 18:30:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CIUFO9090515; Sat, 12 Oct 2024 18:30:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CIUFGw090509; Sat, 12 Oct 2024 18:30:15 GMT (envelope-from git) Date: Sat, 12 Oct 2024 18:30:15 GMT Message-Id: <202410121830.49CIUFGw090509@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 54ff53d89015 - main - ndp(8): Complete libxo transition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54ff53d89015cd4338bcca6060fe2877309f6db3 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=54ff53d89015cd4338bcca6060fe2877309f6db3 commit 54ff53d89015cd4338bcca6060fe2877309f6db3 Author: Yan-Hao Wang AuthorDate: 2024-10-12 14:47:51 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-12 18:21:46 +0000 ndp(8): Complete libxo transition Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41417 --- usr.sbin/ndp/ndp.c | 20 ++++++++++---------- usr.sbin/ndp/ndp_netlink.c | 6 ++---- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index 7c7bc60451c8..a023a7d0ad77 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -103,7 +103,6 @@ #include #include #include -#include #include #include #include @@ -350,7 +349,8 @@ main(int argc, char **argv) break; } xo_close_container("ndp"); - xo_finish(); + if (xo_finish() < 0) + xo_err(1, "stdout"); return (ret); } @@ -921,16 +921,16 @@ ndp_ether_aton(char *a, u_char *n) static void usage(void) { - printf("usage: ndp [-nt] hostname\n"); - printf(" ndp [-nt] -a | -c | -p | -r | -H | -P | -R\n"); - printf(" ndp [-nt] -A wait\n"); - printf(" ndp [-nt] -d hostname\n"); - printf(" ndp [-nt] -f filename\n"); - printf(" ndp [-nt] -i interface [flags...]\n"); + xo_error("usage: ndp [-nt] hostname\n"); + xo_error(" ndp [-nt] -a | -c | -p | -r | -H | -P | -R\n"); + xo_error(" ndp [-nt] -A wait\n"); + xo_error(" ndp [-nt] -d hostname\n"); + xo_error(" ndp [-nt] -f filename\n"); + xo_error(" ndp [-nt] -i interface [flags...]\n"); #ifdef SIOCSDEFIFACE_IN6 - printf(" ndp [-nt] -I [interface|delete]\n"); + xo_error(" ndp [-nt] -I [interface|delete]\n"); #endif - printf(" ndp [-nt] -s nodename etheraddr [temp] [proxy]\n"); + xo_error(" ndp [-nt] -s nodename etheraddr [temp] [proxy]\n"); exit(1); } diff --git a/usr.sbin/ndp/ndp_netlink.c b/usr.sbin/ndp/ndp_netlink.c index bafa9f2a143d..546057e5e552 100644 --- a/usr.sbin/ndp/ndp_netlink.c +++ b/usr.sbin/ndp/ndp_netlink.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -42,7 +41,6 @@ #include #include -#include #include "ndp.h" #define RTF_ANNOUNCE RTF_PROTO2 @@ -56,12 +54,12 @@ nl_init_socket(struct snl_state *ss) if (modfind("netlink") == -1 && errno == ENOENT) { /* Try to load */ if (kldload("netlink") == -1) - err(1, "netlink is not loaded and load attempt failed"); + xo_err(1, "netlink is not loaded and load attempt failed"); if (snl_init(ss, NETLINK_ROUTE)) return; } - err(1, "unable to open netlink socket"); + xo_err(1, "unable to open netlink socket"); } static bool From nobody Sat Oct 12 18:30:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQsVc55NCz5YnT3; Sat, 12 Oct 2024 18:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQsVc3F2yz4Dxm; Sat, 12 Oct 2024 18:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XBi8qZA5j0xfGesFltkQwiUBYCWKZKhEBV9m9Gu2O5Q=; b=McRuqmOj4NajpHVGU97o5xpom/BM/uumliJBTXPxNUAGG4cw0Y0Fkhv3Tpkklrir6/51c5 3p50+vITkPhI+nWSAbXPeM6b94fgNpkGa21PcVANqK4shGQTlEskLXF0TkP6YrzGeEheqf MpvFa8kLitup0U2oAm/mJiVehRNzfz43/8g3pREDLbhC1lPig52hZXeklUzD8c50HwL37L WnY06/QDIlgN+7V/0sciwRPRvZdi9zN+E+I0ozgk3gsKa4gIqHU188RtPo/ejh4o6NOPEi arT+FY/S139aA0g4OCW6nGPTX+51eHScLgONig8ulh2xgUGl4l2fy84kvFg4Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XBi8qZA5j0xfGesFltkQwiUBYCWKZKhEBV9m9Gu2O5Q=; b=UklaYrLdhOJtSJgxBwcexjfGoF1IpyvH7a+p72zuqU7Zia1e3NE4Md80rOfeZI8qK1SbaW J1+Sot2PTXkIwt5FDzKSz/cBnVOhl0kgYpts227d2aX8gzvg14ZNdqQDlKmdvob/FOsEzK XL39HbxLVhq1JnlxvVaIBt2HvogN9ZbtIU38mNSTUNq7zdx+aJlPzroCVy4tZq/d/6v+PZ qMFA1X7/ZOrMqAVuRY1O8JIakVhf+WlLy2P5YdjYsafwcoS6XKC0V1HswSbRTRFLysEnPY cvGXXIsxhJvCO1bXrODi/arzHLw0JYvKQYF3ki/xd5dmgHvjxhqrSmFq0d/YYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728757816; a=rsa-sha256; cv=none; b=f5Dli2ALu/uFZ6OJMMCuJoGWAygoTFnBC6DwFxO3S4yyQnSfpoym8zPZyGwoQHPAc92jaV gL5DnktdwuxwGl94JiLP5djU4bAcjYX4QC121o5uM/wj8eghHT6iblfE91s3u2F5a0v6s3 rdtViEknFNUR2Eqtf+V+YgHhllyHjmAReDNRc4byFlUDpX5rUVrpM7Ya4MbX+VSXb2M0IV cka+FAA2hOzDhMpyE2kn8zxoJcYt+O+NExC/MGxqIC9/AI5quAqMWVccTc1LKSjjcepRhw uAOpPf+JKTNwXlO0AJ2GJ1W/j8TzcDFf13+mzTMqnx2RkC9UpNXSFW4/Sr/ZIA== 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 4XQsVc2JBKzLSL; Sat, 12 Oct 2024 18:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CIUG7P091167; Sat, 12 Oct 2024 18:30:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CIUGm7091162; Sat, 12 Oct 2024 18:30:16 GMT (envelope-from git) Date: Sat, 12 Oct 2024 18:30:16 GMT Message-Id: <202410121830.49CIUGm7091162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 3d1b233e039d - main - sesutil(8): Complete libxo transition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d1b233e039daa6748cde507e313afa718b47e4d Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=3d1b233e039daa6748cde507e313afa718b47e4d commit 3d1b233e039daa6748cde507e313afa718b47e4d Author: Yan-Hao Wang AuthorDate: 2024-10-12 14:49:23 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-12 18:21:46 +0000 sesutil(8): Complete libxo transition Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41418 --- usr.sbin/sesutil/eltsub.c | 1 - usr.sbin/sesutil/sesutil.c | 46 ++++++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/usr.sbin/sesutil/eltsub.c b/usr.sbin/sesutil/eltsub.c index d18fad5cb784..d28c363bcb13 100644 --- a/usr.sbin/sesutil/eltsub.c +++ b/usr.sbin/sesutil/eltsub.c @@ -33,7 +33,6 @@ #include -#include #include #include #include diff --git a/usr.sbin/sesutil/sesutil.c b/usr.sbin/sesutil/sesutil.c index 24ac52bd9b5c..1fedaab39a64 100644 --- a/usr.sbin/sesutil/sesutil.c +++ b/usr.sbin/sesutil/sesutil.c @@ -37,7 +37,6 @@ #include #include -#include #include #include #include @@ -98,26 +97,26 @@ static const int nbcmds = nitems(cmds); static const char *uflag; static void -usage(FILE *out, const char *subcmd) +usage(const char *subcmd) { int i; if (subcmd == NULL) { - fprintf(out, "Usage: %s [-u /dev/ses] [options]\n", + xo_error("usage: %s [-u /dev/ses] [options]\n", getprogname()); - fprintf(out, "Commands supported:\n"); + xo_error("Commands supported:\n"); } for (i = 0; i < nbcmds; i++) { if (subcmd != NULL) { if (strcmp(subcmd, cmds[i].name) == 0) { - fprintf(out, "Usage: %s %s [-u /dev/ses] " + xo_error("usage: %s %s [-u /dev/ses] " "%s\n\t%s\n", getprogname(), subcmd, cmds[i].param, cmds[i].desc); break; } continue; } - fprintf(out, " %-12s%s\n\t\t%s\n\n", cmds[i].name, + xo_error(" %-12s%s\n\t\t%s\n\n", cmds[i].name, cmds[i].param, cmds[i].desc); } @@ -189,7 +188,7 @@ sesled(int argc, char **argv, bool setfault) onoff = false; if (argc != 3) { - usage(stderr, (setfault ? "fault" : "locate")); + usage(setfault ? "fault" : "locate"); } disk = argv[1]; @@ -200,7 +199,7 @@ sesled(int argc, char **argv, bool setfault) if (endptr != NULL && *endptr == '*') { xo_warnx("Must specifying a SES device (-u) to use a SES " "id# to identify a disk"); - usage(stderr, (setfault ? "fault" : "locate")); + usage(setfault ? "fault" : "locate"); } isses = true; } @@ -210,7 +209,7 @@ sesled(int argc, char **argv, bool setfault) } else if (strcmp(argv[2], "off") == 0) { onoff = false; } else { - usage(stderr, (setfault ? "fault" : "locate")); + usage(setfault ? "fault" : "locate"); } if (strcmp(disk, "all") == 0) { @@ -422,7 +421,7 @@ objmap(int argc, char **argv __unused) char str[32]; if (argc != 1) { - usage(stderr, "map"); + usage("map"); } memset(&e_desc, 0, sizeof(e_desc)); @@ -542,7 +541,8 @@ objmap(int argc, char **argv __unused) free(e_desc.elm_desc_str); xo_close_list("enclosures"); xo_close_container("sesutil"); - xo_finish(); + if (xo_finish() < 0) + xo_err(EXIT_FAILURE, "stdout"); return (EXIT_SUCCESS); } @@ -587,7 +587,7 @@ fetch_device_details(char *devnames, char **model, char **serial, off_t *size) comma = (int)strcspn(devnames, ","); asprintf(&tmp, "/dev/%.*s", comma, devnames); if (tmp == NULL) - err(1, "asprintf"); + xo_err(EXIT_FAILURE, "asprintf"); fd = open(tmp, O_RDONLY); free(tmp); if (fd < 0) { @@ -729,7 +729,7 @@ show(int argc, char **argv __unused) char str[32]; if (argc != 1) { - usage(stderr, "map"); + usage("map"); } first_ses = true; @@ -871,7 +871,8 @@ show(int argc, char **argv __unused) free(e_desc.elm_desc_str); xo_close_list("enclosures"); xo_close_container("sesutil"); - xo_finish(); + if (xo_finish() < 0) + xo_err(EXIT_FAILURE, "stdout"); return (EXIT_SUCCESS); } @@ -886,7 +887,7 @@ encstatus(int argc, char **argv __unused) status = 0; if (argc != 1) { - usage(stderr, "status"); + usage("status"); } /* Get the list of ses devices */ @@ -963,7 +964,8 @@ encstatus(int argc, char **argv __unused) xo_close_list("enclosures"); xo_close_container("sesutil"); - xo_finish(); + if (xo_finish() < 0) + xo_err(EXIT_FAILURE, "stdout"); if (status == 1) { return (EXIT_SUCCESS); @@ -980,7 +982,7 @@ main(int argc, char **argv) argc = xo_parse_args(argc, argv); if (argc < 0) - exit(1); + exit(EXIT_FAILURE); uflag = "/dev/ses[0-9]*"; while ((ch = getopt_long(argc, argv, "u:", NULL, NULL)) != -1) { @@ -990,15 +992,15 @@ main(int argc, char **argv) break; case '?': default: - usage(stderr, NULL); + usage(NULL); } } argc -= optind; argv += optind; if (argc < 1) { - warnx("Missing command"); - usage(stderr, NULL); + xo_warnx("Missing command"); + usage(NULL); } for (i = 0; i < nbcmds; i++) { @@ -1009,8 +1011,8 @@ main(int argc, char **argv) } if (cmd == NULL) { - warnx("unknown command %s", argv[0]); - usage(stderr, NULL); + xo_warnx("unknown command %s", argv[0]); + usage(NULL); } return (cmd->exec(argc, argv)); From nobody Sat Oct 12 18:30:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQsVd6ML1z5YnYn; Sat, 12 Oct 2024 18:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQsVd4P5lz4Dsy; Sat, 12 Oct 2024 18:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QyZGpWjCJlQVuDdHJQ+UXb2qUxe+q3WFrktVQm6tGKU=; b=tB0HFpWyNMB5TmdTI58r04FSVjs2apr1ILpA6FZB7xioSLhUEUUrGRJnFl7nAuMx7GVXCe N0BmnPCedxePxjpCJZu+Oark/76AQCb6wmMwwjC+5tF2Qs7rTtA9pOBzh0HN8ytmdK00PY 7IlSA/wEoqv7XX3ype3mdxYjUzMomqwRQPOckRPhd8HwH8DXCkKuxp3Foxja++0ENNnLIk QuHERbIMB3lazb4iL9SfHHZWKnIPnlYOUJHj9lb2TmZZbb+1yegNBJCefq+jBe259SnYIn oiXJJ/6ZzmYUx59KAzuCC3VePB4l+/4l6aXd/jBOgi7T+tNitsPQw+aIqXx0Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QyZGpWjCJlQVuDdHJQ+UXb2qUxe+q3WFrktVQm6tGKU=; b=F0siw55DzGRgm25+fnZfrwp5AKNDzCQmVx1vL3WKXRWNC8VIODd6kN7msPnhUscckaN89S SgYmIGfOmxLdAo361Q8qpUTA/FWYZsCBZJeGJydjmyRaOHp4IAZqc84dsn1DFieBEa4lHU MOUngQ1RvSkmkfxruHNkaKX0NKrDR7qqzb0AgEQKuy3hwdo20qT3xsOOm8EC7wvHaPwu0p Md9Gswaue2Gw+DnO7u+Hhw3rXT2dBj01ZkhnM/jko3+eO51ANq3ryq1PNBGAP9MnkrmGAp JrXeAPkYK1XRzhRz99O2hB5xP9UN4d4qPSaDlfBceny9bRlWhf0IZjk9wET0KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728757817; a=rsa-sha256; cv=none; b=H5a3U+IohOtmhm8u1AZ0RsQj6mCHuVYlNh/3yNYvO4Z4oiFccG+uyS/62TM4uVMVcpvMHS S6Uq4WM3Et+uCgHKXn+FEIDSrgQJKvXSxr6jqyzHK8fzm6TTUHIVMmR0kJ15RfhGi63REe gGRoLzWMUNRBQb0M34FnZlpSVP3R6t5rc6Kd8Q9jLLRtd9/vSC3VwT7vmXgUoodPbqBa6L 4pySQRhxmUXTSNMgkouWUUZMjSqsvMNHmnWW1BkHjlY4zvNw6u4ftTPhsm48j8kYiBbnZF SG+ZTp1Xcj9+5MBIj/GSvaXlnZcYsX5GJh9Z2QM1Tex1PdKKou2xfGzw1h1+YA== 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 4XQsVd2g31zKXx; Sat, 12 Oct 2024 18:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CIUHVl091792; Sat, 12 Oct 2024 18:30:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CIUHBO091774; Sat, 12 Oct 2024 18:30:17 GMT (envelope-from git) Date: Sat, 12 Oct 2024 18:30:17 GMT Message-Id: <202410121830.49CIUHBO091774@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 95968ea7ec8f - main - netstat(1): Complete libxo transition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95968ea7ec8f1cd3c1d03cc56c704cb2392d0d25 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=95968ea7ec8f1cd3c1d03cc56c704cb2392d0d25 commit 95968ea7ec8f1cd3c1d03cc56c704cb2392d0d25 Author: Yan-Hao Wang AuthorDate: 2024-10-12 15:03:00 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-12 18:21:46 +0000 netstat(1): Complete libxo transition Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41427 --- usr.bin/netstat/bpf.c | 1 - usr.bin/netstat/common.c | 5 +-- usr.bin/netstat/if.c | 5 +-- usr.bin/netstat/inet.c | 1 - usr.bin/netstat/inet6.c | 1 - usr.bin/netstat/main.c | 89 +++++++++++++++++++++++------------------ usr.bin/netstat/mbuf.c | 1 - usr.bin/netstat/mroute.c | 1 - usr.bin/netstat/mroute6.c | 1 - usr.bin/netstat/netgraph.c | 1 - usr.bin/netstat/netisr.c | 70 ++++++++++++++++---------------- usr.bin/netstat/nhgrp.c | 9 ++--- usr.bin/netstat/nhops.c | 11 +++-- usr.bin/netstat/route.c | 11 +++-- usr.bin/netstat/route_netlink.c | 3 +- usr.bin/netstat/sctp.c | 1 - usr.bin/netstat/unix.c | 1 - 17 files changed, 103 insertions(+), 109 deletions(-) diff --git a/usr.bin/netstat/bpf.c b/usr.bin/netstat/bpf.c index c0cea882df76..5d61da7b4d2b 100644 --- a/usr.bin/netstat/bpf.c +++ b/usr.bin/netstat/bpf.c @@ -39,7 +39,6 @@ #include #include -#include #include #include #include diff --git a/usr.bin/netstat/common.c b/usr.bin/netstat/common.c index 64e26bf3c21e..00a3f405ed1e 100644 --- a/usr.bin/netstat/common.c +++ b/usr.bin/netstat/common.c @@ -50,7 +50,6 @@ #include #include #include -#include #include #include "netstat.h" #include "common.h" @@ -100,7 +99,7 @@ prepare_ifmap(size_t *pifmap_size) * since we need #ifindex -> if_xname match */ if (getifaddrs(&ifap) != 0) - err(EX_OSERR, "getifaddrs"); + xo_err(EX_OSERR, "getifaddrs"); for (ifa = ifap; ifa; ifa = ifa->ifa_next) { @@ -114,7 +113,7 @@ prepare_ifmap(size_t *pifmap_size) size = roundup2(ifindex + 1, 32) * sizeof(struct ifmap_entry); if ((ifmap = realloc(ifmap, size)) == NULL) - errx(2, "realloc(%d) failed", size); + xo_errx(EX_OSERR, "realloc(%d) failed", size); memset(&ifmap[ifmap_size], 0, size - ifmap_size * sizeof(struct ifmap_entry)); diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index 172ea5324ccb..1603c7662bbd 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -49,7 +49,6 @@ #include #endif -#include #include #include #include @@ -395,9 +394,9 @@ intpr(void (*pfunc)(char *), int af) return sidewaysintpr(); if (getifaddrs(&ifap) != 0) - err(EX_OSERR, "getifaddrs"); + xo_err(EX_OSERR, "getifaddrs"); if (aflag && getifmaddrs(&ifmap) != 0) - err(EX_OSERR, "getifmaddrs"); + xo_err(EX_OSERR, "getifmaddrs"); for (ifa = ifap; ifa; ifa = ifa->ifa_next) { if (interface != NULL && diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 9ff7c687353f..5a5610ccb6c0 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -63,7 +63,6 @@ #include #include -#include #include #include #include diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c index 3adf5548aea4..5995be299425 100644 --- a/usr.bin/netstat/inet6.c +++ b/usr.bin/netstat/inet6.c @@ -54,7 +54,6 @@ #include #include -#include #include #include #include diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index 6d19851b61fc..eaca38365ed8 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -46,7 +46,6 @@ #endif #include -#include #include #ifdef JAIL #include @@ -61,6 +60,7 @@ #include #include #include +#include #include #include "netstat.h" #include "nl_defs.h" @@ -258,14 +258,14 @@ main(int argc, char *argv[]) #ifdef INET af = AF_INET; #else - errx(1, "IPv4 support is not compiled in"); + xo_errx(EX_UNAVAILABLE, "IPv4 support is not compiled in"); #endif break; case '6': #ifdef INET6 af = AF_INET6; #else - errx(1, "IPv6 support is not compiled in"); + xo_errx(EX_UNAVAILABLE, "IPv6 support is not compiled in"); #endif break; case 'A': @@ -293,7 +293,7 @@ main(int argc, char *argv[]) fib = strtol(optarg, &endptr, 0); if (*endptr != '\0' || (fib == 0 && (errno == EINVAL || errno == ERANGE))) - xo_errx(1, "%s: invalid fib", optarg); + xo_errx(EX_DATAERR, "%s: invalid fib", optarg); break; case 'f': if (strcmp(optarg, "inet") == 0) @@ -317,7 +317,7 @@ main(int argc, char *argv[]) else if (strcmp(optarg, "link") == 0) af = AF_LINK; else { - xo_errx(1, "%s: unknown address family", + xo_errx(EX_DATAERR, "%s: unknown address family", optarg); } break; @@ -345,7 +345,7 @@ main(int argc, char *argv[]) usage(); jail_name = optarg; #else - errx(1, "Jail support is not compiled in"); + xo_errx(EX_UNAVAILABLE, "Jail support is not compiled in"); #endif break; case 'L': @@ -374,7 +374,7 @@ main(int argc, char *argv[]) break; case 'p': if ((tp = name2protox(optarg)) == NULL) { - xo_errx(1, "%s: unknown or uninstrumented " + xo_errx(EX_DATAERR, "%s: unknown or uninstrumented " "protocol", optarg); } pflag = 1; @@ -448,9 +448,9 @@ main(int argc, char *argv[]) if (jail_name != NULL) { jid = jail_getid(jail_name); if (jid == -1) - errx(1, "Jail not found"); + xo_errx(EX_UNAVAILABLE, "Jail not found"); if (jail_attach(jid) != 0) - errx(1, "Cannot attach to jail"); + xo_errx(EX_UNAVAILABLE, "Cannot attach to jail"); } #endif @@ -461,20 +461,21 @@ main(int argc, char *argv[]) live = (nlistf == NULL && memf == NULL); if (!live) { if (setgid(getgid()) != 0) - xo_err(-1, "setgid"); + xo_err(EX_OSERR, "setgid"); /* Load all necessary kvm symbols */ kresolve_list(nl); } if (xflag && Tflag) - xo_errx(1, "-x and -T are incompatible, pick one."); + xo_errx(EX_USAGE, "-x and -T are incompatible, pick one."); if (Bflag) { if (!live) usage(); bpf_stats(interface); - xo_finish(); - exit(0); + if (xo_finish() < 0) + xo_err(EX_IOERR, "stdout"); + exit(EX_OK); } if (mflag) { if (!live) { @@ -482,8 +483,9 @@ main(int argc, char *argv[]) mbpr(kvmd, nl[N_SFSTAT].n_value); } else mbpr(NULL, 0); - xo_finish(); - exit(0); + if (xo_finish() < 0) + xo_err(EX_IOERR, "stdout"); + exit(EX_OK); } if (Qflag) { if (!live) { @@ -491,8 +493,9 @@ main(int argc, char *argv[]) netisr_stats(); } else netisr_stats(); - xo_finish(); - exit(0); + if (xo_finish() < 0) + xo_err(EX_IOERR, "stdout"); + exit(EX_OK); } #if 0 /* @@ -513,8 +516,9 @@ main(int argc, char *argv[]) xo_set_version(NETSTAT_XO_VERSION); intpr(NULL, af); xo_close_container("statistics"); - xo_finish(); - exit(0); + if (xo_finish() < 0) + xo_err(EX_IOERR, "stdout"); + exit(EX_OK); } if (rflag) { xo_open_container("statistics"); @@ -527,24 +531,27 @@ main(int argc, char *argv[]) } else routepr(fib, af); xo_close_container("statistics"); - xo_finish(); - exit(0); + if (xo_finish() < 0) + xo_err(EX_IOERR, "stdout"); + exit(EX_OK); } if (oflag) { xo_open_container("statistics"); xo_set_version(NETSTAT_XO_VERSION); nhops_print(fib, af); xo_close_container("statistics"); - xo_finish(); - exit(0); + if (xo_finish() < 0) + xo_err(EX_IOERR, "stdout"); + exit(EX_OK); } if (Oflag) { xo_open_container("statistics"); xo_set_version(NETSTAT_XO_VERSION); nhgrp_print(fib, af); xo_close_container("statistics"); - xo_finish(); - exit(0); + if (xo_finish() < 0) + xo_err(EX_IOERR, "stdout"); + exit(EX_OK); } @@ -568,8 +575,9 @@ main(int argc, char *argv[]) #endif } xo_close_container("statistics"); - xo_finish(); - exit(0); + if (xo_finish() < 0) + xo_err(EX_IOERR, "stdout"); + exit(EX_OK); } if (tp) { @@ -579,8 +587,9 @@ main(int argc, char *argv[]) if (!first) xo_close_list("socket"); xo_close_container("statistics"); - xo_finish(); - exit(0); + if (xo_finish() < 0) + xo_err(EX_IOERR, "stdout"); + exit(EX_OK); } xo_open_container("statistics"); @@ -611,8 +620,9 @@ main(int argc, char *argv[]) if (!first) xo_close_list("socket"); xo_close_container("statistics"); - xo_finish(); - exit(0); + if (xo_finish() < 0) + xo_err(EX_IOERR, "stdout"); + exit(EX_OK); } static int @@ -732,7 +742,7 @@ kvmd_init(void) kvmd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf); if (setgid(getgid()) != 0) - xo_err(-1, "setgid"); + xo_err(EX_OSERR, "setgid"); if (kvmd == NULL) { xo_warnx("kvm not available: %s", errbuf); @@ -757,10 +767,10 @@ kresolve_list(struct nlist *_nl) if (kvm_nlist(kvmd, _nl) < 0) { if (nlistf) - xo_errx(1, "%s: kvm_nlist: %s", nlistf, + xo_errx(EX_UNAVAILABLE, "%s: kvm_nlist: %s", nlistf, kvm_geterr(kvmd)); else - xo_errx(1, "kvm_nlist: %s", kvm_geterr(kvmd)); + xo_errx(EX_UNAVAILABLE, "kvm_nlist: %s", kvm_geterr(kvmd)); } return (0); @@ -774,10 +784,10 @@ kset_dpcpu(u_int cpuid) { if ((kvmd == NULL) && (kvmd_init() != 0)) - xo_errx(-1, "%s: kvm is not available", __func__); + xo_errx(EX_UNAVAILABLE, "%s: kvm is not available", __func__); if (kvm_dpcpu_setcpu(kvmd, cpuid) < 0) - xo_errx(-1, "%s: kvm_dpcpu_setcpu(%u): %s", __func__, + xo_errx(EX_UNAVAILABLE, "%s: kvm_dpcpu_setcpu(%u): %s", __func__, cpuid, kvm_geterr(kvmd)); return; } @@ -834,7 +844,7 @@ kread_counters(u_long addr, void *buf, size_t size) n = size / sizeof(uint64_t); if ((counters = malloc(n * sizeof(u_long))) == NULL) - xo_err(-1, "malloc"); + xo_err(EX_OSERR, "malloc"); if (kread(addr, counters, n * sizeof(u_long)) < 0) { free(counters); return (-1); @@ -914,7 +924,7 @@ name2protox(const char *name) static void usage(void) { - (void)xo_error("%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n", + xo_error("%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n", "usage: netstat [-j jail] [-46AaCcLnRSTWx] [-f protocol_family | -p protocol]\n" " [-M core] [-N system]", " netstat [-j jail] -i | -I interface [-46abdhnW] [-f address_family]\n" @@ -933,6 +943,5 @@ usage(void) " netstat [-j jail] -g [-46W] [-f address_family] [-M core] [-N system]", " netstat [-j jail] -gs [-46s] [-f address_family] [-M core] [-N system]", " netstat [-j jail] -Q"); - xo_finish(); - exit(1); + exit(EX_USAGE); } diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c index ed700720ecb5..9a43e0115223 100644 --- a/usr.bin/netstat/mbuf.c +++ b/usr.bin/netstat/mbuf.c @@ -43,7 +43,6 @@ #include #include -#include #include #include #include diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c index c13fcdede80c..1577a6ae73ac 100644 --- a/usr.bin/netstat/mroute.c +++ b/usr.bin/netstat/mroute.c @@ -62,7 +62,6 @@ #include #undef _NETSTAT_ -#include #include #include #include diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c index 83cd9c18c761..2a98f26f8b27 100644 --- a/usr.bin/netstat/mroute6.c +++ b/usr.bin/netstat/mroute6.c @@ -81,7 +81,6 @@ #include -#include #include #include #include diff --git a/usr.bin/netstat/netgraph.c b/usr.bin/netstat/netgraph.c index 4511b17ddbbe..3a4c11de1db8 100644 --- a/usr.bin/netstat/netgraph.c +++ b/usr.bin/netstat/netgraph.c @@ -53,7 +53,6 @@ #include #include #include -#include #include #include "netstat.h" diff --git a/usr.bin/netstat/netisr.c b/usr.bin/netstat/netisr.c index a3eb976d84bf..1708a8f01c79 100644 --- a/usr.bin/netstat/netisr.c +++ b/usr.bin/netstat/netisr.c @@ -40,12 +40,12 @@ #include #include -#include #include #include #include #include #include +#include #include #include "netstat.h" #include "nl_defs.h" @@ -112,7 +112,7 @@ netisr_load_kvm_string(uintptr_t addr, char *dest, u_int limit) for (i = 0; i < limit; i++) { if (kread(addr + i, &dest[i], sizeof(dest[i])) != 0) - xo_errx(-1, "%s: kread()", __func__); + xo_errx(EX_OSERR, "%s: kread()", __func__); if (dest[i] == '\0') break; } @@ -167,9 +167,9 @@ netisr_load_sysctl_uint(const char *name, u_int *p) retlen = sizeof(u_int); if (sysctlbyname(name, p, &retlen, NULL, 0) < 0) - xo_err(-1, "%s", name); + xo_err(EX_OSERR, "%s", name); if (retlen != sizeof(u_int)) - xo_errx(-1, "%s: invalid len %ju", name, (uintmax_t)retlen); + xo_errx(EX_DATAERR, "%s: invalid len %ju", name, (uintmax_t)retlen); } static void @@ -179,7 +179,7 @@ netisr_load_sysctl_string(const char *name, char *p, size_t len) retlen = len; if (sysctlbyname(name, p, &retlen, NULL, 0) < 0) - xo_err(-1, "%s", name); + xo_err(EX_OSERR, "%s", name); p[len - 1] = '\0'; } @@ -212,13 +212,13 @@ netisr_load_kvm_proto(void) */ kread(nl[N_NETISR_MAXPROT].n_value, &maxprot, sizeof(u_int)); if (maxprot != NETISR_MAXPROT) - xo_errx(-1, "%s: NETISR_MAXPROT mismatch", __func__); + xo_errx(EX_DATAERR, "%s: NETISR_MAXPROT mismatch", __func__); len = maxprot * sizeof(*np_array); np_array = malloc(len); if (np_array == NULL) - xo_err(-1, "%s: malloc", __func__); + xo_err(EX_OSERR, "%s: malloc", __func__); if (kread(nl[N_NETISR_PROTO].n_value, np_array, len) != 0) - xo_errx(-1, "%s: kread(_netisr_proto)", __func__); + xo_errx(EX_DATAERR, "%s: kread(_netisr_proto)", __func__); /* * Size and allocate memory to hold only live protocols. @@ -231,7 +231,7 @@ netisr_load_kvm_proto(void) } proto_array = calloc(protocount, sizeof(*proto_array)); if (proto_array == NULL) - err(-1, "malloc"); + xo_err(EX_OSERR, "malloc"); protocount = 0; for (i = 0; i < maxprot; i++) { npp = &np_array[i]; @@ -263,21 +263,21 @@ netisr_load_sysctl_proto(void) size_t len; if (sysctlbyname("net.isr.proto", NULL, &len, NULL, 0) < 0) - xo_err(-1, "net.isr.proto: query len"); + xo_err(EX_OSERR, "net.isr.proto: query len"); if (len % sizeof(*proto_array) != 0) - xo_errx(-1, "net.isr.proto: invalid len"); + xo_errx(EX_DATAERR, "net.isr.proto: invalid len"); proto_array = malloc(len); if (proto_array == NULL) - xo_err(-1, "malloc"); + xo_err(EX_OSERR, "malloc"); if (sysctlbyname("net.isr.proto", proto_array, &len, NULL, 0) < 0) - xo_err(-1, "net.isr.proto: query data"); + xo_err(EX_OSERR, "net.isr.proto: query data"); if (len % sizeof(*proto_array) != 0) - xo_errx(-1, "net.isr.proto: invalid len"); + xo_errx(EX_DATAERR, "net.isr.proto: invalid len"); proto_array_len = len / sizeof(*proto_array); if (proto_array_len < 1) - xo_errx(-1, "net.isr.proto: no data"); + xo_errx(EX_DATAERR, "net.isr.proto: no data"); if (proto_array[0].snp_version != sizeof(proto_array[0])) - xo_errx(-1, "net.isr.proto: invalid version"); + xo_errx(EX_DATAERR, "net.isr.proto: invalid version"); } static void @@ -293,22 +293,22 @@ netisr_load_kvm_workstream(void) len = numthreads * sizeof(*nws_array); nws_array = malloc(len); if (nws_array == NULL) - xo_err(-1, "malloc"); + xo_err(EX_OSERR, "malloc"); if (kread(nl[N_NWS_ARRAY].n_value, nws_array, len) != 0) - xo_errx(-1, "%s: kread(_nws_array)", __func__); + xo_errx(EX_OSERR, "%s: kread(_nws_array)", __func__); workstream_array = calloc(numthreads, sizeof(*workstream_array)); if (workstream_array == NULL) - xo_err(-1, "calloc"); + xo_err(EX_OSERR, "calloc"); workstream_array_len = numthreads; work_array = calloc(numthreads * proto_array_len, sizeof(*work_array)); if (work_array == NULL) - xo_err(-1, "calloc"); + xo_err(EX_OSERR, "calloc"); counter = 0; for (wsid = 0; wsid < numthreads; wsid++) { cpuid = nws_array[wsid]; kset_dpcpu(cpuid); if (kread(nl[N_NWS].n_value, &nws, sizeof(nws)) != 0) - xo_errx(-1, "%s: kread(nw)", __func__); + xo_errx(EX_OSERR, "%s: kread(nw)", __func__); snwsp = &workstream_array[wsid]; snwsp->snws_version = sizeof(*snwsp); snwsp->snws_wsid = cpuid; @@ -348,22 +348,22 @@ netisr_load_sysctl_workstream(void) size_t len; if (sysctlbyname("net.isr.workstream", NULL, &len, NULL, 0) < 0) - xo_err(-1, "net.isr.workstream: query len"); + xo_err(EX_OSERR, "net.isr.workstream: query len"); if (len % sizeof(*workstream_array) != 0) - xo_errx(-1, "net.isr.workstream: invalid len"); + xo_errx(EX_DATAERR, "net.isr.workstream: invalid len"); workstream_array = malloc(len); if (workstream_array == NULL) - xo_err(-1, "malloc"); + xo_err(EX_OSERR, "malloc"); if (sysctlbyname("net.isr.workstream", workstream_array, &len, NULL, 0) < 0) - xo_err(-1, "net.isr.workstream: query data"); + xo_err(EX_OSERR, "net.isr.workstream: query data"); if (len % sizeof(*workstream_array) != 0) - xo_errx(-1, "net.isr.workstream: invalid len"); + xo_errx(EX_DATAERR, "net.isr.workstream: invalid len"); workstream_array_len = len / sizeof(*workstream_array); if (workstream_array_len < 1) - xo_errx(-1, "net.isr.workstream: no data"); + xo_errx(EX_DATAERR, "net.isr.workstream: no data"); if (workstream_array[0].snws_version != sizeof(workstream_array[0])) - xo_errx(-1, "net.isr.workstream: invalid version"); + xo_errx(EX_DATAERR, "net.isr.workstream: invalid version"); } static void @@ -372,21 +372,21 @@ netisr_load_sysctl_work(void) size_t len; if (sysctlbyname("net.isr.work", NULL, &len, NULL, 0) < 0) - xo_err(-1, "net.isr.work: query len"); + xo_err(EX_OSERR, "net.isr.work: query len"); if (len % sizeof(*work_array) != 0) - xo_errx(-1, "net.isr.work: invalid len"); + xo_errx(EX_DATAERR, "net.isr.work: invalid len"); work_array = malloc(len); if (work_array == NULL) - xo_err(-1, "malloc"); + xo_err(EX_OSERR, "malloc"); if (sysctlbyname("net.isr.work", work_array, &len, NULL, 0) < 0) - xo_err(-1, "net.isr.work: query data"); + xo_err(EX_OSERR, "net.isr.work: query data"); if (len % sizeof(*work_array) != 0) - xo_errx(-1, "net.isr.work: invalid len"); + xo_errx(EX_DATAERR, "net.isr.work: invalid len"); work_array_len = len / sizeof(*work_array); if (work_array_len < 1) - xo_errx(-1, "net.isr.work: no data"); + xo_errx(EX_DATAERR, "net.isr.work: no data"); if (work_array[0].snw_version != sizeof(work_array[0])) - xo_errx(-1, "net.isr.work: invalid version"); + xo_errx(EX_DATAERR, "net.isr.work: invalid version"); } static void diff --git a/usr.bin/netstat/nhgrp.c b/usr.bin/netstat/nhgrp.c index 00b051a04d21..7cbaa1af94e3 100644 --- a/usr.bin/netstat/nhgrp.c +++ b/usr.bin/netstat/nhgrp.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include "netstat.h" #include "common.h" @@ -209,12 +208,12 @@ dump_nhgrp_sysctl(int fibnum, int af, struct nhops_dump *nd) mib[5] = 0; mib[6] = fibnum; if (sysctl(mib, nitems(mib), NULL, &needed, NULL, 0) < 0) - err(EX_OSERR, "sysctl: net.route.0.%d.nhgrpdump.%d estimate", + xo_err(EX_OSERR, "sysctl: net.route.0.%d.nhgrpdump.%d estimate", af, fibnum); if ((buf = malloc(needed)) == NULL) - errx(2, "malloc(%lu)", (unsigned long)needed); + xo_errx(EX_OSERR, "malloc(%lu)", (unsigned long)needed); if (sysctl(mib, nitems(mib), buf, &needed, NULL, 0) < 0) - err(1, "sysctl: net.route.0.%d.nhgrpdump.%d", af, fibnum); + xo_err(EX_OSERR, "sysctl: net.route.0.%d.nhgrpdump.%d", af, fibnum); lim = buf + needed; /* @@ -337,7 +336,7 @@ nhgrp_print(int fibnum, int af) if (sysctlbyname("net.fibs", &numfibs, &intsize, NULL, 0) == -1) numfibs = 1; if (fibnum < 0 || fibnum > numfibs - 1) - errx(EX_USAGE, "%d: invalid fib", fibnum); + xo_errx(EX_USAGE, "%d: invalid fib", fibnum); ifmap = prepare_ifmap(&ifmap_size); prepare_nh_map(fibnum, af); diff --git a/usr.bin/netstat/nhops.c b/usr.bin/netstat/nhops.c index 1a5d8eee74b1..48ec2006994e 100644 --- a/usr.bin/netstat/nhops.c +++ b/usr.bin/netstat/nhops.c @@ -58,7 +58,6 @@ #include #include #include -#include #include #include "netstat.h" #include "common.h" @@ -213,7 +212,7 @@ nhop_map_update(struct nhop_map *map, uint32_t idx, char *gw, char *ifname) sz = new_size * (sizeof(struct nhop_entry)); if ((map->ptr = realloc(map->ptr, sz)) == NULL) - errx(2, "realloc(%zu) failed", sz); + xo_errx(EX_OSERR, "realloc(%zu) failed", sz); memset(&map->ptr[map->size], 0, (new_size - map->size) * sizeof(struct nhop_entry)); map->size = new_size; @@ -352,12 +351,12 @@ dump_nhops_sysctl(int fibnum, int af, struct nhops_dump *nd) mib[5] = 0; mib[6] = fibnum; if (sysctl(mib, nitems(mib), NULL, &needed, NULL, 0) < 0) - err(EX_OSERR, "sysctl: net.route.0.%d.nhdump.%d estimate", af, + xo_err(EX_OSERR, "sysctl: net.route.0.%d.nhdump.%d estimate", af, fibnum); if ((buf = malloc(needed)) == NULL) - errx(2, "malloc(%lu)", (unsigned long)needed); + xo_errx(EX_OSERR, "malloc(%lu)", (unsigned long)needed); if (sysctl(mib, nitems(mib), buf, &needed, NULL, 0) < 0) - err(1, "sysctl: net.route.0.%d.nhdump.%d", af, fibnum); + xo_err(EX_OSERR, "sysctl: net.route.0.%d.nhdump.%d", af, fibnum); lim = buf + needed; /* @@ -463,7 +462,7 @@ nhops_print(int fibnum, int af) if (sysctlbyname("net.fibs", &numfibs, &intsize, NULL, 0) == -1) numfibs = 1; if (fibnum < 0 || fibnum > numfibs - 1) - errx(EX_USAGE, "%d: invalid fib", fibnum); + xo_errx(EX_USAGE, "%d: invalid fib", fibnum); ifmap = prepare_ifmap(&ifmap_size); diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index 482fb07ff950..f32ddee8403f 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -57,7 +57,6 @@ #include #include #include -#include #include #include "netstat.h" #include "common.h" @@ -124,14 +123,14 @@ routepr(int fibnum, int af) if (sysctlbyname("net.fibs", &numfibs, &intsize, NULL, 0) == -1) numfibs = 1; if (fibnum < 0 || fibnum > numfibs - 1) - errx(EX_USAGE, "%d: invalid fib", fibnum); + xo_errx(EX_USAGE, "%d: invalid fib", fibnum); /* * Since kernel & userland use different timebase * (time_uptime vs time_second) and we are reading kernel memory * directly we should do rt_expire --> expire_time conversion. */ if (clock_gettime(CLOCK_UPTIME, &uptime) < 0) - err(EX_OSERR, "clock_gettime() failed"); + xo_err(EX_OSERR, "clock_gettime() failed"); xo_open_container("route-information"); xo_emit("{T:Routing tables}"); @@ -259,12 +258,12 @@ p_rtable_sysctl(int fibnum, int af) mib[5] = 0; mib[6] = fibnum; if (sysctl(mib, nitems(mib), NULL, &needed, NULL, 0) < 0) - err(EX_OSERR, "sysctl: net.route.0.%d.dump.%d estimate", af, + xo_err(EX_OSERR, "sysctl: net.route.0.%d.dump.%d estimate", af, fibnum); if ((buf = malloc(needed)) == NULL) - errx(2, "malloc(%lu)", (unsigned long)needed); + xo_errx(EX_OSERR, "malloc(%lu)", (unsigned long)needed); if (sysctl(mib, nitems(mib), buf, &needed, NULL, 0) < 0) - err(1, "sysctl: net.route.0.%d.dump.%d", af, fibnum); + xo_err(EX_OSERR, "sysctl: net.route.0.%d.dump.%d", af, fibnum); lim = buf + needed; xo_open_container("route-table"); xo_open_list("rt-family"); diff --git a/usr.bin/netstat/route_netlink.c b/usr.bin/netstat/route_netlink.c index 74864fab76a7..e7b2a1964602 100644 --- a/usr.bin/netstat/route_netlink.c +++ b/usr.bin/netstat/route_netlink.c @@ -62,7 +62,6 @@ #include #include #include -#include #include #include "netstat.h" #include "common.h" @@ -104,7 +103,7 @@ prepare_ifmap_netlink(struct snl_state *ss, size_t *pifmap_size) if (link.ifi_index >= ifmap_size) { size_t size = roundup2(link.ifi_index + 1, 32) * sizeof(struct ifmap_entry); if ((ifmap = realloc(ifmap, size)) == NULL) - errx(2, "realloc(%zu) failed", size); + xo_errx(EX_OSERR, "realloc(%zu) failed", size); memset(&ifmap[ifmap_size], 0, size - ifmap_size * sizeof(struct ifmap_entry)); diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c index e9fd494e292b..c3abac407327 100644 --- a/usr.bin/netstat/sctp.c +++ b/usr.bin/netstat/sctp.c @@ -44,7 +44,6 @@ #include #include -#include #include #include #include diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c index 4d6fd9de8af3..ca9671e812ac 100644 --- a/usr.bin/netstat/unix.c +++ b/usr.bin/netstat/unix.c @@ -48,7 +48,6 @@ #include #include -#include #include #include #include From nobody Sat Oct 12 18:30:18 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQsVf5r6Nz5YnnY; Sat, 12 Oct 2024 18:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQsVf465Nz4Dxy; Sat, 12 Oct 2024 18:30:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iF9xnee99UkqkpU4vfyuDPVIgxJ32+X20XL8XNUKD4Y=; b=e9hhDCytzvFhdXjsBue+nDlNkwOskuPYctr9pMRXkZqpCyhexbWguS4zsLnK3v2xNe918d Os/SUmhe6W1tqWSeZ+v9mSzyIvIAW8jhvO3O+E61S6y9G3zKlz1FCkWAoG3U1J2wE0EEHt P7nPI7aiU1YVmlaiHEpgtSOch8Tmk4dXbg6rPR5rrSb/UQC+9BDUcQJs9I1bL06pZ/YKNs n7peWd+0Hbzc5Ti4UPqlv32eb4Oxz5/WadvvXk7EIdD9MPbST4D/qIdW/8zfxyc/0ElBRX H0aBzD/Sx//sA/liceJpg/hWdSEJOl7Akv+FxJb7KpPiWteqYS8ozf0sIqMEmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iF9xnee99UkqkpU4vfyuDPVIgxJ32+X20XL8XNUKD4Y=; b=TI7e/zgCABkRbpvya3jcetaJDwiEHY9x0iLn2614/gjWipN9rYbFkGKRHlRzIaO1Nl371y lKFc+SnuwiUY5A49iWwhJYnhRMj4S982mbtdEUQm4dowgt3UPA2pZFsxXnpiZYAKRCu/ZW Um8qUZip3L1JTiGVjjCN/oDEfv/QigZlUiPyHX+tsRNqDNuSZGE1DiGp4i2fpuFOBrmFcv FizcddBCKBHt6XO2x14trtZd5ZXgTwEhTFzbOaKdAme3Es4pXivdN0ZavAiQ9V7SkrxwNz kIo1wBM8XTC0OspVSKoqf+mmLjcbihR0H33QKlS2/7dm8ZzWy/AUBxWpmx3fgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728757818; a=rsa-sha256; cv=none; b=qcI5TgzbJmuWbJR9StlHKLNbfuiMVuTgSEYTyDx4mm74qeramp8qdbSBMC3EdSkTsH83Ot SadVxWkUCGeHO0hGbCqx69izwiBws7vxL9z+FVZZ9ihmKpOz/dC+L9vxLAPQvuO2JK8ZEy 7+p4J6vJQlYzJKrJHbc8FHEOl99tUJukjyc6TrCbX/MQx5Azde1ECNPzehOJj6xxivqsQI 5mCGwFtbBJof0nFF71AoiH6h/8SNs/AONns2bbj9KlV0RHwnIq6LOnh+fxHmgSnprU9DQt BSL0FSu4aau46TRN4Udk0Y0a08AOWlv0jVxhB7RLbXUDgd+I9wmvYVegaCvjwQ== 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 4XQsVf3clDzLmv; Sat, 12 Oct 2024 18:30:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CIUIeo092210; Sat, 12 Oct 2024 18:30:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CIUIe6092207; Sat, 12 Oct 2024 18:30:18 GMT (envelope-from git) Date: Sat, 12 Oct 2024 18:30:18 GMT Message-Id: <202410121830.49CIUIe6092207@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: e17a2944a6e0 - main - ps(1): Complete libxo transition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e17a2944a6e08478b9c073ba62c46f6714af16a2 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=e17a2944a6e08478b9c073ba62c46f6714af16a2 commit e17a2944a6e08478b9c073ba62c46f6714af16a2 Author: Yan-Hao Wang AuthorDate: 2024-10-12 15:06:59 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-12 18:21:46 +0000 ps(1): Complete libxo transition Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41422 --- bin/ps/keyword.c | 14 +++++++------- bin/ps/print.c | 1 - bin/ps/ps.c | 13 +++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index 82c08d3e75f1..a03f91ec2831 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -36,7 +36,6 @@ #include #include -#include #include #include #include @@ -250,7 +249,8 @@ showkey(void) } xo_emit("\n"); xo_close_list("key"); - xo_finish(); + if (xo_finish() < 0) + xo_err(1, "stdout"); } void @@ -291,7 +291,7 @@ parsefmt(const char *p, int user) continue; } if ((vent = malloc(sizeof(struct varent))) == NULL) - errx(1, "malloc failed"); + xo_errx(1, "malloc failed"); vent->header = v->header; if (hp) { hp = strdup(hp); @@ -300,13 +300,13 @@ parsefmt(const char *p, int user) } vent->var = malloc(sizeof(*vent->var)); if (vent->var == NULL) - errx(1, "malloc failed"); + xo_errx(1, "malloc failed"); memcpy(vent->var, v, sizeof(*vent->var)); STAILQ_INSERT_TAIL(&varlist, vent, next_ve); } free(tempstr1); if (STAILQ_EMPTY(&varlist)) { - warnx("no valid keywords; valid keywords:"); + xo_warnx("no valid keywords; valid keywords:"); showkey(); exit(1); } @@ -345,7 +345,7 @@ findvar(char *p, int user, char **header) rflen = strlen(v->alias) + strlen(hp) + 2; realfmt = malloc(rflen); if (realfmt == NULL) - errx(1, "malloc failed"); + xo_errx(1, "malloc failed"); snprintf(realfmt, rflen, "%s=%s", v->alias, hp); parsefmt(realfmt, user); free(realfmt); @@ -353,7 +353,7 @@ findvar(char *p, int user, char **header) return ((VAR *)NULL); } if (!v) { - warnx("%s: keyword not found", p); + xo_warnx("%s: keyword not found", p); eval = 1; } if (header) diff --git a/bin/ps/print.c b/bin/ps/print.c index fc6f7ab25428..a3423d8b3956 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -40,7 +40,6 @@ #include #include -#include #include #include #include diff --git a/bin/ps/ps.c b/bin/ps/ps.c index 53ace6247b33..b0af2bdf37ca 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -46,7 +46,6 @@ #include #include -#include #include #include #include @@ -657,7 +656,8 @@ main(int argc, char *argv[]) if (nkept == 0) { printheader(); - xo_finish(); + if (xo_finish() < 0) + xo_err(1, "stdout"); exit(1); } @@ -742,7 +742,8 @@ main(int argc, char *argv[]) } xo_close_list("process"); xo_close_container("process-information"); - xo_finish(); + if (xo_finish() < 0) + xo_err(1, "stdout"); free_list(&gidlist); free_list(&jidlist); @@ -812,14 +813,14 @@ addelem_jid(struct listinfo *inf, const char *elem) int tempid; if (*elem == '\0') { - warnx("Invalid (zero-length) jail id"); + xo_warnx("Invalid (zero-length) jail id"); optfatal = 1; return (0); /* Do not add this value. */ } tempid = jail_getid(elem); if (tempid < 0) { - warnx("Invalid %s: %s", inf->lname, elem); + xo_warnx("Invalid %s: %s", inf->lname, elem); optfatal = 1; return (0); } @@ -1480,7 +1481,7 @@ usage(void) { #define SINGLE_OPTS "[-aCcde" OPT_LAZY_f "HhjlmrSTuvwXxZ]" - (void)xo_error("%s\n%s\n%s\n%s\n%s\n", + xo_error("%s\n%s\n%s\n%s\n%s\n", "usage: ps [--libxo] " SINGLE_OPTS " [-O fmt | -o fmt]", " [-G gid[,gid...]] [-J jid[,jid...]] [-M core] [-N system]", " [-p pid[,pid...]] [-t tty[,tty...]] [-U user[,user...]]", From nobody Sat Oct 12 18:30:19 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQsVh0PTNz5Ynfs; Sat, 12 Oct 2024 18:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQsVg4mpWz4DtM; Sat, 12 Oct 2024 18:30:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cg1Jf1e6QL9XaXcBC9g4Yv6kqvUSkowhWuW7OE8DF/c=; b=g81WxiV95A1g2ivg4OJwW5zGqgDr2EGTJ/HAyvXyH7IqmITUNbggY6KEaYGGqGdjgpTFwP dgjw4Eo/AGPBOVrqxcwweiW/dlIMQb01PMnZf4fEgMCqYy3j1FAEC1kGr8Y12lxgXjLI3U +2L/EYzUKubDwRpOUIETkU1kBxNB7JIo+SFP0FjtLoqfo+9XESAVEVAN6jOP7QdxdbjuxT GwG0GYypkyIpPNisbUEn9cHgugR8tMon82ECgSSkXmRGv0UotkhKTSusfjebeSd29Z0Coi y874Mit4SOY9wuefaHLVwIV0pfGl83snx4BDzVp8g6sxu3ayl58Zb1OH0cRO/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cg1Jf1e6QL9XaXcBC9g4Yv6kqvUSkowhWuW7OE8DF/c=; b=Ka3viiotHLBvGpXOh8ZFIz0Esiv6M0jxkcm3QWbc6evJdJbWiubp/otACrEbzDieomjat6 DAr6SVsCaKvAWPBDh2BnWnNhWcwOiqHrIXIx4JXP1l4eSzY4BVaVL5N09rGW7632Mgdk+y mxUAHiegjlU8lQL+x80r1NTCJh7J+IRqriLPTE/14S6gURf6Zx4aYrm1jEWDoguSY4gZSv ZFBUlM9/BFp8MGoR1NH2PTbOafs47uGpJGChvX7oEe/9JbCtnq3z3YCyviDzh8qEszHzBx +JxK5iru76fZKoLax3tbypBKJpLkeLCmbk7yOYaJ/JoEKM0ewsaSZi3zYQzMyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728757819; a=rsa-sha256; cv=none; b=t7615S0TT6g0u0jb+8w7aGSvjGOyV201YtNw3vgandpFLZast0Unlvu5c/6zN8qN5jIDV5 7PccBmd0/VR6OSoZv4XggdIqLlvlzPUCkejH3ikunpPHeNp7NS1poJJFq4e0/10RoF4rDC moVTn3qdKXq9vkppkOcfBcb+ZCHuZSVHv/2VKwQZF+iQizsATFqX0O0BOrNMrrUxtSTTAP rvPWtBV863FtFta5UwSGwj8gx/Tjr53pkzMnuSkhu4BpjQRVJ63Y7YPNQMqatuEmSesP9Z nFPmKKTLv5QKFpBaryaQSbgmTrVbHYQvOGYpehdCWX7hB73SprQipG+5VayIOg== 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 4XQsVg49SZzLh5; Sat, 12 Oct 2024 18:30:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CIUJEP092255; Sat, 12 Oct 2024 18:30:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CIUJh9092252; Sat, 12 Oct 2024 18:30:19 GMT (envelope-from git) Date: Sat, 12 Oct 2024 18:30:19 GMT Message-Id: <202410121830.49CIUJh9092252@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 7d5fd25ab8f5 - main - lastlogin(8): Complete libxo transition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d5fd25ab8f5cc704484e4ec5cd851bedf8fbd1d Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=7d5fd25ab8f5cc704484e4ec5cd851bedf8fbd1d commit 7d5fd25ab8f5cc704484e4ec5cd851bedf8fbd1d Author: Yan-Hao Wang AuthorDate: 2024-10-12 15:08:45 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-12 18:21:47 +0000 lastlogin(8): Complete libxo transition Reviewed by: dees MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41414 --- usr.sbin/lastlogin/lastlogin.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/usr.sbin/lastlogin/lastlogin.c b/usr.sbin/lastlogin/lastlogin.c index 3a71693f7576..ddd0f733b940 100644 --- a/usr.sbin/lastlogin/lastlogin.c +++ b/usr.sbin/lastlogin/lastlogin.c @@ -38,7 +38,6 @@ __RCSID("$NetBSD: lastlogin.c,v 1.4 1998/02/03 04:45:35 perry Exp $"); #endif -#include #include #include #include @@ -147,7 +146,8 @@ main(int argc, char *argv[]) xo_close_list("lastlogin"); xo_close_container("lastlogin-information"); - xo_finish(); + if (xo_finish() < 0) + xo_err(1, "stdout"); exit(0); } @@ -170,6 +170,5 @@ static void usage(void) { xo_error("usage: lastlogin [-f file] [-rt] [user ...]\n"); - xo_finish(); exit(1); } From nobody Sat Oct 12 18:30:20 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQsVj0w0Rz5YncJ; Sat, 12 Oct 2024 18:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQsVh5n1Cz4DrN; Sat, 12 Oct 2024 18:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZAkGN8t961sO6zW+gWjJh/vEAthzAg+tCaaZrzxBqPI=; b=FRgw+n/dcSIz+J4k+VMnlTP3Byu1rAlQVIOuTO+QkQu3nvDWt8e7yRdmjw8A2XVwDiSACr ljggkx3AYOFUBCeBHygIKcOITzW16jIoX6tVN7wcs/zlTuDHlPVjuIpcskwgzJJA8oFtli Kmf6rnGg2lcr6MyCr8Be3yflHQczTk5dFWfwYoMXh/uV3RqrbW21yV7gLXnYIe91sqXzS/ VffcsYGO7K3uKM9kR+WgTDEuxl+YrWQXOzwkLwbrLD447WQIQM/65mxE9Uhoe3tpVWQJsd 37GFsFqWq53au0qtQ/mDjGQR635ngE4PC7W8UE+sIj45u9DDYqkBZPivmmI7Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZAkGN8t961sO6zW+gWjJh/vEAthzAg+tCaaZrzxBqPI=; b=HOgtocG77up323X5DmbNHmKxYheS3MPJ4Hbz1njPb0lsDwonenTSRzvULCiPvuP6GG36JR xIWOBBdtgM5OmDUDTpJoJvHnnsPx7jWLrvm9c+p/6Tj8p8R4LHBaWrwGUqZKhSdj08MgU1 SxCySXU46vUZkYHU48B2CpQu4tIrTZgCxj7wb99OW8fNONbipQa2OX8R7RVFTLcK+Os7O/ K+RybbnZ8iD4A7TOZ417QbRzB7rh7CSOhJ8GWkG13mc6whyVuJ2zlc/747kMRjQJojtJng APqsE5cZ9P6TwWuYinM6t5T3SD4ARzQ+uFCSddifxeWtqNc2GAWNNhTUMBmDBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728757820; a=rsa-sha256; cv=none; b=fPiR/3lq/mhbcDTvcx4lQPxTKL6tgb9Vae/QPyMK60RW0bOLmqmciAp9uSTtEjK2MfYR8k xzh01thXbGm8R8PR7BRWuWjDrJo46BJBVfQe9b5h0bEaspaE8qtSEsOcKuGFShbNi1ulrg P3weNze7kr0yQXGuLMNllGqPSOlEMY55lufiTWxTGZh+cz2D8VJw/WhiWNtHJBP0bUyCEs lp7Q/Uu3ZUZ6fWU1MFF/ofKzeoSAattgP/6gtxXRfPEBqzwwB37YpuRtn5B1OXR3AaVfFa HPECu/g+AocLm8rwpFITZRyA/8nrVTT4cIQS81hYbic3D5ImCSiYzTMnyqz0KA== 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 4XQsVh4rHlzLmw; Sat, 12 Oct 2024 18:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CIUKcZ092295; Sat, 12 Oct 2024 18:30:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CIUKYl092292; Sat, 12 Oct 2024 18:30:20 GMT (envelope-from git) Date: Sat, 12 Oct 2024 18:30:20 GMT Message-Id: <202410121830.49CIUKYl092292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 20bb77c4b918 - main - jls(8): Complete libxo transition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20bb77c4b91837837dbccc40c9cc90eb43026131 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=20bb77c4b91837837dbccc40c9cc90eb43026131 commit 20bb77c4b91837837dbccc40c9cc90eb43026131 Author: Yan-Hao Wang AuthorDate: 2024-10-12 15:14:00 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-12 18:21:47 +0000 jls(8): Complete libxo transition Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41413 --- usr.sbin/jls/jls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/jls/jls.c b/usr.sbin/jls/jls.c index 5c26965b045b..e172c4698f57 100644 --- a/usr.sbin/jls/jls.c +++ b/usr.sbin/jls/jls.c @@ -37,7 +37,6 @@ #include #include -#include #include #include #include @@ -248,8 +247,9 @@ main(int argc, char **argv) } xo_close_list("jail"); xo_close_container("jail-information"); - xo_finish(); - return (0); + if (xo_finish() < 0) + xo_err(1, "stdout"); + exit(0); } static int From nobody Sat Oct 12 18:30:22 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQsVl1nyrz5YnjD; Sat, 12 Oct 2024 18:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQsVl0KQ8z4F4f; Sat, 12 Oct 2024 18:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jo5GCSc1nuSefOLJo1ia+MQBPy9CTnD/E1WDDoDEo6s=; b=wV/pja1pYLyf5cq9YG/Ke5GEDsGP1TIw/oSClBOxMWV6ZXUR+Ocep94B7s+PRJ8AExoi97 xj5xQ21AsWfR1SM4ozvXXREvCTDe/lF1wItjES5IqdofLX1FkjQuFhi/HXtK2dc5xA6j9f QV9VgQQDrN+CfNbzmfVbGItyplWA57MmxLHjmedL+va5w1HkQcwpX5hirkzyv5rLz+9ih4 7JzERDPNhP4g+M+7VD9Yn7TBsQxcFs8FeNV+/fMNahtnZvRa7/UzWGLEGvkXnuOpjNJt5u J17ijLZRYWCefL68zr52GiIoG26crlO5jFhIwfUD8lfH8JvAa0trFtf1EoFIxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jo5GCSc1nuSefOLJo1ia+MQBPy9CTnD/E1WDDoDEo6s=; b=e0Bwh8vyKl1dJpkE6ncfQ7ui1lfD3cuBP1OjeRUX5OzC2J2C5l/Pe1IuMxlBqjP408Jqza SLd1xO/vJiH/ybfoLKLOwhxInR66/bB0RxKiidzdCIIf4+/0Y7I6BSSroWfotOXyzG6Sh6 9Snpxem6ZkUsV4fWrc8s+ljvktrGGQEbaurqmrFu+mNsBgbeEU+FHKYLF3ZMwnsw4r9UMf /rf4r3BKKIQFdcqq6TFqGVy5N3VqkRH9ordP6NC1MXgMe6QHKCE0txq8aZhWKfU/6PnS25 9+izw7x9/0LEDL/hVNA3ffKxylpv9nAOI/9eMF+1UeGrYJn8LRwc5TerRkUk+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728757823; a=rsa-sha256; cv=none; b=YXRfKieaVtWJlI0QG5sN5J7o6BT/VH7zL80KooxuhtBPS/HVFQ/FQcY+muqj6WXia5e5mN jym2uTh90KfS0b6qjrawMRC93FlCO77UnAOF7nr95u/Gg00PhUAiy78NMyxCfWU3uOY5t/ TM9LCJu/KybwC9W3/QQhmxv56QoClp1dSEbZxAyTV8vi3WLPuj8pWRI5w4yyf3HPolr8gi 7MhWstIZizScjAkmLfM98fWyiaJ+t01Cpr99KJf4pkVtH3/ZQTL66rHuYbMg11BU7mnblA D0/+Wsqo473sxy3tU0G/OQRZT36gMMV/j/JkDEuZRsxz0j1/cRjg2EVjgprOQA== 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 4XQsVk6rcbzLSM; Sat, 12 Oct 2024 18:30:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CIUMBB092377; Sat, 12 Oct 2024 18:30:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CIUMSZ092374; Sat, 12 Oct 2024 18:30:22 GMT (envelope-from git) Date: Sat, 12 Oct 2024 18:30:22 GMT Message-Id: <202410121830.49CIUMSZ092374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 183e8aa749c1 - main - mount(8): Complete libxo transition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 183e8aa749c1fe7de44c842542d9e9eadf11b8cb Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=183e8aa749c1fe7de44c842542d9e9eadf11b8cb commit 183e8aa749c1fe7de44c842542d9e9eadf11b8cb Author: Yan-Hao Wang AuthorDate: 2024-10-12 15:18:51 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-12 18:21:47 +0000 mount(8): Complete libxo transition Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41390 --- sbin/mount/mount.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index c950574719ad..1b8eceb9a6ed 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -36,7 +36,7 @@ #include #include -#include + #include #include #include @@ -56,7 +56,8 @@ #define EXIT(a) { \ xo_close_container("mount"); \ - xo_finish(); \ + if (xo_finish() < 0) \ + xo_err(EXIT_FAILURE, "stdout"); \ exit(a); \ } @@ -142,7 +143,7 @@ exec_mountprog(const char *name, const char *execname, char *const argv[]) switch (pid = fork()) { case -1: /* Error. */ xo_warn("fork"); - EXIT(1); + EXIT(EXIT_FAILURE); case 0: /* Child. */ /* Go find an executable. */ execvP(execname, _PATH_SYSPATH, argv); @@ -152,7 +153,7 @@ exec_mountprog(const char *name, const char *execname, char *const argv[]) xo_warnx("in path: %s", _PATH_SYSPATH); } } - EXIT(1); + EXIT(EXIT_FAILURE); default: /* Parent. */ if (waitpid(pid, &status, 0) < 0) { xo_warn("waitpid"); @@ -217,7 +218,7 @@ main(int argc, char *argv[]) argc = xo_parse_args(argc, argv); if (argc < 0) - exit(1); + exit(EXIT_FAILURE); xo_open_container("mount"); while ((ch = getopt(argc, argv, "adF:fLlno:prt:uvw")) != -1) @@ -289,7 +290,7 @@ main(int argc, char *argv[]) if ((init_flags & MNT_UPDATE) && (ro == 0)) options = catopt(options, "noro"); - rval = 0; + rval = EXIT_SUCCESS; switch (argc) { case 0: if ((mntsize = getmntinfo(&mntbuf, @@ -320,7 +321,7 @@ main(int argc, char *argv[]) if (mountfs(fs->fs_vfstype, fs->fs_spec, fs->fs_file, init_flags, options, fs->fs_mntops) && !failok) - rval = 1; + rval = EXIT_FAILURE; } } else if (fstab_style) { xo_open_list("fstab"); @@ -441,7 +442,7 @@ main(int argc, char *argv[]) * If the mount was successfully, and done by root, tell mountd the * good news. */ - if (rval == 0 && getuid() == 0) + if (rval == EXIT_SUCCESS && getuid() == 0) restart_mountd(); EXIT(rval); @@ -884,7 +885,7 @@ usage(void) "usage: mount [-adflpruvw] [-F fstab] [-o options] [-t ufs | external_type]", " mount [-dfpruvw] special | node", " mount [-dfpruvw] [-o options] [-t ufs | external_type] special node"); - EXIT(1); + EXIT(EXIT_FAILURE); } void From nobody Sat Oct 12 18:30:21 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQsVk2FLvz5YnYx; Sat, 12 Oct 2024 18:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQsVk00wlz4DwR; Sat, 12 Oct 2024 18:30:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pt2WUTDEpXAbqXwIo7l0GDGxCcA75dilVDvrK+EbPoY=; b=JSSPKy69izm9r1Mby7rfeVoAx8IZ4U1A2FckFkr/1W0GmkEwu++aL0/cy47FysAvQGFgDl a00USHyGlV5WmtLZsGFClfvK0fbZnVRsrQUG7TemuXZYeA6InsIkkUa3YNLre/5Rb7bmOi UrpOlBbAE9UFbOHSYnhWIwGfyRBBlGB6lsqQPWcdBk+DLXCUx3XUXvUlDMuVzIIw4A5tGU 4EfuTms4E7uxxfYufqseF7gAdsc2tgcdmTZeTJMDpV1axwXoHUrR6IFdBbw+hb/xq9oATM 9OQKLWSLSuZw5m8apAu4oUxvFO2NlvqFz7mcVa5SdvWL7MbJKI2wJUw3RkbEaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pt2WUTDEpXAbqXwIo7l0GDGxCcA75dilVDvrK+EbPoY=; b=cg6z6bNHq2ij0G057iXOnWpGSx27d97ULfaBr73X21vLU4fKGixBiuH2CeFdwfIL4inooq sAtNDyLfrRiPttIH5X8evprEsInAa0RwIOiQQPsU3Umb/EsXZ6TeEltVbDsVq+YbLO7OyJ ywHJ9dUGfOlXhlSL/EubJaa/qiBBvbISQqzyFK0Gz7/iSXN0nFLuKjqHlXiur+aU2dTPxd 2/JQAXE90iMSi3tOk14XP4wszu6gk4hkdU9ESlWoLmhckIFwSVyQqaX48LBECVStehadk0 SuR9feoCv6VJguClmjrzKtn4+BW27j2BDqZdmyWqlPQY957FTSKBXhqGkvD58w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728757822; a=rsa-sha256; cv=none; b=YIN9zoh4jaRiVAMULH4X/FMPQOBiYdGCgh0W5LFKl5LRgKXLC5nydQHhC1UQ7ut21PzjsI Ep4K0RBaU0K69PvkLEVEbi8OpaHl9EDmUeDv5cXSWJbntsTyRhGIzyNf8kjMAJKiK6s3Uf g3idjJvr9JS1csA2fQNTqsnCokB6GLNRvhyzrcGo2jUm8AxUjkvS/p+b3TdIBZOSAtMR2b 8qJ3Q2BL/eXESnGZqsblcPIuISVOOKN2Na0OWMO/Y/6e7PWpohR68UGXyG2DwE+pUMlMqB Qji5BMP0vgSORkktkbOn2SLX1SlibUn4eq2dktKXBiae8oE10Cx2gKsdIB9dMA== 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 4XQsVj67jJzLkW; Sat, 12 Oct 2024 18:30:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CIULaL092335; Sat, 12 Oct 2024 18:30:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CIULTM092332; Sat, 12 Oct 2024 18:30:21 GMT (envelope-from git) Date: Sat, 12 Oct 2024 18:30:21 GMT Message-Id: <202410121830.49CIULTM092332@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: b698093da430 - main - nfsstat(1): Complete libxo transition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b698093da430bb25ee2cdf6346472aac91559b25 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=b698093da430bb25ee2cdf6346472aac91559b25 commit b698093da430bb25ee2cdf6346472aac91559b25 Author: Yan-Hao Wang AuthorDate: 2024-10-12 15:17:23 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-12 18:21:47 +0000 nfsstat(1): Complete libxo transition Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41428 --- usr.bin/nfsstat/nfsstat.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c index 55f5573662c7..20472cf4a129 100644 --- a/usr.bin/nfsstat/nfsstat.c +++ b/usr.bin/nfsstat/nfsstat.c @@ -83,7 +83,6 @@ #include #include #include -#include #include @@ -168,7 +167,7 @@ main(int argc, char **argv) mntbuf->f_mntfromname, mntbuf->f_mntonname, buf); else if (errno == EPERM) - errx(1, "Only privileged users" + xo_errx(1, "Only privileged users" " can use the -m option"); } mntbuf++; @@ -241,7 +240,8 @@ main(int argc, char **argv) xo_close_container("nfsstat"); } - xo_finish(); + if (xo_finish() < 0) + xo_err(1, "stdout"); exit(0); } @@ -505,8 +505,7 @@ printhdr(int clientOnly, int serverOnly, int newStats) static void usage(void) { - (void)fprintf(stderr, - "usage: nfsstat [-cdEemqszW] [-w wait]\n"); + xo_error("usage: nfsstat [-cdEemqszW] [-w wait]\n"); exit(1); } @@ -1131,7 +1130,7 @@ exp_sidewaysintpr(u_int interval, int clientOnly, int serverOnly, ext_nfsstatsp = &lastst; ext_nfsstatsp->vers = NFSSTATS_V1; if (nfssvc(NFSSVC_GETSTATS | NFSSVC_NEWSTRUCT, ext_nfsstatsp) < 0) - err(1, "Can't get stats"); + xo_err(1, "Can't get stats"); clock_gettime(CLOCK_MONOTONIC, &lastts); compute_totals(&lasttotal, ext_nfsstatsp); sleep(interval); @@ -1141,7 +1140,7 @@ exp_sidewaysintpr(u_int interval, int clientOnly, int serverOnly, ext_nfsstatsp->vers = NFSSTATS_V1; if (nfssvc(NFSSVC_GETSTATS | NFSSVC_NEWSTRUCT, ext_nfsstatsp) < 0) - err(1, "Can't get stats"); + xo_err(1, "Can't get stats"); clock_gettime(CLOCK_MONOTONIC, &ts); if (--hdrcnt == 0) { From nobody Sat Oct 12 18:30:23 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQsVm2mMLz5YnjJ; Sat, 12 Oct 2024 18:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQsVm1DJ3z4F2p; Sat, 12 Oct 2024 18:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dPYmFKspLKqNzXZxRgBRWH1qhJE6+2FfLnwgIOyMdbU=; b=HrpHX/WTmaGObAT19L5XV8cGJaAoE8AeA+Fj5t5yR+AU5dpTPreJijuNdBkQM+nYgFzpnk 5kw6ith87ADGJsATFeMqt8o8SvNHs8M1D/MhjaLG3BE/jyMatS0fIeuvjKDUuLd1u/NI+L AOnTZZPaq7WH5amNCT90JQbrTqLHTT9oWDWzejpibOnqUWssSMSrd6Etw4GlJrd+5suo6R 7S4TxRSOo6td4BfFjKmMulyaTSz5LMvMP2VtYGoAY7H+fuUODOoxeDre7boKRat2M4L8VP r8UMdofigyEd60za7F38fE/LD5KNW/zjf3t7xfTBk+rjhco++v6K0M/7fY3MJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dPYmFKspLKqNzXZxRgBRWH1qhJE6+2FfLnwgIOyMdbU=; b=OKmK5LQskaEBkv7aRVIKuEe2Qu1IQTkGetglgHrDohxir0Mk5fTcjPm8TAiUhzLIWYK0P5 N3xhjGq62qpoym5WgGPS9Duz4vxX8+hr1imGMQt6xcQXwA9JxoiRHFf1IBfBmaOv1GinBC EWkGQ7RBhxYvSLSM1423h45KENG7/WDIpEHaaNV65M0LJVh8F0J3M3V6JNFSQXQihe7jml BeWMAl2WMeZL7trfrfS01jb3QOqKYIAPYqNgyw9bzEjlbcuAvia6aL52lyXlkd6ykl0MCH 89BHLXSe0awAyJ8mZlsRAnfI4GO+dQ0ht6CaKY/tqH4mZ0XMh/XJFrKYk98xMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728757824; a=rsa-sha256; cv=none; b=DwC/pz47kMKEhcE+erys4ijegD60jdFxKIu0L5PMabO0LZYEwj4fCM7TRoh0lMTd0S4ziw nxUYMxMxyjmjk/nveHpQ9SmPc6YfIRSQQ/yRgzu6LSUd2Cco9ZGMBXjkUY8ODev2CUKqSX 9tm+Mur6OaVpPeaP9ysdIOY4bz6sgt5Je+nDYoGLEdqhbkbUDJ8ZAAAND9Kvr95m7stNwj nRAdtp99BtQcBg684utsT4T4XrUlGyy+cPEJHvl9XLe92r90iMZxSbcYErSVqUBfjw2TOL ZlugY/3LhGCEji8AhF/qM5cnW+64/bnKoPOPGP9GPONJ42v9Rf2rK1ELyDecUg== 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 4XQsVm0jSfzLkX; Sat, 12 Oct 2024 18:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CIUNBB092416; Sat, 12 Oct 2024 18:30:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CIUNZ5092413; Sat, 12 Oct 2024 18:30:23 GMT (envelope-from git) Date: Sat, 12 Oct 2024 18:30:23 GMT Message-Id: <202410121830.49CIUNZ5092413@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: f5ee007c3939 - main - vmstat(8): Complete libxo transition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5ee007c39391ef6b1b273713d421a508f7fbc8b Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=f5ee007c39391ef6b1b273713d421a508f7fbc8b commit f5ee007c39391ef6b1b273713d421a508f7fbc8b Author: Yan-Hao Wang AuthorDate: 2024-10-12 15:24:46 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-12 18:21:47 +0000 vmstat(8): Complete libxo transition Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41432 --- usr.bin/vmstat/vmstat.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 862cc4809fbe..680eb8bc8fde 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -49,7 +49,6 @@ #include #include -#include #include #include #include @@ -338,8 +337,9 @@ retry_nlist: xo_error("undefined symbols:\n", buf); } else xo_warnx("kvm_nlist: %s", kvm_geterr(kd)); - xo_finish(); - exit(1); + if (xo_finish() < 0) + xo_err(EXIT_FAILURE, "stdout"); + exit(EXIT_FAILURE); } nlist_ok: if (kd && Pflag) @@ -386,8 +386,9 @@ nlist_ok: if (todo & VMSTAT) dovmstat(interval, reps); xo_close_container("vmstat"); - xo_finish(); - exit(0); + if (xo_finish() < 0) + xo_err(EXIT_FAILURE, "stdout"); + exit(EXIT_SUCCESS); } static int @@ -796,7 +797,8 @@ dovmstat(unsigned int interval, int reps) else cpustats(); xo_emit("\n"); - xo_flush(); + if (xo_flush() < 0) + xo_err(EXIT_FAILURE, "stdout"); if (reps >= 0 && --reps <= 0) break; osum = sum; @@ -1192,7 +1194,7 @@ read_intrcnts(unsigned long **intrcnts) if (kd != NULL) { kread(X_SINTRCNT, &intrcntlen, sizeof(intrcntlen)); if ((*intrcnts = malloc(intrcntlen)) == NULL) - err(1, "malloc()"); + xo_err(1, "malloc()"); if (namelist[X_NINTRCNT].n_type == 0) kread(X_INTRCNT, *intrcnts, intrcntlen); else { @@ -1203,7 +1205,7 @@ read_intrcnts(unsigned long **intrcnts) for (*intrcnts = NULL, intrcntlen = 1024; ; intrcntlen *= 2) { *intrcnts = reallocf(*intrcnts, intrcntlen); if (*intrcnts == NULL) - err(1, "reallocf()"); + xo_err(1, "reallocf()"); if (mysysctl("hw.intrcnt", *intrcnts, &intrcntlen) == 0) break; } @@ -1311,7 +1313,8 @@ dointr(unsigned int interval, int reps) print_intrcnts(intrcnts, old_intrcnts, intrnames, nintr, istrnamlen, period_ms); - xo_flush(); + if (xo_flush() < 0) + xo_err(EXIT_FAILURE, "stdout"); free(old_intrcnts); old_intrcnts = intrcnts; @@ -1616,6 +1619,7 @@ usage(void) xo_error("%s%s", "usage: vmstat [-afHhimoPsz] [-M core [-N system]] [-c count] [-n devs]\n", " [-p type,if,pass] [-w wait] [disks] [wait [count]]\n"); - xo_finish(); - exit(1); + if (xo_finish() < 0) + xo_err(EXIT_FAILURE, "stdout"); + exit(EXIT_FAILURE); } From nobody Sat Oct 12 18:30:25 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQsVn34hwz5YncN; Sat, 12 Oct 2024 18:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQsVn28SKz4F34; Sat, 12 Oct 2024 18:30:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/FDSDE0YHYQJyjpCHzajFKdzlw5ObIwDlLvGR91cU5E=; b=kCz8qDjOuc5vsAqZ7nhIS/C1f64Yzc0cpmxRKsausMlvdBbJlswf+vGtXZIs2px60b8pTb 0AaL5bK3BoZh3R7rO5WhMIMoNi+S0ScE8peoF7ovES/gUHZMwo+X6JgrXZPmBeva7GM6wp 2osoBiOTcWEHxQ7Buq2oqY0gaOKXr3dpxMvAuiJMGGfFStAt19tkmsrKAqA08p5Tx2gSGg Dmdsz1mmI1M9BOxtYJkiAXIAhugVXJEPTNlfqHaDNTEt8jYEfTZZ1s2nV7WtHOm+26RRqs iPFjfBE467JfpquaA6+XU+rzNiUHhLewOURLXN+5ruJm9Y0aQDb0YsCPLEnQJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728757825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/FDSDE0YHYQJyjpCHzajFKdzlw5ObIwDlLvGR91cU5E=; b=n4+0CIJGEr2IJ5/NIccG/jgUM1Z1uUhGTbUI+IURXj5Txz1pOIV5koD41bCuM82wcKWKUh TDmBm912pM34lwdRTz6NAxSRN1FTLlAhJf2FqGnrdWEVCfaA3IZZJZdN3eC7ie5RUaf1ep t7LYBoqs7Il+nLa46/y5dUfkEUTjzsnhj3NCc/yKfoKMdNE/CRhOqxtKpKZQfYIMvi6Zow XsdFnSaX76RXhzc7WBfmSLkiz2AHlW3GQ4lCQ8g9KOmQcNQcolyezjArbO4RZNteHfG5fX 0iJ4XYKstA4NIH6P/sZpblmMc6RZpRyzhIgFg7ZsSyFox7D6Acyrix0G6iRodw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728757825; a=rsa-sha256; cv=none; b=pM0WlPFBpuQOSaOkGKZourm4zR7wNFMwiwPTuSePfKgLr0gYAnbBp8TjpB1rHY5O+IvzRb LKnUfMhxuGzLM4ByozpGWGGI/Rn1IvdsayDt8SL4jGobZ9cCsIehaRtmBTaAJu8fH+GnY7 YDJi2I+KgkItY4d0lJ9wC1b03oexyMqk9Gvg6l+9xyMRX+kGxqcHetuRtsEPridO+Hzm0G z9zv36IifBoHNQZLFfbXjyxSdrdMPSgUw3ojN/qkOe3JGp63GVMXtqviB7E1nFRRaiwpVT gq7E8ySEQpCaQJ2I2innj7359hhWqsjZ5DBe3+TWEgynnkPMzPJcKXbhhz4MVg== 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 4XQsVn1mgMzKXy; Sat, 12 Oct 2024 18:30:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CIUPte092467; Sat, 12 Oct 2024 18:30:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CIUPl5092464; Sat, 12 Oct 2024 18:30:25 GMT (envelope-from git) Date: Sat, 12 Oct 2024 18:30:25 GMT Message-Id: <202410121830.49CIUPl5092464@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 00f003da7d07 - main - iscsictl(8): Complete libxo transition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00f003da7d0702caf10d3306b0290efe6b812d32 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=00f003da7d0702caf10d3306b0290efe6b812d32 commit 00f003da7d0702caf10d3306b0290efe6b812d32 Author: Yan-Hao Wang AuthorDate: 2024-10-12 15:26:55 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-12 18:21:48 +0000 iscsictl(8): Complete libxo transition Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41423 --- usr.bin/iscsictl/iscsictl.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/usr.bin/iscsictl/iscsictl.c b/usr.bin/iscsictl/iscsictl.c index b75ff889a9a6..922e9ed9ebea 100644 --- a/usr.bin/iscsictl/iscsictl.c +++ b/usr.bin/iscsictl/iscsictl.c @@ -709,20 +709,20 @@ static void usage(void) { - fprintf(stderr, "usage: iscsictl -A -p portal -t target " + xo_error("usage: iscsictl -A -p portal -t target " "[-u user -s secret] [-w timeout] [-e on | off]\n"); - fprintf(stderr, " iscsictl -A -d discovery-host " + xo_error(" iscsictl -A -d discovery-host " "[-u user -s secret] [-e on | off]\n"); - fprintf(stderr, " iscsictl -A -a [-c path]\n"); - fprintf(stderr, " iscsictl -A -n nickname [-c path]\n"); - fprintf(stderr, " iscsictl -M -i session-id [-p portal] " + xo_error(" iscsictl -A -a [-c path]\n"); + xo_error(" iscsictl -A -n nickname [-c path]\n"); + xo_error(" iscsictl -M -i session-id [-p portal] " "[-t target] [-u user] [-s secret] [-e on | off]\n"); - fprintf(stderr, " iscsictl -M -i session-id -n nickname " + xo_error(" iscsictl -M -i session-id -n nickname " "[-c path]\n"); - fprintf(stderr, " iscsictl -R [-p portal] [-t target]\n"); - fprintf(stderr, " iscsictl -R -a\n"); - fprintf(stderr, " iscsictl -R -n nickname [-c path]\n"); - fprintf(stderr, " iscsictl -L [-v] [-w timeout]\n"); + xo_error(" iscsictl -R [-p portal] [-t target]\n"); + xo_error(" iscsictl -R -a\n"); + xo_error(" iscsictl -R -n nickname [-c path]\n"); + xo_error(" iscsictl -L [-v] [-w timeout]\n"); exit(1); } @@ -743,8 +743,8 @@ main(int argc, char **argv) struct target *targ; argc = xo_parse_args(argc, argv); - if (argc < 0) - exit(1); + if (argc < 0) + exit(1); xo_set_version(ISCSICTL_XO_VERSION); xo_open_container("iscsictl"); @@ -1052,10 +1052,11 @@ main(int argc, char **argv) xo_err(1, "close"); xo_close_container("iscsictl"); - xo_finish(); + if (xo_finish() < 0) + xo_err(1, "stdout"); if (failed != 0) - return (1); + exit(1); - return (0); + exit(0); } From nobody Sat Oct 12 20:58:45 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQwnx4YWhz5YyVv; Sat, 12 Oct 2024 20:58: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQwnx38yRz4SSg; Sat, 12 Oct 2024 20:58:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728766725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WgPBFOU7nq8cqrKMKzcK3I9QxG5xsdUxnm5pI2kFrLE=; b=sApfUsBfsOQIxdpW0TjXdgDdk+ehTqvAdJJKCb4Q/103bpfLWMk7wPp0iTbTqFOIOccaq2 Euwk2YVw5sRKmLkRwtxMuk1K0BSGMUhYmDYbRNSsOpVHQlYEODhTh7dY6nSMKsnctNwODk dLClYq2CO1GaOniQQj43Oltt/WRwF2qtKeNWxy8qFDPbFnUcGRMjwrRmoUBhPKRU4cr/nH EUiOpp4JUr49Ors6AfmT0edX06e9aP9AiGebywJW31yhEri8BT5c/UIsn+16huS6JoSK44 yYb+jSREt+1/XA32sSJ25OjDLJj5GJxzfILgJAqwNhuO45O7CTPdk/pN7i/5/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728766725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WgPBFOU7nq8cqrKMKzcK3I9QxG5xsdUxnm5pI2kFrLE=; b=vXrldJ9cg6wOS5G+UEFfj/psXFroIPE9OJsINDUxNbc775Uo23rH2gZwzk7Esn1N7r+VEK lp87bpzbG/xrJ8TXX8VHo+DK90f1x9MGycKGunDFKgBvuwTqdscFiT3ZTdURssfGcIk7y8 As43u83ZI+RrpeussyD53S66rt3ar9+/r/Q+YK5Nr1oVjFYrk/R8rAcQJWocFXWZhMZka6 RnH7hy3DGOXF5nt7anMVs+Os3efENX+hoV7dQgsQf1maIhylacTADCaPOaPWQuj6YgYsAH JmRPjFN4Zm+8S0qjp63sUTUOMzGGRwtMkdA8nA/AEnZd0ClaFan6QkVXBDGGZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728766725; a=rsa-sha256; cv=none; b=YiX7Ne4ar8CqU0xZvIbU8DcQh9K0eEZSY5CEWJQO3SVnzhv8pbRkKtFWIQWzMoHmDAjGYB 8reSefLjNxEzJXGZcyI+GK6s6NwWl0Id95tuKWtGdUfwCSeLFoq29bV7BSD8PMTqR+1xC6 nMzkxQp8zcFokqkDmhI62xMa+SJqFzpMOLe5ZKlpP28VFkvvWP+y17uw0/WuuUmZvbPqJa XPoEe7b70UsDjgqnyZoJIuWRKxUcU1wLeHNCd0mi1HiimkKpAfeReDwp1RzzodjFd0Z7rj VAiJMOEQK1YGkcMtF2XtlfJtV3VkwXDf5aBmDpvOrcmqyJj+ETfuVKHgOLJ8ng== 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 4XQwnx2m6wzPpZ; Sat, 12 Oct 2024 20:58:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CKwjYQ038139; Sat, 12 Oct 2024 20:58:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CKwjox038136; Sat, 12 Oct 2024 20:58:45 GMT (envelope-from git) Date: Sat, 12 Oct 2024 20:58:45 GMT Message-Id: <202410122058.49CKwjox038136@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4584c8f0ef54 - main - lpt: check readiness with predefined macros List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4584c8f0ef54e19f7be79aeee1ba1c1154af14e1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4584c8f0ef54e19f7be79aeee1ba1c1154af14e1 commit 4584c8f0ef54e19f7be79aeee1ba1c1154af14e1 Author: Arvydas Sidorenko AuthorDate: 2024-10-11 22:54:17 +0000 Commit: Warner Losh CommitDate: 2024-10-12 20:40:24 +0000 lpt: check readiness with predefined macros Replace spelled-out bits with pre-defined macros for those same bits. No functional change. PR: 170076 Reviewed by: imp --- sys/dev/ppbus/lpt.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c index 994adcc6a608..d6f5b34d0e60 100644 --- a/sys/dev/ppbus/lpt.c +++ b/sys/dev/ppbus/lpt.c @@ -238,8 +238,7 @@ lpt_port_test(device_t ppbus, u_char data, u_char mask) do { DELAY(10); temp = ppb_rdtr(ppbus) & mask; - } - while (temp != data && --timeout); + } while (temp != data && --timeout); lprintf(("out=%x\tin=%x\ttout=%d\n", data, temp, timeout)); return (temp == data); } @@ -560,9 +559,7 @@ lptopen(struct cdev *dev, int flags, int fmt, struct thread *td) } /* is printer online and ready for output */ - } while ((ppb_rstr(ppbus) & - (LPS_SEL|LPS_OUT|LPS_NBSY|LPS_NERR)) != - (LPS_SEL|LPS_NBSY|LPS_NERR)); + } while ((ppb_rstr(ppbus) & RDY_MASK) != LP_READY); sc->sc_control = LPC_SEL|LPC_NINIT; if (sc->sc_flags & LP_AUTOLF) @@ -619,9 +616,7 @@ lptclose(struct cdev *dev, int flags, int fmt, struct thread *td) /* if the last write was interrupted, don't complete it */ if ((!(sc->sc_state & INTERRUPTED)) && (sc->sc_irq & LP_USE_IRQ)) - while ((ppb_rstr(ppbus) & - (LPS_SEL|LPS_OUT|LPS_NBSY|LPS_NERR)) != - (LPS_SEL|LPS_NBSY|LPS_NERR) || sc->sc_xfercnt) + while ((ppb_rstr(ppbus) & RDY_MASK) != LP_READY || sc->sc_xfercnt) /* wait 1 second, give up if we get a signal */ if (ppb_sleep(ppbus, lptdev, LPPRI | PCATCH, "lpclose", hz) != EWOULDBLOCK) From nobody Sat Oct 12 20:58:46 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQwny6mHTz5YyMp; Sat, 12 Oct 2024 20:58: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQwny47hQz4SSh; Sat, 12 Oct 2024 20:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728766726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p+er28IMaODP3aOOY/RtG4tPqDSJyHSypigk2pS74G8=; b=J+XdQLSz3eQ/bWsH0c9cxIqWNQ9koJ2lHi7REI65StPgm1tDw8T3ZhKknKX8u1Zr/ziauR 3l0v9czoptgXsa4fLqNedj74Z3gOqYO0fEa/pDbd2Q/CgL4Sg0Kwg+6+kDrzSPEGzEV4q5 it1qqF2p6+A/94NdN23t6C3GVdyZFvR/vD41Tt3fvpJ4UlpHWqzQVvgIBoCvf4gaOcXhTC sPNPPz0Q1/oWuvUrKlPF1GMc4HbvBXCv2iTeClVLqJl5CrAA5KrzRV3gZPc1Ht3AQt0f/t yM2vj0L2vljNhk7CBPKEMx13XUdYvH5uYikLUrLXsj1c698462pXLQRAoC4aiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728766726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p+er28IMaODP3aOOY/RtG4tPqDSJyHSypigk2pS74G8=; b=UAvtW9UsWPtaJjj1kYPw3GXtGVmCXtm5OyWForLIls1BmKJpncV+9oMHDv0Ieb2X4vK66F qb9qNX98Bmqq2tQTIDyC/KMqd9qbEg27U+PQYF4RYdC0GStPZ6h98pHV6zMKkG23OqOZSR kOZxFFyskOqV9XBxj081YH93iep7fvdPCwNeIt2lLC3oVj3+uUXdwfOnlF7wAyw1rrFdD4 aE4LLKqWKSG8F4ii3doneu9zOCRKqNn+KeSUAfpsTHPTWKmwn7a6zt4WqwiUMk1fbjv0kJ +BpEgmY8fHwJ2JRw2FyKWIHB/wCmE7pPja5WIZx0GyR56t7F/MbfLtxU8QYngw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728766726; a=rsa-sha256; cv=none; b=AuUwnlc8CTnknkM6zcGLsN9b3to+jnP3e8sYmlGf1VoNCV9GDZ8cm18dR++Jre6AOOGM7+ /n0w4jhtVGUDt00kMr0Pq9Kncb/v0SGFAme0bKKnViXSPXQH2afxd6OGlPnOmoE/M3L2tY ovaWnKEX0UXgKshCw75rZO/NAD9YfLcY7QQBQLKy4XB0dDrgvuUSVuZr6t4pdKO9UzY3qt BvX7clN2TG/06jEhNsMywXBDSKhnfnWQsyQ3tVnmPgRtPdDWCO2RY3C1cXX5zQX0pt4bHd /3eq+8j04GPX7ytvkX/Xu0ldDsuZjij68RGTv11+Hgs5NXEY/xLW41sPmLIT6Q== 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 4XQwny3lBTzQHx; Sat, 12 Oct 2024 20:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CKwk9l038190; Sat, 12 Oct 2024 20:58:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CKwkrP038188; Sat, 12 Oct 2024 20:58:46 GMT (envelope-from git) Date: Sat, 12 Oct 2024 20:58:46 GMT Message-Id: <202410122058.49CKwkrP038188@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1a37caeb076b - main - modules: Add missing opt_*.h files for stand-alone compile List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a37caeb076b9d31e13c54691d7f1eeb589798bb Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1a37caeb076b9d31e13c54691d7f1eeb589798bb commit 1a37caeb076b9d31e13c54691d7f1eeb589798bb Author: Warner Losh AuthorDate: 2024-10-12 20:40:41 +0000 Commit: Warner Losh CommitDate: 2024-10-12 20:40:41 +0000 modules: Add missing opt_*.h files for stand-alone compile Standalone compile that we at least create these opt_*.h files. Sponsored by: Netflix --- sys/modules/linux/Makefile | 2 ++ sys/modules/linux64/Makefile | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index eb4e17ec706b..36dfbbe2192f 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -33,6 +33,7 @@ SRCS= linux${SFX}_dummy_machdep.c \ linux_uid16.c \ linux_vdso.c \ linux_xattr.c \ + opt_compat.h \ opt_inet.h \ opt_inet6.h \ opt_ktrace.h \ @@ -41,6 +42,7 @@ SRCS= linux${SFX}_dummy_machdep.c \ bus_if.h \ device_if.h \ vnode_if.h + .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" SRCS+= linux_dummy_x86.c VDSODEPS=linux_vdso_gettc_x86.inc diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index b23891a65a4f..119d90126ab3 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -28,14 +28,17 @@ SRCS= linux_dummy_machdep.c \ linux_vdso.c \ linux_timer.c \ linux_xattr.c \ - opt_ktrace.h \ + opt_compat.h \ opt_inet6.h \ + opt_ktrace.h \ opt_posix.h \ + opt_usb.h \ bus_if.h \ device_if.h \ vnode_if.h \ linux_support.S \ linux_vdso_inc.S + .if ${MACHINE_CPUARCH} == "amd64" SRCS+= linux_dummy_x86.c .endif From nobody Sat Oct 12 23:04:54 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQzbW0hyjz5Z6ft; Sat, 12 Oct 2024 23:04: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQzbW0DLWz4fx3; Sat, 12 Oct 2024 23:04:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728774295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s3XBi3mmAKj3SM284Gq4papG4XI1F3j3rPKfcbbIifc=; b=Msdgu5deHUJTlEAZl35p0peH9mUhDFI0vYNVUpaDzoYva0C9mol16ltjR3NE+AgG6hrXw4 N3J351LgefOVHjxYE+xhXzsV+xRlxSY44I1kiwzu2WgwcsMF7EhzrY1XZUXfX3TKFuOzan Mbm3CEQ8wdEQznDO+66Bl1JQCaTGUkFLUN4sahSUrMROMEmfzPFonlGKNazel1+RNgL9EK +4/gS3W0chln2aBSYdjd2G8WWz4tDqxeokgSqPv7FPQO0sarKa/t8kX/fa7c7Yr75rzskg r3MBEG0bBDNkjGAaAkQfcPzHIJGnLH0u93erij5FGk0Y/jLUjR+DCaf6iHQUmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728774295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s3XBi3mmAKj3SM284Gq4papG4XI1F3j3rPKfcbbIifc=; b=qFIawy3mYAZItgOd93JRh9P+Z1JY4UPypOEXCo9ruBXPhYeHYpdFN421zBYgZSbn7jwH29 dVadw4WZSLYe2ACttMu76RGF4a6EfK79Sy2zDlSir4r3Ixs9RHhbmqbzuIRJXG5ur78RND acCePTB92bnNxiuRrzXG0r3ixqVnQHA3Y1InWEcM90aPxk/SRkOay25oZw8pB2kB8IXerh 0DgauFv7RN3wbg/V9ElTuVwDwD/L1mZ/DIxhmMS7QSN0k5mgtwvITWsL4hL1CxfmQygZzs 41r2wnLklbocGGWXYMgqEcX76MOdgivdRha09rljSeuKOF0kmahukjH7cm+g1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728774295; a=rsa-sha256; cv=none; b=WjaW39/ixcDg9VrcgrGapQDRvd0DT5mETSwxMgtdPE5y4cPJaS1G8mn4BPDD1hJuCSjr5Q TCpTZOVZ4sandX8f6vS6cuE6uFnbvKUnObzaOQ4ZRWdd5eOWJj0ZOMlAV2w4q0vHY3ZcJk RSZRUvMypwn91yZRo6YfiFGj1WzixqmkJvuJgucGBgJSPG05S7wUIavshYHbbaCSR6cCxX kH1D6Ug1LHMKKDoCo4umvyTQyZeyAM9dVVK1o31adxDNsON1+Ajo2+kAJTpY+YoShRWlyI Q4ILxIc4EqKiLl8CvBVoye+zZbfOD5tL+OMR1W72K8CSmZI6XHPCHRZNNjo6sg== 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 4XQzbV6xlkzV8b; Sat, 12 Oct 2024 23:04:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49CN4sDU057835; Sat, 12 Oct 2024 23:04:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CN4sf1057833; Sat, 12 Oct 2024 23:04:54 GMT (envelope-from git) Date: Sat, 12 Oct 2024 23:04:54 GMT Message-Id: <202410122304.49CN4sf1057833@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: fa3dfeff95a5 - main - dpaa2: fix MRU for dpni (and software vlans along) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa3dfeff95a5bafcf13accaed5164bfc4e028d9a Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fa3dfeff95a5bafcf13accaed5164bfc4e028d9a commit fa3dfeff95a5bafcf13accaed5164bfc4e028d9a Author: Bjoern A. Zeeb AuthorDate: 2024-10-11 18:51:32 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-10-12 22:13:39 +0000 dpaa2: fix MRU for dpni (and software vlans along) 0480dccd3f34 tried to fix the MTU for software VLANs given dpni announces IFCAP_VLAN_MTU. Unfortunately the initial MRU during setup is reduced from the maximum supported by the HW to our maximum ethernet RX frame length so only after further mtu toggles the solution there would work. Set the maximum RX frame size (without CRC) to jumbo length + vlan encap len by default given we also announce IFCAP_JUMBO_MTU. While here improve the manual (ioctl) MTU setting by checking if IFCAP_VLAN_MTU is currently enabled and only then add the extra bytes. Fixes: 0480dccd3f347da0dbccf5917633435d5ce6cb86 MFC after: 3 days Reviewed by: dsl Differential Revision: https://reviews.freebsd.org/D47066 --- sys/dev/dpaa2/dpaa2_ni.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/dev/dpaa2/dpaa2_ni.c b/sys/dev/dpaa2/dpaa2_ni.c index 6ed656849709..622e63626bfe 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -138,8 +138,9 @@ MALLOC_DEFINE(M_DPAA2_TXB, "dpaa2_txb", "DPAA2 DMA-mapped buffer (Tx)"); #define DPNI_IRQ_LINK_CHANGED 1 /* Link state changed */ #define DPNI_IRQ_EP_CHANGED 2 /* DPAA2 endpoint dis/connected */ -/* Default maximum frame length. */ -#define DPAA2_ETH_MFL (ETHER_MAX_LEN - ETHER_CRC_LEN) +/* Default maximum RX frame length w/o CRC. */ +#define DPAA2_ETH_MFL (ETHER_MAX_LEN_JUMBO + ETHER_VLAN_ENCAP_LEN - \ + ETHER_CRC_LEN) /* Minimally supported version of the DPNI API. */ #define DPNI_VER_MAJOR 7 @@ -2561,8 +2562,10 @@ dpaa2_ni_ioctl(if_t ifp, u_long c, caddr_t data) DPNI_UNLOCK(sc); /* Update maximum frame length. */ - error = DPAA2_CMD_NI_SET_MFL(dev, child, &cmd, - mtu + ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN); + mtu += ETHER_HDR_LEN; + if (if_getcapenable(ifp) & IFCAP_VLAN_MTU) + mtu += ETHER_VLAN_ENCAP_LEN; + error = DPAA2_CMD_NI_SET_MFL(dev, child, &cmd, mtu); if (error) { device_printf(dev, "%s: failed to update maximum frame " "length: error=%d\n", __func__, error); From nobody Sun Oct 13 05:44:38 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XR8Sk4yW4z5YMbd; Sun, 13 Oct 2024 05:44: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XR8Sk4DBvz4QYh; Sun, 13 Oct 2024 05:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728798278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQiaWbr3eV0/mUMM9VgFoFZof6mgMppkrfhf7HRY3KQ=; b=tAcQl73yuE1o968K3zk+jgexL8Im0W2fNoX2iZTlAzJG391vfnFjigyLOiz6tfeiujECdA vozEVbZz3cxBuh34Q0w38VOzEn67XpUX4+N/gf6gQnVxBIWMxzgeHMLy6m7PRYEYhJiZCm Jjm9yf8rKgusfUBhd+fJ9DqLcKuq9bMPGcQgulx+yt6NDmU/u7Nbef8/SNjZz/A3hwemWc jQLINtYVIyNLNZ+P1AhBhy8cgCteuV5lCxfBeiukyv1pusTWbO/DI9UFxBuDBlveCeirp8 tIphm0Ni69Bs5Mc/GqpWC1hf6jfhyJKwdVgOQxCxLLJPxeWj6m7DXOrxVKXIGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728798278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQiaWbr3eV0/mUMM9VgFoFZof6mgMppkrfhf7HRY3KQ=; b=ohOUGKN2w7m5lRKbDv3C+rcht3OW6oL9PsBSg5trjzhUq3SyEP0Jv9pp6NPT2a5hk9o8yp 1GHe84LmZi6bOOvNKZkhB9yQN93cLD3MQldKQL3Fmf2cYlhNW2aTZFGcp33iFRBDVoHYb1 2sctVTsaf2OVvV6KXzlHPatv8+0WJ+aNUWEm/fve4MoR6nV0fZmnzFd2TO2n2eK8LEFayN XmFKC2vCVlbXR/b76Rh4GenmsSLirqY09mugTY89Y2HxN66UpNrLeBZSqblrFfl7wkDY7o eWqGO/xi0xMkXGy+eX7M2Q5kieORfQbh39oXZiBgh1jEudxu/D9aJwriOxV2ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728798278; a=rsa-sha256; cv=none; b=pvNqilu+dv4TqrRrC5kLIqAHkCpdku2aFrldyvY6QJE6I/xnMXHmYJFZsCvORcS+fH59zr l1Uc5hntDpImA+5+6AhKZXyH21I9OAIyXj24jMsPY93vmaxMSj73CPofiF+vtihwNrf2wF Pb0TX4h8Hl/Claz7gY2UylCq/yksyCyaQqfEhxZleTk5lJveVm7E04kmR/j8pRSBTDrtv7 aEC5/M7188K+VyvEyrTHEEaMTWZwMkMO2vEaTR4wxkegUo19734lC+SgcCGCkaSn0JDYGZ mA9foQS2H06cNEKAtUhEyV19sD8o+LcS9bgFaJSo0EAYUbCj1nWxNo4QmX/hLA== 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 4XR8Sk3qHNzhrv; Sun, 13 Oct 2024 05:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49D5ic3M033348; Sun, 13 Oct 2024 05:44:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49D5icsg033345; Sun, 13 Oct 2024 05:44:38 GMT (envelope-from git) Date: Sun, 13 Oct 2024 05:44:38 GMT Message-Id: <202410130544.49D5icsg033345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: a0018c65a759 - main - EC2: Disable floppy and parallel port devices List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0018c65a7590f10f9552b05a422d4888d0aedc4 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a0018c65a7590f10f9552b05a422d4888d0aedc4 commit a0018c65a7590f10f9552b05a422d4888d0aedc4 Author: James Wright AuthorDate: 2024-10-13 05:40:47 +0000 Commit: Colin Percival CommitDate: 2024-10-13 05:43:33 +0000 EC2: Disable floppy and parallel port devices PR: 233861 Reviewed by: lwhsu, imp Differential Revision: https://reviews.freebsd.org/D18482 --- release/tools/ec2.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 9e9471b55149..54eb0b0b8060 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -53,6 +53,13 @@ ec2_common() { echo 'hint.atkbd.0.disabled=1' >> ${DESTDIR}/boot/loader.conf echo 'hint.atkbdc.0.disabled=1' >> ${DESTDIR}/boot/loader.conf + # There is no floppy drive on EC2 instances so disable the driver. + echo 'hint.fd.0.disabled=1' >> ${DESTDIR}/boot/loader.conf + echo 'hint.fdc.0.disabled=1' >> ${DESTDIR}/boot/loader.conf + + # There is no parallel port on EC2 instances so disable driver. + echo 'hint.ppc.0.disabled=1' >> ${DESTDIR}/boot/loader.conf + # EC2 has two consoles: An emulated serial port ("system log"), # which has been present since 2006; and a VGA console ("instance # screenshot") which was introduced in 2016. From nobody Sun Oct 13 06:13:32 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XR9646Wcgz5YPLM; Sun, 13 Oct 2024 06:13: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XR96460R5z4SX4; Sun, 13 Oct 2024 06:13:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728800012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qht2H1+ppROd75Si21P6BgMn7q17Lqtv8UkX8qG88l4=; b=RTtAMmjGyHH5gp6D76+rkvmideBVllX0tCTdinit+InOFnLzanIBrc6ZpDT0v+SiG2sG4d Ad08Fk7Lhd1Pj9oUP2Xq7doTJynnR52l5U9WClYMpiQCNrvjf/si8EkWyg5nwImxtJTbA2 g337zKBR0aZs0JSvLP7tLsbtXnhAW1YllOmrBvq/ZB6qpjKTz4/ego23F/6Pdlg/F/v3sm oOR8Oe3REVyb2D0pFs6+8pnqEVX3p4J0AhxDKNO3a2vNm0jfaxHzyMagTlQAHEQeXI+udT lR6S3jFCnTEkAnfoK/8Bo0I9nD5VxDuaFsit/7fmQk7haSNdNz3+xTV+Yp7baQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728800012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qht2H1+ppROd75Si21P6BgMn7q17Lqtv8UkX8qG88l4=; b=qE1I1QmOgBWsaSX3WEj2Uu3jWJl7VWzgTG6ZjlYFFgLyL6YGAdbbA7bLkrOYv6yLUuck+O 1KYaZhykJtgZLSHc+g7nwBHiSzsmCNN6RZrWRDPJx/9zLm0RtCkdDbYan90A9UaSl8NK20 kAPMv4BdUVY8CyruE8Bq54f2DWmNEeF9w1PR5S6E1MW6IZho9Ikbsj3Dkqt0dBs41e2wKx +80tiJu05htKX7iTgTFIRdlxXY77PKL6wMZWWkT06caIlPLS9yv1paaJkY3ZqachoyDac6 iWqjRyNJruerxmNeQuYrbDkjj8I6UMItZ6UNvyUN6Xs51orMapD9/8OPIislhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728800012; a=rsa-sha256; cv=none; b=uupStw9zryX2rHbv0Rq97rdi6V3rPwgk5lmhKss7/9qObUHKsoUdIIHgWQFOV3r5Ciuchb XPr7yw3oqqi5JikHLZq20l59DXFbsQRVGaJg6Shl7N2BpM3Fd9V5xGtfSreKVt0M0u2GDk GYb5+yhmXPalqKAC6Ed3/iitQ6FCCCoST7JN9hR4UEo3jBmRSdQ7RiEX+IQECUy3vhAu5V y+7Q42T1KTBOTxqi7tz0TMzl5RKDcx3DVTdtj81ak4DogRs7Ehkol7vmPVfXVTppN9lkwY 2hLDi9DktsUFsx/DXjv2aacWMUSQAGYpSOVbs2k+AD3I5QOCTUQsAw7EuI+nxQ== 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 4XR9645c1czjPc; Sun, 13 Oct 2024 06:13:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49D6DWFu085056; Sun, 13 Oct 2024 06:13:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49D6DW1n085053; Sun, 13 Oct 2024 06:13:32 GMT (envelope-from git) Date: Sun, 13 Oct 2024 06:13:32 GMT Message-Id: <202410130613.49D6DW1n085053@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 669d26e5764f - main - igc: Want AIM at 2.5G List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 669d26e5764f612cc60a4a61cdcf22ae46ddd360 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=669d26e5764f612cc60a4a61cdcf22ae46ddd360 commit 669d26e5764f612cc60a4a61cdcf22ae46ddd360 Author: Kevin Bowling AuthorDate: 2024-10-13 06:09:52 +0000 Commit: Kevin Bowling CommitDate: 2024-10-13 06:13:08 +0000 igc: Want AIM at 2.5G This should have been commited with bc9402a, need to account for link_speed of 2500 as well on igc. MFC after: 6 days Sponsored by: Rubicon Communications, LLC ("Netgate") Sponsored by: BBOX.io --- sys/dev/igc/if_igc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index c4f5e82ff8c8..d964fbe4cf91 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -866,7 +866,7 @@ igc_neweitr(struct igc_adapter *sc, struct igc_rx_queue *que, nextlatency = rxr->rx_nextlatency; /* Use half default (4K) ITR if sub-gig */ - if (sc->link_speed != 1000) { + if (sc->link_speed < 1000) { neweitr = IGC_INTS_4K; goto igc_set_next_eitr; } From nobody Sun Oct 13 11:53:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRJf55m9qz5Yqdd; Sun, 13 Oct 2024 11:53: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRJf553Rzz4s0T; Sun, 13 Oct 2024 11:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728820397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vZVICGEMmrXECoAK044rC1yl8NbKD7FC8hLW/4e4VC8=; b=EOTFRccJ03D898AkTZsMdCNAd533m3H2hQIM8HoHbyLTkaAPtrQiTNfda7wnchaNQITozx 4XiwTSShDsh5E1iNrZO6kIj0jjaveTXqLv08cVgmhYM94nkw+iRzvlM3DXnJPELuvf7Ym9 Y6oqVpGJkHzWCyFgfaw/DZvnPCQDvWRE2OPRhdwPpoCYEWy2B6S9qXvjVeozWxO2IHfW/P m83+5eBcGNbrg56nRgwogOEKmAFwD6+tovOcBe3WrIi25YtL+224n7yL92ukbCyHDX8Khb qmIMTIsvIZNXHuR21sq7ZHlqiKBnjr5E8ARGLZowr7zn5HMITUyVwpwB5d52rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728820397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vZVICGEMmrXECoAK044rC1yl8NbKD7FC8hLW/4e4VC8=; b=oNf/tTZUYHUDNTOI4FLRoTKPkDz4BIgXRh7NYDdVsJJBSYhxUd9AeGKwBGYikjLw5BFFxt YmlmXbH+uC2ooAMhKbkgsZ72qXM84B9nz8NOIA+rHdGxjk01fwXW0p1LynGoIvRG7w3z7o 2Gr6U6wpzz04i1uoiac1+E9G+pIPEpnS8BiAm70D9HCEJK2ftqwJIoZdOjS45UduKLh5NN +SkAFDLJeJ6X+9EmycdrXk3Ls3SJBqoG9f39PzCbgskj5BnC86wIAvjmIAp/JCFjUh1c96 KtRwNxJmfMVqqAbVGkc5ND+3J1Ti9E+9bqlNimDwkWVmm7C4Rjrk7UJ1fEa5AA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728820397; a=rsa-sha256; cv=none; b=GPOt/OK+dOngyyZ8sMon1H83p5dXP6bCTcJZKBIRQJx7IEgKjaFmLq/7SUA3zs5yDXmzx4 cyj2EtNDa8MNwcJvm9RtX/pXo9J7EcH/iyYJslQXBXitcFRyZCoWVmz8j3VSaLY9I6GMyw /8CwiV1gqUfrd5PuTmLw6SrRWL1ietPZ72+RKtI6vDm150bfxhJC7V3DXy4B+rERlW+HBU UAsT8aptIcUf7ifxbC37xeg9Bvc9bNblqM9tB3COi+okv2XRc6+mtM9z3VW5DtSMfDgSZ9 eyhT5XKECo+UWkgSxlWvfAjOadipDZd+aknOiC7G1tCjfWIjOsYTgIfFGTKNAg== 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 4XRJf54gPjzt14; Sun, 13 Oct 2024 11:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DBrHOS059833; Sun, 13 Oct 2024 11:53:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DBrHwK059830; Sun, 13 Oct 2024 11:53:17 GMT (envelope-from git) Date: Sun, 13 Oct 2024 11:53:17 GMT Message-Id: <202410131153.49DBrHwK059830@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: e85d2c1b0e10 - main - pf: ensure pd->src/pd->dst are valid List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e85d2c1b0e10b1cabd559bc5a45ac4c0286b2d66 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e85d2c1b0e10b1cabd559bc5a45ac4c0286b2d66 commit e85d2c1b0e10b1cabd559bc5a45ac4c0286b2d66 Author: Kristof Provost AuthorDate: 2024-10-12 08:40:53 +0000 Commit: Kristof Provost CommitDate: 2024-10-13 11:51:53 +0000 pf: ensure pd->src/pd->dst are valid When we reassemble a packet we potentially invalidate the pd->src and pd->dst pointers as they point into the packet. Reset those after reassembly. Reported by: markj, KASAN Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index f5b90424d246..bd8b709e396e 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8708,11 +8708,15 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, return (-1); } + /* Update pointers into the packet. */ + h = mtod(pd->m, struct ip6_hdr *); + pd->src = (struct pf_addr *)&h->ip6_src; + pd->dst = (struct pf_addr *)&h->ip6_dst; + /* * Reassembly may have changed the next protocol from fragment * to something else, so update. */ - h = mtod(pd->m, struct ip6_hdr *); pd->virtual_proto = pd->proto = h->ip6_nxt; pd->off = 0; From nobody Sun Oct 13 13:22:47 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRLdN0Qgbz5Ywwv; Sun, 13 Oct 2024 13:22: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRLdM6xpXz4yd6; Sun, 13 Oct 2024 13:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728825768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZyGBI3qPqDhgUET0aohv5sMrEUU+c+REEUH5PDCqPwg=; b=swtrCY2IS5eSDx2H+pXP9O1OQcJGw8gKm7FzCgMW3xCwqRcvQqv40tGUHenua+Prv1rwpb 3zOO5vMVSXq34jzCKogWag8IkSJKDrvBmZpMLtFRzVHDOz9xNzHjdA7yNKDebe7YpLJnhK ehRaWA1fmzVEFCi41yiuqwzjUtWjk0/JDF9Ia658IHieMdY1UlDTiEKh/3m9FVxblieKT5 zM1VxVfWAxdNpAF5nT7MQGLczSNHMa2PYcOLfG8XWO3NgZrJhjFSvp8NgFaCsZujuQ2qFN TSidrDe/2DKb13U3jCpAHOdrIwHvNm5iZHgwgJmuZgWihDNwg3EzAUHmbH60Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728825768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZyGBI3qPqDhgUET0aohv5sMrEUU+c+REEUH5PDCqPwg=; b=fMjy0m1Uz3h3oNlpIUkk558dG8zO68zQ9Nc/JSxmgbTaTUfxK/632TfzCBkYefjHywhMal PZVptspRhmrgpcKQXuReLAVzswIfDICJjPyJIx+iQA4NkMJXQzrpaAs4jWDCfVg5g4p7XT wvOCEs+kbBEwA6ixHSprib3Hl57NnMYfFszTIVqrYYUdD+wbV95wQsluISa7NgvVOVmmhP J36ksGPbr3tMdpXLVZse8ONWb0HCVxGQDmJhAJUuI1d1+/Zz1aFWGGIZFbhGzhSx170Sf7 59X7buFKOslZx2cMAZLwbZNQmzGLLh9MH18q+t3k4SDAeEAf4tRYpVcaZT4mhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728825768; a=rsa-sha256; cv=none; b=B4kUMP3goVmz7dfAu3Ekbt3hYzoinFho4JNpfLklhVQVKbj4j2w1RTRYIEO4FSuh+g5IxT e4RU9Q2Q6v7EUnwxZ3Ztu1nFXct+yy3DIug25HDdnbAd2vENgD2MfJAKV+f4qpY0AChpGs 25SsfDC5XE8ql1hnWiFoMsEcvMiaJb+gUIIQ82y+VS/5FpROT1kwDyc2LhpFFJUvu2bZFZ F/Iql5aWniJBVAQo7dhPQve2dAiSL/XWyCkyS9oaleOec9hKcdTRLRSTYUd2yslYR00qMw IHrNPwsozBr3mTQ6SR10FfA1kfla8injAwDTbVl5oOME+Gdytu6CXuSd2R+GJQ== 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 4XRLdM6Yjgzw0G; Sun, 13 Oct 2024 13:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DDMlve012888; Sun, 13 Oct 2024 13:22:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DDMliR012885; Sun, 13 Oct 2024 13:22:47 GMT (envelope-from git) Date: Sun, 13 Oct 2024 13:22:47 GMT Message-Id: <202410131322.49DDMliR012885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a76e28d10f85 - main - amdsmn: add support for AMD Family 19h Models 40h-4Fh List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: a76e28d10f8516a2e796bba3fff4257b150bc259 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a76e28d10f8516a2e796bba3fff4257b150bc259 commit a76e28d10f8516a2e796bba3fff4257b150bc259 Author: Matthias Lanter AuthorDate: 2024-10-13 13:20:01 +0000 Commit: Mark Johnston CommitDate: 2024-10-13 13:20:01 +0000 amdsmn: add support for AMD Family 19h Models 40h-4Fh PR: 281962 MFC after: 2 weeks --- sys/dev/amdsmn/amdsmn.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/dev/amdsmn/amdsmn.c b/sys/dev/amdsmn/amdsmn.c index 9a0428608a27..111c3cc8e7c1 100644 --- a/sys/dev/amdsmn/amdsmn.c +++ b/sys/dev/amdsmn/amdsmn.c @@ -59,6 +59,7 @@ #define PCI_DEVICE_ID_AMD_17H_M30H_ROOT 0x1480 /* Also M70H, F19H M00H/M20H */ #define PCI_DEVICE_ID_AMD_17H_M60H_ROOT 0x1630 #define PCI_DEVICE_ID_AMD_19H_M10H_ROOT 0x14a4 +#define PCI_DEVICE_ID_AMD_19H_M40H_ROOT 0x14b5 #define PCI_DEVICE_ID_AMD_19H_M60H_ROOT 0x14d8 #define PCI_DEVICE_ID_AMD_19H_M70H_ROOT 0x14e8 @@ -110,6 +111,12 @@ static const struct pciid { .amdsmn_addr_reg = F17H_SMN_ADDR_REG, .amdsmn_data_reg = F17H_SMN_DATA_REG, }, + { + .amdsmn_vendorid = CPU_VENDOR_AMD, + .amdsmn_deviceid = PCI_DEVICE_ID_AMD_19H_M40H_ROOT, + .amdsmn_addr_reg = F17H_SMN_ADDR_REG, + .amdsmn_data_reg = F17H_SMN_DATA_REG, + }, { .amdsmn_vendorid = CPU_VENDOR_AMD, .amdsmn_deviceid = PCI_DEVICE_ID_AMD_19H_M60H_ROOT, From nobody Sun Oct 13 13:22:48 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRLdP2Fh1z5Ywx8; Sun, 13 Oct 2024 13:22: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRLdP11mVz4yvW; Sun, 13 Oct 2024 13:22:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728825769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JaDgdjvniDE4w8wITdBmnrwFZyDqV5Q2F5RLdUifLJ0=; b=w2ai8HaOUL8PPcJSUVCCaVIPf4DvjuhiiXfWhEjww9wjIsaQ/aIzS7alRJvyo7b27DaV4Z saf9+oQg9tJYSopPlety+xwWa1rtqvIPBpJn9aNIMbo9bu6cj1fAFCavG4DGoslrmo6SUF E1eNqSmTeFVC1wgf++liT0BpAc8Mu7TfthWYfHBAJU+FUPquleQ65mURUXZZkmA2Q/hMxW 3eGVbQJGsH4BmLrVrGsfPLCLb6ZRCKuuSADW5iyXSscTB70ATIlhvpA3lqybHaaKRVcMxI WCW0hvwwduKAY/2GFIYXZ3i8+5szAOkV3QA7GBoeKH22/Ayes7fgAoP6I1z2pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728825769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JaDgdjvniDE4w8wITdBmnrwFZyDqV5Q2F5RLdUifLJ0=; b=ZTnKNbxDjFwPkf/y2pJ54wR83nPDV7jrdTtwxqGxpmAAF90DWJ7IWCLucI1goVQTUtqy1q sJI8TA1l1ACfC8UuHOLhdId9PDlz7sH+Fa48M9zzRvQAiZRiztua/hO51KAP1fZtlAVhVz WBV0GAoOG8XsCzz0olOohJWXplG06V3QJjwUjgaXtyTRbDMT0vsdw1dUX6IdkGloQmlv6e kB1tPPJSUIv7UvUNVhRKjgrabKhZlp1xKDS0ciy8ZR5K0Plho0UPu4zoLVdSLeUxvLZezC rfBG3qWDEOXyg4Ctwnqu+3OCFDGRVysyTx6E4pbgf7XbqBlR3MZUHaID2PwSLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728825769; a=rsa-sha256; cv=none; b=EVZh4/S+w6MhRQXTY4gDkSO3yynxbDbXakvIrjzNHf7w3DUpmBjUVYiH8oOSSiUHrIT9Jf gwG+RkhEOnHtE9iuXB9Mv7PxtEX5SZHSMVeC/qgSEbVMS3yEaG7NkH4fb4yw0/kDIEqyla j8RQzRmI4V9+9ukH4RwMVbyRymbCo7Mws4Vq+k8j5e+ChxKOOht6b6rYghMJbrWOSd78DD FCwfTRH6Udj0DaWKb03VHKtNzBMu/SuCEhM9tAOC0WgnrYn4bPBdAZMnewJNf+TY0Bhq6z fwYj6a+rqzc4QYUKaJQwfmGhTS1hOPHvCvNzlhHMh/DmtIOfyQFLTmve50/v3g== 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 4XRLdP04mhzw3Q; Sun, 13 Oct 2024 13:22:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DDMm38012950; Sun, 13 Oct 2024 13:22:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DDMmub012947; Sun, 13 Oct 2024 13:22:48 GMT (envelope-from git) Date: Sun, 13 Oct 2024 13:22:48 GMT Message-Id: <202410131322.49DDMmub012947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ecbe99e16276 - main - amdtemp: add support for AMD Family 19h Models 40h-4Fh List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ecbe99e1627627b6797153899e4d95fde3e230e2 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ecbe99e1627627b6797153899e4d95fde3e230e2 commit ecbe99e1627627b6797153899e4d95fde3e230e2 Author: Matthias Lanter AuthorDate: 2024-10-13 13:21:19 +0000 Commit: Mark Johnston CommitDate: 2024-10-13 13:21:19 +0000 amdtemp: add support for AMD Family 19h Models 40h-4Fh PR: 281962 MFC after: 2 weeks --- sys/dev/amdtemp/amdtemp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c index ff9866c6221b..431890dfce20 100644 --- a/sys/dev/amdtemp/amdtemp.c +++ b/sys/dev/amdtemp/amdtemp.c @@ -114,6 +114,7 @@ struct amdtemp_softc { #define DEVICEID_AMD_HOSTB17H_M30H_ROOT 0x1480 /* Also M70H, F19H M00H/M20H */ #define DEVICEID_AMD_HOSTB17H_M60H_ROOT 0x1630 #define DEVICEID_AMD_HOSTB19H_M10H_ROOT 0x14a4 +#define DEVICEID_AMD_HOSTB19H_M40H_ROOT 0x14b5 #define DEVICEID_AMD_HOSTB19H_M60H_ROOT 0x14d8 #define DEVICEID_AMD_HOSTB19H_M70H_ROOT 0x14e8 @@ -141,6 +142,7 @@ static const struct amdtemp_product { { VENDORID_AMD, DEVICEID_AMD_HOSTB17H_M30H_ROOT, false }, { VENDORID_AMD, DEVICEID_AMD_HOSTB17H_M60H_ROOT, false }, { VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M10H_ROOT, false }, + { VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M40H_ROOT, false }, { VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M60H_ROOT, false }, { VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M70H_ROOT, false }, }; @@ -874,6 +876,7 @@ amdtemp_probe_ccd_sensors19h(device_t dev, uint32_t model) maxreg = 12; _Static_assert((int)NUM_CCDS >= 12, ""); break; + case 0x40 ... 0x4f: /* Zen3+ Ryzen "Rembrandt" */ case 0x60 ... 0x6f: /* Zen4 Ryzen "Raphael" */ case 0x70 ... 0x7f: /* Zen4 Ryzen "Phoenix" */ sc->sc_temp_base = AMDTEMP_ZEN4_CCD_TMP_BASE; From nobody Sun Oct 13 14:00:21 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRMSj6mvMz5Z0Pw; Sun, 13 Oct 2024 14:00: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRMSj6HTGz52gm; Sun, 13 Oct 2024 14:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728828021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f1nN+xqr0GtKV7wntx/eSIgGIEe0k4ArYM3qGlZa/Mc=; b=yG6KR6y+gqu7LsY0CccVXITSu3WmQ+MbK5hDCA+lYSUUpJ6R3311zpXI1ojpg+MXaH7yQ9 rQTguZ6uTDr12kjYwJyStl9xIq9eo+z5nbxHh3+K04WxbwXCzOJ57ddmo/977/A3e1gPLj 0Cs/f15jqSZMOmyI3ZUmWedn1PajWFXniCHRpGesuypoCRYKkf08K5uMwncHtKZEwsC1qj Wpiz3/62JmSxUse3H3b5ShjuAghHlpIpgO/asAPXf5OLvyBrtCfad13VBQvdBmduPneYME H+zRPT0S9+omkLnKXUr+UMi+4n7Sr+x7sn0cYQUZkMUUu38deDf6GGTQ3TXgTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728828021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f1nN+xqr0GtKV7wntx/eSIgGIEe0k4ArYM3qGlZa/Mc=; b=TmrtHWkcPO7i8oy5x46+Gml6X/5o2LBf2AhRnk1o0wCrR6rfb+Ha73Yk/PKDO1tm1GYYj8 0oRrTsfqkuJuFPb9YnoFZ7fkbvIvqtVx2fQ0G1imAxk3qc8MqLPu+ejpRPDAbEm15+0iw9 VRdjGrKzLJuVErBa+BopSJJTxpLZBI5JVn2IMk5xxVhpgxbFQ8YrKHgDJ4gNiVxjdIEm3s Hu7egRjejQjgvZwfdVJC45M2AwS2wpUbXAfSsUR9KobKurgeV5PsH+bJdKrFuvsJK2Npp5 XmFb6KTdCE7zi7CvTzpvJiK2CVzObYq0ZyvWYgI4shdNnFU4z/BjcvON3gz7qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728828021; a=rsa-sha256; cv=none; b=cP3x7hD9ozhpZHGZStjxHKcAvfnLVzsfzXxeIDQt5tA8khKIfIifKYJE4LEuvzjls2w2nJ CSWrMfcjW1XDAIx2ud/NVWvLpE2KLDwAGZUrZATgou55DOhgpxLEX0Czj1Zxx0isCgMhff UxosBpz2xmnFMb/2BZyn/2PJ6qFig80WXf9GuaQFLBUfkg3msnG2Ndzo9ojRIdckLig4gk xsnqumy9YKqSCF+j+qnYb+nnxauzSmzAVl6L0TVIBctfo59tdfkAbGIOqnAjYKm96hG6GC S0mUacDmrBGNrp/zwh2aVFbDV0+uNg37jfzm+jWRjjBQXchOf2tvrJfr579SSQ== 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 4XRMSj5t7SzxFj; Sun, 13 Oct 2024 14:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DE0Lsd073352; Sun, 13 Oct 2024 14:00:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DE0LGA073349; Sun, 13 Oct 2024 14:00:21 GMT (envelope-from git) Date: Sun, 13 Oct 2024 14:00:21 GMT Message-Id: <202410131400.49DE0LGA073349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Tuffli Subject: git: 5374b9e14681 - main - bhyve/nvme: Fix Infinite loop in queue processing List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5374b9e146811757540e35553a7712c5b9b29239 Auto-Submitted: auto-generated The branch main has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=5374b9e146811757540e35553a7712c5b9b29239 commit 5374b9e146811757540e35553a7712c5b9b29239 Author: Chuck Tuffli AuthorDate: 2024-10-13 13:58:48 +0000 Commit: Chuck Tuffli CommitDate: 2024-10-13 13:58:50 +0000 bhyve/nvme: Fix Infinite loop in queue processing In the functions pci_nvme_handle_admin_cmd and pci_nvme_handle_io_cmd infinite loops are possible in the bhyve process if the sq->tail value is greater than sq->size. An attacker could overload the host CPU. Fix is to validate that doorbell values: - Are for a valid (i.e., created) queue - Are not the same as the previous value - Fit within the available capacity The emulation will generate an Asynchronous Event Notification (Invalid Doorbell or Invalid Doorbell Value) if enabled and ignore the doorbell update. While in the neighborhood, remove a redundant bounds check. Reported by: Synacktiv MFC after: 1 week Security: HYP-14 Sponsored by: Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46064 --- usr.sbin/bhyve/pci_nvme.c | 81 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 73 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index b8eb24d91b49..7e6c8bc9d719 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -265,6 +265,17 @@ struct pci_nvme_aer { uint16_t cid; /* Command ID of the submitted AER */ }; +/** Asynchronous Event Information - Error */ +typedef enum { + PCI_NVME_AEI_ERROR_INVALID_DB, + PCI_NVME_AEI_ERROR_INVALID_DB_VALUE, + PCI_NVME_AEI_ERROR_DIAG_FAILURE, + PCI_NVME_AEI_ERROR_PERSISTANT_ERR, + PCI_NVME_AEI_ERROR_TRANSIENT_ERR, + PCI_NVME_AEI_ERROR_FIRMWARE_LOAD_ERR, + PCI_NVME_AEI_ERROR_MAX, +} pci_nvme_async_event_info_error; + /** Asynchronous Event Information - Notice */ typedef enum { PCI_NVME_AEI_NOTICE_NS_ATTR_CHANGED = 0, @@ -2784,6 +2795,38 @@ complete: pthread_mutex_unlock(&sq->mtx); } +/* + * Check for invalid doorbell write values + * See NVM Express Base Specification, revision 2.0 + * "Asynchronous Event Information - Error Status" for details + */ +static bool +pci_nvme_sq_doorbell_valid(struct nvme_submission_queue *sq, uint64_t value) +{ + uint64_t capacity; + + /* + * Queue empty : head == tail + * Queue full : head is one more than tail accounting for wrap + * Therefore, can never have more than (size - 1) entries + */ + if (sq->head == sq->tail) + capacity = sq->size - 1; + else if (sq->head > sq->tail) + capacity = sq->size - (sq->head - sq->tail) - 1; + else + capacity = sq->tail - sq->head - 1; + + if ((value == sq->tail) || /* same as previous */ + (value > capacity)) { /* exceeds queue capacity */ + EPRINTLN("%s: SQ size=%u head=%u tail=%u capacity=%lu value=%lu", + __func__, sq->size, sq->head, sq->tail, capacity, value); + return false; + } + + return true; +} + static void pci_nvme_handle_doorbell(struct pci_nvme_softc* sc, uint64_t idx, int is_sq, uint64_t value) @@ -2796,22 +2839,34 @@ pci_nvme_handle_doorbell(struct pci_nvme_softc* sc, WPRINTF("%s queue index %lu overflow from " "guest (max %u)", __func__, idx, sc->num_squeues); + pci_nvme_aen_post(sc, PCI_NVME_AE_TYPE_ERROR, + PCI_NVME_AEI_ERROR_INVALID_DB); + return; + } + + if (sc->submit_queues[idx].qbase == NULL) { + WPRINTF("%s write to SQ %lu before created", __func__, + idx); + pci_nvme_aen_post(sc, PCI_NVME_AE_TYPE_ERROR, + PCI_NVME_AEI_ERROR_INVALID_DB); + return; + } + + if (!pci_nvme_sq_doorbell_valid(&sc->submit_queues[idx], value)) { + EPRINTLN("%s write to SQ %lu of %lu invalid", __func__, + idx, value); + pci_nvme_aen_post(sc, PCI_NVME_AE_TYPE_ERROR, + PCI_NVME_AEI_ERROR_INVALID_DB_VALUE); return; } atomic_store_short(&sc->submit_queues[idx].tail, (uint16_t)value); - if (idx == 0) { + if (idx == 0) pci_nvme_handle_admin_cmd(sc, value); - } else { + else { /* submission queue; handle new entries in SQ */ - if (idx > sc->num_squeues) { - WPRINTF("%s SQ index %lu overflow from " - "guest (max %u)", - __func__, idx, sc->num_squeues); - return; - } pci_nvme_handle_io_cmd(sc, (uint16_t)idx); } } else { @@ -2819,6 +2874,16 @@ pci_nvme_handle_doorbell(struct pci_nvme_softc* sc, WPRINTF("%s queue index %lu overflow from " "guest (max %u)", __func__, idx, sc->num_cqueues); + pci_nvme_aen_post(sc, PCI_NVME_AE_TYPE_ERROR, + PCI_NVME_AEI_ERROR_INVALID_DB); + return; + } + + if (sc->compl_queues[idx].qbase == NULL) { + WPRINTF("%s write to CQ %lu before created", __func__, + idx); + pci_nvme_aen_post(sc, PCI_NVME_AE_TYPE_ERROR, + PCI_NVME_AEI_ERROR_INVALID_DB); return; } From nobody Sun Oct 13 14:32:42 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRNB24gXlz5Z2gC; Sun, 13 Oct 2024 14:32: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRNB248jDz54kY; Sun, 13 Oct 2024 14:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728829962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vA3kbAZlua4IN7aE0mup2p/AdGJPH7hFQjtr4nl3IRo=; b=sji76p0ViAXsfaYgUIhtw47uRd5+G0SrThgvWykmYr4jATAHIgYkfG2DxS92mZlMw6r2Se 5K4Z2RMRQlfKubR05GhcXP9P2hHz5Ejd+4MrSF66DBaGn/GJj04YQsOtr5CxIK3YtAKzzV gmP3/PpPcmcmwPUTg0cHHS5Q5SPxezPusTTvpkhmMr0Yy3jxO8pO8PgNPGxLcVDeiUpOGT yqeo+eKVS51n/q7ZZnMsgMPdGV9vrwpwBv25MMmaf3DJ/7SXr0pVY+8tCTW4tTC4aSYblE XEA1+WIiliJAuYw9xAhkcLQbC/Z65tYSyfZ/QGJi7+Zen1mOyP8qq1nMpDfY0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728829962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vA3kbAZlua4IN7aE0mup2p/AdGJPH7hFQjtr4nl3IRo=; b=ysaNkmOKuAU+XwPQsCXkJZQuwoikFv+flx7V3wjqIIyyq2wXiS7YxYJFl+CVXqEv9odZc4 Qfesl+WuOtIFOeqYVpwAvZyswYRI+VfQsjvvMsWsCMLSYFQGHzhL7uLyb8GcQjgdLg3xJ7 z+gdCxJdYwwIn/bnmXYEgK4RT0c25vf304PPPXGDZPAesSOsuv5sF9zKfVcYkzorqnwqke LPg7wiwhrgmb2JOODvmJf9laLbh3qR4IxhuP7ku5fM1AnGnMC3fRGo66kp5tWt0pyxQJMR fwH893rNPJ5kecIoMBvBVT1n3ur9Yp24eKqStpocQIiKCDzN+HJ6gal4pTbLsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728829962; a=rsa-sha256; cv=none; b=hdfEud5pa3HtoPNMwYFbXzxClKhswEJQ1MRGoEQCyA+wbyodZuCRj77wRComtPqZw4JzRd FwdVJJtq5dFPrNO8JOU0/gaVLuGhN85oZNbbf7JR+UxtYWc2ro+LFMtXfA7smoV3flXIZB MR/6pxWu+4mM4b/N/WGNlZJA0mcZC74ktzLli+6OMjbjWciv4Q+foscc9zyod1jjlxCLnm RQkWwwJcsx5EVqd2Mrizi4nxr9idsVtTmZ4hKVTTM7Vx3zoiS8wjeN7xK4sYVjxi1JKfI6 DadzbZu6A7E5Tq5okSQwHJCS1hslWTUThtFHQrE4taHpmXs8c2u6nviP+1oG7w== 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 4XRNB23mrszxxM; Sun, 13 Oct 2024 14:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DEWg6h030530; Sun, 13 Oct 2024 14:32:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DEWghw030527; Sun, 13 Oct 2024 14:32:42 GMT (envelope-from git) Date: Sun, 13 Oct 2024 14:32:42 GMT Message-Id: <202410131432.49DEWghw030527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 610fcb06ff0c - main - vmstat: Fix column header alignment in -o output List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 610fcb06ff0c972434f0b4b7a08947c038dd951e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=610fcb06ff0c972434f0b4b7a08947c038dd951e commit 610fcb06ff0c972434f0b4b7a08947c038dd951e Author: Mark Johnston AuthorDate: 2024-10-13 14:26:47 +0000 Commit: Mark Johnston CommitDate: 2024-10-13 14:32:33 +0000 vmstat: Fix column header alignment in -o output MFC after: 1 week --- usr.bin/vmstat/vmstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 680eb8bc8fde..bd332c64e7ea 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1567,7 +1567,7 @@ doobjstat(void) return; } xo_emit("{T:RES/%5s} {T:ACT/%5s} {T:INACT/%5s} {T:REF/%3s} {T:SHD/%3s} " - "{T:CM/%3s} {T:TP/%2s} {T:PATH/%s}\n"); + "{T:CM/%2s} {T:TP/%3s} {T:PATH/%s}\n"); xo_open_list("object"); for (i = 0; i < cnt; i++) display_object(&kvo[i]); From nobody Sun Oct 13 17:46:20 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRSTS6Sf6z5ZH6C; Sun, 13 Oct 2024 17:46: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRSTS55lbz4F62; Sun, 13 Oct 2024 17:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728841580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rwb2jggEq8ZOpW8akrxOqTV6knsBlKte57gSq40ixsQ=; b=xcpFqjhlvxu/DHL8LNpaqiyxBrlVxYROfrajDjkhiGeOinTnu/YKWI7SVDc2zGQFD93/UC IxIDcVXbUPfsSzfbs91T0ncbJBpljO+1L3HXUGkwVADdYvw/q/jWP6bSZ4m3UicRIuRVR7 02w/de9m10+CHfTP4X1X/3enTuz0y16bc/oU1dBxpxONwHtwIoHayKk6SS51hkxO93gIlf A+5bw3i9aLGm72rT1cmsWJaLJ3mRYVfGFoLk45LYEHnx1jbJAeRrkNl6Kum53zhITYxes+ cuKBisc8HKsbJJGNO7ydyPZMG5sME4MNiwY1jG9l+/3Ze5AcsjB9unynRmt97w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728841580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rwb2jggEq8ZOpW8akrxOqTV6knsBlKte57gSq40ixsQ=; b=ask5k3poO53Y2Rpcg8gmzYW4Ymt1tUuhKjFUGep8yq5D6ntCz5uvrgNsVkZXkoq7H6ccrH NbIcGOkdReLO3mzTNK3f7ABvMKs3au4vq+tSdNQVZfiaQvvXtdrVWqmp6D0jtP+Xehvtfr EjaMiEMqnN6vFGLYrG0dnO5FB//pDMTtJLaTjA/PNejNRUtoSgyhyzlyHDe9jC9sFDBJpn AszZdQz8rqBmbIaYVxTslhBsCmIw0jPYCMny3TCGJpZ98iMPOIQ70pobqokhoqTA2n+UC9 b2pAsGVR0HGPtUUfVjFFP8pDUy9CxHhZR5cjSZZb7yj1brDBg/z7G6ZdiK65Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728841580; a=rsa-sha256; cv=none; b=ZnS8FlrtEfirODTAdUKIBpPG1u0U/FjkpfgxmUXYZp2BjFLPjn7UUyiGIHw3j74VCXmzA9 4bFQ12fFxjiEYAsdzxQ1LprHBLNR2EtXLX6E+RI/US2uI9OghQlujikWnW+Jy3ILtP58SO HhXE9iwXA8mbHvvLl7fSl87Pih3EPJyZTnntnEHX3V0gVyRWvm27PCdkulyffdd6MP5Hqu HMazhMTsbaD8tSrhv29wFg5968gK/Gk9Fw45GykOlMUImlDzGcuxDD7GuPpvRssqaDZ4Zq LYoyNpkOnxFTit1OKRVq5H05HVxwEW1Cl0kMvcH6L9Y7qNMdFGfPdgWj8CRNzQ== 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 4XRSTS2Ttyz1418; Sun, 13 Oct 2024 17:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DHkK7E053123; Sun, 13 Oct 2024 17:46:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DHkKY1053120; Sun, 13 Oct 2024 17:46:20 GMT (envelope-from git) Date: Sun, 13 Oct 2024 17:46:20 GMT Message-Id: <202410131746.49DHkKY1053120@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 255d2d9bbc37 - main - fdisk: add deprecation/removal notice to man page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 255d2d9bbc3756c940462c61d3cd6fb7753aab2c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=255d2d9bbc3756c940462c61d3cd6fb7753aab2c commit 255d2d9bbc3756c940462c61d3cd6fb7753aab2c Author: Ed Maste AuthorDate: 2024-10-11 20:09:25 +0000 Commit: Ed Maste CommitDate: 2024-10-13 17:45:28 +0000 fdisk: add deprecation/removal notice to man page As of 2015 (commit b8c19fd71994) the fdisk man page claimed the command is obsolete, but had no explicit mention of removal. Add another note that follows our current deprecation notice format. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47067 --- sbin/fdisk/fdisk.8 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8 index 981233f6998d..09933acf57df 100644 --- a/sbin/fdisk/fdisk.8 +++ b/sbin/fdisk/fdisk.8 @@ -15,6 +15,22 @@ .Fl f Ar configfile .Op Fl itv .Op Ar disk +.Sh DEPRECATION NOTICE +.Nm +is deprecated and is not available in +.Fx 15.0 +or later. +Use +.Xr gpart 8 +instead +.Po +with the +.Cm MBR +partitioning scheme +.Pc , +or install the +.Pa freebsd-fdisk +port or package. .Sh PROLOGUE In order for the BIOS to boot the kernel, certain conventions must be adhered to. From nobody Sun Oct 13 17:52:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRSch5Lgxz5ZH3J; Sun, 13 Oct 2024 17:52:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRSch4cJmz4GNV; Sun, 13 Oct 2024 17:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728841956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AvliSXqQO2t3BoSak54MRRJ1Ntuu5JtidDSbV0PZkQc=; b=f5hvUxY1z3kxJusa4riHbhAmtPo2Slj3NLS/KylOYn9SQ5Jm/vhC5cZX2IB8ZSGvtADBbM E/9xftEgamB6rI740e7ONQBLIz1NOlTsTZ92WR9wJX9w8nUpAdeG9znF552ckwMylf41d/ 5Gj6Sei+53FCqogL//eDsrV/PMhu8k5bR+dCs9Bt5ZQPL8x1sH4Z4iXooEJdPV7+aiJ7/0 zXttNPh7TH8jh5p960G5HfZkZE+KZ0bhEiZiEtU06x4c9ACnpt3VxPdkBi46EZUG0DqURf DJw2qEMID2T9YfR0IDVdmXsPP+EkSEbMyxc0TzUlWlda7MT+YmKSDcyyxFPgVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728841956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AvliSXqQO2t3BoSak54MRRJ1Ntuu5JtidDSbV0PZkQc=; b=aHES0OMvhvubw2hQa1IRbRIMq+z2BM0SJtlDSZpf4YLV+7cdVQVD5p9Jwg/Lv8riha/YM1 TMqHVbJ5IBrk8DFf5N8pR0U3y0xoQdb4dSNvrhe1Ld9lNIK7uUZlnwNWK/pU4TzGeSV+ot pSrl6Jvz6ephljsYmEB8JBJtTWNN9fjroAxJlv2MIfyJYLvo0Bx1emymY0dn98X3UMO3M9 bBwFzJE3nQQeQ1sal2GJB3D3LdQKys2wbeTbNuql41pmd3WThLFzC/j6/iT+VbD2mX1v0I Kp379JE84oy7sT9g5TYVtgT/cRHYqiYsTglRmPEnqT39wFSPNo0x0AF3ZM1cog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728841956; a=rsa-sha256; cv=none; b=qq2hS3M8j/jNHRtSqNrjnPyOT3ultkfJWQZGE6Z4IJ80ycuS7/jmcNnsalu7vH5vk5g3mw EY2++1+9CcS9QmJyMUZDWgwknYFDdfeJ4Zt0oVV4ka16zItAQPuXRm2Tk19R/ohiVAGAsk gxbBHlQb5jaBL3FZyihDnbrhdifQfGv/lVCchf/yQz8Re2IH1Kjo0jhNidatFlcJa+b946 8mGjWtlqQYZxSOB7S0RNyZ1ynD7c2yBeHhaw0OWsYQjcoIM/0BCUAr1/eMPrd+IhntVm9M /36YO93a1CAj28apYNh8tCpplm6hnFi0h7U3nv0YAmi30mxLbVfYoOJ4uXmOMw== 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 4XRSch4Ckhz149L; Sun, 13 Oct 2024 17:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DHqakU070112; Sun, 13 Oct 2024 17:52:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DHqaMu070109; Sun, 13 Oct 2024 17:52:36 GMT (envelope-from git) Date: Sun, 13 Oct 2024 17:52:36 GMT Message-Id: <202410131752.49DHqaMu070109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 86e66321bb18 - main - fdisk: emit deprecation notice when run List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86e66321bb18ffc242eac61ed2ae0543d71918a0 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=86e66321bb18ffc242eac61ed2ae0543d71918a0 commit 86e66321bb18ffc242eac61ed2ae0543d71918a0 Author: Ed Maste AuthorDate: 2024-01-24 19:12:21 +0000 Commit: Ed Maste CommitDate: 2024-10-13 17:52:14 +0000 fdisk: emit deprecation notice when run Requested by: rgrimes Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43585 --- sbin/fdisk/fdisk.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c index d9514555ae34..a2e1cdb76c6a 100644 --- a/sbin/fdisk/fdisk.c +++ b/sbin/fdisk/fdisk.c @@ -265,6 +265,10 @@ main(int argc, char *argv[]) int partition = -1; struct dos_partition *partp; + fprintf(stderr, + "WARNING: fdisk is deprecated and is not available in FreeBSD 15 or later.\n" + "Please use gpart instead.\n\n"); + while ((c = getopt(argc, argv, "BIab:f:ipqstuv1234")) != -1) switch (c) { case 'B': From nobody Sun Oct 13 20:56:50 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRXjG3b2Mz5YXWf; Sun, 13 Oct 2024 20:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRXjG2jM6z4Zbb; Sun, 13 Oct 2024 20:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728853010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yG4OTlWoaeoRdPgBPbZQTLFQTMlxh0jzV2icOLre2ok=; b=VDOWy0p8nR0j1kifRkOfZu3aA4u54M2LfMckg8E4GHv5ZMSgRljnWBbQshiCD4TFqyIqZ3 XzDNFTPdTq61qoCVxAQqat5yMClOwBSUJPi6zW9XcF8dVm7ie9Zpu+7K5lzpjemeiUMI00 zb1sX+exjLLmBJJr2JgPbheHfeDWW0lNL1bIpBbIuL9g07ttBJ5M2R4lZdi1jF1TrvZZQw hkTz3ba2IXCQ4TEX16mxLYs8S17E3vRdl2DFtVXVe8ka71BxqzMRzB2uXTHOLEQKSs3QOy saS8NaY1X8gA8yS78FTcyM2w+LeNTcchKV4e5yhuEuX/sMJtLQkFXMFi8LOVbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728853010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yG4OTlWoaeoRdPgBPbZQTLFQTMlxh0jzV2icOLre2ok=; b=tQfMjB4jBN6Rsn8K63o/75IATzWE1mUE+DVX5Z3tFxb72+zHVkjr1a5rI7o599q01T5/lz uIZoUcTC0JSHOO6mg8tLGjzOyYcXlp9rTRoYcfJUV77Lg7xIVm0b5LSDPvdk8otL/zlQ43 5dwmWzd82N3VRoAyCIjiD/Jcyv11rGu7vn9Fjcszoi9oJIr2AePBeZ3krvHXz9NNbtSxb4 tCaqrqanN5mBpg+1uXgL+eoFBb+2ko1ao1KNPE+PUlcaQt/jPaJjwyO/BLXANw3gJMDkFJ KQl4xKai5QlmG4JjTbvtX0kUan8mIKTKATIg5d9AGMRUETiy3DW90fpVrD8MxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728853010; a=rsa-sha256; cv=none; b=t8kyRqHJN4HM0sA2FT+9vLhNZsQ2fxecmO0+N080CeHtPpJxb3/vo5ndG3wwIQWf7atddk ixVg4nwHRLUICrisEaqf13wXRIeWq637Rhb1V2BwJ9Qiw+0QucI3SH85ql1KS0chGB+8Iv p/Mc4XU0lI8nuxoLsmeCQ1dVQ/OZNKJaobozZQTDAg0Kb7NL40idMHV8jDOrFbaNqa1ieE jvLWm1S9jXoBEPcMuU8ljcQ03xxkQEkX4QdjHZZCwqTxypHhcdNH4faVHKhIIr3JtlTEc3 fAkbItM+aeeGe9NKG5qFu2Rm3+d4XXjSoVqGtOqo4BV8FcvrTJGcxecoSeQvrg== 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 4XRXjG2JQvz17J4; Sun, 13 Oct 2024 20:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DKuoET076530; Sun, 13 Oct 2024 20:56:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DKuog4076527; Sun, 13 Oct 2024 20:56:50 GMT (envelope-from git) Date: Sun, 13 Oct 2024 20:56:50 GMT Message-Id: <202410132056.49DKuog4076527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jamie Gritton Subject: git: b3c2cc7ea9b9 - main - tests: move sysctl_security_jail_children.sh to the right directory List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3c2cc7ea9b9ad607b60590d9d8c77d71e84b015 Auto-Submitted: auto-generated The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=b3c2cc7ea9b9ad607b60590d9d8c77d71e84b015 commit b3c2cc7ea9b9ad607b60590d9d8c77d71e84b015 Author: Jamie Gritton AuthorDate: 2024-10-13 20:50:22 +0000 Commit: Jamie Gritton CommitDate: 2024-10-13 20:50:22 +0000 tests: move sysctl_security_jail_children.sh to the right directory --- {sys => tests/sys}/kern/sysctl_security_jail_children.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/sys/kern/sysctl_security_jail_children.sh b/tests/sys/kern/sysctl_security_jail_children.sh similarity index 100% rename from sys/kern/sysctl_security_jail_children.sh rename to tests/sys/kern/sysctl_security_jail_children.sh From nobody Sun Oct 13 21:03:28 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRXs00PzZz5YYCc; Sun, 13 Oct 2024 21:03:32 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRXrz514sz4gXv; Sun, 13 Oct 2024 21:03:31 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id zwFxsFyWYAHbZ05kQtDOp9; Sun, 13 Oct 2024 21:03:30 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id 05kPtFJ2a2M9q05kQt5qTp; Sun, 13 Oct 2024 21:03:30 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=ce5xrWDM c=1 sm=1 tr=0 ts=670c35a2 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=DAUX931o1VcA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=bHzTtDopQuIlq81SH0IA:9 a=CjuIK1q_8ugA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id CC5372C0; Sun, 13 Oct 2024 14:03:28 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id C640D20C; Sun, 13 Oct 2024 14:03:28 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Ed Maste cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 255d2d9bbc37 - main - fdisk: add deprecation/removal notice to man page In-reply-to: <202410131746.49DHkKY1053120@gitrepo.freebsd.org> References: <202410131746.49DHkKY1053120@gitrepo.freebsd.org> Comments: In-reply-to Ed Maste message dated "Sun, 13 Oct 2024 17:46:20 +0000." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 13 Oct 2024 14:03:28 -0700 Message-Id: <20241013210328.C640D20C@slippy.cwsent.com> X-CMAE-Envelope: MS4xfDGeBqupRSasNXesogD1lwQWbLoQhtijwN1ZXOsGSOoI7lVabA5JWWAlPXRy9OlQFmvur8R5iwDCl1bcP5wQdfAD2AOMzkRIopux4Ypuw++OHuiSqdBm EeDLY0I8XLe3SCmGJeGdziV9ltjb31rl8jGTcP4oVhbcjo3CxL4h6tYqnigluqUw5UKteplYt7mZaJHSiPjLvX696WUajpNJyBXHo7YVpAWiUBEIohyAe9Vu NNboT6YwmNYAMcbKdmGLNlLUeMBYDqNIobX/GtQINF5FvLm4Tg3EC971X5whTfoEXm+O0tIdR190ZeFhGe14vnp7bXGhIba/3F/GiOPrjPs= X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4XRXrz514sz4gXv X-Spamd-Bar: ---- In message <202410131746.49DHkKY1053120@gitrepo.freebsd.org>, Ed Maste writes: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=255d2d9bbc3756c940462c61d3cd6fb7 > 753aab2c > > commit 255d2d9bbc3756c940462c61d3cd6fb7753aab2c > Author: Ed Maste > AuthorDate: 2024-10-11 20:09:25 +0000 > Commit: Ed Maste > CommitDate: 2024-10-13 17:45:28 +0000 > > fdisk: add deprecation/removal notice to man page > > As of 2015 (commit b8c19fd71994) the fdisk man page claimed the command > is obsolete, but had no explicit mention of removal. Add another note > that follows our current deprecation notice format. > > Reviewed by: imp > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D47067 > --- > sbin/fdisk/fdisk.8 | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8 > index 981233f6998d..09933acf57df 100644 > --- a/sbin/fdisk/fdisk.8 > +++ b/sbin/fdisk/fdisk.8 > @@ -15,6 +15,22 @@ > .Fl f Ar configfile > .Op Fl itv > .Op Ar disk > +.Sh DEPRECATION NOTICE > +.Nm > +is deprecated and is not available in > +.Fx 15.0 > +or later. > +Use > +.Xr gpart 8 > +instead > +.Po > +with the > +.Cm MBR > +partitioning scheme > +.Pc , > +or install the > +.Pa freebsd-fdisk > +port or package. > .Sh PROLOGUE > In order for the BIOS to boot the kernel, > certain conventions must be adhered to. > We should point people at the port. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Sun Oct 13 21:34:57 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRYYF29M0z5Yb9f; Sun, 13 Oct 2024 21:34: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRYYF1ZRWz4jy8; Sun, 13 Oct 2024 21:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728855297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p/ujeLZ2p1oFtBtRGRlR8Kq3oKWcUVbuOHd5FLiSLAg=; b=FaHfmb++r0wZdCIdlRCq5O2qBHIOMS532iBdDADV2bKfm6GiiTqRCeYgMEWPIep/Gwa98X uwSIMrYOr5/tq1aHN2ORFeClC/UC0OSAGf8vKKqalbH1u3m6Qrvd2uMiYEWsqTGuP2RfAc EKnc9NJutDeRGHdK6T64u650gmOdsphQIU6rIMIGFmTuy49u+K7dkqDsnff9+q8m8+er4z 4tDmabOuExtPlhtTqTBJXxiCsFjLtxZUvYuy7etzDl4kxjhff47BOarSGlNIt+O+QPZW3P k9Y2/BOmoYtGaOIwfHNsEf4QKXk9v0Y1Qvtv3HzjKvTv+x9WrYw6IPQzw+HNlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728855297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p/ujeLZ2p1oFtBtRGRlR8Kq3oKWcUVbuOHd5FLiSLAg=; b=o5tAcNPHE7+G7qUOq31wAmLfnD2v9FyKmad35CVWg2kC/hIDlP0wLCAMFNpjkN7S/qVpse 9VoOmKALGBJGr/4ugwEsEOU3haputDt1PzUEWbb1AYb1Bhd1zLnkK6CBIK6lFu8nbmYcr7 fHkZ0X98VGLUSwDPpQLjQa24GT79XuRnQYJMNZq7lF2P1L7UE9E4jCEy9WCR/+OgpS91n2 LAvBUJPCBDYooYv+ewoBuXA2YhDI4d26+2b+4xyZJRpNmhkwueQXoubgQEmI48SrMa4eS+ 6ekyhHuR8fM+Yl7cJQyCI/ryVKKKFjp5ppKAhUIM767VZx0qeJB/obd4FWCvtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728855297; a=rsa-sha256; cv=none; b=cUEHUEx9q46GU0e9g/TzdeKC16qO72y9JjOGn1/guAcsU77UeHU6ZH0y/fF/COH8AblTCK ahce4sGTxpyHKc5YfgZTaKerzlGSsb6OKiLuj8304oU10qd1h42zY09C+UlV2LKh8TR9EA wcdnzm8Zwk1M9fhOCQDm7PxVJttx8pSrOMqXnUzYFMmEOH0b25ylpjYO7ogHdFIp5Ox6Ie h8M929KpCWTbM4Yt80q86pWuIdiIc6wFA5zzoBVw1C8X9Gz/5ot5vM32ri/cR+vbUaM34M 4nQVkRHq/8CxV96fVlJIR4RwAIH3iSne42kmjdQVZIQZfpbEo/tOO4VyKXWXnA== 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 4XRYYF13M7z19ds; Sun, 13 Oct 2024 21:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DLYv1U044845; Sun, 13 Oct 2024 21:34:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DLYvjx044842; Sun, 13 Oct 2024 21:34:57 GMT (envelope-from git) Date: Sun, 13 Oct 2024 21:34:57 GMT Message-Id: <202410132134.49DLYvjx044842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f50a0944d034 - main - vnode.h: add comment line about VIRF_ flags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f50a0944d034519c300be1cd1c9518d259a17337 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f50a0944d034519c300be1cd1c9518d259a17337 commit f50a0944d034519c300be1cd1c9518d259a17337 Author: Konstantin Belousov AuthorDate: 2024-09-20 04:53:02 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-13 21:34:30 +0000 vnode.h: add comment line about VIRF_ flags Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/sys/vnode.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 0d0f228f7051..c929b4265552 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -231,6 +231,7 @@ _Static_assert(sizeof(struct vnode) <= 448, "vnode size crosses 448 bytes"); /* * Vnode flags. * VI flags are protected by interlock and live in v_iflag + * VIRF flags are protected by interlock and live in v_irflag * VV flags are protected by the vnode lock and live in v_vflag * * VIRF_DOOMED is doubly protected by the interlock and vnode lock. Both From nobody Sun Oct 13 21:38:29 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRYdK5Ml5z5YZxt; Sun, 13 Oct 2024 21:38: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRYdK4rfQz4k5k; Sun, 13 Oct 2024 21:38:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728855509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z3yO8UbSjCXjf4X/LYKSPIUYaqmDo/rzSfsiOnevxpM=; b=N5YSAJKOEtg2IGzIst8sojYpUcaR3D/n1QU2IHfmhkwDSV6LzBoIRs0EtCgaWv5vhnCyQX WTp5kc9+/+mO6R0xnl+L3L/6Y88zMCuMB1PjaCO4A4YGIAc1D72Gl4UIO1g9wRQyXt6Uhn CooNbTjxngzGUcZ37+JZRIxVa/HUYH1TenaJcuNn6A8KFuKhlNloDgand7vOLneBaup3MJ 5sc2bBLH85Vy5wYQkDrJcokjPLpl5L5+5+kX/8wNDDZN8lbRXfxbt+FgvPVLN3VKZTqbbB dMb1zHempEYZbaVf9UbgaBdLNLH/cD2EmfBiy1HLv/GkpY+/eb2zp+oUCPYbEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728855509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z3yO8UbSjCXjf4X/LYKSPIUYaqmDo/rzSfsiOnevxpM=; b=vCYlW1OejYvnQ5O4rCo4b4iZGtBrHIp75UZW/OtcWBqlZo9RLicejkf8H4E0Qq+0BYGPHm qZFI1b7ns3efypDWNYqGSg4k6vPfNl49itinvntq/QW9Cv8zNPYwdy6D1Vu+Iq/oiWuJbu XN8KjngpaLQiQaGdV/FJSxIEfzdc+q4BbjHMwF5E41EaQQzwYbuwzij71hSulgLS3yQOCn xEysOtMfb/C4KpZTUjlpm9sKkOMEAYF3fRiNe9e8Vjq1tfBkBJxZRrZulS4n80HLmpofPN qsa4gLPhrAVP6iVVBdqT7zmG3LvmRHkSLr7Ca9bT0fHgQ6av7eNl4NO2o8Kf1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728855509; a=rsa-sha256; cv=none; b=ha43pzik0ySUO2X5sZfZLbf/WUb4BK8QsovgCyJFA2BY1hN9ztM5LXANx6MlRHE6Qeyltb uQgwzGL+FjbluHdomRm81Mv8CDn+cZuBUsxuwxvtXtkuDfZz6BIdDMGILFBDlxnjf/y2Ls RHdkuhCLSMK4qUFIj5fnRYaaj+gaxBzyYIytJ0h4sgDyrbtZTC8wLLCTuFjW9xyQvyTJ4b qGGrKzgthUqu0ACX6GFJs3TW/fF/8VcrxZCTJdvyKjM8YQdSc2ybHxeqQVm0Cn1pAQJRyg lflPOTdWwYzSrq8yfbNml/xPjY58SGQ5adGhpiHtc5difZqs0wGSm7N78zaiRA== 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 4XRYdK4S07z191Z; Sun, 13 Oct 2024 21:38:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DLcTIk045507; Sun, 13 Oct 2024 21:38:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DLcTIG045504; Sun, 13 Oct 2024 21:38:29 GMT (envelope-from git) Date: Sun, 13 Oct 2024 21:38:29 GMT Message-Id: <202410132138.49DLcTIG045504@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c0e0e530ced0 - main - mps/mpr: Add workaround for firmware not responding to IOC_FACTS or IOC_INIT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0e0e530ced057502f51d7a6086857305e08fae0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c0e0e530ced057502f51d7a6086857305e08fae0 commit c0e0e530ced057502f51d7a6086857305e08fae0 Author: prateek sethi AuthorDate: 2024-10-13 18:38:54 +0000 Commit: Warner Losh CommitDate: 2024-10-13 21:38:01 +0000 mps/mpr: Add workaround for firmware not responding to IOC_FACTS or IOC_INIT Sometimes, especially with older firmware, mps(4) would have trouble initializing the card in one of these two steps. Add in a retry after a short delay. Sean Bruno and Stephen McConnell thought this was OK in the bug discussions, but never committed it. Steve indicated the delay might not be necessary, but the OP clearly needed to make it longer to make things work. I've kept the delay, and added the suggested comment. Ported the iocfacts part to mpr as well, since we see similar errors about once every month or two over a few thousand controllers at work. We've not seen it with IOC_INIT as far back as I can query the error log database, so I didn't port that forward. We'll see if this helps, but won't know for sure until next year (so I'm committing it now since it won't hurt and might help). We usually see this failure in connection with complicated recovery operations with a drive that's failing, though, at least in the last year's worth of failures. It's not clear this is the same as OP or not. PR: 212841 Sponsored by: Netflix Co-authored-by: imp --- sys/dev/mpr/mpr.c | 23 ++++++++++++++++++----- sys/dev/mps/mps.c | 38 ++++++++++++++++++++++++++++++-------- 2 files changed, 48 insertions(+), 13 deletions(-) diff --git a/sys/dev/mpr/mpr.c b/sys/dev/mpr/mpr.c index d5c02f9608ca..d1c572e40669 100644 --- a/sys/dev/mpr/mpr.c +++ b/sys/dev/mpr/mpr.c @@ -1195,7 +1195,7 @@ mpr_get_iocfacts(struct mpr_softc *sc, MPI2_IOC_FACTS_REPLY *facts) { MPI2_DEFAULT_REPLY *reply; MPI2_IOC_FACTS_REQUEST request; - int error, req_sz, reply_sz; + int error, req_sz, reply_sz, retry = 0; MPR_FUNCTRACE(sc); mpr_dprint(sc, MPR_INIT, "%s entered\n", __func__); @@ -1204,13 +1204,26 @@ mpr_get_iocfacts(struct mpr_softc *sc, MPI2_IOC_FACTS_REPLY *facts) reply_sz = sizeof(MPI2_IOC_FACTS_REPLY); reply = (MPI2_DEFAULT_REPLY *)facts; + /* + * Retry sending the initialization sequence. Sometimes, especially with + * older firmware, the initialization process fails. Retrying allows the + * error to clear in the firmware. + */ bzero(&request, req_sz); request.Function = MPI2_FUNCTION_IOC_FACTS; - error = mpr_request_sync(sc, &request, reply, req_sz, reply_sz, 5); - - adjust_iocfacts_endianness(facts); - mpr_dprint(sc, MPR_TRACE, "facts->IOCCapabilities 0x%x\n", facts->IOCCapabilities); + while (retry < 5) { + error = mpr_request_sync(sc, &request, reply, req_sz, reply_sz, 5); + if (error == 0) + break; + mpr_dprint(sc, MPR_FAULT, "%s failed retry %d\n", __func__, retry); + DELAY(1000); + retry++; + } + if (error == 0) { + adjust_iocfacts_endianness(facts); + mpr_dprint(sc, MPR_TRACE, "facts->IOCCapabilities 0x%x\n", facts->IOCCapabilities); + } mpr_dprint(sc, MPR_INIT, "%s exit, error= %d\n", __func__, error); return (error); } diff --git a/sys/dev/mps/mps.c b/sys/dev/mps/mps.c index adad2450a3d4..9dfa0471ac0a 100644 --- a/sys/dev/mps/mps.c +++ b/sys/dev/mps/mps.c @@ -1127,7 +1127,7 @@ mps_get_iocfacts(struct mps_softc *sc, MPI2_IOC_FACTS_REPLY *facts) { MPI2_DEFAULT_REPLY *reply; MPI2_IOC_FACTS_REQUEST request; - int error, req_sz, reply_sz; + int error, req_sz, reply_sz, retry = 0; MPS_FUNCTRACE(sc); mps_dprint(sc, MPS_INIT, "%s entered\n", __func__); @@ -1136,10 +1136,21 @@ mps_get_iocfacts(struct mps_softc *sc, MPI2_IOC_FACTS_REPLY *facts) reply_sz = sizeof(MPI2_IOC_FACTS_REPLY); reply = (MPI2_DEFAULT_REPLY *)facts; + /* + * Retry sending the initialization sequence. Sometimes, especially with + * older firmware, the initialization process fails. Retrying allows the + * error to clear in the firmware. + */ bzero(&request, req_sz); request.Function = MPI2_FUNCTION_IOC_FACTS; - error = mps_request_sync(sc, &request, reply, req_sz, reply_sz, 5); - mps_dprint(sc, MPS_INIT, "%s exit error= %d\n", __func__, error); + while (retry < 5) { + error = mps_request_sync(sc, &request, reply, req_sz, reply_sz, 5); + if (error == 0) + break; + mps_dprint(sc, MPS_FAULT, "%s failed retry %d\n", __func__, retry); + DELAY(1000); + retry++; + } return (error); } @@ -1149,7 +1160,7 @@ mps_send_iocinit(struct mps_softc *sc) { MPI2_IOC_INIT_REQUEST init; MPI2_DEFAULT_REPLY reply; - int req_sz, reply_sz, error; + int req_sz, reply_sz, error, retry = 0; struct timeval now; uint64_t time_in_msec; @@ -1193,10 +1204,21 @@ mps_send_iocinit(struct mps_softc *sc) time_in_msec = (now.tv_sec * 1000 + now.tv_usec/1000); init.TimeStamp.High = htole32((time_in_msec >> 32) & 0xFFFFFFFF); init.TimeStamp.Low = htole32(time_in_msec & 0xFFFFFFFF); - - error = mps_request_sync(sc, &init, &reply, req_sz, reply_sz, 5); - if ((reply.IOCStatus & MPI2_IOCSTATUS_MASK) != MPI2_IOCSTATUS_SUCCESS) - error = ENXIO; + /* + * Retry sending the initialization sequence. Sometimes, especially with + * older firmware, the initialization process fails. Retrying allows the + * error to clear in the firmware. + */ + while (retry < 5) { + error = mps_request_sync(sc, &init, &reply, req_sz, reply_sz, 5); + if ((reply.IOCStatus & MPI2_IOCSTATUS_MASK) != MPI2_IOCSTATUS_SUCCESS) + error = ENXIO; + if (error == 0) + break; + mps_dprint(sc, MPS_FAULT, "%s failed retry %d\n", __func__, retry); + DELAY(1000); + retry++; + } mps_dprint(sc, MPS_INIT, "IOCInit status= 0x%x\n", reply.IOCStatus); mps_dprint(sc, MPS_INIT, "%s exit\n", __func__); From nobody Sun Oct 13 21:47:28 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRYqh4TJJz5Ybyd; Sun, 13 Oct 2024 21:47:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRYqh3jQbz4lM8; Sun, 13 Oct 2024 21: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=1728856048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mk9RZVsTZBHOzBpRHoUuOv2Yvaxpc1/efZruhK2+3tg=; b=UZntvFoL9kvG6XyC5lItv0S/OMbNG5a5A9giQVZIeQimreh+5OXraBUW3XoSYehoTZ6akI KSYqeJeKULeYyWnCX9hvEfzVbqjHEM5+8BLU+IZLNq2vr2xwvR8hwjnrRbBFNHmPt/fRM4 ClzP81hnOPXdOZXeN9wu4acPjM8/jxr+zHkoGhaBUmT8q3+A76q8S1HwsP0BUXem+sZF5T 9tXOTliquDXMx8uxpywj4xOJnjQfw76G4LYjFX7FwdqAkLykotmI67vEDUp+2mwXUR++kA Wp+TKbGP20DNdqO6hAZlejvyPIvatI0vBXkL1KQxgSt+/BjT4EiOhjOu2tW3yA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728856048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mk9RZVsTZBHOzBpRHoUuOv2Yvaxpc1/efZruhK2+3tg=; b=B9Gmovu6NGdXn6yvCR0C2MqXSW5+9oPLLR4Hact7gifDH1aI96DD6IrwdjLd30nbTXGQhL kf4V5QDeYYoHX1nhd/JA8jTU+WgYsOayql1fozHyLIXfn6CeUIdDqagU/Qmd0XUe8iQRYi +yg29dnSQsnOsXFuAbkmgzUnVqNEITozvF5p2NMONiItc+fdoRzrIYeXGEWgJQXlQok1j4 jAvzmEJvxmxRG2YVfDp2BeKOMXdvtm7TBmee8hvPjyA5D2wZb9K+ydnRuO6esR18ps85v6 OOAJdNDzsqvo+2iETqOQSKwZIiKtTQUMeCxuOSXaD0FG+NmPVeeafMmo0+lfYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728856048; a=rsa-sha256; cv=none; b=vi3//CRLxCfLhUa68IHG2NKzkbeB3WThuTbPQJBRq1cT8WkQt+qGtWgU2TxKcaihM9dD2u nlKYqi94gwC+NwKTiJzL6r1unPXMf80HL1nqbIicbUTfjKbVmLPIoUMUDlxT18j+aJ7dbY cEggWULVBlAv38WtsOAK/kqguE581+JVCCDqFXcd3Z52bvZiN77YVZ+C73nlwQOek9g+tK dq45skLkSU4YcWBBZAJXMYS6DkOzmeGDgEpQ2Wz7o1PHQolsSjDjd/Rq4jlz7qAJr1yeqZ E4phNdJw65pFZunS/G173IbLaGNDB+LJ3/koLbOu4MzP/JycCFZTjH/WpkXXEg== 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 4XRYqh33jbz19Td; Sun, 13 Oct 2024 21:47:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DLlSP3062796; Sun, 13 Oct 2024 21:47:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DLlS0K062793; Sun, 13 Oct 2024 21:47:28 GMT (envelope-from git) Date: Sun, 13 Oct 2024 21:47:28 GMT Message-Id: <202410132147.49DLlS0K062793@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: ec22e705c266 - main - tmpfs: remove duplicate flags check in tmpfs_rmdir List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec22e705c266ff629cc5ec47b84f67ba02b7b924 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=ec22e705c266ff629cc5ec47b84f67ba02b7b924 commit ec22e705c266ff629cc5ec47b84f67ba02b7b924 Author: Claudiu AuthorDate: 2024-10-13 20:00:42 +0000 Commit: Alan Somers CommitDate: 2024-10-13 21:43:52 +0000 tmpfs: remove duplicate flags check in tmpfs_rmdir MFC after: 2 weeks Reviewed By: asomers Differential Revision: https://reviews.freebsd.org/D47100 --- sys/fs/tmpfs/tmpfs_vnops.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index fa9945a9074a..c2559a61fe37 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -1344,6 +1344,7 @@ tmpfs_rmdir(struct vop_rmdir_args *v) goto out; } + /* Check flags to see if we are allowed to remove the directory. */ if ((dnode->tn_flags & APPEND) || (node->tn_flags & (NOUNLINK | IMMUTABLE | APPEND))) { error = EPERM; @@ -1361,13 +1362,6 @@ tmpfs_rmdir(struct vop_rmdir_args *v) cnp->cn_nameptr, cnp->cn_namelen)); - /* Check flags to see if we are allowed to remove the directory. */ - if ((dnode->tn_flags & APPEND) != 0 || - (node->tn_flags & (NOUNLINK | IMMUTABLE | APPEND)) != 0) { - error = EPERM; - goto out; - } - /* Detach the directory entry from the directory (dnode). */ tmpfs_dir_detach(dvp, de); From nobody Sun Oct 13 22:30:50 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRZnk55mhz5YgG4; Sun, 13 Oct 2024 22:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRZnk4Mcjz4qHv; Sun, 13 Oct 2024 22:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728858650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BJ5e2d7mT0XKDzFVTOz7m5gIH5qTI4ytQskgqNc1Yk0=; b=oiDNMT5fp6J8mCNC/8Wks4mxRxuqzPJwCJOdGPKgDExvgdFr0oJzbQ4Psc1bIAozE9NyHO g4JXDNCAbRmQtpFWVw9jGK45qED+5naac6xMq2ZljtyRKIGUeXFXEMWyQ1KIEaSBDr8EHE 5wN1+TOmRjxTcgdZM7LbOe3/RFBhPVM43bXkRpP7yLHtQg8aHA6MZ9rdvldLxtPjlcandm NbjLsLmsxCcLdIYwwpk3HS6eySQk5PR86Xw2pt6yciBfBAH2zXj3P4f8Bh1gQzZ/5dfuXr MygOd0W26bCKtCC2SMshvbhm2tHIYUu8L7POyy8UqLMYwYkG9q5njSo6sURcmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728858650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BJ5e2d7mT0XKDzFVTOz7m5gIH5qTI4ytQskgqNc1Yk0=; b=m+b+iPSsaMa/VDKA1uIz0Ti1qYBHCfs7qayxXFFLGVgGA5h6btU+EzMKX0/v+iiNNVGLSy IQo/DejTcdxK2e7HG0jQ81dVWbE7+b5Jttbu2d7edjF+qfKtFMKxPLvTXPs7YefYMVnFmd vLtdrQXzJAQ+FO05ayWQIHd3uuV+YItHcNsGDDKSJZnCS9TXUXklPVFZ+LJgxiPKbrSiRX +oiPlRi3TB1VIGjGbn8RCIfJTv3vbg0j66e3LkrqxOns6SPqpd6+EhoBkzsFX0I5dPRl1w QFeqvP9UDQf6hIKp2qUmlKWO+N+6mLlerd9szmNuxQv6egTg4HPonp5eZlOHVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728858650; a=rsa-sha256; cv=none; b=qpr2T5xxmIevgtsaC0ev0zptybGEok5x8ufKJEpzXgVe7QxM+ZBEWNe7MZHuzGwGr42e1a nV+sQj0IhkBtORS5n/8hZ1QZqJ9eeH7my/EfVAy2Lt2HTVRe24sCYK1+2iKak+px66qOIe GWuFX+7fxK4GT1Omv1c6hTb936E9fQWGgE5mYVmv0vJb5ZpbpARv5KcqQjz17ZpYjSFDsL mXYTviiyvA/4u5PjzlVTGN9o6LV3gRy8M39RX/SU3kzruGJckaWHxDHPhdC7wt3MhVXbeq vY9d1ufBRHtwdZdchzSFG0n7aT7W1uCRl9oGz4BNpnmeUDm/CIcWe3/ora+nzw== 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 4XRZnk3yzWz1Bfp; Sun, 13 Oct 2024 22:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DMUobk040060; Sun, 13 Oct 2024 22:30:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DMUo3v040057; Sun, 13 Oct 2024 22:30:50 GMT (envelope-from git) Date: Sun, 13 Oct 2024 22:30:50 GMT Message-Id: <202410132230.49DMUo3v040057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 26ff9d2050a1 - main - iommu.h: improve header self-sufficiency List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26ff9d2050a11449211644c6cb83cda7d94a785a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=26ff9d2050a11449211644c6cb83cda7d94a785a commit 26ff9d2050a11449211644c6cb83cda7d94a785a Author: Konstantin Belousov AuthorDate: 2024-10-13 09:45:41 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-13 22:30:25 +0000 iommu.h: improve header self-sufficiency The header embeds struct task into defined structures. Also it needs the PCI_BUSMAX constant. Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/iommu/iommu.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/iommu/iommu.h b/sys/dev/iommu/iommu.h index 73d0a6f1279b..f425024117d3 100644 --- a/sys/dev/iommu/iommu.h +++ b/sys/dev/iommu/iommu.h @@ -31,9 +31,11 @@ #ifndef _DEV_IOMMU_IOMMU_H_ #define _DEV_IOMMU_IOMMU_H_ +#include #include #include #include +#include struct bus_dma_tag_common; struct iommu_map_entry; From nobody Sun Oct 13 22:30:51 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRZnl5rtpz5Yg52; Sun, 13 Oct 2024 22:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRZnl52mQz4q1S; Sun, 13 Oct 2024 22:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728858651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dF5PpLeVecpQbi3hsZiNF5YVMrMnx2beX9+jefLi9hA=; b=mSqabCD7H2bX2+4vVfOc9ZsMMj4CtR5hGCB8nzm+eW8TfCmsbL83FU4/I7ybIPKLQXc4EV xctqD6d62xUE7wAJuNviEfrAf3HBQL5DH0mcQTldqaX5RHeP3uzIRmlmVZnulUSVdBA2fa JcJlBFp9r1wjlfAVAtKprCBOsHRUCva1qUTQlB8Ec+0JCcUTCPf4T4VRg6MZxIuvWHuv48 8kOAEIXjIpJYvRiT6Ip0FiUFJLbgGtelNhVI4ET7p+JRm7b32aJAYKPUuO2rCACGHe01kJ j12JJvttzWxMlIbfKf6/U3rhaB5/0BsUMeEAw1u5a9rpVgCi7dSj0lVsfTVyYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728858651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dF5PpLeVecpQbi3hsZiNF5YVMrMnx2beX9+jefLi9hA=; b=xXiOUejL1fmnnzGEraLwrUSx6tUe014T0NzvSon8HtkPO/3M6ULX1H6sxRUeTM0a6alOz7 NFDWWAGPRd3R8DseZ8c/oHldFLwk/L2EuDpTY7NyJznwSNx/9V9PyG0fNgFT87WLkpNbqW KcNQICRBs3F2JwqTD0vWaKTziBMj24pVjIcT9d+YTFjuapMv2RkiP/kxB1s8h+L85baIIk i5ItvFH8tOnS/xxPwr4MhAS2vr+o9Giy5uGi7hoky6KIkr0igpSn0Wm9FPUX2jvuwuGozr syxaJ94xwMM3HSvrpCDGQuhdG879NFmn55RYYW+3Jd6wfUsW7tzrStBq4STMpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728858651; a=rsa-sha256; cv=none; b=x0b35dyslNxPfjw+0kqD+k011hiqDqjmIZ/SYWl3QTLnmoa5P561DPju6lDUclQKthRGIe RTgh3PHm0HpJsqabM61lObkYqv+HtjUlvyWWTIDVuE+IZaIZJEyxmoghuzOrdslIuePMkb njEHwjTkB3sf0K94klwzQklIEi0hMcmbSDUBEvMhdOy/TSqDp6KTS+QfR7tsSUjkWSVt5y eUJDV3ZoxVvk7XfJpSjyjC8pCSS+gcchKICuaJk7XVBe15DTcQRbCsMAZvp4FTlKmBGQ4p QBeehXruzK5Y+sdXFcjnQDHqrGfeDe305RMnROZgntNdr1g9CvjQnoamox5/YA== 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 4XRZnl4fQ1z1Bx8; Sun, 13 Oct 2024 22:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DMUpIL040117; Sun, 13 Oct 2024 22:30:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DMUpuW040114; Sun, 13 Oct 2024 22:30:51 GMT (envelope-from git) Date: Sun, 13 Oct 2024 22:30:51 GMT Message-Id: <202410132230.49DMUpuW040114@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7896b03fff4d - main - iommu_get_requester(): do not panic if asked about non-pci device List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7896b03fff4d9c2e9c35ecf1dce2e0d672467a5a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7896b03fff4d9c2e9c35ecf1dce2e0d672467a5a commit 7896b03fff4d9c2e9c35ecf1dce2e0d672467a5a Author: Konstantin Belousov AuthorDate: 2024-10-13 10:04:32 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-13 22:30:26 +0000 iommu_get_requester(): do not panic if asked about non-pci device For now, return zero rid and the device itself. Add a comment noting that eventually ACPI HID can be used to calculate rid for some more devices. Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/iommu/busdma_iommu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c index 7a0ca39172f3..4d295ed7c6b2 100644 --- a/sys/dev/iommu/busdma_iommu.c +++ b/sys/dev/iommu/busdma_iommu.c @@ -126,6 +126,12 @@ iommu_get_requester(device_t dev, uint16_t *rid) pci_class = devclass_find("pci"); l = requester = dev; + pci = device_get_parent(dev); + if (pci == NULL || device_get_devclass(pci) != pci_class) { + *rid = 0; /* XXXKIB: Could be ACPI HID */ + return (requester); + } + *rid = pci_get_rid(dev); /* From nobody Sun Oct 13 22:30:52 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRZnn2Wrdz5YfyQ; Sun, 13 Oct 2024 22:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRZnm658Sz4qJ0; Sun, 13 Oct 2024 22:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728858652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+vnpeegZv3A0xrf9Gboc1B14mW3A3VcX/85Qsx8XNeg=; b=kmXA+vv2/ZT7XsuvxP0+1/c4GaZ4aWxmBI4dn/qVOiuu2T9lWiFs0nHeSac4a7lrbaLmpb vrinXmOMpG1bQEVkbx7VDS2H3sekFHyEoeX8JyMsm9LSFLoHV7j1ikc/du8XhMoj3SYLKY D9a7dmAfCKdJ1+jdP+O1STOnEnZ7gSukHATL36GjKtCEmNlSLGYUyJNANeCFttyWK8cpc2 WeN5MueTgMOl4uxlIPE6YWA0VeRnZhSa7KY7ZbB3vHaiqqh+MvNg7fRVfz8j3U4ehWiYVO J2BiNuzQ60RwZwCel7ghksMqFPp9/YRxEUokvz45ACUhy+7AM0Si7gWgvnf4mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728858652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+vnpeegZv3A0xrf9Gboc1B14mW3A3VcX/85Qsx8XNeg=; b=pwdLq1X+EZM3sWBEag6cKQvrxmY5iL0lLOA+TX68DxFeHkHihyfNclpdxg7g5dlDKCE0NN ZOTUPWuy514AHPkNylYmhZBGNgi9fhmmvsB1QgoLG1KNw6NuCHjWh5qlkCptjcaCqHqd5m 3MYnEnNNW49NXjGrGbRigfHwtcb9lHdvcUtlDaahMmwAGMQSIGOLyYGszIY0glMhJzSkaB /Az3feiswi2Ybh6SzQ1ki1hdMrlIn8w/ndQOxGnwvbGdiLBi1TfcvP1mE2luVg0vEKOIRE xpuuwuPgGbgUR820zoN02hzmEBwyzOmB4cMo+LALU/+z7H0sFmxvH/XNh/S1dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728858652; a=rsa-sha256; cv=none; b=po/no+/q5Cxl46epLj+VR6o42Z2XPwlx46doTTqXuFQvuzjGPw3v9/+iwj27s6fVCu3wxE AQedcHKrlDjJQ9Ls+HTdogWulvp2qODX+WgIbjMUZkTRcZFqVX8OvsSip+q5vCQVT+Nd7u uJRYAC2yR17eZ0nSoMWzr1cuCBrJmsNuLoG9FpjeG6v0oi9INBnLIvIB05MTKe6Q2oQiOw gRkgh7cQKzWgiFhNWrJYTkC/yeH82HQThSCKbkgOZssA5HP4wvofi9JVLxTCTt+fSn/7Hk N61ZP6AIe2rVrn55ej/tdpZRtRblxMcUQw5ku0UyqOdneltW5M7dIf5FRMHOsg== 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 4XRZnm5fj9z1BxB; Sun, 13 Oct 2024 22:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DMUqH6040174; Sun, 13 Oct 2024 22:30:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DMUqnC040171; Sun, 13 Oct 2024 22:30:52 GMT (envelope-from git) Date: Sun, 13 Oct 2024 22:30:52 GMT Message-Id: <202410132230.49DMUqnC040171@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e9d948cfe0d2 - main - iommu: move context link and ref count into device-independent parts List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9d948cfe0d21780d2e94137e322ecfe89f75d6a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e9d948cfe0d21780d2e94137e322ecfe89f75d6a commit e9d948cfe0d21780d2e94137e322ecfe89f75d6a Author: Konstantin Belousov AuthorDate: 2024-10-12 19:56:14 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-13 22:30:26 +0000 iommu: move context link and ref count into device-independent parts This also allows to move some bits of ddb print routines into iommu_utils.c common for x86 iommu drivers. Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/iommu/iommu.h | 3 +++ sys/x86/iommu/intel_ctx.c | 38 ++++++++++++++-------------- sys/x86/iommu/intel_dmar.h | 3 --- sys/x86/iommu/intel_drv.c | 61 +++++++++------------------------------------ sys/x86/iommu/iommu_utils.c | 41 ++++++++++++++++++++++++++++++ sys/x86/iommu/x86_iommu.h | 3 +++ 6 files changed, 78 insertions(+), 71 deletions(-) diff --git a/sys/dev/iommu/iommu.h b/sys/dev/iommu/iommu.h index f425024117d3..b1858f0df9f7 100644 --- a/sys/dev/iommu/iommu.h +++ b/sys/dev/iommu/iommu.h @@ -121,11 +121,14 @@ struct iommu_domain { iommu_gaddr_t msi_base; /* (d) Arch-specific */ vm_paddr_t msi_phys; /* (d) Arch-specific */ u_int flags; /* (u) */ + LIST_HEAD(, iommu_ctx) contexts;/* (u) */ }; struct iommu_ctx { struct iommu_domain *domain; /* (c) */ struct bus_dma_tag_iommu *tag; /* (c) Root tag */ + LIST_ENTRY(iommu_ctx) link; /* (u) Member in the domain list */ + u_int refs; /* (u) References from tags */ u_long loads; /* atomic updates, for stat only */ u_long unloads; /* same */ u_int flags; /* (u) */ diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c index 5af5ac7335b8..c2371d4d9c4f 100644 --- a/sys/x86/iommu/intel_ctx.c +++ b/sys/x86/iommu/intel_ctx.c @@ -375,7 +375,7 @@ dmar_domain_alloc(struct dmar_unit *dmar, bool id_mapped) iodom = DOM2IODOM(domain); unit = DMAR2IOMMU(dmar); domain->domain = id; - LIST_INIT(&domain->contexts); + LIST_INIT(&iodom->contexts); iommu_domain_init(unit, iodom, &dmar_domain_map_ops); domain->dmar = dmar; @@ -430,7 +430,7 @@ dmar_ctx_alloc(struct dmar_domain *domain, uint16_t rid) ctx->context.tag = malloc(sizeof(struct bus_dma_tag_iommu), M_DMAR_CTX, M_WAITOK | M_ZERO); ctx->context.rid = rid; - ctx->refs = 1; + ctx->context.refs = 1; return (ctx); } @@ -446,7 +446,7 @@ dmar_ctx_link(struct dmar_ctx *ctx) domain->ctx_cnt)); domain->refs++; domain->ctx_cnt++; - LIST_INSERT_HEAD(&domain->contexts, ctx, link); + LIST_INSERT_HEAD(&domain->iodom.contexts, &ctx->context, link); } static void @@ -463,7 +463,7 @@ dmar_ctx_unlink(struct dmar_ctx *ctx) domain->refs, domain->ctx_cnt)); domain->refs--; domain->ctx_cnt--; - LIST_REMOVE(ctx, link); + LIST_REMOVE(&ctx->context, link); } static void @@ -476,7 +476,7 @@ dmar_domain_destroy(struct dmar_domain *domain) KASSERT(TAILQ_EMPTY(&domain->iodom.unload_entries), ("unfinished unloads %p", domain)); - KASSERT(LIST_EMPTY(&domain->contexts), + KASSERT(LIST_EMPTY(&iodom->contexts), ("destroying dom %p with contexts", domain)); KASSERT(domain->ctx_cnt == 0, ("destroying dom %p with ctx_cnt %d", domain, domain->ctx_cnt)); @@ -593,13 +593,13 @@ dmar_get_ctx_for_dev1(struct dmar_unit *dmar, device_t dev, uint16_t rid, /* Nothing needs to be done to destroy ctx1. */ free(ctx1, M_DMAR_CTX); domain = CTX2DOM(ctx); - ctx->refs++; /* tag referenced us */ + ctx->context.refs++; /* tag referenced us */ } } else { domain = CTX2DOM(ctx); if (ctx->context.tag->owner == NULL) ctx->context.tag->owner = dev; - ctx->refs++; /* tag referenced us */ + ctx->context.refs++; /* tag referenced us */ } error = dmar_flush_for_ctx_entry(dmar, enable); @@ -737,15 +737,15 @@ dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx) struct dmar_domain *domain; DMAR_ASSERT_LOCKED(dmar); - KASSERT(ctx->refs >= 1, - ("dmar %p ctx %p refs %u", dmar, ctx, ctx->refs)); + KASSERT(ctx->context.refs >= 1, + ("dmar %p ctx %p refs %u", dmar, ctx, ctx->context.refs)); /* * If our reference is not last, only the dereference should * be performed. */ - if (ctx->refs > 1) { - ctx->refs--; + if (ctx->context.refs > 1) { + ctx->context.refs--; DMAR_UNLOCK(dmar); return; } @@ -762,15 +762,15 @@ dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx) TD_PREP_PINNED_ASSERT; ctxp = dmar_map_ctx_entry(ctx, &sf); DMAR_LOCK(dmar); - KASSERT(ctx->refs >= 1, - ("dmar %p ctx %p refs %u", dmar, ctx, ctx->refs)); + KASSERT(ctx->context.refs >= 1, + ("dmar %p ctx %p refs %u", dmar, ctx, ctx->context.refs)); /* * Other thread might have referenced the context, in which * case again only the dereference should be performed. */ - if (ctx->refs > 1) { - ctx->refs--; + if (ctx->context.refs > 1) { + ctx->context.refs--; DMAR_UNLOCK(dmar); iommu_unmap_pgtbl(sf); TD_PINNED_ASSERT; @@ -820,14 +820,14 @@ struct dmar_ctx * dmar_find_ctx_locked(struct dmar_unit *dmar, uint16_t rid) { struct dmar_domain *domain; - struct dmar_ctx *ctx; + struct iommu_ctx *ctx; DMAR_ASSERT_LOCKED(dmar); LIST_FOREACH(domain, &dmar->domains, link) { - LIST_FOREACH(ctx, &domain->contexts, link) { - if (ctx->context.rid == rid) - return (ctx); + LIST_FOREACH(ctx, &domain->iodom.contexts, link) { + if (ctx->rid == rid) + return (IOCTX2CTX(ctx)); } } return (NULL); diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h index fcdc915abcfd..c3163abf6f92 100644 --- a/sys/x86/iommu/intel_dmar.h +++ b/sys/x86/iommu/intel_dmar.h @@ -65,7 +65,6 @@ struct dmar_domain { u_int refs; /* (u) Refs, including ctx */ struct dmar_unit *dmar; /* (c) */ LIST_ENTRY(dmar_domain) link; /* (u) Member in the dmar list */ - LIST_HEAD(, dmar_ctx) contexts; /* (u) */ vm_object_t pgtbl_obj; /* (c) Page table pages */ u_int batch_no; }; @@ -73,8 +72,6 @@ struct dmar_domain { struct dmar_ctx { struct iommu_ctx context; uint64_t last_fault_rec[2]; /* Last fault reported */ - LIST_ENTRY(dmar_ctx) link; /* (u) Member in the domain list */ - u_int refs; /* (u) References from tags */ }; #define DMAR_DOMAIN_PGLOCK(dom) VM_OBJECT_WLOCK((dom)->pgtbl_obj) diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index cc16759ebe34..e973115df21b 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -1053,48 +1053,12 @@ dmar_instantiate_rmrr_ctxs(struct iommu_unit *unit) #include #include -static void -dmar_print_domain_entry(const struct iommu_map_entry *entry) -{ - struct iommu_map_entry *l, *r; - - db_printf( - " start %jx end %jx first %jx last %jx free_down %jx flags %x ", - entry->start, entry->end, entry->first, entry->last, - entry->free_down, entry->flags); - db_printf("left "); - l = RB_LEFT(entry, rb_entry); - if (l == NULL) - db_printf("NULL "); - else - db_printf("%jx ", l->start); - db_printf("right "); - r = RB_RIGHT(entry, rb_entry); - if (r == NULL) - db_printf("NULL"); - else - db_printf("%jx", r->start); - db_printf("\n"); -} - -static void -dmar_print_ctx(struct dmar_ctx *ctx) -{ - - db_printf( - " @%p pci%d:%d:%d refs %d flags %x loads %lu unloads %lu\n", - ctx, pci_get_bus(ctx->context.tag->owner), - pci_get_slot(ctx->context.tag->owner), - pci_get_function(ctx->context.tag->owner), ctx->refs, - ctx->context.flags, ctx->context.loads, ctx->context.unloads); -} - static void dmar_print_domain(struct dmar_domain *domain, bool show_mappings) { struct iommu_domain *iodom; struct iommu_map_entry *entry; - struct dmar_ctx *ctx; + struct iommu_ctx *ctx; iodom = DOM2IODOM(domain); @@ -1104,16 +1068,16 @@ dmar_print_domain(struct dmar_domain *domain, bool show_mappings) domain, domain->domain, domain->mgaw, domain->agaw, domain->pglvl, (uintmax_t)domain->iodom.end, domain->refs, domain->ctx_cnt, domain->iodom.flags, domain->pgtbl_obj, domain->iodom.entries_cnt); - if (!LIST_EMPTY(&domain->contexts)) { + if (!LIST_EMPTY(&iodom->contexts)) { db_printf(" Contexts:\n"); - LIST_FOREACH(ctx, &domain->contexts, link) - dmar_print_ctx(ctx); + LIST_FOREACH(ctx, &iodom->contexts, link) + iommu_db_print_ctx(ctx); } if (!show_mappings) return; db_printf(" mapped:\n"); RB_FOREACH(entry, iommu_gas_entries_tree, &iodom->rb_root) { - dmar_print_domain_entry(entry); + iommu_db_print_domain_entry(entry); if (db_pager_quit) break; } @@ -1121,7 +1085,7 @@ dmar_print_domain(struct dmar_domain *domain, bool show_mappings) return; db_printf(" unloading:\n"); TAILQ_FOREACH(entry, &domain->iodom.unload_entries, dmamap_link) { - dmar_print_domain_entry(entry); + iommu_db_print_domain_entry(entry); if (db_pager_quit) break; } @@ -1131,7 +1095,7 @@ DB_SHOW_COMMAND_FLAGS(dmar_domain, db_dmar_print_domain, CS_OWN) { struct dmar_unit *unit; struct dmar_domain *domain; - struct dmar_ctx *ctx; + struct iommu_ctx *ctx; bool show_mappings, valid; int pci_domain, bus, device, function, i, t; db_expr_t radix; @@ -1179,13 +1143,12 @@ DB_SHOW_COMMAND_FLAGS(dmar_domain, db_dmar_print_domain, CS_OWN) for (i = 0; i < dmar_devcnt; i++) { unit = device_get_softc(dmar_devs[i]); LIST_FOREACH(domain, &unit->domains, link) { - LIST_FOREACH(ctx, &domain->contexts, link) { + LIST_FOREACH(ctx, &domain->iodom.contexts, link) { if (pci_domain == unit->segment && - bus == pci_get_bus(ctx->context.tag->owner) && - device == - pci_get_slot(ctx->context.tag->owner) && - function == - pci_get_function(ctx->context.tag->owner)) { + bus == pci_get_bus(ctx->tag->owner) && + device == pci_get_slot(ctx->tag->owner) && + function == pci_get_function(ctx->tag-> + owner)) { dmar_print_domain(domain, show_mappings); goto out; diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c index db8f94eb584f..fde3f150947b 100644 --- a/sys/x86/iommu/iommu_utils.c +++ b/sys/x86/iommu/iommu_utils.c @@ -34,6 +34,7 @@ #else #include "opt_apic.h" #endif +#include "opt_ddb.h" #include #include @@ -756,3 +757,43 @@ pglvl_page_size(int total_pglvl, int lvl) KASSERT(rlvl < nitems(pg_sz), ("sizeof pg_sz lvl %d", lvl)); return (pg_sz[rlvl]); } + +#ifdef DDB +#include +#include + +void +iommu_db_print_domain_entry(const struct iommu_map_entry *entry) +{ + struct iommu_map_entry *l, *r; + + db_printf( + " start %jx end %jx first %jx last %jx free_down %jx flags %x ", + entry->start, entry->end, entry->first, entry->last, + entry->free_down, entry->flags); + db_printf("left "); + l = RB_LEFT(entry, rb_entry); + if (l == NULL) + db_printf("NULL "); + else + db_printf("%jx ", l->start); + db_printf("right "); + r = RB_RIGHT(entry, rb_entry); + if (r == NULL) + db_printf("NULL"); + else + db_printf("%jx", r->start); + db_printf("\n"); +} + +void +iommu_db_print_ctx(struct iommu_ctx *ctx) +{ + db_printf( + " @%p pci%d:%d:%d refs %d flags %#x loads %lu unloads %lu\n", + ctx, pci_get_bus(ctx->tag->owner), + pci_get_slot(ctx->tag->owner), + pci_get_function(ctx->tag->owner), ctx->refs, + ctx->flags, ctx->loads, ctx->unloads); +} +#endif diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h index 4d0ac8351e2e..043935a3e0de 100644 --- a/sys/x86/iommu/x86_iommu.h +++ b/sys/x86/iommu/x86_iommu.h @@ -194,4 +194,7 @@ vm_pindex_t pglvl_pgtbl_get_pindex(int pglvl, iommu_gaddr_t base, int lvl); vm_pindex_t pglvl_max_pages(int pglvl); iommu_gaddr_t pglvl_page_size(int total_pglvl, int lvl); +void iommu_db_print_domain_entry(const struct iommu_map_entry *entry); +void iommu_db_print_ctx(struct iommu_ctx *ctx); + #endif From nobody Sun Oct 13 22:30:53 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRZnp35ZKz5Yg58; Sun, 13 Oct 2024 22:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRZnp0R4nz4q1f; Sun, 13 Oct 2024 22:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728858654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xGGVyIjszI+PP3enzfnm/vA7UcCC88W6Qs2Ht1v6kak=; b=H+D4liFflo0f7gWcRnMfUleRGXGF/QWnGZy6TvaLKhjZw0v3Wnx8bd3KdTX+bydKwHMmDV vxj8qTWwO+2txHUMrtDZw3ZA+HINANNUHlQ/bdcCgLaavkBawL6VaqK+OqoaGm7JG8moEn Ye535SPAofhOqh6JGgKRwS8pDY2vtzxcK6dTCG4Gu5Yv11k+5aNjMLuxTpsBGjfRI1Ghek ikqTdkiRB6CJGC4qpiNTANGe9sbRdfGIsWiWLvhqGB7VfSnNscLelpUFm2m2a6OAReg3NN VpVvdUaNj6oJa1bzo7RpPH0fgMeY2WYbboB6rX52Emd+ZwMSQN/z2foyjc7dvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728858654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xGGVyIjszI+PP3enzfnm/vA7UcCC88W6Qs2Ht1v6kak=; b=WHyxxoXBYJr6aVPaRZYC+TvqUfQdaMRJSIIkKM+eEJUFRhgXzruxRtLBwl6eXbbEHxKSaE z2oAB60U8OiMvGZ8aWuYI67IyebjDeOq2VdqsXvjKfaAnP9WeOWWMcr3qVZ+X/Z5UcJYq9 UDkY9URYT0WeWj1z5+yqQJqXdVKa2SAaVeK4Oi4Lfs3IpqhtcFsFVH6CGaf4WhrHJ7CWTE PqWcVD1/CZ/pCpLn8+V5XDXT0rXk59iqPK5JRHLNcp2QU9dBhainaNY9+ARnEWFD0WgLHQ GHt67LJi7ZH2kZMxcsf6Q46SpaGcAkO+TnjYMogml/TCxcPnK9mxPBtIt/ihjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728858654; a=rsa-sha256; cv=none; b=h5rAggK/otIw6jV1GvtAIQ5f2gwqkjqAQDShzMqfmmPFNDGYZznDW/wn+pE4weB3QR/FsK 5wz6V5+ddJHAj5x0rvUF+6KkYffL3STjQSQPJXJKX+hWd/bYR9ZG6hcj1GDW3oaqA74Tcx UDORVHH68I2LoutSacMLWrHm/QTKyp64bZqHZNmvQ/qAQkarSnJt9w7lB/1/hGq4Nta2Gw aveDMY9Wf9kMFI+jptn2QSsYhCE25j4wTK5Ny1CZU1DFgrQBo3GZAPIab4dHiw9UWcGXu2 cgrfQWzlq9ce8/Mnc0+JUJSt/ZoGTFE4wZz2rqhew1HiAYSHLk9K43yFCHISxg== 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 4XRZnn6zvmz1BPp; Sun, 13 Oct 2024 22:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DMUrt4040227; Sun, 13 Oct 2024 22:30:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DMUriK040224; Sun, 13 Oct 2024 22:30:53 GMT (envelope-from git) Date: Sun, 13 Oct 2024 22:30:53 GMT Message-Id: <202410132230.49DMUriK040224@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c9e22c749c0f - main - iommu: extract driver-independent ddb context and mapping reporting List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9e22c749c0f3950b4526f630f6853ab104ab52f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c9e22c749c0f3950b4526f630f6853ab104ab52f commit c9e22c749c0f3950b4526f630f6853ab104ab52f Author: Konstantin Belousov AuthorDate: 2024-10-12 20:18:05 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-13 22:30:26 +0000 iommu: extract driver-independent ddb context and mapping reporting Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/x86/iommu/intel_drv.c | 28 +++++----------------------- sys/x86/iommu/iommu_utils.c | 35 +++++++++++++++++++++++++++++++++++ sys/x86/iommu/x86_iommu.h | 2 ++ 3 files changed, 42 insertions(+), 23 deletions(-) diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index e973115df21b..ebc77879480b 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -1057,8 +1057,6 @@ static void dmar_print_domain(struct dmar_domain *domain, bool show_mappings) { struct iommu_domain *iodom; - struct iommu_map_entry *entry; - struct iommu_ctx *ctx; iodom = DOM2IODOM(domain); @@ -1068,27 +1066,11 @@ dmar_print_domain(struct dmar_domain *domain, bool show_mappings) domain, domain->domain, domain->mgaw, domain->agaw, domain->pglvl, (uintmax_t)domain->iodom.end, domain->refs, domain->ctx_cnt, domain->iodom.flags, domain->pgtbl_obj, domain->iodom.entries_cnt); - if (!LIST_EMPTY(&iodom->contexts)) { - db_printf(" Contexts:\n"); - LIST_FOREACH(ctx, &iodom->contexts, link) - iommu_db_print_ctx(ctx); - } - if (!show_mappings) - return; - db_printf(" mapped:\n"); - RB_FOREACH(entry, iommu_gas_entries_tree, &iodom->rb_root) { - iommu_db_print_domain_entry(entry); - if (db_pager_quit) - break; - } - if (db_pager_quit) - return; - db_printf(" unloading:\n"); - TAILQ_FOREACH(entry, &domain->iodom.unload_entries, dmamap_link) { - iommu_db_print_domain_entry(entry); - if (db_pager_quit) - break; - } + + iommu_db_domain_print_contexts(iodom); + + if (show_mappings) + iommu_db_domain_print_mappings(iodom); } DB_SHOW_COMMAND_FLAGS(dmar_domain, db_dmar_print_domain, CS_OWN) diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c index fde3f150947b..259c87403b07 100644 --- a/sys/x86/iommu/iommu_utils.c +++ b/sys/x86/iommu/iommu_utils.c @@ -796,4 +796,39 @@ iommu_db_print_ctx(struct iommu_ctx *ctx) pci_get_function(ctx->tag->owner), ctx->refs, ctx->flags, ctx->loads, ctx->unloads); } + +void +iommu_db_domain_print_contexts(struct iommu_domain *iodom) +{ + struct iommu_ctx *ctx; + + if (LIST_EMPTY(&iodom->contexts)) + return; + + db_printf(" Contexts:\n"); + LIST_FOREACH(ctx, &iodom->contexts, link) + iommu_db_print_ctx(ctx); +} + +void +iommu_db_domain_print_mappings(struct iommu_domain *iodom) +{ + struct iommu_map_entry *entry; + + db_printf(" mapped:\n"); + RB_FOREACH(entry, iommu_gas_entries_tree, &iodom->rb_root) { + iommu_db_print_domain_entry(entry); + if (db_pager_quit) + break; + } + if (db_pager_quit) + return; + db_printf(" unloading:\n"); + TAILQ_FOREACH(entry, &iodom->unload_entries, dmamap_link) { + iommu_db_print_domain_entry(entry); + if (db_pager_quit) + break; + } +} + #endif diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h index 043935a3e0de..92ac993e7c9c 100644 --- a/sys/x86/iommu/x86_iommu.h +++ b/sys/x86/iommu/x86_iommu.h @@ -196,5 +196,7 @@ iommu_gaddr_t pglvl_page_size(int total_pglvl, int lvl); void iommu_db_print_domain_entry(const struct iommu_map_entry *entry); void iommu_db_print_ctx(struct iommu_ctx *ctx); +void iommu_db_domain_print_contexts(struct iommu_domain *iodom); +void iommu_db_domain_print_mappings(struct iommu_domain *iodom); #endif From nobody Sun Oct 13 22:56:03 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRbLq417bz5YhW8; Sun, 13 Oct 2024 22:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRbLq3Gjdz4t4h; Sun, 13 Oct 2024 22:56:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728860163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ut/cA/BJFS3ObrmXbqbL51cZpIJQvTvtXBgp8UJxuzE=; b=bnbrZw16oPGTeccjpaC0dacaJD1iJl8u3OdGTRX/5Rkbd27scTHmcfL2pXaOW0KO8ngEHj /+bkbfzgHL0twzh0mBAvZOmImODXliKBddE6kTe7A9L0Z9LkxfLw0jhPk5ApfE++Du2XP0 v4+L4eXlqi+ltOnuBtO1NUOutYTu4EIhHhx8Se9AbjDafz/NxgdlEsIjYPcFZRmBbcmk/P Y0DI6qzRr1vkd79/KlPGyvayZl7RqmCny1S9ccb87XVDYCRF8KKeud4T6rEbfwu4HPpaOz HOtEyhE8PUg2r1Dpus8j45vcO1BrVptd12CHkRkIC3ORRFt9p8n1SIaUoNi0fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728860163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ut/cA/BJFS3ObrmXbqbL51cZpIJQvTvtXBgp8UJxuzE=; b=aDf8jKtg2CNN17ytWUYySplN9OcnCsiqES6NeZVr5Qi83/3A/i/+5yFEtUn1eFNhvhfo1P Y31xbL067zIiKSE7kKRmLnjYlCEHOuvUZKhlozUN4EIkcvY4StQQJDqaWVMHqlL3PiVyPM dsUCW1ibgO/G7ByGIj41lvaMAEYUVYqVfvNPZ5G/ynazzTdw4a5dQplGWh6mqPyFcR+jtP AgkKirxDIeXvkW0l4uRJxfGvrMNfA7F1DcgQHwFuGVpOfBPCRBTSwxexWjNYaimcAxpMMk JFa7y11O9xcWrKSUJCPa8cdKHLLausz84mAXx/CklwGuxQrTqB+mMSWTLGhj5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728860163; a=rsa-sha256; cv=none; b=ep41bDVbIa8LgltjkVE5Oitq3ZayQpjzRzMhKJuNje5DWIs/r/Yw6CqVd3pJwsYLO7ZUDI dNAuELD0Q7ArlUqCx3Ah4EvanupQh1lnWsyfXVvXcBDSSQLPWXdF6/uSrs3V7vq3DXYZpg tcXfRkMb9W6eg/6WBqfO9iocaJMcQXOnBOPRzZw4F6Awcp8KuiG7McmeMLaybEnRTXw9cC mIp3P4lgaSDLhoPdcBqUajAChZyH2YU2VYHLJOSH4439CG1PY7v5Vi4kas7zHCBbMjlXMX r5NXVPGkdB8vOAI0WYCStxy5cmSlMUj4BE43TNW22tyC/yt+zVIua/NApueJ/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 4XRbLq2glGz1CdC; Sun, 13 Oct 2024 22:56:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DMu3S2081528; Sun, 13 Oct 2024 22:56:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DMu3S6081525; Sun, 13 Oct 2024 22:56:03 GMT (envelope-from git) Date: Sun, 13 Oct 2024 22:56:03 GMT Message-Id: <202410132256.49DMu3S6081525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 63e282288ed8 - main - UPDATING: Add belated note about hints for old-school ISA devices List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63e282288ed84387d2ec75ba8df7d7d004536781 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=63e282288ed84387d2ec75ba8df7d7d004536781 commit 63e282288ed84387d2ec75ba8df7d7d004536781 Author: Warner Losh AuthorDate: 2024-10-13 22:51:21 +0000 Commit: Warner Losh CommitDate: 2024-10-13 22:51:21 +0000 UPDATING: Add belated note about hints for old-school ISA devices Back in July, jhb started a cleanup of our hints. We've removed several that have been a problem for a long time (including some that had workarounds for VM images). We've also moved uarts to ACPI only, so they act more like wiring than enumeration hints. Add a note about this and ways you can find if your system is affected. Old APU1 routers with coreboot are affected, but newer APU2 devices are not. Others likely are as well. The affected systems will be primarily very ancient systems that pre-date ACPI (i586 arch pentium and older typically), as well as some older coreboot and similar non-conventional boot firmware setups (primarily in the embedded space). FreeBSD 15 will require ACPI or PNPBIOS enumeration for everything by default, so any non-enumerated devices via these means will require hints. Add notes on how to grep for affected systems before upgrading. Sponsored by: Netflix --- UPDATING | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/UPDATING b/UPDATING index 01fbf9a30946..aa5c21d0bf77 100644 --- a/UPDATING +++ b/UPDATING @@ -37,6 +37,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: freebsd-current mailing list so that a special-case dependency can be added, if necessary. +20240715: + We now lean more heavily on ACPI enumeration for some traditional + devices. uart has moved from isa to acpi so the hints act as wiring + instead of device enumeration. Hints for parallel port, floppy, etc + have been removed. Before upgrading, grep your dmesg for lines like: + uart1: non-PNP ISA device will be removed from GENERIC in FreeBSD 15. + to see if you need to start including hints for the device on isa + in your loader.conf or device.hints file. APU1 (but not APU2) boards + are known to be affected, but there may be others. + 20240712: Support for armv6 has been disconnected and is being removed.