From nobody Sun Dec 3 17:48:18 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SjvR72LKwz538dJ; Sun, 3 Dec 2023 17:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SjvR71b4cz3Lm9; Sun, 3 Dec 2023 17:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701625699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kKn7RQ1HraZ/j4V9xfwdsKkCCJSuMs/1piv2Bxoj/qw=; b=DHYjSbFu7vIMfuh4dYq+emY58xGlPxGSt6OF8KCl0My6dp6LcccSxycnDUUe40mV+WQqNY 9uFxq5EG8UC/Z0yLkSbOVBXa+3THK3snhN8h3IVYW9ywdVcbkbbTxl4PXho87+SqD/LIVL ita5qH13bexvUffJqJ5bDA4/p2+jaTPtVkyHdh6HWr5H4iSm5DAieBPVugHYKr/ICnJ6u1 olEOaIZVElh3Kg9CvNRXtRaFZ5Okky4bplVi1mCch0IZusTP+WTLwXLzw0NYx1gvaiyQ+D fkkA9pFvL155Q208BsJTOhdYutDOvgeEiDHuzhsRhSwVI/ltRdMt6cn0zOgNSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701625699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kKn7RQ1HraZ/j4V9xfwdsKkCCJSuMs/1piv2Bxoj/qw=; b=fJu20kC8+r5SlAO1oUnB0dL3X5vh0HeNssPMGHOWEx9Lv88eCLWmRV7vlFQ+HLQ1qVGS64 oiRHFLLHDyk0h2InQr7eCQnRlKAO8L4fxb1j65ltPzk8VpEIqQAFukwahBTYgmfgiS7WVM rbEfWMzvqkVUvfLpnEXP+2Y4TmvDtrpJFfzVtG3xhgFIy/qMMEjQsf/HMGDoQhyLlmmhy1 754K7l7bFYTD3JYlvKb185BmpzqLS3WsTHXuvNe+mCT92OhenU9o59LlrDPV4pH8zuHQpG 8sjvAt5LxN0I6jrEhMwNotc70TkuTnioCmT1ACdOyHDLDBr2teiPN2fDNli7+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701625699; a=rsa-sha256; cv=none; b=um7epVjebVn/Nmz8nWjxuFKk0xH1iTrDahXA7M8aMPhgOB9usnnh6C1a+jM4+ucs6fsC73 3W6fUtPtcOkkGoQ3ZCf7E8X1WPR3kHzr9Y8SQnykVRNMSLkGOa/mkTisRBDGeCTj9z98ii PLitUb1ueVx/iojnjVHD0mGRRcxt8cWZ0mcc1Qp8YGeBHLzY2Ws0mxTDokBg6AtX7y1UVl Gd/QbtPpQnFbUmZ6jeoBVRxJTvVDLaXIvjVobg07DfD9eYFb+xl7J9d+TTMAgtPiB2Stsl 5jLVDjLHEqADAXlShJGAl3y3Lipx8b0tEV4sRALZghZHE5ohac+sjEBBZ1y0lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SjvR70D9kz17Ps; Sun, 3 Dec 2023 17:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B3HmIml022333; Sun, 3 Dec 2023 17:48:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B3HmIp5022330; Sun, 3 Dec 2023 17:48:18 GMT (envelope-from git) Date: Sun, 3 Dec 2023 17:48:18 GMT Message-Id: <202312031748.3B3HmIp5022330@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 118b866d9c39 - stable/14 - ossl: Fix some bugs in the fallback AES-GCM implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 118b866d9c39da1f5a17680e2034b3eff7337988 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=118b866d9c39da1f5a17680e2034b3eff7337988 commit 118b866d9c39da1f5a17680e2034b3eff7337988 Author: Mark Johnston AuthorDate: 2023-11-29 20:08:12 +0000 Commit: Mark Johnston CommitDate: 2023-12-03 17:48:09 +0000 ossl: Fix some bugs in the fallback AES-GCM implementation gcm_*_aesni() are used when the AVX512 implementation is not available. Fix two bugs which manifest when handling operations spanning multiple segments: - Avoid underflow when the length of the input is smaller than the residual. - In gcm_decrypt_aesni(), ensure that we begin the operation at the right offset into the input and output buffers. Reviewed by: jhb Fixes: 9b1d87286c78 ("ossl: Add a fallback AES-GCM implementation using AES-NI") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42838 (cherry picked from commit 47d767dab54895f3ba8abac6ab2295797394659e) --- sys/crypto/openssl/amd64/ossl_aes_gcm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/crypto/openssl/amd64/ossl_aes_gcm.c b/sys/crypto/openssl/amd64/ossl_aes_gcm.c index 0d205ec3ff90..d08b2ac8a759 100644 --- a/sys/crypto/openssl/amd64/ossl_aes_gcm.c +++ b/sys/crypto/openssl/amd64/ossl_aes_gcm.c @@ -459,7 +459,7 @@ gcm_encrypt_aesni(struct ossl_gcm_context *ctx, const unsigned char *in, size_t bulk = 0, res; int error; - res = (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN; + res = MIN(len, (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN); if ((error = gcm_encrypt(ctx, in, out, res)) != 0) return error; @@ -621,12 +621,12 @@ gcm_decrypt_aesni(struct ossl_gcm_context *ctx, const unsigned char *in, size_t bulk = 0, res; int error; - res = (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN; + res = MIN(len, (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN); if ((error = gcm_decrypt(ctx, in, out, res)) != 0) return error; - bulk = aesni_gcm_decrypt(in, out, len, &ctx->aes_ks, ctx->gcm.Yi.c, - ctx->gcm.Xi.u); + bulk = aesni_gcm_decrypt(in + res, out + res, len - res, &ctx->aes_ks, + ctx->gcm.Yi.c, ctx->gcm.Xi.u); ctx->gcm.len.u[1] += bulk; bulk += res; From nobody Mon Dec 4 10:24:26 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkKXW0w3mz53Bxv; Mon, 4 Dec 2023 10:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKXW0kcxz4Mk4; Mon, 4 Dec 2023 10:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ogoJ35uvm2DBkOGrp+3iShNoX/NEm7aJxUdXE1LIp2k=; b=FW/2gH02p71ARyz2k0y7AdexQoVQrehZlY8vE3fCUHa+UuBrNDP9V+ePofjmpixwzueUIY DgiqbDl6DUPooQDjw1v+E2MKx44PjWX6xoheGABCJo6GEvcQJK9XKjwHy3KwjYiIznhgms mMV31c0M2qT3qulRiP4Ikk8nnd1o8WvVK2gDU0gmhmi3lYMR8M2H/gDKhsLNyYEXZLKJzc ofSa8eMv1UVJGo9b6OVKdNZYuRiGK2GwTtbsGamoNxJvY8uOM8wk4G96qxrj8YBBQusUAE SDRs1BLLUyFSJ3heY1ezGAZqN7s6jnfspeMabWtK+K76EIDLIf7iqcwg3em4jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ogoJ35uvm2DBkOGrp+3iShNoX/NEm7aJxUdXE1LIp2k=; b=B/nVMMsr9Hlupyim0shNNiZ26slLNDcVl1GBGsOOZU58oXevGcSPGQB2O4DNPJ2Esu4//a 7AGuHERhTKnvFyGwVWSSI3QKFB+/3w9veRUb2Q2YjvW6iyZ9CDf+swMDl/UlM4pGAe8fs7 Nj3oipZmTaNc4DqeGrj6/4T3adEUdWdFkRevLgV1W2jSb5c30Yv8DZx9Z6MgnsEWPDwG7j viqHk2/9oxAX/RgTx9m0j1SzJZFIpdH81QVr5EeqoNz6+LvnY9V51x3JGnPjIHSA2Pq/9A yw9S461y7Jhis/zlk1fI0J6fi0s973UtfemPjBcMN8FhzOU2ZFPVdl3bvR/KSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701685467; a=rsa-sha256; cv=none; b=qGUEkR8HyqSfud9hzA6sYKB67jT05tSXL2QTruiXMxGJ9PE4YfjaLN9nSf5XJkE298j6NB IQbQBFg1F59Y/YYVudv8sKmLkmo4pSE0SCtL2hTZJu9AeAcgktp9y2+aipENvHy+y1loMC zRqt2KwkXQh45iei0IYD7azEGA3lS1rwE/pQgHEu4M8Ayf+vu3zgLCgdWPhTyXgVs80ZKd OBDE3QYP6WhtS6ay0QiZxgsJ19EWbEyzpaA5cEqGi9tipIvYbpAFHgYGZFrboASPlXf/su kQ/GKQIyhgGHOdjlW5utPGMY7pPDO5I3QMxUnFbjX4ag4zqbt2O6VoQxdFPHWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkKXV6vdJz7Ty; Mon, 4 Dec 2023 10:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AOQ9m092404; Mon, 4 Dec 2023 10:24:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AOQrX092401; Mon, 4 Dec 2023 10:24:26 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:24:26 GMT Message-Id: <202312041024.3B4AOQrX092401@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 8b2cfd9d19b9 - stable/14 - nvi: import version 2.2.1 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8b2cfd9d19b98e0a6bae8a8a86e13f4a0108027c Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8b2cfd9d19b98e0a6bae8a8a86e13f4a0108027c commit 8b2cfd9d19b98e0a6bae8a8a86e13f4a0108027c Author: Baptiste Daroussin AuthorDate: 2023-09-27 16:01:58 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:20:00 +0000 nvi: import version 2.2.1 (cherry picked from commit 0fcececbac9880b092aeb56a41a16f1ec8ac1ae6) --- contrib/nvi/CMakeLists.txt | 4 + contrib/nvi/INSTALL.md | 47 ++++++++++++ contrib/nvi/README | 26 ++++++- contrib/nvi/common/key.c | 95 ++++++++++++++++++++++- contrib/nvi/common/main.c | 3 +- contrib/nvi/common/options.c | 2 + contrib/nvi/common/options_f.c | 2 +- contrib/nvi/common/search.c | 11 ++- contrib/nvi/ex/ex.c | 13 +++- contrib/nvi/ex/ex_argv.c | 6 +- contrib/nvi/ex/ex_subst.c | 7 +- contrib/nvi/man/vi.1 | 4 + contrib/nvi/vi/v_paragraph.c | 11 ++- contrib/nvi/vi/v_redraw.c | 1 + usr.bin/vi/ex/version.h | 3 +- usr.bin/vi/options_def.h | 169 +++++++++++++++++++++-------------------- 16 files changed, 298 insertions(+), 106 deletions(-) diff --git a/contrib/nvi/CMakeLists.txt b/contrib/nvi/CMakeLists.txt index 66d3ca2aafb0..0c935b3c2a19 100644 --- a/contrib/nvi/CMakeLists.txt +++ b/contrib/nvi/CMakeLists.txt @@ -37,6 +37,7 @@ if (NOT APPLE) endif() add_compile_options($<$:-Wuninitialized>) add_compile_options($<$:-Wno-dangling-else>) +add_compile_options(-Wno-string-compare) add_compile_options(-Wstack-protector -fstack-protector) add_compile_options(-Wstrict-aliasing -fstrict-aliasing) @@ -148,6 +149,9 @@ if(USE_WIDECHAR) target_sources(regex PRIVATE ${REGEX_SRCS}) target_include_directories(regex PUBLIC regex) target_compile_definitions(regex PUBLIC __REGEX_PRIVATE) + # The macro _XOPEN_SOURCE_EXTENDED is needed to get the waddnwstr() + # definition on at least FreeBSD and recent macOS. + target_compile_definitions(nvi PRIVATE _XOPEN_SOURCE_EXTENDED) target_link_libraries(nvi PRIVATE regex) else() find_library(CURSES_LIBRARY NAMES ncurses curses HINTS /usr/lib) diff --git a/contrib/nvi/INSTALL.md b/contrib/nvi/INSTALL.md new file mode 100644 index 000000000000..7b2fd35b7c60 --- /dev/null +++ b/contrib/nvi/INSTALL.md @@ -0,0 +1,47 @@ +# Install from source + +For instructions to bring nvi2 as a part of your operating system's base system, see [Porting](https://github.com/lichray/nvi2/wiki/Porting) in the Wiki. This document is an overview of the build process that allows you to give nvi2 a try. + +## Prerequisites + +- CMake >= 3.17; +- Ninja build system; +- libiconv (for `USE_ICONV`); +- libncursesw (for `USE_WIDECHAR`); + +Anything required by a minimal nvi, notably: + +- Berkeley DB1 in libc; +- /var/tmp/vi.recover/ with mode 41777. + +## Building + +Nvi2 uses CMake build system generator. By specifying "Ninja Multi-Config" as the build system to generate, you can compile the project in both Debug and Release modes without re-running CMake. Under the project root directory, run + +```sh +cmake -G "Ninja Multi-Config" -B build +``` + +Now `build` becomes your build directory to hold the artifacts. To build nvi2 in Debug mode, run + +```sh +ninja -C build +``` + +Upon finishing, the nvi2 executable will be available as `build/Debug/nvi`. To launch it in `ex` mode, you can create a symlink + +```sh +ln -s nvi build/Debug/ex +``` + +and run `./build/Debug/ex` rather than `./build/Debug/nvi`. + +To build nvi2 in Release mode, use the following command instead: + +```sh +ninja -C build -f build-Release.ninja +``` + +Upon finishing, you will be able to edit files with `./build/Release/nvi`. + +To change configure-time options, such as disabling wide character support, use `ccmake build`. diff --git a/contrib/nvi/README b/contrib/nvi/README index 8f61a97144be..9e638d952444 100644 --- a/contrib/nvi/README +++ b/contrib/nvi/README @@ -1,4 +1,4 @@ -This is version 2.2.0 (2020-08-01) of nex/nvi, a reimplementation of the ex/vi +This is version 2.2.1 (2023-09-25) of nex/nvi, a reimplementation of the ex/vi text editors originally distributed as part of the Fourth Berkeley Software Distribution (4BSD), by the University of California, Berkeley. @@ -24,6 +24,30 @@ o Nvi was written by Keith Bostic, and the last version is 1.79. After that, Jun-ichiro itojun Hagino developed the file encoding detection techniques in his nvi-m17n. +o In nvi2, Zhihao Yuan incorporated the multibyte encoding support onto DB1. + + It was not possible without great support from Alexander Leidinger, + Peter Wemm, and the FreeBSD community. + + Last but not least, money from Google Summer of Code. + +o Since then, + + Todd C. Miller and Craig Leres adopted and refined the NetBSD-style + expandtab option. + + Yamamoto Takashi, Matija Skala, and Jessica Clarke ported the + software to macOS and Linux. + + Anthony J. Bentley made heroic efforts to modernize the code base + and documentation, leveraging experience from OpenBSD to improve the + quality of the project. + + ...and many others, including Michael McConville, Marc Simpson, + Jeffrey H. Johnson, Bosco García, Anton Konyahin, Walter Alejandro + Iglesias, and those who tried hard to keep anonymous on GitHub :) + Their insights render the software usable, secure, and sustainable. + The following acknowledgments were written by Keith Bostic: =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= diff --git a/contrib/nvi/common/key.c b/contrib/nvi/common/key.c index e71396893fd4..1ccfb61ee0a1 100644 --- a/contrib/nvi/common/key.c +++ b/contrib/nvi/common/key.c @@ -31,6 +31,7 @@ static int v_event_grow(SCR *, int); static int v_key_cmp(const void *, const void *); static void v_keyval(SCR *, int, scr_keyval_t); static void v_sync(SCR *, int); +static const char *alt_key_notation(int ch); /* * !!! @@ -252,6 +253,10 @@ v_key_name(SCR *sp, ARG_CHAR_T ach) * followed by the character offset from the '@' character in the ASCII * character set. Del (0x7f) is represented as '^' followed by '?'. * + * If set O_ALTNOTATION, control characters less than 0x20 are + * represented in notations. Carriage feed, escape, and + * delete are marked as , , and , respectively. + * * XXX * The following code depends on the current locale being identical to * the ASCII map from 0x40 to 0x5f (since 0x1f + 0x40 == 0x5f). I'm @@ -264,9 +269,14 @@ v_key_name(SCR *sp, ARG_CHAR_T ach) if (CAN_PRINT(sp, ach)) goto done; nopr: if (iscntrl(ch) && (ch < 0x20 || ch == 0x7f)) { - sp->cname[0] = '^'; - sp->cname[1] = ch == 0x7f ? '?' : '@' + ch; - len = 2; + if (O_ISSET(sp, O_ALTNOTATION)) { + const char *notation = alt_key_notation(ch); + len = strlcpy(sp->cname, notation, sizeof(sp->cname)); + } else { + sp->cname[0] = '^'; + sp->cname[1] = ch == 0x7f ? '?' : '@' + ch; + len = 2; + } goto done; } #ifdef USE_WIDECHAR @@ -745,6 +755,85 @@ v_sync(SCR *sp, int flags) rcv_sync(sp, flags); } +/* + * alt_key_notation -- + * Lookup for alternative notations of control characters. + */ +static const char* +alt_key_notation(int ch) +{ + switch (ch) { + case 0x00: + return ""; + case 0x01: + return ""; + case 0x02: + return ""; + case 0x03: + return ""; + case 0x04: + return ""; + case 0x05: + return ""; + case 0x06: + return ""; + case 0x07: + return ""; + case 0x08: + return ""; + case 0x09: + return ""; + case 0x0A: + return ""; + case 0x0B: + return ""; + case 0x0C: + return ""; + case 0x0D: + return ""; + case 0x0E: + return ""; + case 0x0F: + return ""; + case 0x10: + return ""; + case 0x11: + return ""; + case 0x12: + return ""; + case 0x13: + return ""; + case 0x14: + return ""; + case 0x15: + return ""; + case 0x16: + return ""; + case 0x17: + return ""; + case 0x18: + return ""; + case 0x19: + return ""; + case 0x1A: + return ""; + case 0x1B: + return ""; + case 0x1C: + return ""; + case 0x1D: + return ""; + case 0x1E: + return ""; + case 0x1F: + return ""; + case 0x7f: + return ""; + default: + __builtin_unreachable(); + } +} + /* * v_event_err -- * Unexpected event. diff --git a/contrib/nvi/common/main.c b/contrib/nvi/common/main.c index a7e60f1af806..807dbde3895c 100644 --- a/contrib/nvi/common/main.c +++ b/contrib/nvi/common/main.c @@ -419,8 +419,7 @@ err: rval = 1; * PUBLIC: void v_end(GS *); */ void -v_end(gp) - GS *gp; +v_end(GS *gp) { MSGS *mp; SCR *sp; diff --git a/contrib/nvi/common/options.c b/contrib/nvi/common/options.c index d5c039f97228..c3d1f7343f9a 100644 --- a/contrib/nvi/common/options.c +++ b/contrib/nvi/common/options.c @@ -46,6 +46,8 @@ static int opts_print(SCR *, OPTLIST const *); * VI and EX Text Editors", 1990. */ OPTLIST const optlist[] = { +/* O_ALTNOTATION */ + {L("altnotation"), f_print, OPT_0BOOL, 0}, /* O_ALTWERASE 4.4BSD */ {L("altwerase"), f_altwerase, OPT_0BOOL, 0}, /* O_AUTOINDENT 4BSD */ diff --git a/contrib/nvi/common/options_f.c b/contrib/nvi/common/options_f.c index 45ab913c55ab..fe07e4989f05 100644 --- a/contrib/nvi/common/options_f.c +++ b/contrib/nvi/common/options_f.c @@ -147,7 +147,7 @@ f_print(SCR *sp, OPTION *op, char *str, u_long *valp) int offset = op - sp->opts; /* Preset the value, needed for reinitialization of lookup table. */ - if (offset == O_OCTAL) { + if (offset == O_OCTAL || offset == O_ALTNOTATION) { if (*valp) O_SET(sp, offset); else diff --git a/contrib/nvi/common/search.c b/contrib/nvi/common/search.c index e8dcac431f51..c3f7291437ff 100644 --- a/contrib/nvi/common/search.c +++ b/contrib/nvi/common/search.c @@ -103,9 +103,14 @@ prev: if (sp->re == NULL) { ++p; break; } - if (plen > 1 && p[0] == '\\' && p[1] == delim) { - ++p; - --plen; + if (plen > 1 && p[0] == '\\') { + if (p[1] == delim) { + ++p; + --plen; + } else if ( p[1] == '\\') { + *t++ = *p++; + --plen; + } } } if (epp != NULL) diff --git a/contrib/nvi/ex/ex.c b/contrib/nvi/ex/ex.c index fd920a8df9a1..900678e942eb 100644 --- a/contrib/nvi/ex/ex.c +++ b/contrib/nvi/ex/ex.c @@ -154,6 +154,10 @@ ex(SCR **spp) if (file_end(sp, NULL, F_ISSET(sp, SC_EXIT_FORCE))) return (1); *spp = screen_next(sp); + if (*spp) { + F_CLR(*spp, SC_SCR_VI); + F_SET(*spp, SC_SCR_EX); + } return (screen_end(sp)); } } @@ -1463,8 +1467,13 @@ addr_verify: LF_INIT(FL_ISSET(ecp->iflags, E_C_HASH | E_C_LIST | E_C_PRINT)); if (!LF_ISSET(E_C_HASH | E_C_LIST | E_C_PRINT | E_NOAUTO) && !F_ISSET(sp, SC_EX_GLOBAL) && - O_ISSET(sp, O_AUTOPRINT) && F_ISSET(ecp, E_AUTOPRINT)) - LF_INIT(E_C_PRINT); + O_ISSET(sp, O_AUTOPRINT) && F_ISSET(ecp, E_AUTOPRINT)) { + /* Honor the number option if autoprint is set. */ + if (F_ISSET(ecp, E_OPTNUM)) + LF_INIT(E_C_HASH); + else + LF_INIT(E_C_PRINT); + } if (LF_ISSET(E_C_HASH | E_C_LIST | E_C_PRINT)) { cur.lno = sp->lno; diff --git a/contrib/nvi/ex/ex_argv.c b/contrib/nvi/ex/ex_argv.c index 8b1fd7858fb1..dd37fe1f69e2 100644 --- a/contrib/nvi/ex/ex_argv.c +++ b/contrib/nvi/ex/ex_argv.c @@ -764,11 +764,11 @@ err: if (ifp != NULL) * shell that does that is broken. */ for (p = bp, len = 0, ch = EOF; - (ch = GETC(ifp)) != EOF; *p++ = ch, blen-=sizeof(CHAR_T), ++len) + (ch = GETC(ifp)) != EOF; *p++ = ch, blen -= sizeof(CHAR_T), ++len) if (blen < 5) { - ADD_SPACE_GOTOW(sp, bp, *blenp, *blenp * 2); + ADD_SPACE_GOTO(sp, CHAR_T, bp, *blenp, *blenp * 2); p = bp + len; - blen = *blenp - len; + blen = *blenp - len * sizeof(CHAR_T); } /* Delete the final newline, nul terminate the string. */ diff --git a/contrib/nvi/ex/ex_subst.c b/contrib/nvi/ex/ex_subst.c index bf03e4417e91..3113ac5ca360 100644 --- a/contrib/nvi/ex/ex_subst.c +++ b/contrib/nvi/ex/ex_subst.c @@ -643,7 +643,9 @@ nextmatch: match[0].rm_so = 0; goto lquit; } } else { - if (ex_print(sp, cmdp, &from, &to, 0) || + const int flags = + O_ISSET(sp, O_NUMBER) ? E_C_HASH : 0; + if (ex_print(sp, cmdp, &from, &to, flags) || ex_scprint(sp, &from, &to)) goto lquit; if (ex_txt(sp, tiq, 0, TXT_CR)) @@ -1195,7 +1197,8 @@ re_tag_conv(SCR *sp, CHAR_T **ptrnp, size_t *plenp, int *replacedp) for (; len > 0; --len) { if (p[0] == '\\' && (p[1] == '/' || p[1] == '?')) { ++p; - --len; + if (len > 1) + --len; } else if (STRCHR(L("^.[]$*"), p[0])) *t++ = '\\'; *t++ = *p++; diff --git a/contrib/nvi/man/vi.1 b/contrib/nvi/man/vi.1 index b6eaf6964bbd..f1893040ceb7 100644 --- a/contrib/nvi/man/vi.1 +++ b/contrib/nvi/man/vi.1 @@ -2282,6 +2282,10 @@ and .Nm vi modes, unless otherwise specified. .Bl -tag -width Ds +.It Cm altnotation Bq off +Display control characters less than 0x20 in notations. +Carriage feed, escape, and delete are marked as , , and , +respectively. .It Cm altwerase Bq off .Nm vi only. diff --git a/contrib/nvi/vi/v_paragraph.c b/contrib/nvi/vi/v_paragraph.c index abe8d9cf50e0..2d7f07569b79 100644 --- a/contrib/nvi/vi/v_paragraph.c +++ b/contrib/nvi/vi/v_paragraph.c @@ -39,15 +39,20 @@ if (p[0] == '\014') { \ if (!--cnt) \ goto found; \ + if (pstate == P_INTEXT && !--cnt) \ + goto found; \ continue; \ } \ if (p[0] != '.' || len < 2) \ continue; \ for (lp = VIP(sp)->ps; *lp != '\0'; lp += 2) \ if (lp[0] == p[1] && \ - (lp[1] == ' ' && len == 2 || lp[1] == p[2]) && \ - !--cnt) \ - goto found; \ + (lp[1] == ' ' && len == 2 || lp[1] == p[2])) { \ + if (!--cnt) \ + goto found; \ + if (pstate == P_INTEXT && !--cnt) \ + goto found; \ + } \ } while (0) /* diff --git a/contrib/nvi/vi/v_redraw.c b/contrib/nvi/vi/v_redraw.c index de6ed0079701..046fcf15c1b4 100644 --- a/contrib/nvi/vi/v_redraw.c +++ b/contrib/nvi/vi/v_redraw.c @@ -29,5 +29,6 @@ int v_redraw(SCR *sp, VICMD *vp) { + F_SET(sp, SC_SCR_REFORMAT); return (sp->gp->scr_refresh(sp, 1)); } diff --git a/usr.bin/vi/ex/version.h b/usr.bin/vi/ex/version.h index 657da969e721..1c18911cc593 100644 --- a/usr.bin/vi/ex/version.h +++ b/usr.bin/vi/ex/version.h @@ -1,2 +1 @@ - -#define VI_VERSION "2.2.0 (2020-08-01)" +#define VI_VERSION "2.2.1 (2023-09-25)" diff --git a/usr.bin/vi/options_def.h b/usr.bin/vi/options_def.h index 54dd6c20c891..cd6f5ba3eb26 100644 --- a/usr.bin/vi/options_def.h +++ b/usr.bin/vi/options_def.h @@ -1,84 +1,85 @@ -#define O_ALTWERASE 0 -#define O_AUTOINDENT 1 -#define O_AUTOPRINT 2 -#define O_AUTOWRITE 3 -#define O_BACKUP 4 -#define O_BEAUTIFY 5 -#define O_CDPATH 6 -#define O_CEDIT 7 -#define O_COLUMNS 8 -#define O_COMBINED 9 -#define O_COMMENT 10 -#define O_TMPDIR 11 -#define O_EDCOMPATIBLE 12 -#define O_ERRORBELLS 13 -#define O_ESCAPETIME 14 -#define O_EXPANDTAB 15 -#define O_EXRC 16 -#define O_EXTENDED 17 -#define O_FILEC 18 -#define O_FILEENCODING 19 -#define O_FLASH 20 -#define O_HARDTABS 21 -#define O_ICLOWER 22 -#define O_IGNORECASE 23 -#define O_INPUTENCODING 24 -#define O_KEYTIME 25 -#define O_LEFTRIGHT 26 -#define O_LINES 27 -#define O_LISP 28 -#define O_LIST 29 -#define O_LOCKFILES 30 -#define O_MAGIC 31 -#define O_MATCHCHARS 32 -#define O_MATCHTIME 33 -#define O_MESG 34 -#define O_MODELINE 35 -#define O_MSGCAT 36 -#define O_NOPRINT 37 -#define O_NUMBER 38 -#define O_OCTAL 39 -#define O_OPEN 40 -#define O_OPTIMIZE 41 -#define O_PARAGRAPHS 42 -#define O_PATH 43 -#define O_PRINT 44 -#define O_PROMPT 45 -#define O_READONLY 46 -#define O_RECDIR 47 -#define O_REDRAW 48 -#define O_REMAP 49 -#define O_REPORT 50 -#define O_RULER 51 -#define O_SCROLL 52 -#define O_SEARCHINCR 53 -#define O_SECTIONS 54 -#define O_SECURE 55 -#define O_SHELL 56 -#define O_SHELLMETA 57 -#define O_SHIFTWIDTH 58 -#define O_SHOWMATCH 59 -#define O_SHOWMODE 60 -#define O_SIDESCROLL 61 -#define O_SLOWOPEN 62 -#define O_SOURCEANY 63 -#define O_TABSTOP 64 -#define O_TAGLENGTH 65 -#define O_TAGS 66 -#define O_TERM 67 -#define O_TERSE 68 -#define O_TILDEOP 69 -#define O_TIMEOUT 70 -#define O_TTYWERASE 71 -#define O_VERBOSE 72 -#define O_W1200 73 -#define O_W300 74 -#define O_W9600 75 -#define O_WARN 76 -#define O_WINDOW 77 -#define O_WINDOWNAME 78 -#define O_WRAPLEN 79 -#define O_WRAPMARGIN 80 -#define O_WRAPSCAN 81 -#define O_WRITEANY 82 -#define O_OPTIONCOUNT 83 +#define O_ALTNOTATION 0 +#define O_ALTWERASE 1 +#define O_AUTOINDENT 2 +#define O_AUTOPRINT 3 +#define O_AUTOWRITE 4 +#define O_BACKUP 5 +#define O_BEAUTIFY 6 +#define O_CDPATH 7 +#define O_CEDIT 8 +#define O_COLUMNS 9 +#define O_COMBINED 10 +#define O_COMMENT 11 +#define O_TMPDIR 12 +#define O_EDCOMPATIBLE 13 +#define O_ERRORBELLS 14 +#define O_ESCAPETIME 15 +#define O_EXPANDTAB 16 +#define O_EXRC 17 +#define O_EXTENDED 18 +#define O_FILEC 19 +#define O_FILEENCODING 20 +#define O_FLASH 21 +#define O_HARDTABS 22 +#define O_ICLOWER 23 +#define O_IGNORECASE 24 +#define O_INPUTENCODING 25 +#define O_KEYTIME 26 +#define O_LEFTRIGHT 27 +#define O_LINES 28 +#define O_LISP 29 +#define O_LIST 30 +#define O_LOCKFILES 31 +#define O_MAGIC 32 +#define O_MATCHCHARS 33 +#define O_MATCHTIME 34 +#define O_MESG 35 +#define O_MODELINE 36 +#define O_MSGCAT 37 +#define O_NOPRINT 38 +#define O_NUMBER 39 +#define O_OCTAL 40 +#define O_OPEN 41 +#define O_OPTIMIZE 42 +#define O_PARAGRAPHS 43 +#define O_PATH 44 +#define O_PRINT 45 +#define O_PROMPT 46 +#define O_READONLY 47 +#define O_RECDIR 48 +#define O_REDRAW 49 +#define O_REMAP 50 +#define O_REPORT 51 +#define O_RULER 52 +#define O_SCROLL 53 +#define O_SEARCHINCR 54 +#define O_SECTIONS 55 +#define O_SECURE 56 +#define O_SHELL 57 +#define O_SHELLMETA 58 +#define O_SHIFTWIDTH 59 +#define O_SHOWMATCH 60 +#define O_SHOWMODE 61 +#define O_SIDESCROLL 62 +#define O_SLOWOPEN 63 +#define O_SOURCEANY 64 +#define O_TABSTOP 65 +#define O_TAGLENGTH 66 +#define O_TAGS 67 +#define O_TERM 68 +#define O_TERSE 69 +#define O_TILDEOP 70 +#define O_TIMEOUT 71 +#define O_TTYWERASE 72 +#define O_VERBOSE 73 +#define O_W1200 74 +#define O_W300 75 +#define O_W9600 76 +#define O_WARN 77 +#define O_WINDOW 78 +#define O_WINDOWNAME 79 +#define O_WRAPLEN 80 +#define O_WRAPMARGIN 81 +#define O_WRAPSCAN 82 +#define O_WRITEANY 83 +#define O_OPTIONCOUNT 84 From nobody Mon Dec 4 10:24:28 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkKXX31Sjz53By1; Mon, 4 Dec 2023 10:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKXX1lQJz4MkS; Mon, 4 Dec 2023 10:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KEaMFj6qKbtgXJsHQD7dgZmEGxLlUErP0JeEmLEsIGs=; b=A9VX1qRSh+K41QqYNORbF/NvdCPHW+sSqBecVTVoHSVDeSc0ukJlcL8m3VXVH8suPwk40r uagt1jisfxpXKm+NwHhthSGzsOG80ytsCw/69moD2v0byDYXm8stN5ULFSteHqoK1393B+ tGz00tApAEzgH1xRAJXBHVA3XeM19jzLQ35SVeXreCuOWicFb+4pGs41vPH/TrCjPjpnEh J/DiCTFM8x57kxh9onixAWuov2c0YS17kEmf0tegmb/uhZ1vh3wzAJXkSOyrr1ZzOgxMp9 J9rgRMZtLiawSxCMrX3T9ILZpZIcmLoUY/bDjH+cP8ENZlwWQWLSV0Ssxpm6bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KEaMFj6qKbtgXJsHQD7dgZmEGxLlUErP0JeEmLEsIGs=; b=UjmBBAwHwqSa4LHsBvE7f2tyZjxm5IZZ7h/KqXsAdrQMhCyhItq+MghkTUZQpZviaRg+T/ ODFLRrumjuXaRoAKadctmPBv+YMq/2fEK6M23n4CzZ/WML/sp3tOIN82rpEnnQGeL7OcFX /kncMWobM3ZPbT9i2CbhaiYN5KPebTrzwNVnpr5bTfjtN7uz0dXytoCHzuO3kA3uow4Qnt 1wuILrTRnGczREBCsMNkOim7reD4cncPDP2KrVBpCJhjmxIUsuRGWq7AFpVY/GgmLDRSrX On3Yn8HrypnCyt6NOFS2b4204fwiAahA1AuXWa8ZLH2lpzPEFZZUrtKtk4k7ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701685468; a=rsa-sha256; cv=none; b=IcPsMAyxVt0oBTxH11ZDrGzwlNXM6vTJvbdNYZchWb5U9rNGEIW8H6mWE5Cpp2HUgnnTEN ibmmb4y0Ay3rN/zqqKBxcng5JKvDeBc/O/wTW8aqMJ0XSoE01T5PvYBIJmjgO69z5cqRdy Gwl5eU82uQamUbY7FBj3cQh3P4u1qH/n8OnMiFcBNLOQqDCTbTdD7WoAtBbjK7P4Eus1D3 iZgugKUvNRJzOyUL24dgqg9YossECqw/CcRcIdfeafoSsoFYLVbjxd5ohb+CLJ0ypPuM0h ncLT0FjbdE9B/oDJpXnfnSigoMr5kCE5kybkBIOQuLGPQRjaxQzrjQZ64Udquw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkKXX0pYLz7V0; Mon, 4 Dec 2023 10:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AOSXc092446; Mon, 4 Dec 2023 10:24:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AOSEA092443; Mon, 4 Dec 2023 10:24:28 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:24:28 GMT Message-Id: <202312041024.3B4AOSEA092443@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: c01ee3f8592b - stable/14 - pkg: use https by default List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c01ee3f8592bb62146774d912d2a0d7798ed9904 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c01ee3f8592bb62146774d912d2a0d7798ed9904 commit c01ee3f8592bb62146774d912d2a0d7798ed9904 Author: Baptiste Daroussin AuthorDate: 2023-06-08 21:37:58 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:20:56 +0000 pkg: use https by default Switch the repository to use https by default, base is providing a CA root bundle suitable to validate the certificates used by the project. This can now be activated without requiring another packages to be installed Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40473 (cherry picked from commit d557a86c879a8515d59e8380b083b2265e9a3547) --- usr.sbin/pkg/FreeBSD.conf.latest | 2 +- usr.sbin/pkg/FreeBSD.conf.quarterly | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pkg/FreeBSD.conf.latest b/usr.sbin/pkg/FreeBSD.conf.latest index 3f0c4a6243cb..a75b0703386f 100644 --- a/usr.sbin/pkg/FreeBSD.conf.latest +++ b/usr.sbin/pkg/FreeBSD.conf.latest @@ -7,7 +7,7 @@ # FreeBSD: { - url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest", + url: "pkg+https://pkg.FreeBSD.org/${ABI}/latest", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly b/usr.sbin/pkg/FreeBSD.conf.quarterly index 31dc1bde8c2a..645053820dda 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly @@ -7,7 +7,7 @@ # FreeBSD: { - url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly", + url: "pkg+https://pkg.FreeBSD.org/${ABI}/quarterly", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", From nobody Mon Dec 4 10:24:29 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkKXY4J2Sz53CKP; Mon, 4 Dec 2023 10:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKXY2tWKz4MhN; Mon, 4 Dec 2023 10:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iMh3bkADqA3eu/TplmaM1QWKEHnU6TJXFBTDtpOuAq4=; b=avdsw9JT+2+lWZgRiCGn6mxUfe6wHnLeUILG0yAk5fSedMg62Z6FjSLq9+VHMLtxr1kgQM M2H5yodTz6vcn8N4HrShqRg18rwDKd6GxGnSL0EKqDVyK3nZRbQOFunqHvpdULV5lus2Ne DOF0omGagLlt8uBY2UCWg1/DhLSFQDBA7Wz4MPTzL7/gaB3zDkJDR1x7Bep1FDvsiLLId+ I2ezbi9B4SqJpzh6OAvb4s9/v4lXmHnvFID19ZzYTfnh3gGEk+PpRQoGuH/htPVB/Z6gEh jqZdic5bzIy6f0n4Fr8dmF4730ZFVAT1n2LoYHyKefWxqC8p509EFyJ7XrUSYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iMh3bkADqA3eu/TplmaM1QWKEHnU6TJXFBTDtpOuAq4=; b=rRoewqlJx6X1YGBE77HrsN6HDZaLx8IalBdWGMlsx5oZA6J3IEGSCs1w+e841C5t16TUMZ Om5YfDPI5XcYTWsa/4jWc7LMd94b2h23vSumL+s+f9ZR9ykK2b53sbevLTMr4eTXZU+BKl 6oMgSv/RkQE2rui8gWBxbfS9MUp0IQO9bRTdL4WDU/i4vcPfbGvlBl0sw0YrqIJP3MZn4P zZpIdapRlr+2sXpjGs6QHSHLIZZ9j9+F9xZWJOhBkS8LPLH2ggLtDJVfyQWsObeH8TXM2S ULwdd3nZHCXgw//OSTu2K5g2+o+6q3dtmubaoOHb9QHcHzPJfyskONxrFZbYmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701685469; a=rsa-sha256; cv=none; b=vrP/JD8yF3aldhtqzprCzaJEYDizbredaBaBa83hSIRSyt/pWjQsLFSc/9wUkj3jWzS2V7 BylMaUL+766L14IUr9WhDVJDG9/HIIQdGrgL6is4C58UuJQhT2ha5X4a1Q57nIFu9p5xTB FzSCctmmrGkhn5uKifoBDLbwveHvF9hKuGkUlcjQyVrgJjUH7eoW01iq/BEo39D8s9TkS+ 74BaoxCAChGWJ68wFDVbOxVlx0JqMcFH37dGf8v+HoVeBeM0WDS8m6f5PYgkymTZfQN5VS +RwFcEREOKDV0BIu4FKxKFcE741Zd6sY5T4XLMa1xGglwI3yodDk1eqBQtcp0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkKXY1p6Kz7Dl; Mon, 4 Dec 2023 10:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AOTF4092488; Mon, 4 Dec 2023 10:24:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AOTX6092485; Mon, 4 Dec 2023 10:24:29 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:24:29 GMT Message-Id: <202312041024.3B4AOTX6092485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: a501d357eb45 - stable/14 - genl: add a monitor subcommand List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a501d357eb45e6b66057fa78a6447ddb1cc1de65 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=a501d357eb45e6b66057fa78a6447ddb1cc1de65 commit a501d357eb45e6b66057fa78a6447ddb1cc1de65 Author: Baptiste Daroussin AuthorDate: 2023-10-05 10:51:02 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:21:33 +0000 genl: add a monitor subcommand usage: $ genl monitor this subcommand allows to monitor the message from a multicast group of a given family when received. If it knows how to parse the messages received it will dump the decoded version, otherwise it will just inform a new message has been received So far it only knows how to parse nlctrl notify messages, but the plan to allow to make the parsing extensible via lua scripts Differential Revision: https://reviews.freebsd.org/D40372 (cherry picked from commit e19b2ef976d326d34b17331c5071d9e687d0d5d5) --- usr.bin/genl/genl.1 | 27 ++++++++-- usr.bin/genl/genl.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 158 insertions(+), 10 deletions(-) diff --git a/usr.bin/genl/genl.1 b/usr.bin/genl/genl.1 index 44ce4feaea48..b3d66298eb00 100644 --- a/usr.bin/genl/genl.1 +++ b/usr.bin/genl/genl.1 @@ -24,23 +24,44 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 20, 2023 +.Dd Oct 5, 2023 .Dt GENL 1 .Os .Sh NAME .Nm genl -.Nd "generic netlink list" +.Nd "generic netlink" .Sh SYNOPSIS .Nm +.Pp +.Nm Cm list +.Pp +.Nm Cm monitor Ao family Ac Ao multicast group Ac .Sh DESCRIPTION +The .Nm -lists all available generic netlink protocols, and presents its details: +utility is design to provide access to the user to generic netlink +protocols. +.Pp +The following commands are available: +.Bl -tag -ident +.It Cm list Po default Pc +Lists all available generic netlink protocols, and presents its details: .Bl -tag -width "multicast groups" .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 .El +.It Cm monitor Ao family Ac Ao multicast group Ac +Connect to the +.Ar family +protocol and subscribe to the +.Ar mulicast group +then print the received messages in a readable format if the protocol is known. +So far only +.Qq nlctrl +is known. +.El .Sh SEE ALSO .Xr genetlink 4 , .Xr netlink 4 diff --git a/usr.bin/genl/genl.c b/usr.bin/genl/genl.c index 8e8e18a7f8e2..e3acb872a39e 100644 --- a/usr.bin/genl/genl.c +++ b/usr.bin/genl/genl.c @@ -27,18 +27,41 @@ #include #include +#include #include #include #include #include #include +#include #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_fallback(struct snl_state *ss, struct nlmsghdr *hdr); + +static struct commands { + const char *name; + const char *usage; + int (*cmd)(int argc, char **argv); +} cmds[] = { + { "monitor", "monitor ", monitor_mcast }, + { "list", "list", list_families }, +}; + +static struct mcast_parsers { + const char *family; + void (*parser)(struct snl_state *ss, struct nlmsghdr *hdr); +} mcast_parsers [] = { + { "nlctrl", parser_nlctrl_notify }, +}; + struct genl_ctrl_op { uint32_t id; uint32_t flags; @@ -131,6 +154,13 @@ dump_mcast_groups( struct snl_genl_ctrl_mcast_groups *mcast_groups) mcast_groups->groups[i]->mcast_grp_name); } +static void +usage(void) +{ + fprintf(stderr, "Usage: %s\n", getprogname()); + for (size_t i = 0; i < nitems(cmds); i++) + fprintf(stderr, " %s %s\n", getprogname(), cmds[i].usage); +} static void dump_family(struct genl_family *family) @@ -143,8 +173,87 @@ dump_family(struct genl_family *family) dump_mcast_groups(&family->mcast_groups); } +void +parser_nlctrl_notify(struct snl_state *ss, struct nlmsghdr *hdr) +{ + struct genl_family family = {}; + + if (snl_parse_nlmsg(ss, hdr, &genl_family_parser, + &family)) + dump_family(&family); +} + +void +parser_fallback(struct snl_state *ss __unused, struct nlmsghdr *hdr __unused) +{ + printf("New unknown message\n"); +} + +int +monitor_mcast(int argc __unused, char **argv) +{ + struct snl_state ss; + struct nlmsghdr *hdr; + struct _getfamily_attrs attrs; + struct pollfd pfd; + bool found = false; + void (*parser)(struct snl_state *ss, struct nlmsghdr *hdr); + + parser = parser_fallback; + + if (!snl_init(&ss, NETLINK_GENERIC)) + err(EXIT_FAILURE, "snl_init()"); + + if (argc != 2) { + usage(); + return (EXIT_FAILURE); + } + if (!snl_get_genl_family_info(&ss, argv[0], &attrs)) + errx(EXIT_FAILURE, "Unknown family '%s'", argv[0]); + for (uint32_t i = 0; i < attrs.mcast_groups.num_groups; i++) { + if (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, + sizeof(attrs.mcast_groups.groups[i]->mcast_grp_id)) + == -1) + err(EXIT_FAILURE, "Cannot subscribe to command " + "notify"); + break; + } + } + if (!found) + errx(EXIT_FAILURE, "No such multicat group '%s'" + " in family '%s'", argv[1], argv[0]); + for (size_t i= 0; i < nitems(mcast_parsers); i++) { + if (strcmp(mcast_parsers[i].family, argv[0]) == 0) { + parser = mcast_parsers[i].parser; + break; + } + } + memset(&pfd, 0, sizeof(pfd)); + pfd.fd = ss.fd; + pfd.events = POLLIN | POLLERR; + while (true) { + pfd.revents = 0; + if (poll(&pfd, 1, -1) == -1) { + if (errno == EINTR) + continue; + err(EXIT_FAILURE, "poll()"); + } + hdr = snl_read_message(&ss); + if (hdr != NULL && hdr->nlmsg_type != NLMSG_ERROR) + parser(&ss, hdr); + + } + + return (EXIT_SUCCESS); +} + int -main(int argc, char **argv __unused) +list_families(int argc, char **argv __unused) { struct snl_state ss; struct snl_writer nw; @@ -152,16 +261,16 @@ main(int argc, char **argv __unused) struct snl_errmsg_data e = {}; uint32_t seq_id; - if (argc > 1) - errx(EXIT_FAILURE, "usage: genl does not accept any argument"); - if (modfind("netlink") == -1) - err(EXIT_FAILURE, "require netlink module to be loaded"); - + if (argc != 0) { + usage(); + return (EXIT_FAILURE); + } if (!snl_init(&ss, NETLINK_GENERIC)) err(EXIT_FAILURE, "snl_init()"); snl_init_writer(&ss, &nw); - hdr = snl_create_genl_msg_request(&nw, GENL_ID_CTRL, CTRL_CMD_GETFAMILY); + hdr = snl_create_genl_msg_request(&nw, GENL_ID_CTRL, + CTRL_CMD_GETFAMILY); if ((hdr = snl_finalize_msg(&nw)) == NULL) err(EXIT_FAILURE, "snl_finalize_msg"); seq_id = hdr->nlmsg_seq; @@ -179,3 +288,21 @@ main(int argc, char **argv __unused) return (EXIT_SUCCESS); } + +int +main(int argc, char **argv) +{ + if (modfind("netlink") == -1) + err(EXIT_FAILURE, "require netlink module to be loaded"); + + if (argc == 1) + return (list_families(0, NULL)); + + for (size_t i = 0; i < nitems(cmds); i++) { + if (strcmp(argv[1], cmds[i].name) == 0) + return (cmds[i].cmd(argc - 2, argv + 2)); + } + usage(); + + return (EXIT_FAILURE); +} From nobody Mon Dec 4 10:24:30 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkKXZ6DNXz53CDm; Mon, 4 Dec 2023 10:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKXZ3bKBz4N11; Mon, 4 Dec 2023 10:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZPFYtTdLlhOJAa7WnezLSEERbnAxrg0cFAGsTVDNpzg=; b=KqOwqRKT3N9YSuTfYcKUvZe5np0Ewn7pRPdhgCM32o5pvdNTK9LePBRvq5cBtCds3nCMFa KVYsdARUNsVSBemiwv3HMObo2LQpnaYun77exQn0ZWWTI/9iBF5DqyOGXe4bwQGLzLs6RA 8sk4CbShLKaUCf8t3gYs/b0j6Z7GYlmYzztZL9Uww0jRP+KVYnlj8PFmoegDAx0ffuDHtf qXvtjfTPWVq8ZmGVe7cK2bifG3zSrS8oyYQvrWjpobkYAYyy8J6ilclBpGvoh6imNnpKcp STcrAA6Wob63TONFtyWFtyDqltF+LFU0exX3zq4LfxxLO294y5ur3C6pfBhzUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZPFYtTdLlhOJAa7WnezLSEERbnAxrg0cFAGsTVDNpzg=; b=Hq5itTM+FQxZFZ2JYRkXN7Ad07vcT4MPUAeu86sANBMMbAAGYNSlZ9Nj2cDpkjv1quvi0K ufxmseYVBwGj/SiwDzG33XpXgEsUkkdtsle2NwTiqOOM7DLLE3FutgPQAT+B6TKzISp0kS 0X59DJENPAATxqEmESOJ72sIhUdHC8uNRqVCIMX1zl26Riv4RAupRRh43Z7cHSPN1F4dcS yaoAd8yfoJ9h0DDLdw2lIN31cSoBUYmo6o5NbrZ8ehRKcSiCd8ssR78WBsaHee+B604ps9 NWEAfyeb+DJuQz7lSulvYWxm7TL2BasLh9Onx0w5gbhPAMQPgAwI//inTxvWdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701685470; a=rsa-sha256; cv=none; b=WjvjYlGKa6SjtwtLC1JkNeVZUTfppPWUQByVnH5o0T3R5K9pmaIBGHZtkzu1wt0/mj9WIk ho2mZ1f7eJOUY7SOV35nfEVAh32qFqI2pk1SgpafY4eRc0Xlbb/vMmb5ddNgww9/s+6fBe wHtVMwTnq0lZGaI7Y1tfsBlfoU1bms3vGMU7kw6cbnkfN/ecFr1E954R3uIE/C55xAJZmq M2l0heXjeh9KLjkrqHPQZ0auVovwZ8iJ7GQgVrLuJtK8r57EDWkWpYIzQrjMFVhNm9OpdJ AjxhY9PaZE4FFIpPXIv/f/FZx5h2JPebTwJrdcvBtGw/xf+0C0+abTKbXa8Gyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkKXZ2cCfz7V1; Mon, 4 Dec 2023 10:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AOUxl092548; Mon, 4 Dec 2023 10:24:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AOUsN092545; Mon, 4 Dec 2023 10:24:30 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:24:30 GMT Message-Id: <202312041024.3B4AOUsN092545@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 693ea5a3b1e4 - stable/14 - sendmail: remove all m4 files with WITHOUT_SENDMAIL List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 693ea5a3b1e42b1fc2354bd173131856bb8f781c Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=693ea5a3b1e42b1fc2354bd173131856bb8f781c commit 693ea5a3b1e42b1fc2354bd173131856bb8f781c Author: Baptiste Daroussin AuthorDate: 2023-08-04 11:57:12 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:22:22 +0000 sendmail: remove all m4 files with WITHOUT_SENDMAIL (cherry picked from commit 358f8a7add3c83f5f5a37b4c295e116ec511936b) --- tools/build/mk/OptionalObsoleteFiles.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 11e7f9cbb868..c62c5cb6fc4c 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -7156,6 +7156,7 @@ OLD_FILES+=usr/share/sendmail/cf/feature/bestmx_is_local.m4 OLD_FILES+=usr/share/sendmail/cf/feature/bitdomain.m4 OLD_FILES+=usr/share/sendmail/cf/feature/blacklist_recipients.m4 OLD_FILES+=usr/share/sendmail/cf/feature/block_bad_helo.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/check_other.m4 OLD_FILES+=usr/share/sendmail/cf/feature/check_cert_altnames.m4 OLD_FILES+=usr/share/sendmail/cf/feature/check_other.m4 OLD_FILES+=usr/share/sendmail/cf/feature/compat_check.m4 From nobody Mon Dec 4 10:24:31 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkKXb59ZBz53C2p; Mon, 4 Dec 2023 10:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKXb4Dnyz4N63; Mon, 4 Dec 2023 10:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w8SatJeTDayS1EroYv8JohIiUCLjgsuptVx/BINTibY=; b=dtGyf1m8FIS7RV5ZBapp4nZTCHo05uMTLfn9AQZPwr65Jqd7ycp0eGg1lFv/0DLv0ABR/O kSpBGfyAMF/G4ZWLLj7YHzKZCbJrZvcRWuL4Z8kwIAQGx9TA3a++QpXjci6/fJWUI/nkX6 gyIuiSwCbNakxo8DJWtnupfAXvV5K3DL6s3FGyhwv3dx0G8oGVrjfZNZHOIujUQX6QY9aj 9Xsx+BbvvEuD2MC4j/NoO9bDHpvrqoneDnTIe1xDhFUhHeEFNR+zZikTEIdvxDf5OGisqZ TxnmkTAZfJK+m39rUsNdsgDaBiHGC6AgCwck2t88IU3KxPok3eVu5em67guvNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w8SatJeTDayS1EroYv8JohIiUCLjgsuptVx/BINTibY=; b=IknVTCUI39saW6/QDyRWUVeG1XVG4CQLtQeP5sZPszbTK6zVNMKL2HyuupeFGtgKo+1aAs o3IKZ/gFEaLbpSmZRiORwv3nxhxogZ3bMZh6khDwbV7WpvYdXsbjhDeucOFqXZufyaM/Ok gTvjreNMifTPxEMYMEvvmuHeHRpoKaa2yxhU9eX08VRYjAaEptt9Ko5cuxHuWjn4wWC+kh dmx/1fABHJI5Ct+PIbvfLPP7JhKy2SQtwZL+TFmeWEN8TA32Ji4roO4/He8C150SkEh+XF ptIH1bYJ94m3vSMdZXlut5pzWnd26L3byT9s1LlndXcCPYVqS6gdjcpR3GiXsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701685471; a=rsa-sha256; cv=none; b=PbE8TiUJZ9GsjHgGN/ckiHqXQpUdDI/Z6dqYYR2XWB0YlnXdcakHP777HoK+FyHCI+iS9b F2ga6K9Vdjkyu/pttVJ5S4/XTdgI4JxLVfjN4zp38zVui2iMzpBoQ7IdO6IF1umQpJNv2n l8Nk44O5e7YjyNq2OwkgnbviAa2zNfvAkQY3fTd+MB8O12uA7qFzPcTdIEYRW8CmjGCq12 awQF9BTBUVsdkgEcnhaIVlzTxTBHeRIZWDFRxIqf7jGRX87M0K8ECaqohN9p+f+Sf3UC9l BTMuyqo7xvUTw7sQsOgwzdOtZG6WylrILpKfCOyZJ2u+UBEaA6LH8tbUVWKAbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkKXb3HL2z7kC; Mon, 4 Dec 2023 10:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AOVCq092587; Mon, 4 Dec 2023 10:24:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AOVI7092584; Mon, 4 Dec 2023 10:24:31 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:24:31 GMT Message-Id: <202312041024.3B4AOVI7092584@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 629c764f0a6d - stable/14 - pci_vendors: update to 2023-08-12 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 629c764f0a6dad4fc1fdd4596f2f07db62ab3f45 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=629c764f0a6dad4fc1fdd4596f2f07db62ab3f45 commit 629c764f0a6dad4fc1fdd4596f2f07db62ab3f45 Author: Baptiste Daroussin AuthorDate: 2023-09-06 12:22:11 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:23:56 +0000 pci_vendors: update to 2023-08-12 (cherry picked from commit bf986d52458aaefa4d3a1d4668449cbb5c991afe) --- share/misc/pci_vendors | 342 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 295 insertions(+), 47 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index 29f7a824bbaf..d3988731c30a 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.06.19 -# Date: 2023-06-19 03:15:02 +# Version: 2023.08.12 +# Date: 2023-08-12 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -90,6 +90,8 @@ 025e d819 NVMe DC SSD E3.S 7.5mm [D5-P5336] 025e d81d NVMe DC SSD E1.L 9.5mm [D5-P5336] 0b70 NVMe DC SSD [Yorktown controller] + f1ab P41 Plus NVMe SSD (DRAM-less) + f1ac P44 Pro NVMe SSD 0270 Hauppauge computer works Inc. (Wrong ID) 0291 Davicom Semiconductor, Inc. (Wrong ID) # SpeedStream is Efficient Networks, Inc, a Siemens Company @@ -1037,8 +1039,8 @@ 15d9 1c6e AOC-SLG4-2H8M2 Storage Adapter 1d49 0505 ThinkSystem RAID 540-8i PCIe Gen4 12Gb Adapter 1d49 0506 ThinkSystem RAID 540-16i PCIe Gen4 12Gb Adapter - 1d49 0700 ThinkSystem M.2 SATA/NVMe 2-Bay RAID Enablement Kit - 1d49 0701 ThinkSystem 7mm SATA/NVMe 2-Bay RAID Enablement Kit + 1d49 0700 ThinkSystem M.2 SATA/NVMe 2-Bay Non-Hot-Swap RAID Enablement Kit + 1d49 0701 ThinkSystem 7mm SATA/NVMe 2-Bay Rear Hot-Swap RAID Enablement Kit 10e7 MegaRAID 12GSAS/PCIe Unsupported SAS38xx 1960 MegaRAID 1000 0518 MegaRAID 518 SCSI 320-2 Controller @@ -1375,6 +1377,7 @@ 1043 841b M5A88-V EVO 1043 8445 M5A78L LE 105b 0e13 N15235/A74MX mainboard / AMD SB700 + 1179 ff1e Satellite C660D-113 1179 ff50 Satellite P305D-S8995E 1458 a022 GA-770/78-series motherboard 1458 a102 GA-880GMA-USB3 @@ -2178,7 +2181,7 @@ 6640 Saturn XT [FirePro M6100] 106b 014b Tropo XT [Radeon R9 M380 Mac Edition] 6641 Saturn PRO [Radeon HD 8930M] - 6646 Bonaire XT [Radeon R9 M280X] + 6646 Bonaire XT [Radeon R9 M280X / FirePro W6150M] 6647 Saturn PRO/XT [Radeon R9 M270X/M280X] 1043 223d N551ZU laptop Radeon R9 M280X 6649 Bonaire [FirePro W5100] @@ -2240,7 +2243,7 @@ 17aa 368f Radeon R5 A230 6667 Jet ULT [Radeon R5 M230] 666f Sun LE [Radeon HD 8550M / R5 M230] - 66a0 Vega 20 [Radeon Instinct] + 66a0 Vega 20 [Radeon Pro/Radeon Instinct] 66a1 Vega 20 [Radeon Pro VII/Radeon Instinct MI50 32GB] 66a2 Vega 20 66a3 Vega 20 [Radeon Pro Vega II/Radeon Pro Vega II Duo] @@ -2898,6 +2901,7 @@ 1787 a480 Radeon RX 480 1849 5001 Phantom Gaming X RX 580 OC 1849 5030 Phantom Gaming D Radeon RX580 8G OC + 1da2 e343 Radeon RX 570 Pulse ITX 4GB 1da2 e353 Radeon RX 570 Pulse 4GB 1da2 e366 Nitro+ Radeon RX 570/580/590 1da2 e387 Radeon RX 580 Pulse 4GB @@ -3168,7 +3172,7 @@ 686e Vega 10 GLXLA 687f Vega 10 XL/XT [Radeon RX Vega 56/64] 1002 0b36 RX Vega64 - 1002 6b76 RX Vega64 + 1002 6b76 AMD Radeon RX Vega 56 8GB # ROG-STRIX-RXVEGA64-O8G-GAMING 1043 04c4 Radeon RX Vega 64 1458 230c Radeon RX VEGA 56 GAMING OC 8G @@ -3906,13 +3910,14 @@ 1eae 6901 Speedster MERC 319 AMD Radeon RX 6900 XT Black 73c3 Navi 22 73c4 Navi 22 USB - 73ce Navi22-XL SRIOV MxGPU + 73ce Navi 22-XL SRIOV MxGPU 73df Navi 22 [Radeon RX 6700/6700 XT/6750 XT / 6800M/6850M XT] 1043 16c2 Radeon RX 6800M 1458 2408 Radeon RX 6750 XT GAMING OC 12G 1462 3980 Radeon RX 6700 XT Mech 2X 12G [MSI] 1849 5219 Radeon RX 6700 XT Challenger D 1849 5222 RX 6700 XT Challenger D OC + 1da2 465e Radeon RX 6750 XT PULSE OC 1da2 e445 Sapphire Radeon RX 6700 1eae 6601 Speedster QICK 319 RX 6700 XT 73e0 Navi 23 @@ -3936,16 +3941,17 @@ 7424 Navi 24 [Radeon RX 6300] 743f Navi 24 [Radeon RX 6400/6500 XT/6500M] 1da2 e457 PULSE AMD Radeon RX 6500 XT - 7448 Navi31 [Radeon Pro W7900] + 7446 Navi 31 USB + 7448 Navi 31 [Radeon Pro W7900] 744c Navi 31 [Radeon RX 7900 XT/7900 XTX] 1da2 471e PULSE RX 7900 XTX 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] - 745e Navi31 [Radeon Pro W7800] - 7480 Navi 33 [Radeon RX 7700S/7600S/7600M XT] + 745e Navi 31 [Radeon Pro W7800] + 7480 Navi 33 [Radeon RX 7700S/7600/7600S/7600M XT/PRO W7600] 1849 5313 RX 7600 Challenger OC 7483 Navi 33 [Radeon RX 7600M/7600M XT] - 7489 Navi 33 + 7489 Navi 33 [Radeon Pro W7500] 7833 RS350 Host Bridge 7834 RS350 [Radeon 9100 PRO/XT IGP] 7835 RS350M [Mobility Radeon 9000 IGP] @@ -4348,6 +4354,7 @@ ab18 Vega 12 HDMI Audio ab20 Vega 20 HDMI Audio [Radeon VII] ab28 Navi 21/23 HDMI/DP Audio Controller + ab30 Navi 31 HDMI/DP Audio ab38 Navi 10 HDMI Audio ac00 Theater 506 World-Wide Analog Decoder ac01 Theater 506 World-Wide Analog Decoder @@ -5032,7 +5039,11 @@ 14b7 Family 17h-19h PCIe Dummy Host Bridge 14b9 Family 17h-19h Internal PCIe GPP Bridge 14ba Family 17h-19h PCIe GPP Bridge +# Server device + 14ca Genoa CCP/PSP 4.0 Device 14cd Family 19h USB4/Thunderbolt PCIe tunnel + 14de Phoenix PCIe Dummy Function + 14ef Family 19h USB4/Thunderbolt PCIe tunnel 1510 Family 14h Processor Root Complex 174b 1001 PURE Fusion Mini 1512 Family 14h Processor Root Port @@ -5116,6 +5127,9 @@ 15b5 Stoney NB Performance Monitor 15bc Stoney PCIe [GFX,GPP] Bridge [4:0] 15be Stoney Audio Processor + 15c4 Phoenix USB4/Thunderbolt NHI controller #1 + 15c5 Phoenix USB4/Thunderbolt NHI controller #2 + 15c7 Family 19h (Model 74h) CCP/PSP 3.0 Device 15d0 Raven/Raven2 Root Complex 103c 8615 Pavilion Laptop 15-cw1xxx 1043 876b PRIME B450M-A Motherboard @@ -5264,6 +5278,8 @@ 1665 VanGogh Data Fabric; Function 5 1666 VanGogh Data Fabric; Function 6 1667 VanGogh Data Fabric; Function 7 + 1668 Pink Sardine USB4/Thunderbolt NHI controller #1 + 1669 Pink Sardine USB4/Thunderbolt NHI controller #2 166a Cezanne Data Fabric; Function 0 166b Cezanne Data Fabric; Function 1 166c Cezanne Data Fabric; Function 2 @@ -5707,6 +5723,7 @@ 1028 215f ENT NVMe RT1 RI 7.68TB 1028 2160 ENT NVMe RT1 FIPS RI 3.84TB 1028 2161 ENT NVMe RT1 FIPS RI 7.68TB + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 1029 Siemens Nixdorf IS 102a LSI Logic 0000 HYDRA @@ -6971,6 +6988,7 @@ 90dc Baikal DMA Controller 90dd Baikal Memory (DDR3/SPM) 90de Baikal USB 3.0 xHCI Host Controller + 9121 Nextorage NEM-PA NVMe SSD for PlayStation 104e Oak Technology, Inc 0017 OTI-64017 0107 OTI-107 [Spitfire] @@ -7201,6 +7219,7 @@ c350 80333 [SuperTrak EX12350] e350 80333 [SuperTrak EX24350] 105b Foxconn International, Inc. + e0c3 T99W175 5G Modem [Snapdragon X55] 105c Wipro Infotech Limited 105d Number 9 Computer Company 2309 Imagine 128 @@ -12732,8 +12751,13 @@ 2330 GH100 [H100 SXM5 80GB] 2331 GH100 [H100 PCIe] 2336 GH100 [H100] - 2339 GH100 [H100] + 2337 GH100 [H100 SXM5 64GB] + 2339 GH100 [H100 SXM5 94GB] 233a GH100 [H800L 94GB] + 233d GH100 [H100 96GB] + 2342 GH100 [GH200 120GB] + 2343 GH100 + 2345 GH100 [GH200 480GB] 2414 GA103 [GeForce RTX 3060 Ti] 2420 GA103M [GeForce RTX 3080 Ti Mobile] 2438 GA103GLM [RTX A5500 Laptop GPU] @@ -12829,6 +12853,7 @@ 26b2 AD102GL [RTX 5000 Ada Generation] 26b5 AD102GL [L40] 26b8 AD102GL [L40G] + 26b9 AD102GL [L40S] 26f5 AD102GL [L40 CNX] 2704 AD103 [GeForce RTX 4080] 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] @@ -12839,15 +12864,18 @@ 2786 AD104 [GeForce RTX 4070] 27a0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 27b0 AD104GL [RTX 4000 SFF Ada Generation] + 27b2 AD104GL [RTX 4000 Ada Generation] 27b7 AD104GL [L16] 27b8 AD104GL [L4] 27ba AD104GLM [RTX 4000 Ada Generation Laptop GPU] 27bb AD104GLM [RTX 3500 Ada Generation Laptop GPU] 27e0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 2803 AD106 [GeForce RTX 4060 Ti] + 2805 AD106 [GeForce RTX 4060 Ti 16GB] 2820 AD106M [GeForce RTX 4070 Max-Q / Mobile] 2838 AD106GLM [RTX 3000 Ada Generation Laptop GPU] 2860 AD106M [GeForce RTX 4070 Max-Q / Mobile] + 2882 AD107 [GeForce RTX 4060] 28a0 AD107M [GeForce RTX 4060 Max-Q / Mobile] 28a1 AD107M [GeForce RTX 4050 Max-Q / Mobile] 28b8 AD107GLM [RTX 2000 Ada Generation Laptop GPU] @@ -13097,7 +13125,10 @@ 5288 RTS5288 PCI Express Card Reader 5289 RTL8411 PCI Express Card Reader 1043 1457 K55A Laptop + 5760 RTS5763DL x2 NVMe SSD Controller 5762 RTS5763DL NVMe SSD Controller + 5763 RTS5763DL NVMe SSD Controller (DRAM-less) + 5765 RTS5765DL NVMe SSD Controller (DRAM-less) 8029 RTL-8029(AS) 10b8 2011 EZ-Card (SMC1208) 10ec 8029 RTL-8029(AS) @@ -15293,8 +15324,8 @@ 0102 Extended IDE Controller 0103 EX-IDE Type-B 010e PXP04 NVMe SSD - 010f NVMe Controller - 0110 NVMe SSD Controller Cx5 + 010f XG3 NVMe SSD Controller + 0110 Cx5 NVMe SSD Controller 1028 1ffb Express Flash NVMe 960G (RI) U.2 (CD5) 1028 1ffc Express Flash NVMe 1.92T (RI) U.2 (CD5) 1028 1ffd Express Flash NVMe 3.84T (RI) U.2 (CD5) @@ -16410,6 +16441,7 @@ 8331 O2 Flash Memory Card 8520 SD/MMC Card Reader Controller 8621 SD/MMC Card Reader Controller + 8760 FORESEE E2M2 NVMe SSD 1218 Hybricon Corp. 1219 First Virtual Corporation 121a 3Dfx Interactive, Inc. @@ -16767,8 +16799,9 @@ 0811 SM811 LynxE 0820 SM820 Lynx3D 0910 SM910 + 2260 SM2260 NVMe SSD Controller 2262 SM2262/SM2262EN SSD Controller - 2263 SM2263EN/SM2263XT SSD Controller + 2263 SM2263EN/SM2263XT (DRAM-less) NVMe SSD Controllers 1270 Olympus Optical Co., Ltd. 1271 GW Instruments 1272 Telematics International @@ -17556,6 +17589,8 @@ 5190 9200 ECO NVMe SSD 5191 9200 PRO NVMe SSD 5192 9200 MAX NVMe SSD + 5196 9400 PRO NVMe SSD + 5197 9400 MAX NVMe SSD 51a2 7300 PRO NVMe SSD 1344 2000 960GB U.2 1344 3000 1920GB U.2 @@ -17615,8 +17650,12 @@ 51c3 7450 PRO NVMe SSD 51c4 7450 MAX NVMe SSD 1344 3000 U.3 1600GB [MTFDKCB1T6TFS/MTFDKCC1T6TFS] - 5410 2200S NVMe SSD - 5411 2450 NVMe SSD (DRAM-less) + 5404 2210 NVMe SSD [Cobain] + 5405 2300 NVMe SSD [Santana] + 5407 3400 NVMe SSD [Hendrix] + 5410 2200S NVMe SSD [Cassandra] + 5411 2450 NVMe SSD [HendrixV] (DRAM-less) + 5413 2400 NVMe SSD (DRAM-less) 5414 3460 NVMe SSD 6001 2100AI NVMe SSD [Nitro] 1345 Arescom Inc @@ -19307,15 +19346,18 @@ 144b Verint Systems Inc. 144c Catalina Research Inc 144d Samsung Electronics Co Ltd - 1600 Apple PCIe SSD + 1600 S4LN053X01 AHCI SSD Controller(Apple slot) + 9602 RS780/RS880 PCI to PCI bridge (int gfx) a544 Exynos 8890 PCIe Root Complex a575 Exynos 7420 PCIe Root Complex a5e3 Exynos 5433 PCIe Root Complex a800 XP941 PCIe SSD + a801 S4LN058A01[SSUBX] AHCI SSD Controller (Apple slot) a802 NVMe SSD Controller SM951/PM951 144d a801 PM963 2.5" NVMe PCIe SSD a804 NVMe SSD Controller SM961/PM961/SM963 144d a801 SM963 2.5" NVMe PCIe SSD + a806 NVMe SSD SM0032L a808 NVMe SSD Controller SM981/PM981/PM983 144d a801 SSD 970 EVO 1d49 403b Thinksystem U.2 PM983 NVMe SSD @@ -19341,6 +19383,7 @@ 1028 512d DC NVMe PM9A3 RI U.2 7.68TB 144d a813 General DC NVMe PM9A3 a80b NVMe SSD Controller PM9B1 + a80c NVMe SSD Controller S4LV008[Pascal] a820 NVMe SSD Controller 171X 1028 1f95 Express Flash NVMe XS1715 SSD 400GB 1028 1f96 Express Flash NVMe XS1715 SSD 800GB @@ -20469,6 +20512,7 @@ 43aa BCM43131 802.11b/g/n 43ae BCM43162 802.11ac Wireless Network Adapter 43b1 BCM4352 802.11ac Wireless Network Adapter + 1043 85ba PCE-AC56 Dual-Band Wireless PCI-E Adapter 43ba BCM43602 802.11ac Wireless LAN SoC 43bb BCM43602 802.11ac Wireless LAN SoC 43bc BCM43602 802.11ac Wireless LAN SoC @@ -20594,7 +20638,8 @@ d804 BCM58804 Stingray 100Gb Ethernet SoC f800 BCM78800 Switch ASIC [Trident5-X12] f900 BCM78900 Switch ASIC [Tomahawk5] - f903 BCM78903 Switch ASIC [Tomahawk6] + f902 BCM78902 Switch ASIC [Tomahawk5T] + f903 BCM78903 Switch ASIC [Tomahawk5] f905 BCM78905 Switch ASIC [Tomahawk5+] f910 BCM78910 Switch ASIC [Tomahawk6] f914 BCM78914 Switch ASIC [Tomahawk6] @@ -21410,6 +21455,7 @@ 101d MT2892 Family [ConnectX-6 Dx] 101e ConnectX Family mlx5Gen Virtual Function 101f MT2894 Family [ConnectX-6 Lx] + 193d 1035 NIC-ETH641F-LP-2P SFP28 2x25GbE PCIe Network Adapter 1020 MT28860 1021 MT2910 Family [ConnectX-7] 1023 CX8 Family [ConnectX-8] @@ -21542,18 +21588,25 @@ 5004 PC SN520 NVMe SSD 5005 PC SN520 NVMe SSD 5006 WD Black SN750 / PC SN730 NVMe SSD - 5007 PC SN530 NVMe SSD (DRAM-less) - 5008 PC SN530 NVMe SSD + 5007 IX SN530 NVMe SSD (DRAM-less) + 5008 PC SN530 NVMe SSD (DRAM-less) 5009 WD Blue SN550 NVMe SSD 15b7 5009 WD Blue SN550 NVMe SSD 500b PC SN530 NVMe SSD 1414 500b Xbox Series X 500d WD Ultrastar DC SN340 NVMe SSD 5011 WD PC SN810 / Black SN850 NVMe SSD - 5015 PC SN740 NVMe SSD - 5017 WD Black SN770 NVMe SSD + 5014 WD Green SN350 NVMe SSD 1 TB (DRAM-less) + 5015 PC SN740 NVMe SSD (DRAM-less) + 5016 WD PC SN740 NVMe SSD 512GB (DRAM-less) + 5017 WD Black SN770 / PC SN740 256GB / PC SN560 (DRAM-less) NVMe SSD + 5019 WD Green SN350 NVMe SSD 240GB (DRAM-less) 501a WD Blue SN570 NVMe SSD 1TB + 501d WD Blue SN550 NVMe SSD 2TB (DRAM-less) + 501e PC SN735 NVMe SSD (DRAM-less) + 501f WD PC SN735 NVMe SSD 512GB (DRAM-less) 5025 WD Blue SN570 NVMe SSD 2TB + 5026 WD PC SN735 NVMe SSD 1TB (DRAM-less) 5030 Western Digital WD Black SN850X NVMe SSD 15b8 ADDI-DATA GmbH 1001 APCI1516 SP controller (16 digi outputs) @@ -22637,8 +22690,11 @@ 9755 GL9755 SD Host Controller e763 GL9763E eMMC Controller 17aa Lenovo + 0003 LENSE20256GMSP34MEAT2TA + 0004 LENSE20512GMSP34MEAT2TA # 250GB nvme ssd from lenovo, can be found in Thinkpad x380 yoga 0005 LENSE30256GMSP34MEAT3TA + 0006 LENSE30512GMSP34MEAT3TA 3181 ThinkCentre M75n IoT 402b Intel 82599ES 10Gb 2-port Server Adapter X520-2 17ab Phillips Components @@ -22665,6 +22721,7 @@ 0105 MSM8998 PCIe Root Complex 0108 SM8150 PCIe Root Complex 0109 SA8195P PCIe Root Complex + 010e SC8280XP PCI Express Root Port 0300 MDM9x35 LTE Modem [Snapdragon X7] 0301 MDM9x45 LTE Modem [Snapdragon X12] 0302 MDM9x55 LTE Modem [Snapdragon X16] @@ -22674,6 +22731,8 @@ 1101 QCA6390 Wireless Network Adapter 1103 QCNFA765 Wireless Network Adapter 1104 QCN6024/9024/9074 Wireless Network Adapter + 1108 IPQ95xx/97xx PCI Express Root Port + 1109 QCN62xx/92xx Wireless Network Adapter 17cc NetChip Technology, Inc 2280 USB 2.0 17cd Cadence Design Systems, Inc. @@ -23604,6 +23663,7 @@ 16ff OX16C954 HOST-B 1987 Phison Electronics Corporation 5007 E7 NVMe Controller + 5008 E8 PCIe3 NVMe Controller 5012 E12 NVMe Controller 5013 PS5013 E13 NVMe Controller 5016 E16 PCIe4 NVMe Controller @@ -23661,6 +23721,7 @@ 103c 3315 NC553i 10Gb 2-port FlexFabric Converged Network Adapter 103c 337b NC554FLB 10Gb 2-port FlexFabric Converged Network Adapter 0800 ServerView iRMC HTI +19a4 Owl Cyber Defense Solutions 19a8 DAQDATA GmbH 19ac Kasten Chase Applied Research 0001 ACA2400 Crypto Accelerator @@ -23893,7 +23954,8 @@ 0050 FlashMAX III 1a84 Commex Technologies 0001 Vulcan SP HT6210 10-Gigabit Ethernet (rev 02) -1a88 MEN Mikro Elektronik +# nee MEN Mikro Elektronik +1a88 Duagon AG 4d45 Multifunction IP core 1a8a StarBridge, Inc. 1a8c Verigy Pte. Ltd. @@ -24128,6 +24190,7 @@ 000c QEMU PCIe Root port 000d QEMU XHCI Host Controller 0010 QEMU NVM Express Controller + 0013 QEMU UFS Host Controller 0100 QXL paravirtual graphic card 1af4 1100 QEMU Virtual Machine 1b37 Signal Processing Devices Sweden AB @@ -24170,7 +24233,7 @@ 1028 2112 BOSS-N1 Monolithic 1028 2113 BOSS-N1 Modular 1028 2151 BOSS-N1 Modular ET - 1028 2196 ROR-N100 + 1028 2196 ROR-N1 1b4b 2241 Santa Cruz NVMe Host Adapter 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit 1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit @@ -24241,7 +24304,9 @@ d430 D410/430 Quad-port E1/T1 card 1b79 Absolute Analysis 1b85 OCZ Technology Group, Inc. - 1041 RevoDrive 3 X2 PCI-Express SSD 240 GB (Marvell Controller) + 1021 RevoDrive 3 X2 PCIe SSD 240 GB (Marvell SAS Controller) + 1041 RevoDrive 3 X2 PCIe SSD 240 GB (Marvell SAS Controller) + 4018 Z Drive 6000/6300 NVME SSD 6018 RD400/400A SSD 8788 RevoDrive Hybrid 1b94 Signatec / Dynamic Signals Corp @@ -24371,7 +24436,8 @@ # Nytro 5360S (Rocinante Single Port) TCG - E3.S 1bb1 0180 Nytro 5360S TCG - E3.S 1bb1 01a1 Nytro XP7102 - 5012 FireCuda 510 SSD + 5012 FireCuda/IronWolf 510 SSD + 5013 BarraCuda Q5 NVMe SSD (DRAM-less) 5016 FireCuda 520 SSD 5018 FireCuda 530 SSD 1bb3 Bluecherry @@ -24390,7 +24456,7 @@ 0004 MAX4 1bc0 Innodisk Corporation 1001 PCIe 3TG6-P Controller - 1002 PCIe 3TE6 Controller + 1002 PCIe 3TE6 Controller (DRAM-less) 1160 PCIe 3TE2 Controller 1321 PCIe 4TG-P Controller 1322 PCIe 4TE Controller @@ -24398,6 +24464,8 @@ 5208 PCIe 3TE7 Controller 5216 PCIe 3TE8 Controller 5236 PCIe 4TG2-P Controller +1bcd Apacer Technology + 0120 NVMe SSD Drive 960GB 1bcf NEC Corporation 001c Vector Engine 1.0 1bd0 Astronics Corporation @@ -24420,6 +24488,16 @@ 1203 NG3 Series Avionics Discrete Interface 1bd4 Inspur Electronic Information Industry Co., Ltd. 0911 Arria10_PCIe_F10A1150 + 1000 NS8600G1U160 NVME SSD + 1001 NS8600G1U320 NVME SSD + 1002 NS8600G1U640 NVME SSD + 1003 NS8500G1U192 NVME SSD + 1004 NS8500G1U384 NVME SSD + 1005 NS8500G1U768 NVME SSD + 1006 NS6610G1U160, NS6510G1U192 NVME SSD + 1007 NS6610G1U320, NS6510G1U384 NVME SSD + 100c NS8510G1Uxxx, NS8610G1Uxxx NVME SSD + 100e NS8500G2Uxxxx, NS8600G2Uxxxx NVME SSD 1bee IXXAT Automation GmbH 0003 CAN-IB200/PCIe 1bef Lantiq @@ -24427,6 +24505,7 @@ 1bf4 VTI Instruments Corporation 0001 SentinelEX 7011 RX0xxx +1bfc Duagon AG 1bfd EeeTOP 1c00 Nanjing Qinheng Microelectronics Co., Ltd. 3252 CH382 PCIe Dual Port Serial Adapter @@ -24507,6 +24586,7 @@ # http://www.accensusllc.com/accensustelas2.html 0300 Telas 2.V 1c44 Enmotus Inc + 1100 Fuzedrive NVMe SSD 8000 8000 Storage IO Controller # A Western Digital Subsidiary 1c58 HGST, Inc. @@ -24517,6 +24597,7 @@ 0023 Ultrastar SN200 Series NVMe SSD 1c58 8823 Ultrastar Memory (ME200) 1c5c SK hynix + 1282 PC300 NVMe Solid State Drive 128GB 1283 PC300 NVMe Solid State Drive 256GB 1284 PC300 NVMe Solid State Drive 512GB 1285 PC300 NVMe Solid State Drive 1TB @@ -24524,11 +24605,15 @@ 1339 BC511 NVMe SSD 1504 PC400 NVMe SSD 1527 PC401 NVMe Solid State Drive 256GB + 1627 PC601 NVMe Solid State Drive 1639 PC611 NVMe Solid State Drive + 1739 BC701 NVMe Solid State Drive 174a Gold P31/BC711/PC711 NVMe Solid State Drive 1959 Platinum P41/PC801 NVMe Solid State Drive 1d59 BC901 NVMe Solid State Drive (DRAM-less) 2204 960GB TLC PCIe Gen3 x4 NVMe M.2 22110 + 2427 PE6010 NVMe Solid State Drive + 2429 PE6011 NVMe Solid State Drive 243b PE6110 NVMe Solid State Drive 1c5c 0100 PE6110 NVMe Solid State Drive 2839 PE8000 Series NVMe Solid State Drive @@ -24551,6 +24636,8 @@ 1028 2268 DC NVMe ISE PE8110 RI U.2 3840GB 1028 2269 DC NVMe ISE PE8110 RI U.2 7680GB 1c5c 0101 PE81x0 U.2/3 NVMe Solid State Drive + 284a PE8110 Series NVMe Solid State Drive + 2a49 PE9110 Series NVMe Solid State Drive 1c5f Beijing Memblaze Technology Co. Ltd. 000d PBlaze5 520/526 1c5f 0220 NVMe SSD PBlaze5 520 1920G AIC @@ -24656,10 +24743,19 @@ 0002 Clarett 1cb8 Dawning Information Industry Co., Ltd. 1cc1 ADATA Technology Co., Ltd. +# SX6000LNP + 2263 XPG SX6000 Lite NVMe SSD (DRAM-less) + 33f3 IM2P33F3 NVMe SSD (DRAM-less) 33f8 IM2P33F8ABR1 NVMe SSD 5350 XPG GAMMIX S50 NVMe SSD -# 256GB NVMe SSD - 5766 ADATA XPG GAMMIXS1 1L Media + 5762 FALCON NVMe SSD + 5766 ADATA XPG GAMMIXS1 1L Media (256 GB SSD) + 612a LEGEND 750 NVMe SSD (DRAM-less) + 613a LEGEND 840 NVMe SSD (DRAM-less) + 621a LEGEND 850 NVMe SSD (DRAM-less) + 622a LEGEND 960 NVMe SSD + 624a LEGEND 700 NVMe SSD (DRAM-less) + 627a LEGEND 800 NVMe SSD 8201 XPG SX8200 Pro PCIe Gen3x4 M.2 2280 Solid State Drive 1cc4 Shenzhen Unionmemory Information System Ltd. 1203 NVMe SSD Controller UHXXXa series @@ -24675,8 +24771,21 @@ 1cc4 e122 NVMe SSD UH711a series U.2 1920GB 1cc4 e123 NVMe SSD UH711a series U.2 3840GB 1cc4 e124 NVMe SSD UH711a series U.2 7680GB - 17ab NVMe 256G SSD device + 17a9 RPITJ1TBVME2HWD NVMe SSD 1024GB + 17aa AH631 PCIe 3.0 NVMe SSD 512GB + 17ab AH631 PCIe 3.0 NVMe SSD 256GB + 2263 AM611 PCIe 3.0 NVMe SSD 256GB + 5008 AM610 PCIe 3.0 NVMe SSD 128GB + 5012 RPITJ512PED2OWX NVMe SSD 512GB + 6201 AM620 PCIe 3.0 NVMe SSD 128GB + 6202 AM620 PCIe 3.0 NVMe SSD 256GB + 6203 AM620 PCIe 3.0 NVMe SSD 512GB + 6204 AM620 PCIe 3.0 NVMe SSD 1024GB + 6302 AM630 PCIe 4.0 NVMe SSD 256GB 6303 AM630 PCIe 4.0 x4 NVMe SSD Controller + 6304 AM630 PCIe 4.0 NVMe SSD 1024GB + 6a03 RPETJ512MKP1QDQ PCIe 4.0 NVMe SSD 512GB (DRAM-less) + 6a14 RPEYJ1T24MKN2QWY PCIe 4.0 NVMe SSD 1024GB (DRAM-less) 1cc5 Embedded Intelligence, Inc. 0100 PCIe-CAN-02 Dual CAN bus (9-pin male). PCI Express x1. 0101 PCIe-CAN-01 Single CAN bus (9-pin male). PCI Express x1. @@ -24720,6 +24829,8 @@ 1cf0 Akitio 1cf7 Subspace Dynamics 1cfa Corsair Memory, Inc +1cfd Mangstor + 6300 MX6300 series PCIe x8 NVMe SSD 1d00 Pure Storage 1d05 Tongfang Hongkong Limited 1d0f Amazon.com, Inc. @@ -24827,6 +24938,9 @@ 0015 PM4edge 0016 PM4edge User Device 1d40 Techman Electronics (Changshu) Co., Ltd. + 5501 XC100C55-xxxx NVME SSD + 5c01 XC100C5C-xxxx, XC100E5C-xxxx NVME SSD + b100 PV100C55-xxxx NVME SSD 1d44 DPT a400 PM2x24/PM3224 1d49 Lenovo @@ -24960,6 +25074,10 @@ 1d78 7204 Aliflash V2 U.2 15mm 3.84TB NVMe SSD 1d78 7208 Aliflash V2 U.2 15mm 7.68TB NVMe SSD 1d79 Transcend Information, Inc. + 2262 NVMe PCIe SSD 220S + 2263 NVMe PCIe SSD 120S/112S (DRAM-less) + 2264 NVMe PCIe SSD 250H + 5766 NVMe PCIe SSD 110Q (DRAM-less) 1d7c Aerotech, Inc. # Fiber-optic HyperWire motion control bus from Aerotech. 0001 HyperWire Adapter @@ -25015,9 +25133,12 @@ 0001 Colossus GC2 [C2] 0002 Colossus GC1 [S1] 1d97 Shenzhen Longsys Electronics Co., Ltd. + 1062 Lexar NM710 NVME SSD 1d97 Lexar NM620 NVME SSD (DRAM-less) 2263 SM2263EN/SM2263XT-based OEM SSD 2269 Lexar NM760 NVME SSD (DRAM-less) + 5216 Lexar NM620 NVME SSD (DRAM-less) + 5236 Lexar NM800 PRO NVME SSD # nee Facebook, Inc. 1d9b Meta Platforms, Inc. 0010 Networking DOM Engine @@ -25037,6 +25158,8 @@ # PCIe accelerator card for Deep Learning training tasks 1020 Gaudi2 AI Training Accelerator 1da8 Corigine, Inc. + 3800 Network Flow Processor 3800 + 3803 Network Flow Processor 3800 Virtual Function 1dad Fungible 1db2 ATP ELECTRONICS INC 1db7 Phytium Technology Co., Ltd. @@ -25064,6 +25187,9 @@ dc3c GPU_DMA Controller [X100 Series] 1dbb NGD Systems, Inc. 1dbe INNOGRIT Corporation + 5216 NVMe SSD Controller IG5216 (DRAM-less) + 5220 NVMe SSD Controller IG5220 (DRAM-less) + 5236 NVMe SSD Controller IG5236 5636 NVMe DC SSD IG5636 1dbe 0001 DONGTING-N1 DC SSD U.2 1dbe 1001 DONGHU-Z1 DC ZNS SSD U.2 @@ -25078,6 +25204,7 @@ 1dcf Beijing Sinead Technology Co., Ltd. 1dd3 Sage Microelectronics Corp. 1dd4 Swissbit AG + 0010 N-10m2 NVMe SSD 1dd8 AMD Pensando Systems 0002 DSC2 Elba Upstream Port 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card @@ -25231,6 +25358,8 @@ 8003 RCEC PF 8004 RCEC VF 1dee Biwin Storage Technology Co., Ltd. + 2262 HP EX950 NVMe SSD + 2263 HP EX900 NVMe SSD (DRAM-less) 1def Ampere Computing, LLC e005 eMAG PCI Express Root Port 0 e006 eMAG PCI Express Root Port 1 @@ -25305,6 +25434,8 @@ 0208 ACE-NIC100RN Programmable Network Accelerator 1df3 0000 Maintenance Mode 1df3 0001 ENA2100RN +1df5 Shenzhen TIGO Semiconductor + 1202 kimtigo NVMe SSD (DRAM-less) 1df7 opencpi.org 0001 ml605 0002 alst4 @@ -25321,7 +25452,7 @@ 1dfc JSC NT-COM 1181 TDM 8 Port E1/T1/J1 Adapter 1e0f KIOXIA Corporation - 0001 NVMe SSD Controller BG4 + 0001 NVMe SSD Controller BG4 (DRAM-less) 0007 NVMe SSD Controller Cx6 1028 2078 DC NVMe CD6 RI 960GB 1028 2079 DC NVMe CD6 RI 1.92TB @@ -25343,9 +25474,13 @@ 1028 210f Dell Ent NVMe FIPS CM6 MU 3.2TB 1028 2110 Dell Ent NVMe FIPS CM6 MU 6.4TB 1e0f 0001 Generic NVMe CM6 + 0008 RD500/Exceria Plus/Exceria Plus G2 NVMe SSD 0009 NVMe SSD 1e0f 0001 Toshiba RC500 Series NVMe SSD 1e0f 0032 KIOXIA EXCERIA RC10 Series NVMe SSD + 000c NVMe SSD Controller BG5 (DRAM-less) + 000d NVMe SSD Controller XG7 + 0010 NVMe SSD Controller XG8 0011 NVMe SSD Controller CD7 1028 2189 DC NVMe SED CD7 RI 960GB 1028 218a DC NVMe CD7 RI 960GB @@ -25392,6 +25527,7 @@ 1028 2247 Ent NVMe CM7 E3.S MU 6.4TB 1028 2248 Ent NVMe CM7 E3.S MU 3.2TB 1028 2249 Ent NVMe CM7 E3.S MU 1.6TB + 0018 Exceria Pro NVMe SSD 001f NVMe SSD Controller CD8 1028 2223 DC NVMe CD8 U.2 SED 15.36TB 1028 2224 DC NVMe CD8 U.2 SED 7.68TB @@ -25428,6 +25564,16 @@ 8001 I20 [CloudBlazer] 8011 I10 [CloudBlazer] 8012 I10L [CloudBlazer] +# HHHL PCIe card, single slot, 3rd generation from Enflame + 8031 S6 [Enflame] +# HHHL PCIe card, single slot, 3rd generation from Enflame, 24GB device memory + 8032 S6 [Enflame] +# FHFL PCIe card, single slot, 3rd generation from Enflame + c031 S30 [Enflame] +# HHHL PCIe card, dual slot, 3rd generation from Enflame + c032 S60 [Enflame] +# FHFL PCIe card, single slot, 3rd generation from Enflame, 48GB device memory + c033 S30 [Enflame] # nee Thinci, Inc 1e38 Blaize, Inc 0102 Xplorer X1600 @@ -25506,11 +25652,20 @@ 1e3b 008b Enterprise NVMe SSD HHHL 1.6TB (H3900) 1e3b 0091 Enterprise NVMe SSD HHHL 0.75TB (H3900) 1333 Haishen5 NVMe SSD + 1e3b 0081 Enterprise NVMe SSD U.2 3.84TB (H5100) + 1e3b 0082 Enterprise NVMe SSD U.2 7.68TB (H5100) + 1e3b 0084 Enterprise NVMe SSD U.2 3.2TB (H5300) + 1e3b 0085 Enterprise NVMe SSD U.2 6.4TB (H5300) 1e3d Burlywood, Inc 1e44 Valve Software 1e49 Yangtze Memory Technologies Co.,Ltd + 0001 ZHITAI PC005 NVMe SSD 0021 ZHITAI TiPro5000 NVMe SSD 0041 ZHITAI TiPro7000 + 0071 ZHITAI TiPlus7100 +# YMTC + 1001 PC005 NVMe SSD + 1011 PC210 NVMe SSD # YMTC PCIe/NVMe SSD 1013 PC210 1e4b MAXIO Technology (Hangzhou) Ltd. @@ -25561,6 +25716,7 @@ 1e81 a213 NVMe SSD UHXXXa series U.2 3200GB 1e81 a214 NVMe SSD UHXXXa series U.2 6400GB 1e81 f123 NVMe SSD TP6500 series U.2 3840GB + 6206 AM620 NVMe SSD 1e83 Huaqin Technology Co.Ltd 1e85 Heitec AG 1e89 ID Quantique SA @@ -25573,6 +25729,8 @@ 1002 NVMe SSD [3DNAND] 2.5" U.2 (LJ1) 1e95 1101 NVMe SSD [3DNAND] 2.5" U.2 (LJ1) 1ea0 5636 TP1500 Series U.2 NVMe Datacenter SSD + 1003 CLR-8W512 NVMe SSD M.2 (DRAM-less) + 1007 CL4-8D512 NVMe SSD M.2 (DRAM-less) 9100 CL1-3D256-Q11 NVMe SSD M.2 1e96 Drut Technologies Inc. 1e9f Lynxi Technologies Co., Ltd. @@ -25585,7 +25743,7 @@ 224a IPA-PE224A CXL to Gen-Z Bridge [Sphinx] 1eab Hefei DATANG Storage Technology Co.,LTD. 300a NVMe SSD Controller 300A - 300b NVMe SSD Controller 300B + 300b NVMe SSD Controller 300B (DRAM-less) 1eac Quectel Wireless Solutions Co., Ltd. 1001 EM120R-GL LTE Modem 1002 EM160R-GL LTE Modem @@ -25652,12 +25810,16 @@ 0201 MTT S80 0202 MTT S70 0203 MTT S60 - 0211 G2D40 + 0211 MTT X200 0221 G2S80 0222 MTT S3000 0223 G2S4 0251 G2N10 02ff MTT HDMI/DP Audio + 0300 MTT S90 Engineering Sample + 0301 MTT S90 + 0323 MTT S4000 + 03ff MTT HDMI/DP Audio 1ed8 Digiteq Automotive 0101 FG4 PCIe Frame Grabber 1ed9 Myrtle.ai @@ -25714,6 +25876,8 @@ 5220 IG5220-Based NVMe SSD 5236 IG5236-Based NVMe SSD 5636 IG5636-Based NVMe SSD +1f0a Motorcomm Microelectronics. + 6801 YT6801 Gigabit Ethernet Controller 1f0f NebulaMatrix Technology 1041 D1055AS vDPA Ethernet Controller 1f0f 0001 D1055AS vDPA Ethernet Controller @@ -25744,6 +25908,8 @@ 1f2f 6115 KM660 U.2 3.2TB NVMe SSD 1f2f 6116 KM560 U.2 3.84TB NVMe SSD 1f2f 6118 KM560 U.2 7.68TB NVMe SSD +1f31 Nextorage + 4512 Nextorage NE1N NVMe SSD 1f3f 3SNIC Ltd 2100 SSSHBA SAS/SATA HBA 1f3f 0120 HBA 32 Ports @@ -25783,6 +25949,7 @@ 9032 SSSNIC SDI5.1 1f3f 00a1 Dual Port 100GE SDI5.1 1f40 Netac Technology Co.,Ltd + 2263 NVMe SSD (DRAM-less) 1f44 VVDN Technologies Private Limited 1f4b Axera Semiconductor Co., Ltd 1f52 MangoBoost Inc. @@ -25890,6 +26057,14 @@ 1fd4 SUNIX Co., Ltd. 0001 Matrix multiport serial adapter 1999 Multiport serial controller +1fde Kratos Defense & Security Solutions, Inc. + 1125 OpenEdge 1125P + 2500 OpenEdge 2500P +1fe0 Allwinmeta Co., Ltd. + 1010 AWM 1 + 2000 AWM 2 + 2010 AWM 2-M +1fe4 HippStor Technology 2000 Smart Link Ltd. 2800 SmartPCI2800 V.92 PCI Soft DFT 2001 Temporal Research Ltd @@ -25909,13 +26084,24 @@ 2010 8142 100VG/AnyLAN 2646 Kingston Technology Company, Inc. 0010 HyperX Predator PCIe AHCI SSD - 2262 KC2000 NVMe SSD +# KC2000 and KC2500 share the same DID + 2262 KC2000/KC2500 NVMe SSD 2263 A2000 NVMe SSD 5008 U-SNS8154P3 NVMe SSD + 500b DC1000M NVMe SSD + 500c OM8PCP Design-In PCIe 3 NVMe SSD (DRAM-less) 500d OM3PDP3 NVMe SSD - 500e SNVS2000G [NV1 NVMe PCIe SSD 2TB] - 5012 DC1500M U.2 Enterprise SSD - 5013 FURY Renegade NVMe SSD + 500e NV1 NVMe SSD + 5010 OM8SBP NVMe PCIe SSD (DRAM-less) + 5012 DC1500M NVMe SSD +# KC3000 and Renegade share the same DID + 5013 KC3000/Renegade NVMe SSD + 5014 Design-In PCIe 4 NVMe SSD (TLC) + 5016 OM3PGP4 NVMe SSD + 501b OM8PGP4 NVMe PCIe SSD (DRAM-less) + 501d NV2 NVMe PCIe 4 SSD 500GB (DRAM-less) + 501f FURY Renegade NVMe SSD with heatsink + 5021 Design-In PCIe 4 NVMe SSD (QLC) 270b Xantel Corporation 270f Chaintech Computer Co. Ltd 2711 AVID Technology Inc. @@ -27193,6 +27379,7 @@ 0960 80960RP (i960RP) Microprocessor/Bridge 0962 80960RM (i960RM) Bridge 0964 80960RP (i960RP) Microprocessor/Bridge + 0975 Optane NVME SSD H10 with Solid State Storage [Teton Glacier] 0998 Ice Lake IEH 09a2 Ice Lake Memory Map/VT-d 09a3 Ice Lake RAS @@ -27200,6 +27387,7 @@ 09a6 Ice Lake MSM 09a7 Ice Lake PMON MSM 09ab RST VMD Managed Controller + 09ad Optane NVME SSD H20 with Solid State Storage [Pyramid Glacier] 09c4 PAC with Intel Arria 10 GX FPGA 0a03 Haswell-ULT Thermal Subsystem 0a04 Haswell-ULT DRAM Controller @@ -28923,6 +29111,7 @@ 15fb Ethernet Connection (13) I219-LM 15fc Ethernet Connection (13) I219-V 15ff Ethernet Controller X710 for 10GBASE-T + 1014 0000 PCIe3 4-port 10GbE Base-T Adapter 1137 0000 X710TLG GbE RJ45 PCIe NIC 1137 02c1 X710T2LG 2x10 GbE RJ45 PCIe NIC 1137 02c2 X710T4LG 4x10 GbE RJ45 PCIe NIC @@ -30436,6 +30625,7 @@ 2522 NVMe Optane Memory Series 8086 3806 Optane Memory 16GB 8086 3810 Optane Memory M10 16GB + 2525 Optane NVME SSD P1600X Series 2526 Wireless-AC 9260 2530 82850 850 (Tehama) Chipset Host Bridge (MCH) 1028 00c7 Dimension 8100 @@ -32555,9 +32745,17 @@ 34aa Ice Lake-LP Serial IO SPI Controller #0 34ab Ice Lake-LP Serial IO SPI Controller #1 34b0 Ice Lake-LP PCI Express Root Port #9 + 34b1 Ice Lake-LP PCIe Port #10 + 34b4 Ice Lake-LP PCIe Port #13 + 34b5 Ice Lake-LP PCIe Port #14 34b7 Ice Lake-LP PCI Express Root Port #16 + 34b8 Ice Lake-LP PCIe Port #1 34ba Ice Lake-LP PCI Express Root Port #3 + 34bb Ice Lake-LP PCIe Port #4 34bc Ice Lake-LP PCI Express Root Port #5 + 34bd Ice Lake-LP PCIe Port #6 + 34be Ice Lake-LP PCIe Port #7 + 34bf Ice Lake-LP PCIe Port #8 34c4 Ice Lake-LP SD Host Controller 34c5 Ice Lake-LP Serial IO I2c Controller #4 34c6 Ice Lake-LP Serial IO I2c Controller #5 @@ -33348,13 +33546,29 @@ 8086 1216 WiMAX/WiFi Link 5150 ABG 8086 1311 WiMAX/WiFi Link 5150 AGN 8086 1316 WiMAX/WiFi Link 5150 ABG - 4389 WM590 Chipset LPC Controller - 438b Tiger Lake-H LPC/eSPI Controller + 4384 Q570 LPC/eSPI Controller + 4385 Z590 LPC/eSPI Controller + 4386 H570 LPC/eSPI Controller + 4387 B560 LPC/eSPI Controller + 4388 H510 LPC/eSPI Controller + 4389 WM590 LPC/eSPI Controller + 438a QM580 LPC/eSPI Controller + 438b HM570 LPC/eSPI Controller + 438c C252 LPC/eSPI Controller + 438d C256 LPC/eSPI Controller + 438e H310D LPC/eSPI Controller + 438f W580 LPC/eSPI Controller + 4390 RM590E LPC/eSPI Controller + 4391 R580E LPC/eSPI Controller 43a3 Tiger Lake-H SMBus Controller 43a4 Tiger Lake-H SPI Controller 43b0 Tiger Lake-H PCI Express Root Port #9 + 43b8 Tiger Lake-H PCIe Root Port #1 43ba Tiger Lake-H PCIe Root Port #3 + 43bb Tiger Lake-H PCIe Root Port #4 43bc Tiger Lake-H PCI Express Root Port #5 + 43c0 Tiger Lake-H PCIe Root Port #17 + 43c7 Tiger Lake-H PCIe Root Port #24 43c8 Tiger Lake-H HD Audio Controller 43d3 Tiger Lake SATA AHCI Controller 43e0 Tiger Lake-H Management Engine Interface @@ -33436,6 +33650,9 @@ 193d 4000 UN-GPU-XG310-32GB-FHFL 4908 DG1 [Iris Xe Graphics] 4909 DG1 [Iris Xe MAX 100] + 4940 4xxx Series QAT + 4942 4xxx Series QAT + 4944 4xxx Series QAT 4b00 Elkhart Lake eSPI Controller 4b23 Elkhart Lake SMBus Controller 4b24 Elkhart Lake SPI (Flash) Controller @@ -33524,6 +33741,7 @@ 5182 Alder Lake PCH eSPI Controller 1028 0b10 Precision 3571 5187 Alder Lake LPC Controller + 519d Raptor Lake LPC/eSPI Controller 51a3 Alder Lake PCH-P SMBus Host Controller 1028 0b10 Precision 3571 51a4 Alder Lake-P PCH SPI Controller @@ -33538,6 +33756,7 @@ 51c6 Alder Lake-P Serial IO I2C Controller #1 51c8 Alder Lake PCH-P High Definition Audio Controller 1028 0b10 Precision 3571 + 51ca Raptor Lake-P/U/H cAVS 51cc Alder Lake Smart Sound Technology Audio Controller *** 178 LINES SKIPPED *** From nobody Mon Dec 4 10:24:32 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkKXc6NfYz53C0f; Mon, 4 Dec 2023 10:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKXc62xkz4MtF; Mon, 4 Dec 2023 10:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0svjSq9/o0d2VjwxVYKbtig1vLYTyLLZnbggAKdljJE=; b=eLlfXrzlbWdQLvFuD17TLqU2IuaY4mpQ6364MI2wAlseHjxdIrodSCOdww4H/15G5iUUFA ZmhUjIh5StDPbpWdPxRwpI719lRpwhtGDxWnAAqLjy3ecFL1f/GBgoNcchH5Hr1oqDH2Nl ViVoyWJanVr6+de65fQH5M8ZQLKzpp9+OFsVRslaEmY6hNBiruriaouHoryNbNV/mCZCL2 b53BSQy0nuLmV9sV9DaHWJvnzRLTRI93GaJf3UWQ6S7Ept/mMmBB7flj3AemQLm4Qk5Dx4 hG/v5Yeobha3qMIqK/sD8CycS0xGO44sxx+/m2tkalO3n9rgVq2EQcXwAoqJZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701685472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0svjSq9/o0d2VjwxVYKbtig1vLYTyLLZnbggAKdljJE=; b=DHeqtAF0MXvUziiUkvSZ4F3PEH4PVx9nQFha9+tK50fyKquDylC9mjFIhHE8MvO6W/sjvh KyOVNwgmLuv/6xKRy1F6ieoBPDFkDa17kD3qVkdBkqLDy9BmSnWB/NpXZjtvgiPCs9jZxU zKFxYsjuRfyExgX8Rd1TwrBCDKosdHdB3J4Y4k7+JKwe89BqiFUTyGAjBBT1GnwT/2zqjJ p42SffAYYzZsY1VIBpwmKFJUgKlho9DsPYu/kfwshWA3o9LJVjsoMJ80XkPpdqzexD+s3o p/xA5WsjLp336gMwQv2wmKvzf6pOcJmOBvCDo+fxiuVegSnhHCCWZJcXGsBWQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701685472; a=rsa-sha256; cv=none; b=Ggnu3ULyc2N7u19Yb44+JJg3wsYECugQMMerODnWSZoMqpQ5CAJU6EkPl8Yui5G/vpfOLa uvh32oiRmb6K0WdvUrPDdYNIn6ky9kn/GZggybY5VTxZHSBZtGi5niKOtOsXik7euRo5e7 cpf4t+EZTQnd6v0GNdbRoPEFs+bPvlkuouzfgUILmyoeJkShUun0mGQhsd2C8srhroPPft IkFhhjpH3WorR3DtztbIfJx7oV0XOrQS5UWTekDEh9MaUIqcGV8Oi/IIF1Zfq+exdPDjli SdWnRmj9R3lRPnzmF1vSs7G/2RtVzLK+Jkn3yUr9tYInsWj9GDU3DQWbL+iyXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkKXc4SbFz7V2; Mon, 4 Dec 2023 10:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AOWHo092626; Mon, 4 Dec 2023 10:24:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AOW9a092623; Mon, 4 Dec 2023 10:24:32 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:24:32 GMT Message-Id: <202312041024.3B4AOW9a092623@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 728de4f0c8e2 - stable/14 - pci_vendors: update to 2023-09-22 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 728de4f0c8e20a7cf657c528616894f2d9689c1c Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=728de4f0c8e20a7cf657c528616894f2d9689c1c commit 728de4f0c8e20a7cf657c528616894f2d9689c1c Author: Baptiste Daroussin AuthorDate: 2023-11-03 16:32:35 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:24:07 +0000 pci_vendors: update to 2023-09-22 (cherry picked from commit dbffadd8c28e3ab7dc8b5d38e3c5d7f96a5ad62d) --- share/misc/pci_vendors | 390 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 318 insertions(+), 72 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index d3988731c30a..50115d979327 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.08.12 -# Date: 2023-08-12 03:15:02 +# Version: 2023.09.22 +# Date: 2023-09-22 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -773,7 +773,6 @@ 1028 2142 HBA465e Adapter 1028 2209 HBA465i Adapter 1028 220a HBA465i Front - 1028 228a HBA465e-s Adapter 15d9 1d03 AOC-S4116L-H16IR (16DD/96DD) RAID Adapter 15d9 1d07 AOC-S4016L-L16IT Storage Adapter 15d9 1d08 AOC-S4016L-L16IR Storage Adapter @@ -803,6 +802,20 @@ 1d49 0204 ThinkSystem 430-8i SAS/SATA 12Gb Dense HBA 00b2 PCIe Switch management endpoint 1d49 0003 ThinkSystem 1611-8P PCIe Gen4 NVMe Switch Adapter +# 24G SAS/PCIe storage adapter chip + 00b3 Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx +# 9760W 32 internal port RAID controller + 1000 5000 MegaRAID 9760W-32i 24G SAS/PCIe Storage Adapter +# 9760W 16 internal port RAID controller + 1000 5001 MegaRAID 9760W-16i 24G SAS/PCIe Storage Adapter +# 9760W 16 internal and 16 external port RAID controller + 1000 5010 MegaRAID 9760W-16i16e 24G SAS/PCIe Storage Adapter +# 9700W 32 internal port Storage controller + 1000 5020 eHBA 9700W-32i 24G SAS/PCIe Storage Adapter +# 9700W 16 internal port Storage controller + 1000 5021 eHBA 9700W-16i 24G SAS/PCIe Storage Adapter +# 9700 16 external port Storage controller + 1000 5030 eHBA 9700-16e 24G SAS/PCIe Storage Adapter 00be SAS3504 Fusion-MPT Tri-Mode RAID On Chip (ROC) 00bf SAS3404 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) 00c0 SAS3324 PCI-Express Fusion-MPT SAS-3 @@ -1039,8 +1052,9 @@ 15d9 1c6e AOC-SLG4-2H8M2 Storage Adapter 1d49 0505 ThinkSystem RAID 540-8i PCIe Gen4 12Gb Adapter 1d49 0506 ThinkSystem RAID 540-16i PCIe Gen4 12Gb Adapter - 1d49 0700 ThinkSystem M.2 SATA/NVMe 2-Bay Non-Hot-Swap RAID Enablement Kit - 1d49 0701 ThinkSystem 7mm SATA/NVMe 2-Bay Rear Hot-Swap RAID Enablement Kit + 1d49 0700 ThinkSystem M.2 RAID B540i-2i SATA/NVMe Enablement Kit + 1d49 0701 ThinkSystem 7mm RAID B540p-2HS SATA/NVMe Enablement Kit + 1d49 0702 ThinkSystem M.2 RAID B540p-2HS SATA/NVMe Enablement Kit 10e7 MegaRAID 12GSAS/PCIe Unsupported SAS38xx 1960 MegaRAID 1000 0518 MegaRAID 518 SCSI 320-2 Controller @@ -1152,6 +1166,7 @@ 13e9 Ariel/Navi10Lite 13f9 Oberon/Navi12Lite 13fe Cyan Skillfish [BC-250] + 145a Dummy Function (absent graphics controller) 1478 Navi 10 XL Upstream Port of PCI Express Switch 1479 Navi 10 XL Downstream Port of PCI Express Switch 1506 Mendocino @@ -3932,6 +3947,7 @@ 1462 5022 RX 6600 MECH 2X 148c 2412 PowerColor Red Devil RX 6600 XT 1849 5218 Radeon RX 6600 Challenger ITX 8GB + 1da2 448e Radeon RX 6600 XT Pulse 7408 Aldebaran/MI200 [Instinct MI250X] 740c Aldebaran/MI200 [Instinct MI250X/MI250] 740f Aldebaran/MI200 [Instinct MI210] @@ -3948,6 +3964,7 @@ 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] 745e Navi 31 [Radeon Pro W7800] + 747e Navi 32 [Radeon RX 7700 XT / 7800 XT] 7480 Navi 33 [Radeon RX 7700S/7600/7600S/7600M XT/PRO W7600] 1849 5313 RX 7600 Challenger OC 7483 Navi 33 [Radeon RX 7600M/7600M XT] @@ -4981,6 +4998,8 @@ 1455 Zeppelin/Renoir PCIe Dummy Function 1456 Family 17h (Models 00h-0fh) Platform Security Processor (PSP) 3.0 Device 1457 Family 17h (Models 00h-0fh) HD Audio Controller + 1458 XGMAC 10GbE Controller + 1459 XGMAC 10GbE Controller 145a Zeppelin/Raven/Raven2 PCIe Dummy Function 145b Zeppelin Non-Transparent Bridge 145c Family 17h (Models 00h-0fh) USB 3.0 Host Controller @@ -5037,6 +5056,7 @@ 14b5 Family 17h-19h PCIe Root Complex 14b6 Family 17h-19h IOMMU 14b7 Family 17h-19h PCIe Dummy Host Bridge + 14b8 Family 17h-19h PCIe GPP Bridge 14b9 Family 17h-19h Internal PCIe GPP Bridge 14ba Family 17h-19h PCIe GPP Bridge # Server device @@ -5044,6 +5064,7 @@ 14cd Family 19h USB4/Thunderbolt PCIe tunnel 14de Phoenix PCIe Dummy Function 14ef Family 19h USB4/Thunderbolt PCIe tunnel + 1502 AMD IPU Device 1510 Family 14h Processor Root Complex 174b 1001 PURE Fusion Mini 1512 Family 14h Processor Root Port @@ -12492,7 +12513,7 @@ 1c2d GP106M 1c30 GP106GL [Quadro P2000] 1c31 GP106GL [Quadro P2200] - 1c35 GP106M [Quadro P2000 Mobile] + 1c35 GP106M [Quadro P2000 Mobile / DRIVE PX 2 AutoChauffeur] 1c36 GP106 [P106M] 1c60 GP106BM [GeForce GTX 1060 Mobile 6GB] 103c 8390 GeForce GTX 1060 Max-Q 6GB @@ -12548,6 +12569,8 @@ 1d52 GP108BM [GeForce MX250] 1d56 GP108BM [GeForce MX330] 1d81 GV100 [TITAN V] + 1d83 GV100 [CMP 100-200] + 1d84 GV100 [CMP 100-210] 1db1 GV100GL [Tesla V100 SXM2 16GB] 1db2 GV100GL [Tesla V100 DGXS 16GB] 1db3 GV100GL [Tesla V100 FHHL 16GB] @@ -12560,6 +12583,7 @@ 1dba GV100GL [Quadro GV100] 10de 12eb TITAN V CEO Edition 1dbe GV100 Engineering Sample + 1dc1 GV100 [CMP 100-200] 1df0 GV100GL [Tesla PG500-216] 1df2 GV100GL [Tesla PG503-216] 1df5 GV100GL [Tesla V100 SXM2 16GB] @@ -12649,7 +12673,7 @@ 1f96 TU117M [GeForce GTX 1650 Mobile / Max-Q] 1f97 TU117M [GeForce MX450] 1f98 TU117M [GeForce MX450] - 1f99 TU117M + 1f99 TU117M [GeForce GTX 1650 Mobile / Max-Q] 1f9c TU117M [GeForce MX450] 1f9d TU117M [GeForce GTX 1650 Mobile / Max-Q] # via Lenovo 496.90 @@ -12688,9 +12712,10 @@ 20b8 GA100 [A100X] 20b9 GA100 [A30X] 20bb GA100 [DRIVE A100 PROD] + 20bd GA100 [A800 SXM4 40GB] 20be GA100 [GRID A100A] 20bf GA100 [GRID A100B] - 20c0 GA100 + 20c0 GA100 [Initial DevID] 20c2 GA100 [CMP 170HX] 20f0 GA100 [A100-PG506-207] 20f1 GA100 [A100 PCIe 40GB] @@ -12699,7 +12724,7 @@ 20f5 GA100 [A800 80GB PCIe] 20f6 GA100 [A800 40GB PCIe] 20fd GA100 [AX800 Converged Accelerator] - 20fe GA100 + 20fe GA100 [INT SKU] 20ff GA100 2182 TU116 [GeForce GTX 1660 Ti] 2183 TU116 @@ -12742,6 +12767,7 @@ 228b GA104 High Definition Audio Controller 228e GA106 High Definition Audio Controller 2296 Tegra PCIe Endpoint Virtual Network + 22a3 GH100 [H100 NVSwitch] 22ba AD102 High Definition Audio Controller 2302 GH100 2313 GH100 [H100 CNX] @@ -12859,6 +12885,7 @@ 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] 2730 AD103GLM [RTX 5000 Ada Generation Laptop GPU] 2757 GN21-X11 + 2770 AD103GLM [RTX 5000 Ada Generation Embedded GPU] 2782 AD104 [GeForce RTX 4070 Ti] 2785 AD104 [AC AD104 20GB] 2786 AD104 [GeForce RTX 4070] @@ -12870,17 +12897,21 @@ 27ba AD104GLM [RTX 4000 Ada Generation Laptop GPU] 27bb AD104GLM [RTX 3500 Ada Generation Laptop GPU] 27e0 AD104M [GeForce RTX 4080 Max-Q / Mobile] + 27fa AD104GLM [RTX 4000 Ada Generation Embedded GPU] + 27fb AD104GLM [RTX 3500 Ada Generation Embedded GPU] 2803 AD106 [GeForce RTX 4060 Ti] 2805 AD106 [GeForce RTX 4060 Ti 16GB] 2820 AD106M [GeForce RTX 4070 Max-Q / Mobile] 2838 AD106GLM [RTX 3000 Ada Generation Laptop GPU] 2860 AD106M [GeForce RTX 4070 Max-Q / Mobile] + 2878 AD106GLM [RTX 3000 Ada Generation Embedded GPU] 2882 AD107 [GeForce RTX 4060] 28a0 AD107M [GeForce RTX 4060 Max-Q / Mobile] 28a1 AD107M [GeForce RTX 4050 Max-Q / Mobile] 28b8 AD107GLM [RTX 2000 Ada Generation Laptop GPU] 28e0 AD107M [GeForce RTX 4060 Max-Q / Mobile] 28e1 AD107M [GeForce RTX 4050 Max-Q / Mobile] + 28f8 AD107GLM [RTX 2000 Ada Generation Embedded GPU] 10df Emulex Corporation 0720 OneConnect NIC (Skyhawk) 103c 1934 FlexFabric 20Gb 2-port 650M Adapter @@ -13126,7 +13157,7 @@ 5289 RTL8411 PCI Express Card Reader 1043 1457 K55A Laptop 5760 RTS5763DL x2 NVMe SSD Controller - 5762 RTS5763DL NVMe SSD Controller + 5762 RTS5762 NVMe SSD Controller 5763 RTS5763DL NVMe SSD Controller (DRAM-less) 5765 RTS5765DL NVMe SSD Controller (DRAM-less) 8029 RTL-8029(AS) @@ -14093,6 +14124,7 @@ 5409 VX855/VX875 APIC and Central Traffic Control 5410 VX900 Series APIC and Central Traffic Control 6100 VT85C100A [Rhine II] + 6122 VN1000 Graphics [Chrome 520 IGP] 6287 SATA RAID Controller 6290 K8M890CE Host Bridge 6327 P4M890 Security Device @@ -17094,7 +17126,7 @@ 12a2 Newgen Systems Corporation 12a3 Lucent Technologies 8105 T8105 H100 Digital Switch -12a4 NTT Electronics Corporation +12a4 NTT Innovative Devices Corporation 12a5 Vision Dynamics Ltd. 12a6 Scalable Networks, Inc. 12a7 AMO GmbH @@ -19948,6 +19980,8 @@ 103c 3383 Ethernet 1Gb 4-port 331T Adapter 14e4 1904 4-port 1Gb Ethernet Adapter 14e4 1909 Broadcom NetXtreme 5719 Quad Port Gigabit NIC + 14e4 d146 BCM95719-P41 4x1GBT Ethernet NIC + 14e4 d346 BCM95719-N41 4x1GBT Ethernet NIC 193d 1025 NIC-ETH330T-LP-4P 1659 NetXtreme BCM5721 Gigabit Ethernet PCI Express 1014 02c6 eServer xSeries server mainboard @@ -20251,6 +20285,8 @@ 117c 00ce FastFrame N4T2 Dual-port 10GBASE-T Ethernet Adapter 14e4 4163 NetXtreme-E Dual-port 10GBASE-T Ethernet OCP 2.0 Adapter (BCM957416M4163C) 14e4 4166 NetXtreme-E Dual-port 10GBASE-T Ethernet OCP 3.0 Adapter (BCM957416N4160C) + 14e4 d140 BCM957416-P410 4x10GBT Ethernet NIC + 14e4 d340 BCM957416-N410 4x10GBT Ethernet NIC 1590 020c Ethernet 10Gb 2-port 535T Adapter 1590 0212 Ethernet 10Gb 2-port 535FLR-T Adapter 16d9 BCM57417 NetXtreme-E 10GBASE-T RDMA Ethernet Controller @@ -20303,15 +20339,19 @@ 117c 00cf FastFrame N412 Dual-port 100Gb Ethernet Adapter 14e4 2100 NetXtreme-E Dual-port 100G QSFP56 Ethernet PCIe4.0 x16 Adapter (BCM957508-P2100G) 14e4 5208 NetXtreme-E Dual-port 100G QSFP56 Ethernet OCP 3.0 Adapter (BCM957508-N2100G) + 14e4 520a NetXtreme-E Dual-port 100G DSFP Ethernet OCP 3.0 Adapter (BCM957508-N2100GD) 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 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) 14e4 5045 NetXtreme-E BCM57504 4x25G OCP3.0 14e4 5100 NetXtreme-E Single-port 100G QSFP56 Ethernet OCP 3.0 Adapter (BCM957504-N1100G) 14e4 5105 NetXtreme-E Single-port 100G DSFP Ethernet OCP 3.0 Adapter (BCM957504-N1100GD) 14e4 5250 NetXtreme-E BCM57504 4x25G KR Mezz + 14e4 5425 NetXtreme-E Quad-port 25G SFP28 Ethernet OCP 3.0 Adapter (BCM957504-N425G) 14e4 d142 NetXtreme-E P425D BCM57504 4x25G SFP28 PCIE 1752 BCM57502 NetXtreme-E 10Gb/25Gb/40Gb/50Gb Ethernet 1800 BCM57502 NetXtreme-E Ethernet Partition @@ -21447,8 +21487,11 @@ 193d 1051 NIC-IB1040i-Mb-2P 1018 MT27800 Family [ConnectX-5 Virtual Function] 1019 MT28800 Family [ConnectX-5 Ex] + 1014 0617 PCIe4 x16 2-Port EDR IB-only ConnectX-5 CAPI Capable Adapter [IBM EC64] + 1014 0635 PCIe4 2-port 100 GbE RoCE x16 adapter [IBM EC66] 15b3 0008 ConnectX-5 Ex EN network interface card, 100GbE dual-port QSFP28, PCIe4.0 x16, tall bracket; MCX516A-CDAT 15b3 0125 Tencent ConnectX-5 EN Ex network interface card for OCP 3.0, with host management, 50GbE Dual-port QSFP28, PCIe4.0 x16, Thumbscrew (pull-tab) bracket + 15b3 0126 PCIe4 x16 2-port EDR 100GbE ConnectX-5 CAPI Capable adapter [IBM AJP1] 101a MT28800 Family [ConnectX-5 Ex Virtual Function] 101b MT28908 Family [ConnectX-6] 101c MT28908 Family [ConnectX-6 Virtual Function] @@ -21583,14 +21626,14 @@ 15b7 Sandisk Corp 2001 Skyhawk Series NVME SSD 5001 WD Black NVMe SSD - 5002 WD Black 2018/SN750 / PC SN720 NVMe SSD + 5002 SanDisk Extreme Pro / WD Black 2018/SN750/PC SN720 NVMe SSD 5003 WD Blue SN500 / PC SN520 NVMe SSD 5004 PC SN520 NVMe SSD 5005 PC SN520 NVMe SSD - 5006 WD Black SN750 / PC SN730 NVMe SSD + 5006 WD Black SN750 / PC SN730 / Red SN700 NVMe SSD 5007 IX SN530 NVMe SSD (DRAM-less) 5008 PC SN530 NVMe SSD (DRAM-less) - 5009 WD Blue SN550 NVMe SSD + 5009 SanDisk Ultra 3D / WD Blue SN550 NVMe SSD 15b7 5009 WD Blue SN550 NVMe SSD 500b PC SN530 NVMe SSD 1414 500b Xbox Series X @@ -21601,13 +21644,14 @@ 5016 WD PC SN740 NVMe SSD 512GB (DRAM-less) 5017 WD Black SN770 / PC SN740 256GB / PC SN560 (DRAM-less) NVMe SSD 5019 WD Green SN350 NVMe SSD 240GB (DRAM-less) - 501a WD Blue SN570 NVMe SSD 1TB + 501a WD Blue SN570 NVMe SSD 501d WD Blue SN550 NVMe SSD 2TB (DRAM-less) 501e PC SN735 NVMe SSD (DRAM-less) 501f WD PC SN735 NVMe SSD 512GB (DRAM-less) 5025 WD Blue SN570 NVMe SSD 2TB 5026 WD PC SN735 NVMe SSD 1TB (DRAM-less) - 5030 Western Digital WD Black SN850X NVMe SSD + 5030 WD Black SN850X NVMe SSD + 5041 WD Blue SN580 NVMe SSD (DRAM-less) 15b8 ADDI-DATA GmbH 1001 APCI1516 SP controller (16 digi outputs) 1003 APCI1032 SP controller (32 digi inputs w/ opto coupler) @@ -22781,7 +22825,8 @@ 188a ARC-1886 series PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller 17d3 1217 ARC-1217 4-Port PCIe 4.0 to SAS/SATA 12/6Gb RAID Controller 17d3 1227 ARC-1227 8-Port PCIe 4.0 to SAS/SATA 12/6Gb RAID Controller - 17d3 1686 ARC-1686 PCIe 4.0 to SAS/SATA 12/6Gb Tape drive Controller + 17d3 1686 ARC-1686 PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller + 17d3 1688 ARC-1688 PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller 17d3 1886 ARC-1886 PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller # nee Neterion Inc., previously S2io Inc. 17d5 Exar Corp. @@ -23865,6 +23910,14 @@ 1a0d SEAKR Engineering 1a0e DekTec Digital Video B.V. 083f DTA-2111 VHF/UHF Modulator + 0860 DTA-2144(B) Quad ASI/SDI in+out + 0861 DTA-2145 ASI/SDI in+out with bypass relay + 087c DTA-2172 Dual 3G-SDI/ASI ports + 087e DTA-2174 Quad 3G-SDI/ASI in+out + 087f DTA-2175 3G-SDI/ASI input+output with bypass relay + 0882 DTA-2178 Octal 12G-SDI/ASI ports with genlock + a882 DTA-2178-ASI Octal ASI Ports + b87e DTA-2174B Quad 3G-SDI/ASI ports (1x12G) with genlock 1a17 Force10 Networks, Inc. 8002 PB-10GE-2P 10GbE Security Card 1a1d GFaI e.V. @@ -23974,6 +24027,8 @@ 0017 SEL-3350 GPIO Expansion Board 0018 SEL-3390E4 Ethernet Adapter 001c SEL-3390E4 Ethernet Adapter +1aab Silver Creations AG + 7750 Sceye 10L 1aae Global Velocity, Inc. 1ab4 Distributed Management Task Force, Inc. (DMTF) 1ab6 CalDigit, Inc. @@ -24158,6 +24213,7 @@ 2142 ASM2142/ASM3142 USB 3.1 Host Controller 1462 7a72 H270 PC MATE 2824 ASM2824 PCIe Gen3 Packet Switch + 3042 ASM3042 USB 3.2 Gen 1 xHCI Controller 3242 ASM3242 USB 3.2 Host Controller 1b26 Netcope Technologies, a.s. c132 COMBO-LXT155 @@ -24237,6 +24293,9 @@ 1b4b 2241 Santa Cruz NVMe Host Adapter 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit 1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit + 2b43 NXP 88W9098 Wi-Fi 6 (ax) MAC #1 + 2b44 NXP 88W9098 Wi-Fi 6 (ax) MAC #2 + 2b45 NXP 88W9098 Bluetooth 5.3 9120 88SE9120 SATA 6Gb/s Controller 9123 88SE9123 PCIe SATA 6.0 Gb/s controller dc93 600e DC-6xxe series SATA 6G controller @@ -24321,6 +24380,7 @@ 2404 Ultrastar DC SN640 NVMe SSD 2500 Ultrastar DC SN840 NVMe SSD 2600 Ultrastar DC ZN540 ZNS NVMe SSD + 3001 RapidFlex C2000 NVMe Initiator 3714 PC SN730 NVMe SSD 3734 PC SN730 NVMe SSD 1b9a XAVi Technologies Corp. @@ -24438,7 +24498,7 @@ 1bb1 01a1 Nytro XP7102 5012 FireCuda/IronWolf 510 SSD 5013 BarraCuda Q5 NVMe SSD (DRAM-less) - 5016 FireCuda 520 SSD + 5016 FireCuda 520/IronWolf 525 SSD 5018 FireCuda 530 SSD 1bb3 Bluecherry 4304 BC-04120A MPEG4 4 port video encoder / decoder @@ -24505,6 +24565,7 @@ 1bf4 VTI Instruments Corporation 0001 SentinelEX 7011 RX0xxx +1bf5 Greenliant 1bfc Duagon AG 1bfd EeeTOP 1c00 Nanjing Qinheng Microelectronics Co., Ltd. @@ -24703,6 +24764,12 @@ 1c5f 4b51 NVMe SSD PBlaze6 6936 12800GB 2.5" U.3 1c5f 4b61 NVMe SSD PBlaze6 6936 25600GB 2.5" U.3 003f PBlaze7 7940/7946 NVMe SSD + 1c5f 1431 NVMe SSD PBlaze7 7940 3840G 2.5" U.2 + 1c5f 1441 NVMe SSD PBlaze7 7940 7680G 2.5" U.2 + 1c5f 1451 NVMe SSD PBlaze7 7940 15360G 2.5" U.2 + 1c5f 5431 NVMe SSD PBlaze7 7946 3200G 2.5" U.2 + 1c5f 5441 NVMe SSD PBlaze7 7946 6400G 2.5" U.2 + 1c5f 5451 NVMe SSD PBlaze7 7946 12800G 2.5" U.2 0540 PBlaze4 NVMe SSD 0550 PBlaze5 700/900 0555 PBlaze5 510/516 @@ -24853,47 +24920,55 @@ 0714 ZX-100/ZX-200 PCI Express Root Port 0715 ZX-100/ZX-200 PCI Express Root Port 0716 ZX-D PCI Express Root Port - 0717 KX-5000/KX-6000/KX-6000G Express Root Port - 0718 KX-5000/KX-6000/KX-6000G Express Root Port - 0719 KX-5000/KX-6000/KX-6000G Express Root Port - 071a KX-5000/KX-6000/KX-6000G Express Root Port - 071b KX-5000/KX-6000/KX-6000G Express Root Port - 071c KX-5000/KX-6000/KX-6000G Express Root Port - 071d KX-5000/KX-6000/KX-6000G Express Root Port - 071e KX-5000/KX-6000/KX-6000G Express Root Port + 0717 KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 0718 KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 0719 KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071a KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071b KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071c KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071d KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071e KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port 071f ZX-200 Upstream Port of PCI Express Switch 0720 ZX-200 PCIE RC6 controller 0721 ZX-200 Downstream Port of PCI Express Switch 0722 ZX-200 PCIE P2C bridge + 0731 KH-40000 Express Root Port + 0732 KH-40000 Express Root Port 1000 ZX-D Standard Host Bridge - 1001 ZX-D/ZX-E Miscellaneous Bus + 1001 ZX-D/ZX-E/KH-40000 Miscellaneous Bus 1003 ZX-E Standard Host Bridge + 1005 KH-40000 Standard Host Bridge 1006 KX-6000G Standard Host Bridge 3001 ZX-100 Standard Host Bridge 300a ZX-100 Miscellaneous Bus - 3038 ZX-100/ZX-200/KX-6000/KX-6000G Standard Universal PCI to USB Host Controller - 3104 ZX-100/ZX-200/KX-6000/KX-6000G Standard Enhanced PCI to USB Host Controller - 31b0 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge - 31b1 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge - 31b2 ZX-100/KX-5000/KX-6000/KX-6000G DRAM Controller - 31b3 ZX-100/KX-5000/KX-6000/KX-6000G Power Management Controller - 31b4 ZX-100/KX-5000/KX-6000/KX-6000G I/O APIC - 31b5 ZX-100/KX-5000/KX-6000/KX-6000G Scratch Device - 31b7 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge + 3038 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 Standard Universal PCI to USB Host Controller + 3104 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 Standard Enhanced PCI to USB Host Controller + 31b0 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge + 31b1 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge + 31b2 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 DRAM Controller + 31b3 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Power Management Controller + 31b4 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 I/O APIC + 31b5 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Scratch Device + 31b7 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge 31b8 ZX-100/ZX-D PCI to PCI Bridge - 3288 ZX-100/KX-5000/KX-6000/KX-6000G High Definition Audio Controller - 345b ZX-100/KX-5000/KX-6000/KX-6000G Miscellaneous Bus + 3288 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 High Definition Audio Controller + 345b ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Miscellaneous Bus 3a02 ZX-100 C-320 GPU 3a03 ZX-D C-860 GPU 3a04 ZX-E C-960 GPU + 3b01 KH-40000 OPI Controller + 3b02 KH-40000 OPI Controller + 3b03 KH-40000 OPI Controller + 3b04 KH-40000 OPI Controller + 3c00 KH-40000 DRAM Controller 3c02 KX-6000G DRAM Controller 3d01 KX-6000G C-1080 GPU - 9002 ZX-100/ZX-200 EIDE Controller + 9002 ZX-100/ZX-200/KH-40000 EIDE Controller 9003 ZX-100/KX-6000/KX-6000G EIDE Controller - 9043 KX-6000G RAID Controller + 9043 KX-6000G/KH-40000 RAID Controller 9045 ZX-100/ZX-D/ZX-E RAID Accelerator 0 9046 ZX-D/ZX-E RAID Accelerator 1 - 9083 ZX-100/ZX-200/KX-6000/KX-6000G StorX AHCI Controller + 9083 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 StorX AHCI Controller 9084 ZX-100 StorX AHCI Controller 9100 ZX-200 Cross bus 9101 ZX-200 Traffic Controller @@ -24902,11 +24977,14 @@ 9144 ZX-E High Definition Audio Controller 9145 KX-6000G High Definition Audio Controller 9180 ZX-200 Networking Gigabit Ethernet Adapter + 91c1 KH-40000 ZPI Controller + 91c2 KH-40000 ZPI Controller 9202 ZX-100 USB eXtensible Host Controller 9203 ZX-200 USB eXtensible Host Controller 9204 KX-6000/KX-6000G USB eXtensible Host Controller + 9205 KH-40000 USB eXtensible Host Controller 9286 ZX-D eMMC Host Controller - 9300 ZX-100/KX-5000/KX-6000/KX-6000G eSPI Host Controller + 9300 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 eSPI Host Controller 95d0 ZX-100 Universal SD Host Controller f410 ZX-100/KX-5000/KX-6000/KX-6000G PCI Com Port 1d18 RME @@ -24944,6 +25022,7 @@ 1d44 DPT a400 PM2x24/PM3224 1d49 Lenovo + 0522 ThinkSystem RAID 5350-8i PCIe 12Gb Internal Adapter 1d4c Diamanti, Inc. 1d5c Fantasia Trading LLC 1d61 Technobox, Inc. @@ -25075,8 +25154,9 @@ 1d78 7208 Aliflash V2 U.2 15mm 7.68TB NVMe SSD 1d79 Transcend Information, Inc. 2262 NVMe PCIe SSD 220S - 2263 NVMe PCIe SSD 120S/112S (DRAM-less) + 2263 NVMe PCIe SSD 110S/112S/120S/MTE652T2 (DRAM-less) 2264 NVMe PCIe SSD 250H + 2267 NVMe PCIe SSD 240S/MTE710T 5766 NVMe PCIe SSD 110Q (DRAM-less) 1d7c Aerotech, Inc. # Fiber-optic HyperWire motion control bus from Aerotech. @@ -25207,10 +25287,17 @@ 0010 N-10m2 NVMe SSD 1dd8 AMD Pensando Systems 0002 DSC2 Elba Upstream Port + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1000 DSC Capri Upstream Port 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB @@ -25223,6 +25310,7 @@ 1dd8 400e DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1001 DSC Virtual Downstream Port + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25235,9 +25323,16 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1002 DSC Ethernet Controller + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25250,9 +25345,16 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1003 DSC Ethernet Controller VF + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25265,9 +25367,16 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1004 DSC Management Controller + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25280,19 +25389,40 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1005 DSC NVMe Controller + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1006 DSC NVMe Controller VF + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1007 DSC Storage Accelerator + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25305,33 +25435,74 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1009 DSC Ethernet Controller UPT + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100a DSC Serial Port Controller + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100b DSC vDPA Network Device VF + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100c DSC PDS Core Management + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100d DSC Virtio Network Device VF + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1ddd Thorlabs 1de0 Groq 0000 TSP [GroqChip] @@ -25495,26 +25666,6 @@ 1028 2193 NVMe CD7 E3.S 1.92TB 1028 2194 NVMe CD7 E3.S 3.84TB 1028 2195 NVMe CD7 E3.S 7.68TB - 0013 NVMe SSD Controller CM7 2.5" - 1028 222d Ent NVMe CM7 FIPS U.2 RI 30.72TB - 1028 222e Ent NVMe CM7 FIPS U.2 RI 15.36TB - 1028 222f Ent NVMe CM7 FIPS U.2 RI 7.68TB - 1028 2230 Ent NVMe CM7 FIPS U.2 RI 3.84TB - 1028 2231 Ent NVMe CM7 FIPS U.2 RI 1.92TB - 1028 2232 Ent NVMe CM7 U.2 RI 30.72TB - 1028 2233 Ent NVMe CM7 U.2 RI 15.36TB - 1028 2234 Ent NVMe CM7 U.2 RI 7.68TB - 1028 2235 Ent NVMe CM7 U.2 RI 3.84TB - 1028 2236 Ent NVMe CM7 U.2 RI 1.92TB - 1028 2237 Ent NVMe CM7 FIPS U.2 MU 12.8TB - 1028 2238 Ent NVMe CM7 FIPS U.2 MU 6.4TB - 1028 2239 Ent NVMe CM7 FIPS U.2 MU 3.2TB - 1028 223a Ent NVMe CM7 FIPS U.2 MU 1.6TB - 1028 223b Ent NVMe CM7 U.2 MU 12.8TB - 1028 223c Ent NVMe CM7 U.2 MU 6.4TB - 1028 223d Ent NVMe CM7 U.2 MU 3.2TB - 1028 223e Ent NVMe CM7 U.2 MU 1.6TB - 1028 228c Ent NVMe CM7 U.2 MU 6.4TB 0014 NVMe SSD Controller CM7 EDSFF 1028 223f Ent NVMe CM7 FIPS E3.S RI 15.36TB 1028 2240 Ent NVMe CM7 FIPS E3.S RI 7.68TB @@ -25527,6 +25678,10 @@ 1028 2247 Ent NVMe CM7 E3.S MU 6.4TB 1028 2248 Ent NVMe CM7 E3.S MU 3.2TB 1028 2249 Ent NVMe CM7 E3.S MU 1.6TB + 1028 22b7 Ent NVMe CM7 FIPS E3.S MU 1.6TB + 1028 22b8 Ent NVMe CM7 FIPS E3.S MU 3.2TB + 1028 22b9 Ent NVMe CM7 FIPS E3.S MU 6.4TB + 1028 22ba Ent NVMe CM7 FIPS E3.S MU 12.8TB 0018 Exceria Pro NVMe SSD 001f NVMe SSD Controller CD8 1028 2223 DC NVMe CD8 U.2 SED 15.36TB @@ -25539,6 +25694,25 @@ 1028 222a DC NVMe CD8 U.2 3.84TB 1028 222b DC NVMe CD8 U.2 1.92TB 1028 222c DC NVMe CD8 U.2 960GB + 0025 NVMe SSD Controller CM7 2.5" + 1028 222d Ent NVMe CM7 FIPS U.2 RI 30.72TB + 1028 222e Ent NVMe CM7 FIPS U.2 RI 15.36TB + 1028 222f Ent NVMe CM7 FIPS U.2 RI 7.68TB + 1028 2230 Ent NVMe CM7 FIPS U.2 RI 3.84TB + 1028 2231 Ent NVMe CM7 FIPS U.2 RI 1.92TB + 1028 2232 Ent NVMe CM7 U.2 RI 30.72TB + 1028 2233 Ent NVMe CM7 U.2 RI 15.36TB + 1028 2234 Ent NVMe CM7 U.2 RI 7.68TB + 1028 2235 Ent NVMe CM7 U.2 RI 3.84TB + 1028 2236 Ent NVMe CM7 U.2 RI 1.92TB + 1028 2237 Ent NVMe CM7 FIPS U.2 MU 12.8TB + 1028 2238 Ent NVMe CM7 FIPS U.2 MU 6.4TB + 1028 2239 Ent NVMe CM7 FIPS U.2 MU 3.2TB + 1028 223a Ent NVMe CM7 FIPS U.2 MU 1.6TB + 1028 223b Ent NVMe CM7 U.2 MU 12.8TB + 1028 223c Ent NVMe CM7 U.2 MU 6.4TB + 1028 223d Ent NVMe CM7 U.2 MU 3.2TB + 1028 223e Ent NVMe CM7 U.2 MU 1.6TB 1e17 Arnold & Richter Cine Technik GmbH & Co. Betriebs KG 1e18 Beijing GuangRunTong Technology Development Co.,Ltd 1e24 Squirrels Research Labs @@ -25570,10 +25744,10 @@ 8032 S6 [Enflame] # FHFL PCIe card, single slot, 3rd generation from Enflame c031 S30 [Enflame] -# HHHL PCIe card, dual slot, 3rd generation from Enflame - c032 S60 [Enflame] # FHFL PCIe card, single slot, 3rd generation from Enflame, 48GB device memory - c033 S30 [Enflame] + c032 S90 [Enflame] +# FHFL PCIe card, single slot, 3rd generation from Enflame, 48GB device memory + c033 S60 [Enflame] # nee Thinci, Inc 1e38 Blaize, Inc 0102 Xplorer X1600 @@ -25657,6 +25831,10 @@ 1e3b 0084 Enterprise NVMe SSD U.2 3.2TB (H5300) 1e3b 0085 Enterprise NVMe SSD U.2 6.4TB (H5300) 1e3d Burlywood, Inc +1e43 MaxLinear Inc + 8904 MxL8904 + 8906 MxL8906 + 8908 MxL8908 1e44 Valve Software 1e49 Yangtze Memory Technologies Co.,Ltd 0001 ZHITAI PC005 NVMe SSD @@ -25957,6 +26135,7 @@ 1f60 Accelecom 0001 XELE-NIC 25K5 0054 XELE-NIC 25K5 +1f67 Yunsilicon Technology Co,. Ltd. 1faa Hexaflake (Shanghai) Information Technology Co., Ltd. 0c10 Compass C10 PF 0c11 Compass C10 VF @@ -26065,6 +26244,14 @@ 2000 AWM 2 2010 AWM 2-M 1fe4 HippStor Technology + 1600 HP600 Series NVMe SSD + 1fe4 0075 Enterprise NVMe SSD U.2 3.84TB(HP610) + 1fe4 0076 Enterprise NVMe SSD U.2 7.68TB(HP610) + 1fe4 0077 Enterprise NVMe SSD U.2 6.40TB(HP630) + 1fe4 0078 Enterprise NVMe SSD U.2 3.20TB(HP630) +1ff4 DEEPX Co., Ltd. + 0000 DX_M1 + 0001 DX_M1A 2000 Smart Link Ltd. 2800 SmartPCI2800 V.92 PCI Soft DFT 2001 Temporal Research Ltd @@ -26088,6 +26275,7 @@ 2262 KC2000/KC2500 NVMe SSD 2263 A2000 NVMe SSD 5008 U-SNS8154P3 NVMe SSD + 500a DC1000B NVMe SSD 500b DC1000M NVMe SSD 500c OM8PCP Design-In PCIe 3 NVMe SSD (DRAM-less) 500d OM3PDP3 NVMe SSD @@ -26533,6 +26721,8 @@ 5053 Voyetra Technologies 2010 Daytona Audio Adapter 50b2 TerraTec Electronic GmbH +50ce System-on-Chip Engineering S.L. + 0001 RELY-MIL-XMC-TSN-SWITCH 5136 S S Technologies 5143 Qualcomm Inc 5145 Ensoniq (Old) @@ -26696,6 +26886,17 @@ 544d 6905 TBS6905 DVB-S2 Quad Tuner PCIe Card 6205 0001 TBS6205 DVB-T2/T/C Quad TV Tuner PCIe Card 6209 0001 TBS6209 DVB-T2/C2/T/C/ISDB-T OctaTV Tuner + 6590 0001 TBS6590 DVB-S/S2/S2X/T/T2/C/C2/ISDB-T + 2xCI + 6590 0002 TBS6590SE DVB-S/S2/S2X/T/T2/C/C2 + 2xCI + 6704 ffff TBS6704 (Quad ATSC/QAMB) + 6903 0020 TBS6903x (Dual DVB-S/S2/S2X) + 6903 0021 TBS6903x (Dual DVB-S/S2/S2X) + 6903 8888 TBS6903x (Dual DVB-S/S2/S2X) + 6909 0009 TBS6909x (Octa DVB-S/S2/S2X) + 6909 0010 TBS6909x (Octa DVB-S/S2/S2X) + 6909 0019 TBS6909x (Octa DVB-S/S2/S2X) + 6910 0001 TBS6910 DVB-S/S2 + 2xCI + 6910 0002 TBS6910SE DVB-S/S2/S2x + 2xCI 5452 SCANLAB AG 3443 RTC4 5455 Technische Universitaet Berlin @@ -26737,6 +26938,7 @@ 6409 Logitec Corp. 6549 Teradici Corp. 1200 TERA1200 PC-over-IP Host +6590 TBS Technologies (wrong ID) 6666 Decision Computer International Co. 0001 PCCOM4 0002 PCCOM8 @@ -26754,16 +26956,24 @@ 1400 CooVOX TDM GSM Module 1600 CooVOX TDM E1/T1 Module 1800 CooVOX TDM BRI Module +6704 TBS Technologies (wrong ID) 6766 Glenfly Tech Co., Ltd. 3d00 Arise-GT-10C0 3d02 Arise1020 3d03 Arise-GT-1040 3d04 Arise1010 - 3d40 Arise-GT-10C0 High Definition Audio Controller - 3d41 Arise1020 High Definition Audio Controller + 3d06 Arise-GT-10C0t + 3d07 Arise2030 + 3d08 Arise2020 + 3d40 GLF HDMI/DP Audio + 3d41 GLF HDMI/DP Audio + 3d43 GLF HDMI/DP Audio 6899 ZT Systems # nee Qumranet 6900 Red Hat, Inc. +6903 TBS Technologies (wrong ID) +6909 TBS Technologies (wrong ID) +6910 TBS Technologies (wrong ID) 7063 pcHDTV 2000 HD-2000 3000 HD-3000 @@ -29010,6 +29220,7 @@ 1bd4 0058 Ethernet Network Adapter E810-XXVAM2 for OCP 3.0 1bd4 006e Ethernet Network Adapter E810-XXVAM2 for BD 1bd4 0083 Ethernet Network Adapter E810-XXVAM2 for lldp + 1bd4 00a0 S252IE810 1eec 0102 VSE-225-41E Dual-port 10Gb/25Gb Etherent PCIe 8086 0001 Ethernet 25G 2P E810-XXV OCP 8086 0002 Ethernet 25G 2P E810-XXV Adapter @@ -29181,8 +29392,10 @@ 188b Ethernet Connection E823-C for QSFP 188c Ethernet Connection E823-C for SFP 1028 0abd Ethernet Connection 25G 4P E823-C LOM + 17aa 405e E823 25G/10G Ethernet LOM Controller 188d Ethernet Connection E823-C/X557-AT 10GBASE-T 188e Ethernet Connection E823-C 1GbE + 17aa 405f E823 1G Ethernet LOM Controller 1890 Ethernet Connection E822-C for backplane 1891 Ethernet Connection E822-C for QSFP 1892 Ethernet Connection E822-C for SFP @@ -33629,7 +33842,7 @@ 46a0 AlderLake-P GT2 46a1 UHD Graphics 46a3 Alder Lake-P GT1 [UHD Graphics] - 46a6 Alder Lake-P Integrated Graphics Controller + 46a6 Alder Lake-P GT2 [Iris Xe Graphics] 46a8 Alder Lake-UP3 GT2 [Iris Xe Graphics] 46aa Alder Lake-UP4 GT2 [Iris Xe Graphics] 46b0 AlderLake-P [Iris Xe Graphics] @@ -33750,7 +33963,9 @@ 51a9 Alder Lake PCH UART #1 51aa Alder Lake SPI Controller 51ab Alder Lake SPI Controller + 51b0 Alder Lake PCI Express Root Port #9 51b1 Alder Lake PCI Express x1 Root Port #10 + 51bb Alder Lake-P PCH PCIe Root Port #4 51bf Alder Lake PCH-P PCI Express Root Port #9 51c5 Alder Lake-P Serial IO I2C Controller #0 51c6 Alder Lake-P Serial IO I2C Controller #1 @@ -34229,7 +34444,7 @@ 7d0b Volume Management Device NVMe RAID Controller Intel Corporation 7d40 Meteor Lake-M [Intel Graphics] 7d45 Meteor Lake-P [Intel Graphics] - 7d55 Meteor Lake-P [Intel Graphics] + 7d55 Meteor Lake-P [Intel Arc Graphics] 7d60 Meteor Lake-M [Intel Graphics] 7dd5 Meteor Lake-P [Intel Graphics] 7e01 Meteor Lake-P LPC/eSPI Controller @@ -35294,12 +35509,18 @@ a3eb Comet Lake PCI Express Root Port #21 a3f0 Comet Lake PCH-V cAVS a620 6400/6402 Advanced Memory Buffer (AMB) + a707 Raptor Lake-P/U 4p+8e cores Host Bridge/DRAM Controller a708 Raptor Lake-P/U 2p+8e cores Host Bridge/DRAM Controller a71d Raptor Lake Dynamic Platform and Thermal Framework Processor Participant + a71e Raptor Lake-P Thunderbolt 4 USB Controller a720 Raptor Lake-P [UHD Graphics] a721 Raptor Lake-P [UHD Graphics] + a72f Raptor Lake-P Thunderbolt 4 PCI Express Root Port #2 + a73e Raptor Lake-P Thunderbolt 4 NHI #0 a74d Raptor Lake PCIe 4.0 Graphics Port a74f GNA Scoring Accelerator module + a76d Raptor Lake-P Thunderbolt 4 NHI #1 + a76e Raptor Lake-P Thunderbolt 4 PCI Express Root Port #0 a77d Raptor Lake Crashlog and Telemetry a77f Volume Management Device NVMe RAID Controller Intel Corporation a780 Raptor Lake-S GT1 [UHD Graphics 770] @@ -35314,6 +35535,10 @@ a7a1 Raptor Lake-P [Iris Xe Graphics] a7a8 Raptor Lake-P [UHD Graphics] a7a9 Raptor Lake-P [UHD Graphics] + a7aa Raptor Lake-P [Intel Graphics] + a7ab Raptor Lake-P [Intel Graphics] + a7ac Raptor Lake-U [Intel Graphics] + a7ad Raptor Lake-U [Intel Graphics] abc0 Omni-Path Fabric Switch Silicon 100 Series ad0b Volume Management Device NVMe RAID Controller Intel Corporation b152 21152 PCI-to-PCI Bridge @@ -35439,12 +35664,16 @@ # Wuxi Micro Innovation Integrated Circuit Design Co.,Ltd. 8848 MUCSE *** 42 LINES SKIPPED *** From nobody Mon Dec 4 10:34:12 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkKlm6n3Tz53CRb; Mon, 4 Dec 2023 10:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKlm5xyNz4QYl; Mon, 4 Dec 2023 10:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q6MgmSYnwppJbn0wMoiRHcKP9wVJDDlnDAAjYnBemBg=; b=oN7edB5q+ji3Oo/vt+COZdX37c5ZAVyZEQppA05OcyFiCKXKV7snlhVbQN/8pDkXNzDpqW 3ssnr1Tw/PuA0EZy67LcYTdcoj+JxYFXH9fWabx/ciXG+flo68KTxqCvCXebt3WtU/HYmi SU19vg9YWX8KC9UzoepXETcQRcdZR7Q4/ICKUxrQ0RHtlynZ1piUpWEzM19VLc+0qgtGgw lBjwGGq8smJzJ6oQfe7URQUOnP4ZlzIWRqS8mToXoZC8sqs73WphpQjPgmO63pFj5N46uR fcX/wx4ZnkjqGWwnRHgPDd471bVtxzWb19VWWRPVylSZ/vsbxYFuhhrsEAoyhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q6MgmSYnwppJbn0wMoiRHcKP9wVJDDlnDAAjYnBemBg=; b=uwIyXCZrZmAiUli8rFymaWNr+4wb+7V675kigawLNeTQBNj9pzyJojXUt8qyqsRG94Bw7k K48mx72TVZJ4Pz3tmI74dCqvub732K1YE2yYgzk7FWL+A2w3JShSMNb9TvoFzhAzs17GTp dB5W4X084nFfoAybU3zfd9NwNHhfkmgqFcsd7808XUV/vYZIije+M76MngsWoKAfzpyXMX CwRv1RewrWxBHWLZMCNu/QR1e6mvzFbIQ7LUu4OP5EDRpZIRQpNc8Vsfkd72IJSEA+6tWE 7IbijbnYS2yoawqBDk4OIZGtWRHdffVhm5R6o06HlIqUd9j3EqbXjwIYvZD50w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686052; a=rsa-sha256; cv=none; b=ACk7pZEGfE0Kll3BW4Oec4wT2zOwTQkXIoAM3xd50YM0kIp1zcERdSvdw42atvFnNDDYv2 I794Uu5+0BNfGeIVzJw6Y4YHODPivYmuQexeq40ndF6VM2X+VviNiCuv1LGSBfmkYltKAD 2AXHfFdZdGFzVF08WfyJWNEgVs6xRFpmegWDkyy2T80EJCiosGgTD6UW7Opryh2CLTqLi7 xbPZbJfkj8CbNGKXwOOqrctACa0eWQGfe4/GsSfL9UI1ydj0GdhqH6KOhk0xy8+7XfLoqr g36pOWznAqWKxk4Hc+6tc5Lp9kLeOuECVGAnlxTKqn1exhjyLEcuW7RgHFf6YQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkKlm505Cz7kl; Mon, 4 Dec 2023 10:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AYCcH009140; Mon, 4 Dec 2023 10:34:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AYCfU009137; Mon, 4 Dec 2023 10:34:12 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:34:12 GMT Message-Id: <202312041034.3B4AYCfU009137@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: ef922c733a00 - stable/13 - nvi: import version 2.2.1 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ef922c733a00991fba7805b2fac50403759a102c Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ef922c733a00991fba7805b2fac50403759a102c commit ef922c733a00991fba7805b2fac50403759a102c Author: Baptiste Daroussin AuthorDate: 2023-09-27 16:01:58 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:34:07 +0000 nvi: import version 2.2.1 (cherry picked from commit 0fcececbac9880b092aeb56a41a16f1ec8ac1ae6) --- contrib/nvi/CMakeLists.txt | 4 + contrib/nvi/INSTALL.md | 47 ++++++++++++ contrib/nvi/README | 26 ++++++- contrib/nvi/common/key.c | 95 ++++++++++++++++++++++- contrib/nvi/common/main.c | 3 +- contrib/nvi/common/options.c | 2 + contrib/nvi/common/options_f.c | 2 +- contrib/nvi/common/search.c | 11 ++- contrib/nvi/ex/ex.c | 13 +++- contrib/nvi/ex/ex_argv.c | 6 +- contrib/nvi/ex/ex_subst.c | 7 +- contrib/nvi/man/vi.1 | 4 + contrib/nvi/vi/v_paragraph.c | 11 ++- contrib/nvi/vi/v_redraw.c | 1 + usr.bin/vi/ex/version.h | 3 +- usr.bin/vi/options_def.h | 169 +++++++++++++++++++++-------------------- 16 files changed, 298 insertions(+), 106 deletions(-) diff --git a/contrib/nvi/CMakeLists.txt b/contrib/nvi/CMakeLists.txt index 66d3ca2aafb0..0c935b3c2a19 100644 --- a/contrib/nvi/CMakeLists.txt +++ b/contrib/nvi/CMakeLists.txt @@ -37,6 +37,7 @@ if (NOT APPLE) endif() add_compile_options($<$:-Wuninitialized>) add_compile_options($<$:-Wno-dangling-else>) +add_compile_options(-Wno-string-compare) add_compile_options(-Wstack-protector -fstack-protector) add_compile_options(-Wstrict-aliasing -fstrict-aliasing) @@ -148,6 +149,9 @@ if(USE_WIDECHAR) target_sources(regex PRIVATE ${REGEX_SRCS}) target_include_directories(regex PUBLIC regex) target_compile_definitions(regex PUBLIC __REGEX_PRIVATE) + # The macro _XOPEN_SOURCE_EXTENDED is needed to get the waddnwstr() + # definition on at least FreeBSD and recent macOS. + target_compile_definitions(nvi PRIVATE _XOPEN_SOURCE_EXTENDED) target_link_libraries(nvi PRIVATE regex) else() find_library(CURSES_LIBRARY NAMES ncurses curses HINTS /usr/lib) diff --git a/contrib/nvi/INSTALL.md b/contrib/nvi/INSTALL.md new file mode 100644 index 000000000000..7b2fd35b7c60 --- /dev/null +++ b/contrib/nvi/INSTALL.md @@ -0,0 +1,47 @@ +# Install from source + +For instructions to bring nvi2 as a part of your operating system's base system, see [Porting](https://github.com/lichray/nvi2/wiki/Porting) in the Wiki. This document is an overview of the build process that allows you to give nvi2 a try. + +## Prerequisites + +- CMake >= 3.17; +- Ninja build system; +- libiconv (for `USE_ICONV`); +- libncursesw (for `USE_WIDECHAR`); + +Anything required by a minimal nvi, notably: + +- Berkeley DB1 in libc; +- /var/tmp/vi.recover/ with mode 41777. + +## Building + +Nvi2 uses CMake build system generator. By specifying "Ninja Multi-Config" as the build system to generate, you can compile the project in both Debug and Release modes without re-running CMake. Under the project root directory, run + +```sh +cmake -G "Ninja Multi-Config" -B build +``` + +Now `build` becomes your build directory to hold the artifacts. To build nvi2 in Debug mode, run + +```sh +ninja -C build +``` + +Upon finishing, the nvi2 executable will be available as `build/Debug/nvi`. To launch it in `ex` mode, you can create a symlink + +```sh +ln -s nvi build/Debug/ex +``` + +and run `./build/Debug/ex` rather than `./build/Debug/nvi`. + +To build nvi2 in Release mode, use the following command instead: + +```sh +ninja -C build -f build-Release.ninja +``` + +Upon finishing, you will be able to edit files with `./build/Release/nvi`. + +To change configure-time options, such as disabling wide character support, use `ccmake build`. diff --git a/contrib/nvi/README b/contrib/nvi/README index 8f61a97144be..9e638d952444 100644 --- a/contrib/nvi/README +++ b/contrib/nvi/README @@ -1,4 +1,4 @@ -This is version 2.2.0 (2020-08-01) of nex/nvi, a reimplementation of the ex/vi +This is version 2.2.1 (2023-09-25) of nex/nvi, a reimplementation of the ex/vi text editors originally distributed as part of the Fourth Berkeley Software Distribution (4BSD), by the University of California, Berkeley. @@ -24,6 +24,30 @@ o Nvi was written by Keith Bostic, and the last version is 1.79. After that, Jun-ichiro itojun Hagino developed the file encoding detection techniques in his nvi-m17n. +o In nvi2, Zhihao Yuan incorporated the multibyte encoding support onto DB1. + + It was not possible without great support from Alexander Leidinger, + Peter Wemm, and the FreeBSD community. + + Last but not least, money from Google Summer of Code. + +o Since then, + + Todd C. Miller and Craig Leres adopted and refined the NetBSD-style + expandtab option. + + Yamamoto Takashi, Matija Skala, and Jessica Clarke ported the + software to macOS and Linux. + + Anthony J. Bentley made heroic efforts to modernize the code base + and documentation, leveraging experience from OpenBSD to improve the + quality of the project. + + ...and many others, including Michael McConville, Marc Simpson, + Jeffrey H. Johnson, Bosco García, Anton Konyahin, Walter Alejandro + Iglesias, and those who tried hard to keep anonymous on GitHub :) + Their insights render the software usable, secure, and sustainable. + The following acknowledgments were written by Keith Bostic: =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= diff --git a/contrib/nvi/common/key.c b/contrib/nvi/common/key.c index e71396893fd4..1ccfb61ee0a1 100644 --- a/contrib/nvi/common/key.c +++ b/contrib/nvi/common/key.c @@ -31,6 +31,7 @@ static int v_event_grow(SCR *, int); static int v_key_cmp(const void *, const void *); static void v_keyval(SCR *, int, scr_keyval_t); static void v_sync(SCR *, int); +static const char *alt_key_notation(int ch); /* * !!! @@ -252,6 +253,10 @@ v_key_name(SCR *sp, ARG_CHAR_T ach) * followed by the character offset from the '@' character in the ASCII * character set. Del (0x7f) is represented as '^' followed by '?'. * + * If set O_ALTNOTATION, control characters less than 0x20 are + * represented in notations. Carriage feed, escape, and + * delete are marked as , , and , respectively. + * * XXX * The following code depends on the current locale being identical to * the ASCII map from 0x40 to 0x5f (since 0x1f + 0x40 == 0x5f). I'm @@ -264,9 +269,14 @@ v_key_name(SCR *sp, ARG_CHAR_T ach) if (CAN_PRINT(sp, ach)) goto done; nopr: if (iscntrl(ch) && (ch < 0x20 || ch == 0x7f)) { - sp->cname[0] = '^'; - sp->cname[1] = ch == 0x7f ? '?' : '@' + ch; - len = 2; + if (O_ISSET(sp, O_ALTNOTATION)) { + const char *notation = alt_key_notation(ch); + len = strlcpy(sp->cname, notation, sizeof(sp->cname)); + } else { + sp->cname[0] = '^'; + sp->cname[1] = ch == 0x7f ? '?' : '@' + ch; + len = 2; + } goto done; } #ifdef USE_WIDECHAR @@ -745,6 +755,85 @@ v_sync(SCR *sp, int flags) rcv_sync(sp, flags); } +/* + * alt_key_notation -- + * Lookup for alternative notations of control characters. + */ +static const char* +alt_key_notation(int ch) +{ + switch (ch) { + case 0x00: + return ""; + case 0x01: + return ""; + case 0x02: + return ""; + case 0x03: + return ""; + case 0x04: + return ""; + case 0x05: + return ""; + case 0x06: + return ""; + case 0x07: + return ""; + case 0x08: + return ""; + case 0x09: + return ""; + case 0x0A: + return ""; + case 0x0B: + return ""; + case 0x0C: + return ""; + case 0x0D: + return ""; + case 0x0E: + return ""; + case 0x0F: + return ""; + case 0x10: + return ""; + case 0x11: + return ""; + case 0x12: + return ""; + case 0x13: + return ""; + case 0x14: + return ""; + case 0x15: + return ""; + case 0x16: + return ""; + case 0x17: + return ""; + case 0x18: + return ""; + case 0x19: + return ""; + case 0x1A: + return ""; + case 0x1B: + return ""; + case 0x1C: + return ""; + case 0x1D: + return ""; + case 0x1E: + return ""; + case 0x1F: + return ""; + case 0x7f: + return ""; + default: + __builtin_unreachable(); + } +} + /* * v_event_err -- * Unexpected event. diff --git a/contrib/nvi/common/main.c b/contrib/nvi/common/main.c index a7e60f1af806..807dbde3895c 100644 --- a/contrib/nvi/common/main.c +++ b/contrib/nvi/common/main.c @@ -419,8 +419,7 @@ err: rval = 1; * PUBLIC: void v_end(GS *); */ void -v_end(gp) - GS *gp; +v_end(GS *gp) { MSGS *mp; SCR *sp; diff --git a/contrib/nvi/common/options.c b/contrib/nvi/common/options.c index d5c039f97228..c3d1f7343f9a 100644 --- a/contrib/nvi/common/options.c +++ b/contrib/nvi/common/options.c @@ -46,6 +46,8 @@ static int opts_print(SCR *, OPTLIST const *); * VI and EX Text Editors", 1990. */ OPTLIST const optlist[] = { +/* O_ALTNOTATION */ + {L("altnotation"), f_print, OPT_0BOOL, 0}, /* O_ALTWERASE 4.4BSD */ {L("altwerase"), f_altwerase, OPT_0BOOL, 0}, /* O_AUTOINDENT 4BSD */ diff --git a/contrib/nvi/common/options_f.c b/contrib/nvi/common/options_f.c index 45ab913c55ab..fe07e4989f05 100644 --- a/contrib/nvi/common/options_f.c +++ b/contrib/nvi/common/options_f.c @@ -147,7 +147,7 @@ f_print(SCR *sp, OPTION *op, char *str, u_long *valp) int offset = op - sp->opts; /* Preset the value, needed for reinitialization of lookup table. */ - if (offset == O_OCTAL) { + if (offset == O_OCTAL || offset == O_ALTNOTATION) { if (*valp) O_SET(sp, offset); else diff --git a/contrib/nvi/common/search.c b/contrib/nvi/common/search.c index e8dcac431f51..c3f7291437ff 100644 --- a/contrib/nvi/common/search.c +++ b/contrib/nvi/common/search.c @@ -103,9 +103,14 @@ prev: if (sp->re == NULL) { ++p; break; } - if (plen > 1 && p[0] == '\\' && p[1] == delim) { - ++p; - --plen; + if (plen > 1 && p[0] == '\\') { + if (p[1] == delim) { + ++p; + --plen; + } else if ( p[1] == '\\') { + *t++ = *p++; + --plen; + } } } if (epp != NULL) diff --git a/contrib/nvi/ex/ex.c b/contrib/nvi/ex/ex.c index fd920a8df9a1..900678e942eb 100644 --- a/contrib/nvi/ex/ex.c +++ b/contrib/nvi/ex/ex.c @@ -154,6 +154,10 @@ ex(SCR **spp) if (file_end(sp, NULL, F_ISSET(sp, SC_EXIT_FORCE))) return (1); *spp = screen_next(sp); + if (*spp) { + F_CLR(*spp, SC_SCR_VI); + F_SET(*spp, SC_SCR_EX); + } return (screen_end(sp)); } } @@ -1463,8 +1467,13 @@ addr_verify: LF_INIT(FL_ISSET(ecp->iflags, E_C_HASH | E_C_LIST | E_C_PRINT)); if (!LF_ISSET(E_C_HASH | E_C_LIST | E_C_PRINT | E_NOAUTO) && !F_ISSET(sp, SC_EX_GLOBAL) && - O_ISSET(sp, O_AUTOPRINT) && F_ISSET(ecp, E_AUTOPRINT)) - LF_INIT(E_C_PRINT); + O_ISSET(sp, O_AUTOPRINT) && F_ISSET(ecp, E_AUTOPRINT)) { + /* Honor the number option if autoprint is set. */ + if (F_ISSET(ecp, E_OPTNUM)) + LF_INIT(E_C_HASH); + else + LF_INIT(E_C_PRINT); + } if (LF_ISSET(E_C_HASH | E_C_LIST | E_C_PRINT)) { cur.lno = sp->lno; diff --git a/contrib/nvi/ex/ex_argv.c b/contrib/nvi/ex/ex_argv.c index 8b1fd7858fb1..dd37fe1f69e2 100644 --- a/contrib/nvi/ex/ex_argv.c +++ b/contrib/nvi/ex/ex_argv.c @@ -764,11 +764,11 @@ err: if (ifp != NULL) * shell that does that is broken. */ for (p = bp, len = 0, ch = EOF; - (ch = GETC(ifp)) != EOF; *p++ = ch, blen-=sizeof(CHAR_T), ++len) + (ch = GETC(ifp)) != EOF; *p++ = ch, blen -= sizeof(CHAR_T), ++len) if (blen < 5) { - ADD_SPACE_GOTOW(sp, bp, *blenp, *blenp * 2); + ADD_SPACE_GOTO(sp, CHAR_T, bp, *blenp, *blenp * 2); p = bp + len; - blen = *blenp - len; + blen = *blenp - len * sizeof(CHAR_T); } /* Delete the final newline, nul terminate the string. */ diff --git a/contrib/nvi/ex/ex_subst.c b/contrib/nvi/ex/ex_subst.c index bf03e4417e91..3113ac5ca360 100644 --- a/contrib/nvi/ex/ex_subst.c +++ b/contrib/nvi/ex/ex_subst.c @@ -643,7 +643,9 @@ nextmatch: match[0].rm_so = 0; goto lquit; } } else { - if (ex_print(sp, cmdp, &from, &to, 0) || + const int flags = + O_ISSET(sp, O_NUMBER) ? E_C_HASH : 0; + if (ex_print(sp, cmdp, &from, &to, flags) || ex_scprint(sp, &from, &to)) goto lquit; if (ex_txt(sp, tiq, 0, TXT_CR)) @@ -1195,7 +1197,8 @@ re_tag_conv(SCR *sp, CHAR_T **ptrnp, size_t *plenp, int *replacedp) for (; len > 0; --len) { if (p[0] == '\\' && (p[1] == '/' || p[1] == '?')) { ++p; - --len; + if (len > 1) + --len; } else if (STRCHR(L("^.[]$*"), p[0])) *t++ = '\\'; *t++ = *p++; diff --git a/contrib/nvi/man/vi.1 b/contrib/nvi/man/vi.1 index b6eaf6964bbd..f1893040ceb7 100644 --- a/contrib/nvi/man/vi.1 +++ b/contrib/nvi/man/vi.1 @@ -2282,6 +2282,10 @@ and .Nm vi modes, unless otherwise specified. .Bl -tag -width Ds +.It Cm altnotation Bq off +Display control characters less than 0x20 in notations. +Carriage feed, escape, and delete are marked as , , and , +respectively. .It Cm altwerase Bq off .Nm vi only. diff --git a/contrib/nvi/vi/v_paragraph.c b/contrib/nvi/vi/v_paragraph.c index abe8d9cf50e0..2d7f07569b79 100644 --- a/contrib/nvi/vi/v_paragraph.c +++ b/contrib/nvi/vi/v_paragraph.c @@ -39,15 +39,20 @@ if (p[0] == '\014') { \ if (!--cnt) \ goto found; \ + if (pstate == P_INTEXT && !--cnt) \ + goto found; \ continue; \ } \ if (p[0] != '.' || len < 2) \ continue; \ for (lp = VIP(sp)->ps; *lp != '\0'; lp += 2) \ if (lp[0] == p[1] && \ - (lp[1] == ' ' && len == 2 || lp[1] == p[2]) && \ - !--cnt) \ - goto found; \ + (lp[1] == ' ' && len == 2 || lp[1] == p[2])) { \ + if (!--cnt) \ + goto found; \ + if (pstate == P_INTEXT && !--cnt) \ + goto found; \ + } \ } while (0) /* diff --git a/contrib/nvi/vi/v_redraw.c b/contrib/nvi/vi/v_redraw.c index de6ed0079701..046fcf15c1b4 100644 --- a/contrib/nvi/vi/v_redraw.c +++ b/contrib/nvi/vi/v_redraw.c @@ -29,5 +29,6 @@ int v_redraw(SCR *sp, VICMD *vp) { + F_SET(sp, SC_SCR_REFORMAT); return (sp->gp->scr_refresh(sp, 1)); } diff --git a/usr.bin/vi/ex/version.h b/usr.bin/vi/ex/version.h index 657da969e721..1c18911cc593 100644 --- a/usr.bin/vi/ex/version.h +++ b/usr.bin/vi/ex/version.h @@ -1,2 +1 @@ - -#define VI_VERSION "2.2.0 (2020-08-01)" +#define VI_VERSION "2.2.1 (2023-09-25)" diff --git a/usr.bin/vi/options_def.h b/usr.bin/vi/options_def.h index 54dd6c20c891..cd6f5ba3eb26 100644 --- a/usr.bin/vi/options_def.h +++ b/usr.bin/vi/options_def.h @@ -1,84 +1,85 @@ -#define O_ALTWERASE 0 -#define O_AUTOINDENT 1 -#define O_AUTOPRINT 2 -#define O_AUTOWRITE 3 -#define O_BACKUP 4 -#define O_BEAUTIFY 5 -#define O_CDPATH 6 -#define O_CEDIT 7 -#define O_COLUMNS 8 -#define O_COMBINED 9 -#define O_COMMENT 10 -#define O_TMPDIR 11 -#define O_EDCOMPATIBLE 12 -#define O_ERRORBELLS 13 -#define O_ESCAPETIME 14 -#define O_EXPANDTAB 15 -#define O_EXRC 16 -#define O_EXTENDED 17 -#define O_FILEC 18 -#define O_FILEENCODING 19 -#define O_FLASH 20 -#define O_HARDTABS 21 -#define O_ICLOWER 22 -#define O_IGNORECASE 23 -#define O_INPUTENCODING 24 -#define O_KEYTIME 25 -#define O_LEFTRIGHT 26 -#define O_LINES 27 -#define O_LISP 28 -#define O_LIST 29 -#define O_LOCKFILES 30 -#define O_MAGIC 31 -#define O_MATCHCHARS 32 -#define O_MATCHTIME 33 -#define O_MESG 34 -#define O_MODELINE 35 -#define O_MSGCAT 36 -#define O_NOPRINT 37 -#define O_NUMBER 38 -#define O_OCTAL 39 -#define O_OPEN 40 -#define O_OPTIMIZE 41 -#define O_PARAGRAPHS 42 -#define O_PATH 43 -#define O_PRINT 44 -#define O_PROMPT 45 -#define O_READONLY 46 -#define O_RECDIR 47 -#define O_REDRAW 48 -#define O_REMAP 49 -#define O_REPORT 50 -#define O_RULER 51 -#define O_SCROLL 52 -#define O_SEARCHINCR 53 -#define O_SECTIONS 54 -#define O_SECURE 55 -#define O_SHELL 56 -#define O_SHELLMETA 57 -#define O_SHIFTWIDTH 58 -#define O_SHOWMATCH 59 -#define O_SHOWMODE 60 -#define O_SIDESCROLL 61 -#define O_SLOWOPEN 62 -#define O_SOURCEANY 63 -#define O_TABSTOP 64 -#define O_TAGLENGTH 65 -#define O_TAGS 66 -#define O_TERM 67 -#define O_TERSE 68 -#define O_TILDEOP 69 -#define O_TIMEOUT 70 -#define O_TTYWERASE 71 -#define O_VERBOSE 72 -#define O_W1200 73 -#define O_W300 74 -#define O_W9600 75 -#define O_WARN 76 -#define O_WINDOW 77 -#define O_WINDOWNAME 78 -#define O_WRAPLEN 79 -#define O_WRAPMARGIN 80 -#define O_WRAPSCAN 81 -#define O_WRITEANY 82 -#define O_OPTIONCOUNT 83 +#define O_ALTNOTATION 0 +#define O_ALTWERASE 1 +#define O_AUTOINDENT 2 +#define O_AUTOPRINT 3 +#define O_AUTOWRITE 4 +#define O_BACKUP 5 +#define O_BEAUTIFY 6 +#define O_CDPATH 7 +#define O_CEDIT 8 +#define O_COLUMNS 9 +#define O_COMBINED 10 +#define O_COMMENT 11 +#define O_TMPDIR 12 +#define O_EDCOMPATIBLE 13 +#define O_ERRORBELLS 14 +#define O_ESCAPETIME 15 +#define O_EXPANDTAB 16 +#define O_EXRC 17 +#define O_EXTENDED 18 +#define O_FILEC 19 +#define O_FILEENCODING 20 +#define O_FLASH 21 +#define O_HARDTABS 22 +#define O_ICLOWER 23 +#define O_IGNORECASE 24 +#define O_INPUTENCODING 25 +#define O_KEYTIME 26 +#define O_LEFTRIGHT 27 +#define O_LINES 28 +#define O_LISP 29 +#define O_LIST 30 +#define O_LOCKFILES 31 +#define O_MAGIC 32 +#define O_MATCHCHARS 33 +#define O_MATCHTIME 34 +#define O_MESG 35 +#define O_MODELINE 36 +#define O_MSGCAT 37 +#define O_NOPRINT 38 +#define O_NUMBER 39 +#define O_OCTAL 40 +#define O_OPEN 41 +#define O_OPTIMIZE 42 +#define O_PARAGRAPHS 43 +#define O_PATH 44 +#define O_PRINT 45 +#define O_PROMPT 46 +#define O_READONLY 47 +#define O_RECDIR 48 +#define O_REDRAW 49 +#define O_REMAP 50 +#define O_REPORT 51 +#define O_RULER 52 +#define O_SCROLL 53 +#define O_SEARCHINCR 54 +#define O_SECTIONS 55 +#define O_SECURE 56 +#define O_SHELL 57 +#define O_SHELLMETA 58 +#define O_SHIFTWIDTH 59 +#define O_SHOWMATCH 60 +#define O_SHOWMODE 61 +#define O_SIDESCROLL 62 +#define O_SLOWOPEN 63 +#define O_SOURCEANY 64 +#define O_TABSTOP 65 +#define O_TAGLENGTH 66 +#define O_TAGS 67 +#define O_TERM 68 +#define O_TERSE 69 +#define O_TILDEOP 70 +#define O_TIMEOUT 71 +#define O_TTYWERASE 72 +#define O_VERBOSE 73 +#define O_W1200 74 +#define O_W300 75 +#define O_W9600 76 +#define O_WARN 77 +#define O_WINDOW 78 +#define O_WINDOWNAME 79 +#define O_WRAPLEN 80 +#define O_WRAPMARGIN 81 +#define O_WRAPSCAN 82 +#define O_WRITEANY 83 +#define O_OPTIONCOUNT 84 From nobody Mon Dec 4 10:34:13 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkKlp2CBsz53ChB; Mon, 4 Dec 2023 10:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKln6lQCz4QYv; Mon, 4 Dec 2023 10:34:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ttIQ95EhFecpXEk3tIAAdN46bRfsVo9/Nh/3X3eCLas=; b=V/NDOkw2fqsZlx8DVSE+p/9I6DebD6/blWTHGNumVNJN8wEXhpruAfEhuI3IFfq1CvVHtp IVtXekMWGbwxrrZJAO7x3j1UR3qfV+cb8F+ZfOJ1PxjzJR0nsDc/yIqF+7bqFC3xWNvMbG WiFt3/koAWM87J0YYvUIO3JV9CyIoj7LbGt935rbUUevzg/T7YUTnsbdZkZCPRDB+qI6s/ DT4zANoxkQlcw/VjFb5zf3OpUPjGQzb9nrgCUyCz+o5R0kwdmOf/4Kk83H0TGZ8lfrvCyQ wX56Zl9VyHJq720I9Bc8LxY09qiCcPGF0EId5xNGgeyrmML76MOnis+ex8RMvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ttIQ95EhFecpXEk3tIAAdN46bRfsVo9/Nh/3X3eCLas=; b=G6N+7WMTru2KT91EdAiaOn0O6PUS7RxzvKZ7AC+b6oM3JdCFAaLZ7Zr4q9CxlzqFg+Nt+r U20CkvjHmu4IQ53oEaV0pJ0xA6hr9zpwLseXnHZX8+sm1mWufNE5featnKNujVcnuYoT/V Tnlp/uafQJSLpIvVTbgyrbSYXWY8DtAhTbWIOSPRG+skjGyBO1PbXg93urMVFtaU1KHM/3 sDaARXreZFOiDgaxvqA4+GJSAZVGh8lQrgN6VzXtFHKepBaSHSdRnQtF0htmgwLmhATAIc YBv7L+ez8nALwye07DosFDqrwQUUs0VcUiGvXiPA3oRNAQc2ZKP7TCq61BNcag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686053; a=rsa-sha256; cv=none; b=leSkknSJkhv9l5SxY7+sORqvFV0ASTagy7sYOapzV25NdPPwDr8fKkQ6Rb9vtxqFzREWQn uW6j5QzSQTLsCdIJt/FUhHgsjlr+QGUXE72BQXhJOlhh1bZAUviUFArFElMZspHLOWA8w2 +OWBu8bBM3soicQenom2VlltUHK3ufYnpymSUkD0VgbHuw/2XbhSlHRJdrf7HW7fnigExN XNJr5Ch6K3Bxfyv1JArsiXbNT2A6WF1VeF9Vhbx97UoPeYMthrBW590jMGfXPkF8p5iMG4 LKgRGcT7yiaa7T2PCiyHz1rHKzii+6Z1e5RGZvregnw6gxHLCG2kXyP4fPm35w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkKln5dBmz78n; Mon, 4 Dec 2023 10:34:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AYDZ6009184; Mon, 4 Dec 2023 10:34:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AYDlx009180; Mon, 4 Dec 2023 10:34:13 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:34:13 GMT Message-Id: <202312041034.3B4AYDlx009180@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 041e69abf10b - stable/13 - pci_vendors: update to 2023-06-19 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 041e69abf10bfec014032e85d7dc7e5e7649bee1 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=041e69abf10bfec014032e85d7dc7e5e7649bee1 commit 041e69abf10bfec014032e85d7dc7e5e7649bee1 Author: Baptiste Daroussin AuthorDate: 2023-07-05 06:30:42 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:34:07 +0000 pci_vendors: update to 2023-06-19 (cherry picked from commit 3743f3d020bbb8899af68fc5e01086113468fd2c) --- share/misc/pci_vendors | 150 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 130 insertions(+), 20 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index fb0a22837428..29f7a824bbaf 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.05.15 -# Date: 2023-05-15 03:15:02 +# Version: 2023.06.19 +# Date: 2023-06-19 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -768,7 +768,6 @@ 1028 213e PERC H765i MX 1028 213f PERC H365i Adapter 1028 2140 PERC H365i Front - 1028 2141 PERC H365i MX 1028 2142 HBA465e Adapter 1028 2209 HBA465i Adapter 1028 220a HBA465i Front @@ -2876,7 +2875,7 @@ 1462 3411 Radeon RX 470 1462 3413 Radeon RX 480 Gaming X 8GB 1462 3416 Radeon RX 570 - 1462 3418 Radeon RX 580 Armor 4G OC + 1462 3418 Radeon RX 580 ARMOR 8G OC 1462 341b Radeon RX 570 Armor 8G OC 1462 341e Radeon RX 570 Armor 4G OC 1462 809e Radeon RX 480 4GB @@ -3566,6 +3565,8 @@ 103c 3580 Radeon HD 5450 1043 0386 Radeon HD 5450 1043 03c2 EAH5450 SILENT/DI/512MD2 (LP) +# GV-R545SC-1GI + 1458 21d8 Radeon HD 5450 1GB DDR3 Silent 1462 2130 Radeon HD 5450 1462 2131 Radeon HD 5450 1462 2133 Radeon HD 6350 @@ -3909,7 +3910,9 @@ 73df Navi 22 [Radeon RX 6700/6700 XT/6750 XT / 6800M/6850M XT] 1043 16c2 Radeon RX 6800M 1458 2408 Radeon RX 6750 XT GAMING OC 12G + 1462 3980 Radeon RX 6700 XT Mech 2X 12G [MSI] 1849 5219 Radeon RX 6700 XT Challenger D + 1849 5222 RX 6700 XT Challenger D OC 1da2 e445 Sapphire Radeon RX 6700 1eae 6601 Speedster QICK 319 RX 6700 XT 73e0 Navi 23 @@ -3935,10 +3938,12 @@ 1da2 e457 PULSE AMD Radeon RX 6500 XT 7448 Navi31 [Radeon Pro W7900] 744c Navi 31 [Radeon RX 7900 XT/7900 XTX] + 1da2 471e PULSE RX 7900 XTX 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] - 745e Navi 31 + 745e Navi31 [Radeon Pro W7800] 7480 Navi 33 [Radeon RX 7700S/7600S/7600M XT] + 1849 5313 RX 7600 Challenger OC 7483 Navi 33 [Radeon RX 7600M/7600M XT] 7489 Navi 33 7833 RS350 Host Bridge @@ -9437,8 +9442,10 @@ 103c 0024 Pavilion ze4400 builtin USB 103c 0025 XE4500 Notebook 104d 810f VAIO PCG-U1 USB/OHCI Revision 1.0 + 10b9 5237 M5273 USB OHCI PCI adapter 1849 5237 ASRock 939Dual-SATA2 Motherboard 5239 USB 2.0 Controller + 10b9 5239 M5273 USB PCI adapter 1849 5239 ASRock 939Dual-SATA2 Motherboard 5243 M1541 PCI to AGP Controller 5246 AGP8X Controller @@ -12672,7 +12679,7 @@ 20f3 GA100 [A800-SXM4-80GB] 20f5 GA100 [A800 80GB PCIe] 20f6 GA100 [A800 40GB PCIe] - 20fd GA100 [A100T] + 20fd GA100 [AX800 Converged Accelerator] 20fe GA100 20ff GA100 2182 TU116 [GeForce GTX 1660 Ti] @@ -12719,13 +12726,14 @@ 22ba AD102 High Definition Audio Controller 2302 GH100 2313 GH100 [H100 CNX] - 2321 GH100 + 2321 GH100 [H100L 94GB] 2322 GH100 [H800 PCIe] 2324 GH100 [H800] - 2330 GH100[H100 SXM5 80GB] + 2330 GH100 [H100 SXM5 80GB] 2331 GH100 [H100 PCIe] 2336 GH100 [H100] 2339 GH100 [H100] + 233a GH100 [H800L 94GB] 2414 GA103 [GeForce RTX 3060 Ti] 2420 GA103M [GeForce RTX 3080 Ti Mobile] 2438 GA103GLM [RTX A5500 Laptop GPU] @@ -12827,7 +12835,7 @@ 2730 AD103GLM [RTX 5000 Ada Generation Laptop GPU] 2757 GN21-X11 2782 AD104 [GeForce RTX 4070 Ti] - 2785 AD104 + 2785 AD104 [AC AD104 20GB] 2786 AD104 [GeForce RTX 4070] 27a0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 27b0 AD104GL [RTX 4000 SFF Ada Generation] @@ -16754,6 +16762,7 @@ 0720 SM720 Lynx3DM 0730 SM731 Cougar3DR 0750 SM750 + 0768 SM768 0810 SM810 LynxE 0811 SM811 LynxE 0820 SM820 Lynx3D @@ -17542,6 +17551,8 @@ 5163 RealSSD P425m 5180 9100 PRO NVMe SSD 5181 9100 MAX NVMe SSD + 5188 7100 ECO NVMe SSD + 5189 7100 MAX NVMe SSD 5190 9200 ECO NVMe SSD 5191 9200 PRO NVMe SSD 5192 9200 MAX NVMe SSD @@ -17604,6 +17615,10 @@ 51c3 7450 PRO NVMe SSD 51c4 7450 MAX NVMe SSD 1344 3000 U.3 1600GB [MTFDKCB1T6TFS/MTFDKCC1T6TFS] + 5410 2200S NVMe SSD + 5411 2450 NVMe SSD (DRAM-less) + 5414 3460 NVMe SSD + 6001 2100AI NVMe SSD [Nitro] 1345 Arescom Inc 1347 Odetics 1349 Sumitomo Electric Industries, Ltd. @@ -19642,6 +19657,7 @@ # MT7612E too? 7662 MT7662E 802.11ac PCI Express Wireless Network Adapter 7915 MT7915E 802.11ax PCI Express Wireless Network Adapter + 7916 MT7905D/MT7975 # WiFi 6E capable 7922 MT7922 802.11ax PCI Express Wireless Network Adapter 7961 MT7921 802.11ax PCI Express Wireless Network Adapter @@ -20248,6 +20264,7 @@ 14e4 df24 NetXtreme-E NGM2100D BCM57508 2x100G KR Mezz Ethernet 1751 BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet 1028 09d4 PowerEdge XR11/XR12 LOM + 1028 0b1b PowerEdge XR5610 LOM 14e4 5045 NetXtreme-E BCM57504 4x25G OCP3.0 14e4 5100 NetXtreme-E Single-port 100G QSFP56 Ethernet OCP 3.0 Adapter (BCM957504-N1100G) 14e4 5105 NetXtreme-E Single-port 100G DSFP Ethernet OCP 3.0 Adapter (BCM957504-N1100GD) @@ -20578,7 +20595,7 @@ f800 BCM78800 Switch ASIC [Trident5-X12] f900 BCM78900 Switch ASIC [Tomahawk5] f903 BCM78903 Switch ASIC [Tomahawk6] - f905 BCM78905 Switch ASIC [Tomahawk5] + f905 BCM78905 Switch ASIC [Tomahawk5+] f910 BCM78910 Switch ASIC [Tomahawk6] f914 BCM78914 Switch ASIC [Tomahawk6] f917 BCM78917 Switch ASIC [Tomahawk6] @@ -21525,12 +21542,15 @@ 5004 PC SN520 NVMe SSD 5005 PC SN520 NVMe SSD 5006 WD Black SN750 / PC SN730 NVMe SSD + 5007 PC SN530 NVMe SSD (DRAM-less) + 5008 PC SN530 NVMe SSD 5009 WD Blue SN550 NVMe SSD 15b7 5009 WD Blue SN550 NVMe SSD 500b PC SN530 NVMe SSD 1414 500b Xbox Series X 500d WD Ultrastar DC SN340 NVMe SSD 5011 WD PC SN810 / Black SN850 NVMe SSD + 5015 PC SN740 NVMe SSD 5017 WD Black SN770 NVMe SSD 501a WD Blue SN570 NVMe SSD 1TB 5025 WD Blue SN570 NVMe SSD 2TB @@ -23588,6 +23608,8 @@ 5013 PS5013 E13 NVMe Controller 5016 E16 PCIe4 NVMe Controller 5018 E18 PCIe4 NVMe Controller + 5019 PS5019-E19 PCIe4 NVMe Controller (DRAM-less) + 5021 PS5021-E21 PCIe4 NVMe Controller (DRAM-less) 1989 Montilio Inc. 0001 RapidFile Bridge 8001 RapidFile @@ -24499,11 +24521,13 @@ 1284 PC300 NVMe Solid State Drive 512GB 1285 PC300 NVMe Solid State Drive 1TB 1327 BC501 NVMe Solid State Drive - 1339 BC511 + 1339 BC511 NVMe SSD 1504 PC400 NVMe SSD 1527 PC401 NVMe Solid State Drive 256GB - 174a Gold P31/PC711 NVMe Solid State Drive - 1959 Platinum P41 NVMe Solid State Drive 2TB + 1639 PC611 NVMe Solid State Drive + 174a Gold P31/BC711/PC711 NVMe Solid State Drive + 1959 Platinum P41/PC801 NVMe Solid State Drive + 1d59 BC901 NVMe Solid State Drive (DRAM-less) 2204 960GB TLC PCIe Gen3 x4 NVMe M.2 22110 243b PE6110 NVMe Solid State Drive 1c5c 0100 PE6110 NVMe Solid State Drive @@ -24518,6 +24542,14 @@ 1028 214a DC NVMe PE8010 RI U.2 7.68TB 1c5c 0100 PE8000 Series NVMe Solid State Drive 2849 PE81x0 U.2/3 NVMe Solid State Drive + 1028 2262 DC NVMe OPAL PE8110 RI U.2 960GB + 1028 2263 DC NVMe OPAL PE8110 RI U.2 1920GB + 1028 2264 DC NVMe OPAL PE8110 RI U.2 3840GB + 1028 2265 DC NVMe OPAL PE8110 RI U.2 7680GB + 1028 2266 DC NVMe ISE PE8110 RI U.2 960GB + 1028 2267 DC NVMe ISE PE8110 RI U.2 1920GB + 1028 2268 DC NVMe ISE PE8110 RI U.2 3840GB + 1028 2269 DC NVMe ISE PE8110 RI U.2 7680GB 1c5c 0101 PE81x0 U.2/3 NVMe Solid State Drive 1c5f Beijing Memblaze Technology Co. Ltd. 000d PBlaze5 520/526 @@ -24583,7 +24615,7 @@ 1c5f 4b41 NVMe SSD PBlaze6 6936 6400GB 2.5" U.3 1c5f 4b51 NVMe SSD PBlaze6 6936 12800GB 2.5" U.3 1c5f 4b61 NVMe SSD PBlaze6 6936 25600GB 2.5" U.3 - 003f PBlaze7 7940/7946 Gen5 NVMe SSD + 003f PBlaze7 7940/7946 NVMe SSD 0540 PBlaze4 NVMe SSD 0550 PBlaze5 700/900 0555 PBlaze5 510/516 @@ -24818,6 +24850,7 @@ 08b1 AQC108 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion] 11b1 AQC111 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion] 12b1 AQC112 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion] + 14c0 AQC113C NBase-T/IEEE 802.3bz Ethernet Controller [AQtion] 87b1 AQC107 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion] 94c0 AQC113CS NBase-T/IEEE 802.3bz Ethernet Controller [AQtion] 1043 87f5 ProArt X570-CREATOR WIFI @@ -24982,7 +25015,9 @@ 0001 Colossus GC2 [C2] 0002 Colossus GC1 [S1] 1d97 Shenzhen Longsys Electronics Co., Ltd. + 1d97 Lexar NM620 NVME SSD (DRAM-less) 2263 SM2263EN/SM2263XT-based OEM SSD + 2269 Lexar NM760 NVME SSD (DRAM-less) # nee Facebook, Inc. 1d9b Meta Platforms, Inc. 0010 Networking DOM Engine @@ -25485,6 +25520,7 @@ 1201 NVMe SSD Controller MAP1201 1202 NVMe SSD Controller MAP1202 1601 NVMe SSD Controller MAP1601 + 1602 NVMe SSD Controller MAP1602 1e4c GSI Technology 0010 Associative Processing Unit [Leda] 1e4c 0120 SE120 @@ -25537,6 +25573,8 @@ 1002 NVMe SSD [3DNAND] 2.5" U.2 (LJ1) 1e95 1101 NVMe SSD [3DNAND] 2.5" U.2 (LJ1) 1ea0 5636 TP1500 Series U.2 NVMe Datacenter SSD + 9100 CL1-3D256-Q11 NVMe SSD M.2 +1e96 Drut Technologies Inc. 1e9f Lynxi Technologies Co., Ltd. 1ea0 Tencent Technology (Shenzhen) Company Limited 2a16 Cloud Intelligent Inference Controller @@ -25558,19 +25596,40 @@ 3401 SSD Contoller 1ebd EMERGETECH Company Ltd. 0101 Seirios 2063 Video Codec -1ec6 Vastai Technologies (Shanghai) Inc. +1ec6 Vastai Technologies 0100 SV100 + 1ec6 0010 VA1V + 1ec6 0011 VA1A + 1ec6 0012 VA1 + 1ec6 0013 VA1E + 1ec6 0020 VA10V + 1ec6 0021 VA10A + 1ec6 0022 VA10 + 1ec6 0030 VE1P + 1ec6 0031 VE1S + 1ec6 0032 VE1V + 1ec6 0033 VE1M + 1ec6 0034 VE1E + 1ec6 0040 VV1U + 1ec6 0041 VA1U + 0200 SG100 + 1ec6 0060 VG1200 + 1ec6 0061 VG1600 + 1ec6 0062 VG1800 + 1ec6 0063 VG1000 + 020f SG100 vGPU 1ec8 Innosilicon Co Ltd 8800 Fantasy I 1ec8 12a2 Fantasy I Device 8810 Fantasy I + 1ec8 12a2 Fantasy I Device 9800 Fantasy II 1ec8 12a2 Fantasy II Device 9802 Fantasy II 1ec8 12a2 Fantasy II Device 9804 Fantasy II 1ec8 12a2 Fantasy II Device - 9810 Fantasy II + 9810 Fantasy II-M 1ec8 12a2 Fantasy II Device 1ec9 Wingtech Group(HongKong)Limited 1eca Lightmatter @@ -25607,6 +25666,7 @@ 1ee1 0009 Airglow A430 NVMe SSD U.2 1.6TB 1ee1 000a Airglow A430 NVMe SSD U.2 3.2TB 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 1ee9 SUSE LLC @@ -25855,6 +25915,7 @@ 500d OM3PDP3 NVMe SSD 500e SNVS2000G [NV1 NVMe PCIe SSD 2TB] 5012 DC1500M U.2 Enterprise SSD + 5013 FURY Renegade NVMe SSD 270b Xantel Corporation 270f Chaintech Computer Co. Ltd 2711 AVID Technology Inc. @@ -26720,13 +26781,16 @@ 02b4 Comet Lake PCI Express Root Port #13 02b8 Comet Lake PCI Express Root Port #1 02bc Comet Lake PCI Express Root Port #5 + 02bf Comet Lake PCI Express Root Port #8 02c5 Comet Lake Serial IO I2C Host Controller 1028 09be Latitude 7410 02c8 Comet Lake PCH-LP cAVS 1028 09be Latitude 7410 02d3 Comet Lake SATA AHCI Controller + 02d7 Comet Lake RAID Controller 02e0 Comet Lake Management Engine Interface 1028 09be Latitude 7410 + 02e3 Comet Lake AMT SOL Redirection 02e8 Serial IO I2C Host Controller 1028 09be Latitude 7410 02e9 Comet Lake Serial IO I2C Host Controller @@ -27346,7 +27410,7 @@ 0d58 Ethernet Controller XXV710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking 8086 0000 Ethernet Controller XXV710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking 8086 0001 Ethernet Controller XXV710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking - 0d9f Ethernet Controller (2) I225-IT + 0d9f Ethernet Controller I225-IT 0dcd Ethernet Connection C825-X 0dd2 Ethernet Network Adapter I710 1137 0000 I710T4LG 4x1 GbE RJ45 PCIe NIC @@ -28301,6 +28365,7 @@ 1250 430HX - 82439HX TXC [Triton II] 125b Ethernet Controller I226-LM 125c Ethernet Controller I226-V + 125d Ethernet Controller I226-IT 1360 82806AA PCI64 Hub PCI Bridge 1361 82806AA PCI64 Hub Controller (HRes) 8086 1361 82806AA PCI64 Hub Controller (HRes) @@ -29105,6 +29170,8 @@ 1b48 82597EX 10GbE Ethernet Controller 8086 a01f PRO/10GbE LR Server Adapter 8086 a11f PRO/10GbE LR Server Adapter + 1bd2 Sapphire Rapids SATA AHCI Controller + 1bf2 Sapphire Rapids SATA AHCI Controller 1c00 6 Series/C200 Series Chipset Family Desktop SATA Controller (IDE mode, ports 0-3) 1c01 6 Series/C200 Series Chipset Family Mobile SATA Controller (IDE mode, ports 0-3) 1c02 6 Series/C200 Series Chipset Family 6 port Desktop SATA AHCI Controller @@ -33281,12 +33348,15 @@ 8086 1216 WiMAX/WiFi Link 5150 ABG 8086 1311 WiMAX/WiFi Link 5150 AGN 8086 1316 WiMAX/WiFi Link 5150 ABG + 4389 WM590 Chipset LPC Controller 438b Tiger Lake-H LPC/eSPI Controller 43a3 Tiger Lake-H SMBus Controller 43a4 Tiger Lake-H SPI Controller 43b0 Tiger Lake-H PCI Express Root Port #9 + 43ba Tiger Lake-H PCIe Root Port #3 43bc Tiger Lake-H PCI Express Root Port #5 43c8 Tiger Lake-H HD Audio Controller + 43d3 Tiger Lake SATA AHCI Controller 43e0 Tiger Lake-H Management Engine Interface 43e8 Tiger Lake-H Serial IO I2C Controller #0 43e9 Tiger Lake-H Serial IO I2C Controller #1 @@ -33303,6 +33373,7 @@ 4538 Elkhart Lake PCI-e Root Complex 4555 Elkhart Lake [UHD Graphics Gen11 16EU] 4571 Elkhart Lake [UHD Graphics Gen11 32EU] + 4602 Alder Lake Host and DRAM Controller 460d 12th Gen Core Processor PCI Express x16 Controller #1 461d Alder Lake Innovation Platform Framework Processor Participant 1028 0b10 Precision 3571 @@ -33326,6 +33397,7 @@ 464d 12th Gen Core Processor PCI Express x4 Controller #0 464f 12th Gen Core Processor Gaussian & Neural Accelerator 1028 0b10 Precision 3571 + 465d Alder Lake Imaging Signal Processor 4660 12th Gen Core Processor Host Bridge/DRAM Registers 4668 12th Gen Core Processor Host Bridge/DRAM Registers 466d Alder Lake-P Thunderbolt 4 NHI #1 @@ -33369,7 +33441,10 @@ 4b24 Elkhart Lake SPI (Flash) Controller 4b38 Elkhart Lake PCH PCI Express Root Port #0 4b39 Elkhart Lake PCH PCI Express Root Port #1 + 4b3c Elkhart Lake PCIe Root Port #4 4b3e Elkhart Lake PCH PCI Express Root Port #6 + 4b4b Elkhart Lake Serial IO I2C Controller #4 + 4b4d Elkhart Lake Serial IO UART Controller #2 4b58 Elkhart Lake High Density Audio bus interface 4b63 Elkhart Lake SATA AHCI 4b70 Elkhart Lake Management Engine Interface @@ -33448,18 +33523,22 @@ 5181 Alder Lake PCH-P LPC/eSPI Controller 5182 Alder Lake PCH eSPI Controller 1028 0b10 Precision 3571 + 5187 Alder Lake LPC Controller 51a3 Alder Lake PCH-P SMBus Host Controller 1028 0b10 Precision 3571 51a4 Alder Lake-P PCH SPI Controller 1028 0b10 Precision 3571 51a8 Alder Lake PCH UART #0 51a9 Alder Lake PCH UART #1 + 51aa Alder Lake SPI Controller + 51ab Alder Lake SPI Controller 51b1 Alder Lake PCI Express x1 Root Port #10 51bf Alder Lake PCH-P PCI Express Root Port #9 51c5 Alder Lake-P Serial IO I2C Controller #0 51c6 Alder Lake-P Serial IO I2C Controller #1 51c8 Alder Lake PCH-P High Definition Audio Controller 1028 0b10 Precision 3571 + 51cc Alder Lake Smart Sound Technology Audio Controller 51d3 Alder Lake-P SATA AHCI Controller 1028 0b10 Precision 3571 51d8 Alder Lake-P Serial IO I2C Controller #2 @@ -33499,18 +33578,38 @@ 5693 DG2 [Arc A370M] 5694 DG2 [Arc A350M] 5695 DG2 [Iris Xe MAX A200M] + 5696 DG2 [Arc A570M] + 5697 DG2 [Arc A530M] + 5698 DG2 [Arc Xe Graphics] 56a0 DG2 [Arc A770] 56a1 DG2 [Arc A750] 56a2 DG2 [Arc A580] + 56a3 DG2 [Arc Xe Graphics] + 56a4 DG2 [Arc Xe Graphics] 56a5 DG2 [Arc A380] 56a6 DG2 [Arc A310] + 56a7 DG2 [Arc Xe Graphics] + 56a8 DG2 [Arc Xe Graphics] + 56a9 DG2 [Arc Xe Graphics] 56b0 DG2 [Arc Pro A30M] 56b1 DG2 [Arc Pro A40/A50] - 56c0 Data Center GPU Flex 170 - 56c1 Data Center GPU Flex 140 + 56b2 DG2 [Arc Pro A60M] + 56b3 DG2 [Arc Pro A60] + 56c0 ATS-M [Data Center GPU Flex 170] + 56c1 ATS-M [Data Center GPU Flex 140] + 5780 Thunderbolt 80/120G Bridge [Barlow Ridge Host 80G 2023] + 5781 Thunderbolt 80/120G NHI [Barlow Ridge Host 80G 2023] + 5782 Thunderbolt 80/120G USB Controller [Barlow Ridge Host 80G 2023] + 5783 Thunderbolt Bridge [Barlow Ridge Host 40G 2023] + 5784 Thunderbolt NHI [Barlow Ridge Host 40G 2023] + 5785 Thunderbolt USB Controller [Barlow Ridge Host 40G 2023] + 5786 Thunderbolt 80/120G Bridge [Barlow Ridge Hub 80G 2023] + 5787 Thunderbolt 80/120G USB Controller [Barlow Ridge Hub 80G 2023] 579c Ethernet Connection E825-C for backplane 579d Ethernet Connection E825-C for QSFP 579e Ethernet Connection E825-C for SFP + 57a4 Thunderbolt Bridge [Barlow Ridge Hub 40G 2023] + 57a5 Thunderbolt USB Controller [Barlow Ridge Hub 40G 2023] 57b1 Ethernet Controller E610 1GBASE T 8086 0000 Ethernet Converged Network Adapter E610 5845 QEMU NVM Express Controller @@ -33907,6 +34006,11 @@ 7afc Alder Lake-S PCH Serial IO I2C Controller #4 7afd Alder Lake-S PCH Serial IO I2C Controller #5 7d0b Volume Management Device NVMe RAID Controller Intel Corporation + 7d40 Meteor Lake-M [Intel Graphics] + 7d45 Meteor Lake-P [Intel Graphics] + 7d55 Meteor Lake-P [Intel Graphics] + 7d60 Meteor Lake-M [Intel Graphics] + 7dd5 Meteor Lake-P [Intel Graphics] 7e01 Meteor Lake-P LPC/eSPI Controller 7e22 Meteor Lake-P SMBus Controller 7e23 Meteor Lake-P SPI Controller @@ -35076,9 +35180,13 @@ 1bd4 0084 Ethernet Controller RP1000 for 10GbE SFP+(lldp) 1bd4 0085 Ethernet Controller SP1000A for 10GBASE-T 8088 0000 Ethernet Network Adaptor RP1000 for 10GbE SFP+ + 8088 0300 Ethernet Network Adaptor RP1000-A03 for 10GbE SFP+ + 8088 0400 Ethernet Network Adaptor RP1000-A04 for 10GbE SFP+ 2000 Ethernet Controller RP2000 Virtual Function for 10GbE SFP+ 2001 Ethernet Controller RP2000 for 10GbE SFP+ 8088 2000 Ethernet Network Adaptor RP2000 for 10GbE SFP+ + 8088 2300 Ethernet Network Adaptor RP2000-A03 for 10GbE SFP+ + 8088 2400 Ethernet Network Adaptor RP2000-A04 for 10GbE SFP+ 80ee InnoTek Systemberatung GmbH beef VirtualBox Graphics Adapter cafe VirtualBox Guest Service @@ -35101,7 +35209,7 @@ 1001 Ethernet Controller N400 Series for 1GbE (Dual-port) 1020 Ethernet Controller N10 Series for 10GbE (Quad-port) 1021 Ethernet Controller N400 Series for 1GbE (Quad-port) - 1060 Ethernet Controller N10 Series for 10GbE (8-port) + 1060 Ethernet Controller N10 Series for 1GbE or 10GbE (8-port) 1080 Ethernet Controller N10 Series Virtual Function 1081 Ethernet Controller N400 Series Virtual Function 8308 Ethernet Controller N500 Series for 1GbE (Quad-port, Copper RJ45) @@ -35673,9 +35781,11 @@ 1500 STAR1500 PCIe NVMe SSD Controller 1501 STAR1500C NVMe SSD 1502 STAR1500E NVMe SSD + 1504 STAR1500L NVMe SSD 2000 STAR2000 NVMe Controller 2001 STAR2000E NVMe SSD 2002 STAR2000C NVMe SSD + 2003 STAR2000L NVMe SSD a000 Asix Electronics Corporation (Wrong ID) a0a0 AOPEN Inc. a0f1 UNISYS Corporation From nobody Mon Dec 4 10:34:14 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkKlq1M2Rz53Clp; Mon, 4 Dec 2023 10:34:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKlq0M9wz4QVB; Mon, 4 Dec 2023 10:34:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ScmPy+n9dd8zIx2Z2DpHEIOZ0LdnahkuXHmW7TzTIuQ=; b=TtMxCPd+FN4zAxKX4Ucpb4P+7WEXBQp8dL0pdgVdClZJn7MIcDqOHD+gIIL2ndemN5YllB HNL0C/TqPqt8LgUWpHCjaxnR9EdRgIu887xEqMcuJbSelTWST1kmIewWvGVeSFhPGkRHgS 6McCnBEXiKMy3Kwf/5dPZd9Z0U7HhviXQKoDCZ4YQMeWUek9GJE4XfWSupFdFR9IGc316/ guB/3QrXbTbRVAJYzOP4fLYXLHozeKY+BHTJ2OWrQFQ9EhVl3GoZFsRshDbypo22hUJpsu 2dLIND83WOVNZbY8/q8zI55EbqHZVa8zRqOVsbSumpuY6x8CrCwQ14M2+rmUew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ScmPy+n9dd8zIx2Z2DpHEIOZ0LdnahkuXHmW7TzTIuQ=; b=xMNb8bXrHAbGfbED4lipDxoAvohktii96H3FZq3z/kvA9hkslfLMwj4fDGpwn9tNqZgX2Z yhgYUwNe5RK/e0r5CuEDl9UD+17UU604Rs2eJ7xC5q+wj1SGOBvZIHXahJrTkFv49vgIIr AFvmta/NVmFr/5qEqhiGyCuvof9wOhJeCYUUafbgpd+Ih6t+hEVROao5pIKlRmkIK/r5c0 Bt3ncZ8EHbLzfl3FOMyfLmc3Wrz+l/uw4z3sblB8uo8ahzWn2q5D9wS/3mjDg38BWP9aaF M9v1CtuoTpTv/UbI+ItyfTtm+aZPV+hg5cRIvkTf10snKSefJufdMju45x1dJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686055; a=rsa-sha256; cv=none; b=ckSOLx96KxyjO/BjVc4hWKcgRBHDUolY/llfrVWl25IoA+IXX67TwiMxcdui3B13JNnbnX xJfgniQm8mh8VgkyK795MzhhuB7su+cNzbO1Gw9L9bg4r18gzUmO2D+HJzx3+MqouNnTAv 7PYHPCM9OH+IkqBS9g+ikRp7JimKoOVh11GPLrco9DLN6ihT//hAfVAEldUbyj0qjSFjTk M6F+mY7Fs1FsZygtqzpJvuYOGTkHCddsoohtM61AU5AkN7XJil5z54Iu9jcO8VcP398kl9 bAxLBLrjnvIEsYWSjnj/vApPTzLIkHrNAqmdaI/cg8uPc+4aX1WsCKCpZ2AJEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkKlp6Y0gz7X3; Mon, 4 Dec 2023 10:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AYEZd009225; Mon, 4 Dec 2023 10:34:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AYENE009222; Mon, 4 Dec 2023 10:34:14 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:34:14 GMT Message-Id: <202312041034.3B4AYENE009222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 0b56acfaf127 - stable/13 - pci_vendors: update to 2023-08-12 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0b56acfaf12773000c77cba6f9fe65db8aa8e5b2 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0b56acfaf12773000c77cba6f9fe65db8aa8e5b2 commit 0b56acfaf12773000c77cba6f9fe65db8aa8e5b2 Author: Baptiste Daroussin AuthorDate: 2023-09-06 12:22:11 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:34:08 +0000 pci_vendors: update to 2023-08-12 (cherry picked from commit bf986d52458aaefa4d3a1d4668449cbb5c991afe) --- share/misc/pci_vendors | 342 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 295 insertions(+), 47 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index 29f7a824bbaf..d3988731c30a 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.06.19 -# Date: 2023-06-19 03:15:02 +# Version: 2023.08.12 +# Date: 2023-08-12 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -90,6 +90,8 @@ 025e d819 NVMe DC SSD E3.S 7.5mm [D5-P5336] 025e d81d NVMe DC SSD E1.L 9.5mm [D5-P5336] 0b70 NVMe DC SSD [Yorktown controller] + f1ab P41 Plus NVMe SSD (DRAM-less) + f1ac P44 Pro NVMe SSD 0270 Hauppauge computer works Inc. (Wrong ID) 0291 Davicom Semiconductor, Inc. (Wrong ID) # SpeedStream is Efficient Networks, Inc, a Siemens Company @@ -1037,8 +1039,8 @@ 15d9 1c6e AOC-SLG4-2H8M2 Storage Adapter 1d49 0505 ThinkSystem RAID 540-8i PCIe Gen4 12Gb Adapter 1d49 0506 ThinkSystem RAID 540-16i PCIe Gen4 12Gb Adapter - 1d49 0700 ThinkSystem M.2 SATA/NVMe 2-Bay RAID Enablement Kit - 1d49 0701 ThinkSystem 7mm SATA/NVMe 2-Bay RAID Enablement Kit + 1d49 0700 ThinkSystem M.2 SATA/NVMe 2-Bay Non-Hot-Swap RAID Enablement Kit + 1d49 0701 ThinkSystem 7mm SATA/NVMe 2-Bay Rear Hot-Swap RAID Enablement Kit 10e7 MegaRAID 12GSAS/PCIe Unsupported SAS38xx 1960 MegaRAID 1000 0518 MegaRAID 518 SCSI 320-2 Controller @@ -1375,6 +1377,7 @@ 1043 841b M5A88-V EVO 1043 8445 M5A78L LE 105b 0e13 N15235/A74MX mainboard / AMD SB700 + 1179 ff1e Satellite C660D-113 1179 ff50 Satellite P305D-S8995E 1458 a022 GA-770/78-series motherboard 1458 a102 GA-880GMA-USB3 @@ -2178,7 +2181,7 @@ 6640 Saturn XT [FirePro M6100] 106b 014b Tropo XT [Radeon R9 M380 Mac Edition] 6641 Saturn PRO [Radeon HD 8930M] - 6646 Bonaire XT [Radeon R9 M280X] + 6646 Bonaire XT [Radeon R9 M280X / FirePro W6150M] 6647 Saturn PRO/XT [Radeon R9 M270X/M280X] 1043 223d N551ZU laptop Radeon R9 M280X 6649 Bonaire [FirePro W5100] @@ -2240,7 +2243,7 @@ 17aa 368f Radeon R5 A230 6667 Jet ULT [Radeon R5 M230] 666f Sun LE [Radeon HD 8550M / R5 M230] - 66a0 Vega 20 [Radeon Instinct] + 66a0 Vega 20 [Radeon Pro/Radeon Instinct] 66a1 Vega 20 [Radeon Pro VII/Radeon Instinct MI50 32GB] 66a2 Vega 20 66a3 Vega 20 [Radeon Pro Vega II/Radeon Pro Vega II Duo] @@ -2898,6 +2901,7 @@ 1787 a480 Radeon RX 480 1849 5001 Phantom Gaming X RX 580 OC 1849 5030 Phantom Gaming D Radeon RX580 8G OC + 1da2 e343 Radeon RX 570 Pulse ITX 4GB 1da2 e353 Radeon RX 570 Pulse 4GB 1da2 e366 Nitro+ Radeon RX 570/580/590 1da2 e387 Radeon RX 580 Pulse 4GB @@ -3168,7 +3172,7 @@ 686e Vega 10 GLXLA 687f Vega 10 XL/XT [Radeon RX Vega 56/64] 1002 0b36 RX Vega64 - 1002 6b76 RX Vega64 + 1002 6b76 AMD Radeon RX Vega 56 8GB # ROG-STRIX-RXVEGA64-O8G-GAMING 1043 04c4 Radeon RX Vega 64 1458 230c Radeon RX VEGA 56 GAMING OC 8G @@ -3906,13 +3910,14 @@ 1eae 6901 Speedster MERC 319 AMD Radeon RX 6900 XT Black 73c3 Navi 22 73c4 Navi 22 USB - 73ce Navi22-XL SRIOV MxGPU + 73ce Navi 22-XL SRIOV MxGPU 73df Navi 22 [Radeon RX 6700/6700 XT/6750 XT / 6800M/6850M XT] 1043 16c2 Radeon RX 6800M 1458 2408 Radeon RX 6750 XT GAMING OC 12G 1462 3980 Radeon RX 6700 XT Mech 2X 12G [MSI] 1849 5219 Radeon RX 6700 XT Challenger D 1849 5222 RX 6700 XT Challenger D OC + 1da2 465e Radeon RX 6750 XT PULSE OC 1da2 e445 Sapphire Radeon RX 6700 1eae 6601 Speedster QICK 319 RX 6700 XT 73e0 Navi 23 @@ -3936,16 +3941,17 @@ 7424 Navi 24 [Radeon RX 6300] 743f Navi 24 [Radeon RX 6400/6500 XT/6500M] 1da2 e457 PULSE AMD Radeon RX 6500 XT - 7448 Navi31 [Radeon Pro W7900] + 7446 Navi 31 USB + 7448 Navi 31 [Radeon Pro W7900] 744c Navi 31 [Radeon RX 7900 XT/7900 XTX] 1da2 471e PULSE RX 7900 XTX 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] - 745e Navi31 [Radeon Pro W7800] - 7480 Navi 33 [Radeon RX 7700S/7600S/7600M XT] + 745e Navi 31 [Radeon Pro W7800] + 7480 Navi 33 [Radeon RX 7700S/7600/7600S/7600M XT/PRO W7600] 1849 5313 RX 7600 Challenger OC 7483 Navi 33 [Radeon RX 7600M/7600M XT] - 7489 Navi 33 + 7489 Navi 33 [Radeon Pro W7500] 7833 RS350 Host Bridge 7834 RS350 [Radeon 9100 PRO/XT IGP] 7835 RS350M [Mobility Radeon 9000 IGP] @@ -4348,6 +4354,7 @@ ab18 Vega 12 HDMI Audio ab20 Vega 20 HDMI Audio [Radeon VII] ab28 Navi 21/23 HDMI/DP Audio Controller + ab30 Navi 31 HDMI/DP Audio ab38 Navi 10 HDMI Audio ac00 Theater 506 World-Wide Analog Decoder ac01 Theater 506 World-Wide Analog Decoder @@ -5032,7 +5039,11 @@ 14b7 Family 17h-19h PCIe Dummy Host Bridge 14b9 Family 17h-19h Internal PCIe GPP Bridge 14ba Family 17h-19h PCIe GPP Bridge +# Server device + 14ca Genoa CCP/PSP 4.0 Device 14cd Family 19h USB4/Thunderbolt PCIe tunnel + 14de Phoenix PCIe Dummy Function + 14ef Family 19h USB4/Thunderbolt PCIe tunnel 1510 Family 14h Processor Root Complex 174b 1001 PURE Fusion Mini 1512 Family 14h Processor Root Port @@ -5116,6 +5127,9 @@ 15b5 Stoney NB Performance Monitor 15bc Stoney PCIe [GFX,GPP] Bridge [4:0] 15be Stoney Audio Processor + 15c4 Phoenix USB4/Thunderbolt NHI controller #1 + 15c5 Phoenix USB4/Thunderbolt NHI controller #2 + 15c7 Family 19h (Model 74h) CCP/PSP 3.0 Device 15d0 Raven/Raven2 Root Complex 103c 8615 Pavilion Laptop 15-cw1xxx 1043 876b PRIME B450M-A Motherboard @@ -5264,6 +5278,8 @@ 1665 VanGogh Data Fabric; Function 5 1666 VanGogh Data Fabric; Function 6 1667 VanGogh Data Fabric; Function 7 + 1668 Pink Sardine USB4/Thunderbolt NHI controller #1 + 1669 Pink Sardine USB4/Thunderbolt NHI controller #2 166a Cezanne Data Fabric; Function 0 166b Cezanne Data Fabric; Function 1 166c Cezanne Data Fabric; Function 2 @@ -5707,6 +5723,7 @@ 1028 215f ENT NVMe RT1 RI 7.68TB 1028 2160 ENT NVMe RT1 FIPS RI 3.84TB 1028 2161 ENT NVMe RT1 FIPS RI 7.68TB + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 1029 Siemens Nixdorf IS 102a LSI Logic 0000 HYDRA @@ -6971,6 +6988,7 @@ 90dc Baikal DMA Controller 90dd Baikal Memory (DDR3/SPM) 90de Baikal USB 3.0 xHCI Host Controller + 9121 Nextorage NEM-PA NVMe SSD for PlayStation 104e Oak Technology, Inc 0017 OTI-64017 0107 OTI-107 [Spitfire] @@ -7201,6 +7219,7 @@ c350 80333 [SuperTrak EX12350] e350 80333 [SuperTrak EX24350] 105b Foxconn International, Inc. + e0c3 T99W175 5G Modem [Snapdragon X55] 105c Wipro Infotech Limited 105d Number 9 Computer Company 2309 Imagine 128 @@ -12732,8 +12751,13 @@ 2330 GH100 [H100 SXM5 80GB] 2331 GH100 [H100 PCIe] 2336 GH100 [H100] - 2339 GH100 [H100] + 2337 GH100 [H100 SXM5 64GB] + 2339 GH100 [H100 SXM5 94GB] 233a GH100 [H800L 94GB] + 233d GH100 [H100 96GB] + 2342 GH100 [GH200 120GB] + 2343 GH100 + 2345 GH100 [GH200 480GB] 2414 GA103 [GeForce RTX 3060 Ti] 2420 GA103M [GeForce RTX 3080 Ti Mobile] 2438 GA103GLM [RTX A5500 Laptop GPU] @@ -12829,6 +12853,7 @@ 26b2 AD102GL [RTX 5000 Ada Generation] 26b5 AD102GL [L40] 26b8 AD102GL [L40G] + 26b9 AD102GL [L40S] 26f5 AD102GL [L40 CNX] 2704 AD103 [GeForce RTX 4080] 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] @@ -12839,15 +12864,18 @@ 2786 AD104 [GeForce RTX 4070] 27a0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 27b0 AD104GL [RTX 4000 SFF Ada Generation] + 27b2 AD104GL [RTX 4000 Ada Generation] 27b7 AD104GL [L16] 27b8 AD104GL [L4] 27ba AD104GLM [RTX 4000 Ada Generation Laptop GPU] 27bb AD104GLM [RTX 3500 Ada Generation Laptop GPU] 27e0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 2803 AD106 [GeForce RTX 4060 Ti] + 2805 AD106 [GeForce RTX 4060 Ti 16GB] 2820 AD106M [GeForce RTX 4070 Max-Q / Mobile] 2838 AD106GLM [RTX 3000 Ada Generation Laptop GPU] 2860 AD106M [GeForce RTX 4070 Max-Q / Mobile] + 2882 AD107 [GeForce RTX 4060] 28a0 AD107M [GeForce RTX 4060 Max-Q / Mobile] 28a1 AD107M [GeForce RTX 4050 Max-Q / Mobile] 28b8 AD107GLM [RTX 2000 Ada Generation Laptop GPU] @@ -13097,7 +13125,10 @@ 5288 RTS5288 PCI Express Card Reader 5289 RTL8411 PCI Express Card Reader 1043 1457 K55A Laptop + 5760 RTS5763DL x2 NVMe SSD Controller 5762 RTS5763DL NVMe SSD Controller + 5763 RTS5763DL NVMe SSD Controller (DRAM-less) + 5765 RTS5765DL NVMe SSD Controller (DRAM-less) 8029 RTL-8029(AS) 10b8 2011 EZ-Card (SMC1208) 10ec 8029 RTL-8029(AS) @@ -15293,8 +15324,8 @@ 0102 Extended IDE Controller 0103 EX-IDE Type-B 010e PXP04 NVMe SSD - 010f NVMe Controller - 0110 NVMe SSD Controller Cx5 + 010f XG3 NVMe SSD Controller + 0110 Cx5 NVMe SSD Controller 1028 1ffb Express Flash NVMe 960G (RI) U.2 (CD5) 1028 1ffc Express Flash NVMe 1.92T (RI) U.2 (CD5) 1028 1ffd Express Flash NVMe 3.84T (RI) U.2 (CD5) @@ -16410,6 +16441,7 @@ 8331 O2 Flash Memory Card 8520 SD/MMC Card Reader Controller 8621 SD/MMC Card Reader Controller + 8760 FORESEE E2M2 NVMe SSD 1218 Hybricon Corp. 1219 First Virtual Corporation 121a 3Dfx Interactive, Inc. @@ -16767,8 +16799,9 @@ 0811 SM811 LynxE 0820 SM820 Lynx3D 0910 SM910 + 2260 SM2260 NVMe SSD Controller 2262 SM2262/SM2262EN SSD Controller - 2263 SM2263EN/SM2263XT SSD Controller + 2263 SM2263EN/SM2263XT (DRAM-less) NVMe SSD Controllers 1270 Olympus Optical Co., Ltd. 1271 GW Instruments 1272 Telematics International @@ -17556,6 +17589,8 @@ 5190 9200 ECO NVMe SSD 5191 9200 PRO NVMe SSD 5192 9200 MAX NVMe SSD + 5196 9400 PRO NVMe SSD + 5197 9400 MAX NVMe SSD 51a2 7300 PRO NVMe SSD 1344 2000 960GB U.2 1344 3000 1920GB U.2 @@ -17615,8 +17650,12 @@ 51c3 7450 PRO NVMe SSD 51c4 7450 MAX NVMe SSD 1344 3000 U.3 1600GB [MTFDKCB1T6TFS/MTFDKCC1T6TFS] - 5410 2200S NVMe SSD - 5411 2450 NVMe SSD (DRAM-less) + 5404 2210 NVMe SSD [Cobain] + 5405 2300 NVMe SSD [Santana] + 5407 3400 NVMe SSD [Hendrix] + 5410 2200S NVMe SSD [Cassandra] + 5411 2450 NVMe SSD [HendrixV] (DRAM-less) + 5413 2400 NVMe SSD (DRAM-less) 5414 3460 NVMe SSD 6001 2100AI NVMe SSD [Nitro] 1345 Arescom Inc @@ -19307,15 +19346,18 @@ 144b Verint Systems Inc. 144c Catalina Research Inc 144d Samsung Electronics Co Ltd - 1600 Apple PCIe SSD + 1600 S4LN053X01 AHCI SSD Controller(Apple slot) + 9602 RS780/RS880 PCI to PCI bridge (int gfx) a544 Exynos 8890 PCIe Root Complex a575 Exynos 7420 PCIe Root Complex a5e3 Exynos 5433 PCIe Root Complex a800 XP941 PCIe SSD + a801 S4LN058A01[SSUBX] AHCI SSD Controller (Apple slot) a802 NVMe SSD Controller SM951/PM951 144d a801 PM963 2.5" NVMe PCIe SSD a804 NVMe SSD Controller SM961/PM961/SM963 144d a801 SM963 2.5" NVMe PCIe SSD + a806 NVMe SSD SM0032L a808 NVMe SSD Controller SM981/PM981/PM983 144d a801 SSD 970 EVO 1d49 403b Thinksystem U.2 PM983 NVMe SSD @@ -19341,6 +19383,7 @@ 1028 512d DC NVMe PM9A3 RI U.2 7.68TB 144d a813 General DC NVMe PM9A3 a80b NVMe SSD Controller PM9B1 + a80c NVMe SSD Controller S4LV008[Pascal] a820 NVMe SSD Controller 171X 1028 1f95 Express Flash NVMe XS1715 SSD 400GB 1028 1f96 Express Flash NVMe XS1715 SSD 800GB @@ -20469,6 +20512,7 @@ 43aa BCM43131 802.11b/g/n 43ae BCM43162 802.11ac Wireless Network Adapter 43b1 BCM4352 802.11ac Wireless Network Adapter + 1043 85ba PCE-AC56 Dual-Band Wireless PCI-E Adapter 43ba BCM43602 802.11ac Wireless LAN SoC 43bb BCM43602 802.11ac Wireless LAN SoC 43bc BCM43602 802.11ac Wireless LAN SoC @@ -20594,7 +20638,8 @@ d804 BCM58804 Stingray 100Gb Ethernet SoC f800 BCM78800 Switch ASIC [Trident5-X12] f900 BCM78900 Switch ASIC [Tomahawk5] - f903 BCM78903 Switch ASIC [Tomahawk6] + f902 BCM78902 Switch ASIC [Tomahawk5T] + f903 BCM78903 Switch ASIC [Tomahawk5] f905 BCM78905 Switch ASIC [Tomahawk5+] f910 BCM78910 Switch ASIC [Tomahawk6] f914 BCM78914 Switch ASIC [Tomahawk6] @@ -21410,6 +21455,7 @@ 101d MT2892 Family [ConnectX-6 Dx] 101e ConnectX Family mlx5Gen Virtual Function 101f MT2894 Family [ConnectX-6 Lx] + 193d 1035 NIC-ETH641F-LP-2P SFP28 2x25GbE PCIe Network Adapter 1020 MT28860 1021 MT2910 Family [ConnectX-7] 1023 CX8 Family [ConnectX-8] @@ -21542,18 +21588,25 @@ 5004 PC SN520 NVMe SSD 5005 PC SN520 NVMe SSD 5006 WD Black SN750 / PC SN730 NVMe SSD - 5007 PC SN530 NVMe SSD (DRAM-less) - 5008 PC SN530 NVMe SSD + 5007 IX SN530 NVMe SSD (DRAM-less) + 5008 PC SN530 NVMe SSD (DRAM-less) 5009 WD Blue SN550 NVMe SSD 15b7 5009 WD Blue SN550 NVMe SSD 500b PC SN530 NVMe SSD 1414 500b Xbox Series X 500d WD Ultrastar DC SN340 NVMe SSD 5011 WD PC SN810 / Black SN850 NVMe SSD - 5015 PC SN740 NVMe SSD - 5017 WD Black SN770 NVMe SSD + 5014 WD Green SN350 NVMe SSD 1 TB (DRAM-less) + 5015 PC SN740 NVMe SSD (DRAM-less) + 5016 WD PC SN740 NVMe SSD 512GB (DRAM-less) + 5017 WD Black SN770 / PC SN740 256GB / PC SN560 (DRAM-less) NVMe SSD + 5019 WD Green SN350 NVMe SSD 240GB (DRAM-less) 501a WD Blue SN570 NVMe SSD 1TB + 501d WD Blue SN550 NVMe SSD 2TB (DRAM-less) + 501e PC SN735 NVMe SSD (DRAM-less) + 501f WD PC SN735 NVMe SSD 512GB (DRAM-less) 5025 WD Blue SN570 NVMe SSD 2TB + 5026 WD PC SN735 NVMe SSD 1TB (DRAM-less) 5030 Western Digital WD Black SN850X NVMe SSD 15b8 ADDI-DATA GmbH 1001 APCI1516 SP controller (16 digi outputs) @@ -22637,8 +22690,11 @@ 9755 GL9755 SD Host Controller e763 GL9763E eMMC Controller 17aa Lenovo + 0003 LENSE20256GMSP34MEAT2TA + 0004 LENSE20512GMSP34MEAT2TA # 250GB nvme ssd from lenovo, can be found in Thinkpad x380 yoga 0005 LENSE30256GMSP34MEAT3TA + 0006 LENSE30512GMSP34MEAT3TA 3181 ThinkCentre M75n IoT 402b Intel 82599ES 10Gb 2-port Server Adapter X520-2 17ab Phillips Components @@ -22665,6 +22721,7 @@ 0105 MSM8998 PCIe Root Complex 0108 SM8150 PCIe Root Complex 0109 SA8195P PCIe Root Complex + 010e SC8280XP PCI Express Root Port 0300 MDM9x35 LTE Modem [Snapdragon X7] 0301 MDM9x45 LTE Modem [Snapdragon X12] 0302 MDM9x55 LTE Modem [Snapdragon X16] @@ -22674,6 +22731,8 @@ 1101 QCA6390 Wireless Network Adapter 1103 QCNFA765 Wireless Network Adapter 1104 QCN6024/9024/9074 Wireless Network Adapter + 1108 IPQ95xx/97xx PCI Express Root Port + 1109 QCN62xx/92xx Wireless Network Adapter 17cc NetChip Technology, Inc 2280 USB 2.0 17cd Cadence Design Systems, Inc. @@ -23604,6 +23663,7 @@ 16ff OX16C954 HOST-B 1987 Phison Electronics Corporation 5007 E7 NVMe Controller + 5008 E8 PCIe3 NVMe Controller 5012 E12 NVMe Controller 5013 PS5013 E13 NVMe Controller 5016 E16 PCIe4 NVMe Controller @@ -23661,6 +23721,7 @@ 103c 3315 NC553i 10Gb 2-port FlexFabric Converged Network Adapter 103c 337b NC554FLB 10Gb 2-port FlexFabric Converged Network Adapter 0800 ServerView iRMC HTI +19a4 Owl Cyber Defense Solutions 19a8 DAQDATA GmbH 19ac Kasten Chase Applied Research 0001 ACA2400 Crypto Accelerator @@ -23893,7 +23954,8 @@ 0050 FlashMAX III 1a84 Commex Technologies 0001 Vulcan SP HT6210 10-Gigabit Ethernet (rev 02) -1a88 MEN Mikro Elektronik +# nee MEN Mikro Elektronik +1a88 Duagon AG 4d45 Multifunction IP core 1a8a StarBridge, Inc. 1a8c Verigy Pte. Ltd. @@ -24128,6 +24190,7 @@ 000c QEMU PCIe Root port 000d QEMU XHCI Host Controller 0010 QEMU NVM Express Controller + 0013 QEMU UFS Host Controller 0100 QXL paravirtual graphic card 1af4 1100 QEMU Virtual Machine 1b37 Signal Processing Devices Sweden AB @@ -24170,7 +24233,7 @@ 1028 2112 BOSS-N1 Monolithic 1028 2113 BOSS-N1 Modular 1028 2151 BOSS-N1 Modular ET - 1028 2196 ROR-N100 + 1028 2196 ROR-N1 1b4b 2241 Santa Cruz NVMe Host Adapter 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit 1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit @@ -24241,7 +24304,9 @@ d430 D410/430 Quad-port E1/T1 card 1b79 Absolute Analysis 1b85 OCZ Technology Group, Inc. - 1041 RevoDrive 3 X2 PCI-Express SSD 240 GB (Marvell Controller) + 1021 RevoDrive 3 X2 PCIe SSD 240 GB (Marvell SAS Controller) + 1041 RevoDrive 3 X2 PCIe SSD 240 GB (Marvell SAS Controller) + 4018 Z Drive 6000/6300 NVME SSD 6018 RD400/400A SSD 8788 RevoDrive Hybrid 1b94 Signatec / Dynamic Signals Corp @@ -24371,7 +24436,8 @@ # Nytro 5360S (Rocinante Single Port) TCG - E3.S 1bb1 0180 Nytro 5360S TCG - E3.S 1bb1 01a1 Nytro XP7102 - 5012 FireCuda 510 SSD + 5012 FireCuda/IronWolf 510 SSD + 5013 BarraCuda Q5 NVMe SSD (DRAM-less) 5016 FireCuda 520 SSD 5018 FireCuda 530 SSD 1bb3 Bluecherry @@ -24390,7 +24456,7 @@ 0004 MAX4 1bc0 Innodisk Corporation 1001 PCIe 3TG6-P Controller - 1002 PCIe 3TE6 Controller + 1002 PCIe 3TE6 Controller (DRAM-less) 1160 PCIe 3TE2 Controller 1321 PCIe 4TG-P Controller 1322 PCIe 4TE Controller @@ -24398,6 +24464,8 @@ 5208 PCIe 3TE7 Controller 5216 PCIe 3TE8 Controller 5236 PCIe 4TG2-P Controller +1bcd Apacer Technology + 0120 NVMe SSD Drive 960GB 1bcf NEC Corporation 001c Vector Engine 1.0 1bd0 Astronics Corporation @@ -24420,6 +24488,16 @@ 1203 NG3 Series Avionics Discrete Interface 1bd4 Inspur Electronic Information Industry Co., Ltd. 0911 Arria10_PCIe_F10A1150 + 1000 NS8600G1U160 NVME SSD + 1001 NS8600G1U320 NVME SSD + 1002 NS8600G1U640 NVME SSD + 1003 NS8500G1U192 NVME SSD + 1004 NS8500G1U384 NVME SSD + 1005 NS8500G1U768 NVME SSD + 1006 NS6610G1U160, NS6510G1U192 NVME SSD + 1007 NS6610G1U320, NS6510G1U384 NVME SSD + 100c NS8510G1Uxxx, NS8610G1Uxxx NVME SSD + 100e NS8500G2Uxxxx, NS8600G2Uxxxx NVME SSD 1bee IXXAT Automation GmbH 0003 CAN-IB200/PCIe 1bef Lantiq @@ -24427,6 +24505,7 @@ 1bf4 VTI Instruments Corporation 0001 SentinelEX 7011 RX0xxx +1bfc Duagon AG 1bfd EeeTOP 1c00 Nanjing Qinheng Microelectronics Co., Ltd. 3252 CH382 PCIe Dual Port Serial Adapter @@ -24507,6 +24586,7 @@ # http://www.accensusllc.com/accensustelas2.html 0300 Telas 2.V 1c44 Enmotus Inc + 1100 Fuzedrive NVMe SSD 8000 8000 Storage IO Controller # A Western Digital Subsidiary 1c58 HGST, Inc. @@ -24517,6 +24597,7 @@ 0023 Ultrastar SN200 Series NVMe SSD 1c58 8823 Ultrastar Memory (ME200) 1c5c SK hynix + 1282 PC300 NVMe Solid State Drive 128GB 1283 PC300 NVMe Solid State Drive 256GB 1284 PC300 NVMe Solid State Drive 512GB 1285 PC300 NVMe Solid State Drive 1TB @@ -24524,11 +24605,15 @@ 1339 BC511 NVMe SSD 1504 PC400 NVMe SSD 1527 PC401 NVMe Solid State Drive 256GB + 1627 PC601 NVMe Solid State Drive 1639 PC611 NVMe Solid State Drive + 1739 BC701 NVMe Solid State Drive 174a Gold P31/BC711/PC711 NVMe Solid State Drive 1959 Platinum P41/PC801 NVMe Solid State Drive 1d59 BC901 NVMe Solid State Drive (DRAM-less) 2204 960GB TLC PCIe Gen3 x4 NVMe M.2 22110 + 2427 PE6010 NVMe Solid State Drive + 2429 PE6011 NVMe Solid State Drive 243b PE6110 NVMe Solid State Drive 1c5c 0100 PE6110 NVMe Solid State Drive 2839 PE8000 Series NVMe Solid State Drive @@ -24551,6 +24636,8 @@ 1028 2268 DC NVMe ISE PE8110 RI U.2 3840GB 1028 2269 DC NVMe ISE PE8110 RI U.2 7680GB 1c5c 0101 PE81x0 U.2/3 NVMe Solid State Drive + 284a PE8110 Series NVMe Solid State Drive + 2a49 PE9110 Series NVMe Solid State Drive 1c5f Beijing Memblaze Technology Co. Ltd. 000d PBlaze5 520/526 1c5f 0220 NVMe SSD PBlaze5 520 1920G AIC @@ -24656,10 +24743,19 @@ 0002 Clarett 1cb8 Dawning Information Industry Co., Ltd. 1cc1 ADATA Technology Co., Ltd. +# SX6000LNP + 2263 XPG SX6000 Lite NVMe SSD (DRAM-less) + 33f3 IM2P33F3 NVMe SSD (DRAM-less) 33f8 IM2P33F8ABR1 NVMe SSD 5350 XPG GAMMIX S50 NVMe SSD -# 256GB NVMe SSD - 5766 ADATA XPG GAMMIXS1 1L Media + 5762 FALCON NVMe SSD + 5766 ADATA XPG GAMMIXS1 1L Media (256 GB SSD) + 612a LEGEND 750 NVMe SSD (DRAM-less) + 613a LEGEND 840 NVMe SSD (DRAM-less) + 621a LEGEND 850 NVMe SSD (DRAM-less) + 622a LEGEND 960 NVMe SSD + 624a LEGEND 700 NVMe SSD (DRAM-less) + 627a LEGEND 800 NVMe SSD 8201 XPG SX8200 Pro PCIe Gen3x4 M.2 2280 Solid State Drive 1cc4 Shenzhen Unionmemory Information System Ltd. 1203 NVMe SSD Controller UHXXXa series @@ -24675,8 +24771,21 @@ 1cc4 e122 NVMe SSD UH711a series U.2 1920GB 1cc4 e123 NVMe SSD UH711a series U.2 3840GB 1cc4 e124 NVMe SSD UH711a series U.2 7680GB - 17ab NVMe 256G SSD device + 17a9 RPITJ1TBVME2HWD NVMe SSD 1024GB + 17aa AH631 PCIe 3.0 NVMe SSD 512GB + 17ab AH631 PCIe 3.0 NVMe SSD 256GB + 2263 AM611 PCIe 3.0 NVMe SSD 256GB + 5008 AM610 PCIe 3.0 NVMe SSD 128GB + 5012 RPITJ512PED2OWX NVMe SSD 512GB + 6201 AM620 PCIe 3.0 NVMe SSD 128GB + 6202 AM620 PCIe 3.0 NVMe SSD 256GB + 6203 AM620 PCIe 3.0 NVMe SSD 512GB + 6204 AM620 PCIe 3.0 NVMe SSD 1024GB + 6302 AM630 PCIe 4.0 NVMe SSD 256GB 6303 AM630 PCIe 4.0 x4 NVMe SSD Controller + 6304 AM630 PCIe 4.0 NVMe SSD 1024GB + 6a03 RPETJ512MKP1QDQ PCIe 4.0 NVMe SSD 512GB (DRAM-less) + 6a14 RPEYJ1T24MKN2QWY PCIe 4.0 NVMe SSD 1024GB (DRAM-less) 1cc5 Embedded Intelligence, Inc. 0100 PCIe-CAN-02 Dual CAN bus (9-pin male). PCI Express x1. 0101 PCIe-CAN-01 Single CAN bus (9-pin male). PCI Express x1. @@ -24720,6 +24829,8 @@ 1cf0 Akitio 1cf7 Subspace Dynamics 1cfa Corsair Memory, Inc +1cfd Mangstor + 6300 MX6300 series PCIe x8 NVMe SSD 1d00 Pure Storage 1d05 Tongfang Hongkong Limited 1d0f Amazon.com, Inc. @@ -24827,6 +24938,9 @@ 0015 PM4edge 0016 PM4edge User Device 1d40 Techman Electronics (Changshu) Co., Ltd. + 5501 XC100C55-xxxx NVME SSD + 5c01 XC100C5C-xxxx, XC100E5C-xxxx NVME SSD + b100 PV100C55-xxxx NVME SSD 1d44 DPT a400 PM2x24/PM3224 1d49 Lenovo @@ -24960,6 +25074,10 @@ 1d78 7204 Aliflash V2 U.2 15mm 3.84TB NVMe SSD 1d78 7208 Aliflash V2 U.2 15mm 7.68TB NVMe SSD 1d79 Transcend Information, Inc. + 2262 NVMe PCIe SSD 220S + 2263 NVMe PCIe SSD 120S/112S (DRAM-less) + 2264 NVMe PCIe SSD 250H + 5766 NVMe PCIe SSD 110Q (DRAM-less) 1d7c Aerotech, Inc. # Fiber-optic HyperWire motion control bus from Aerotech. 0001 HyperWire Adapter @@ -25015,9 +25133,12 @@ 0001 Colossus GC2 [C2] 0002 Colossus GC1 [S1] 1d97 Shenzhen Longsys Electronics Co., Ltd. + 1062 Lexar NM710 NVME SSD 1d97 Lexar NM620 NVME SSD (DRAM-less) 2263 SM2263EN/SM2263XT-based OEM SSD 2269 Lexar NM760 NVME SSD (DRAM-less) + 5216 Lexar NM620 NVME SSD (DRAM-less) + 5236 Lexar NM800 PRO NVME SSD # nee Facebook, Inc. 1d9b Meta Platforms, Inc. 0010 Networking DOM Engine @@ -25037,6 +25158,8 @@ # PCIe accelerator card for Deep Learning training tasks 1020 Gaudi2 AI Training Accelerator 1da8 Corigine, Inc. + 3800 Network Flow Processor 3800 + 3803 Network Flow Processor 3800 Virtual Function 1dad Fungible 1db2 ATP ELECTRONICS INC 1db7 Phytium Technology Co., Ltd. @@ -25064,6 +25187,9 @@ dc3c GPU_DMA Controller [X100 Series] 1dbb NGD Systems, Inc. 1dbe INNOGRIT Corporation + 5216 NVMe SSD Controller IG5216 (DRAM-less) + 5220 NVMe SSD Controller IG5220 (DRAM-less) + 5236 NVMe SSD Controller IG5236 5636 NVMe DC SSD IG5636 1dbe 0001 DONGTING-N1 DC SSD U.2 1dbe 1001 DONGHU-Z1 DC ZNS SSD U.2 @@ -25078,6 +25204,7 @@ 1dcf Beijing Sinead Technology Co., Ltd. 1dd3 Sage Microelectronics Corp. 1dd4 Swissbit AG + 0010 N-10m2 NVMe SSD 1dd8 AMD Pensando Systems 0002 DSC2 Elba Upstream Port 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card @@ -25231,6 +25358,8 @@ 8003 RCEC PF 8004 RCEC VF 1dee Biwin Storage Technology Co., Ltd. + 2262 HP EX950 NVMe SSD + 2263 HP EX900 NVMe SSD (DRAM-less) 1def Ampere Computing, LLC e005 eMAG PCI Express Root Port 0 e006 eMAG PCI Express Root Port 1 @@ -25305,6 +25434,8 @@ 0208 ACE-NIC100RN Programmable Network Accelerator 1df3 0000 Maintenance Mode 1df3 0001 ENA2100RN +1df5 Shenzhen TIGO Semiconductor + 1202 kimtigo NVMe SSD (DRAM-less) 1df7 opencpi.org 0001 ml605 0002 alst4 @@ -25321,7 +25452,7 @@ 1dfc JSC NT-COM 1181 TDM 8 Port E1/T1/J1 Adapter 1e0f KIOXIA Corporation - 0001 NVMe SSD Controller BG4 + 0001 NVMe SSD Controller BG4 (DRAM-less) 0007 NVMe SSD Controller Cx6 1028 2078 DC NVMe CD6 RI 960GB 1028 2079 DC NVMe CD6 RI 1.92TB @@ -25343,9 +25474,13 @@ 1028 210f Dell Ent NVMe FIPS CM6 MU 3.2TB 1028 2110 Dell Ent NVMe FIPS CM6 MU 6.4TB 1e0f 0001 Generic NVMe CM6 + 0008 RD500/Exceria Plus/Exceria Plus G2 NVMe SSD 0009 NVMe SSD 1e0f 0001 Toshiba RC500 Series NVMe SSD 1e0f 0032 KIOXIA EXCERIA RC10 Series NVMe SSD + 000c NVMe SSD Controller BG5 (DRAM-less) + 000d NVMe SSD Controller XG7 + 0010 NVMe SSD Controller XG8 0011 NVMe SSD Controller CD7 1028 2189 DC NVMe SED CD7 RI 960GB 1028 218a DC NVMe CD7 RI 960GB @@ -25392,6 +25527,7 @@ 1028 2247 Ent NVMe CM7 E3.S MU 6.4TB 1028 2248 Ent NVMe CM7 E3.S MU 3.2TB 1028 2249 Ent NVMe CM7 E3.S MU 1.6TB + 0018 Exceria Pro NVMe SSD 001f NVMe SSD Controller CD8 1028 2223 DC NVMe CD8 U.2 SED 15.36TB 1028 2224 DC NVMe CD8 U.2 SED 7.68TB @@ -25428,6 +25564,16 @@ 8001 I20 [CloudBlazer] 8011 I10 [CloudBlazer] 8012 I10L [CloudBlazer] +# HHHL PCIe card, single slot, 3rd generation from Enflame + 8031 S6 [Enflame] +# HHHL PCIe card, single slot, 3rd generation from Enflame, 24GB device memory + 8032 S6 [Enflame] +# FHFL PCIe card, single slot, 3rd generation from Enflame + c031 S30 [Enflame] +# HHHL PCIe card, dual slot, 3rd generation from Enflame + c032 S60 [Enflame] +# FHFL PCIe card, single slot, 3rd generation from Enflame, 48GB device memory + c033 S30 [Enflame] # nee Thinci, Inc 1e38 Blaize, Inc 0102 Xplorer X1600 @@ -25506,11 +25652,20 @@ 1e3b 008b Enterprise NVMe SSD HHHL 1.6TB (H3900) 1e3b 0091 Enterprise NVMe SSD HHHL 0.75TB (H3900) 1333 Haishen5 NVMe SSD + 1e3b 0081 Enterprise NVMe SSD U.2 3.84TB (H5100) + 1e3b 0082 Enterprise NVMe SSD U.2 7.68TB (H5100) + 1e3b 0084 Enterprise NVMe SSD U.2 3.2TB (H5300) + 1e3b 0085 Enterprise NVMe SSD U.2 6.4TB (H5300) 1e3d Burlywood, Inc 1e44 Valve Software 1e49 Yangtze Memory Technologies Co.,Ltd + 0001 ZHITAI PC005 NVMe SSD 0021 ZHITAI TiPro5000 NVMe SSD 0041 ZHITAI TiPro7000 + 0071 ZHITAI TiPlus7100 +# YMTC + 1001 PC005 NVMe SSD + 1011 PC210 NVMe SSD # YMTC PCIe/NVMe SSD 1013 PC210 1e4b MAXIO Technology (Hangzhou) Ltd. @@ -25561,6 +25716,7 @@ 1e81 a213 NVMe SSD UHXXXa series U.2 3200GB 1e81 a214 NVMe SSD UHXXXa series U.2 6400GB 1e81 f123 NVMe SSD TP6500 series U.2 3840GB + 6206 AM620 NVMe SSD 1e83 Huaqin Technology Co.Ltd 1e85 Heitec AG 1e89 ID Quantique SA @@ -25573,6 +25729,8 @@ 1002 NVMe SSD [3DNAND] 2.5" U.2 (LJ1) 1e95 1101 NVMe SSD [3DNAND] 2.5" U.2 (LJ1) 1ea0 5636 TP1500 Series U.2 NVMe Datacenter SSD + 1003 CLR-8W512 NVMe SSD M.2 (DRAM-less) + 1007 CL4-8D512 NVMe SSD M.2 (DRAM-less) 9100 CL1-3D256-Q11 NVMe SSD M.2 1e96 Drut Technologies Inc. 1e9f Lynxi Technologies Co., Ltd. @@ -25585,7 +25743,7 @@ 224a IPA-PE224A CXL to Gen-Z Bridge [Sphinx] 1eab Hefei DATANG Storage Technology Co.,LTD. 300a NVMe SSD Controller 300A - 300b NVMe SSD Controller 300B + 300b NVMe SSD Controller 300B (DRAM-less) 1eac Quectel Wireless Solutions Co., Ltd. 1001 EM120R-GL LTE Modem 1002 EM160R-GL LTE Modem @@ -25652,12 +25810,16 @@ 0201 MTT S80 0202 MTT S70 0203 MTT S60 - 0211 G2D40 + 0211 MTT X200 0221 G2S80 0222 MTT S3000 0223 G2S4 0251 G2N10 02ff MTT HDMI/DP Audio + 0300 MTT S90 Engineering Sample + 0301 MTT S90 + 0323 MTT S4000 + 03ff MTT HDMI/DP Audio 1ed8 Digiteq Automotive 0101 FG4 PCIe Frame Grabber 1ed9 Myrtle.ai @@ -25714,6 +25876,8 @@ 5220 IG5220-Based NVMe SSD 5236 IG5236-Based NVMe SSD 5636 IG5636-Based NVMe SSD +1f0a Motorcomm Microelectronics. + 6801 YT6801 Gigabit Ethernet Controller 1f0f NebulaMatrix Technology 1041 D1055AS vDPA Ethernet Controller 1f0f 0001 D1055AS vDPA Ethernet Controller @@ -25744,6 +25908,8 @@ 1f2f 6115 KM660 U.2 3.2TB NVMe SSD 1f2f 6116 KM560 U.2 3.84TB NVMe SSD 1f2f 6118 KM560 U.2 7.68TB NVMe SSD +1f31 Nextorage + 4512 Nextorage NE1N NVMe SSD 1f3f 3SNIC Ltd 2100 SSSHBA SAS/SATA HBA 1f3f 0120 HBA 32 Ports @@ -25783,6 +25949,7 @@ 9032 SSSNIC SDI5.1 1f3f 00a1 Dual Port 100GE SDI5.1 1f40 Netac Technology Co.,Ltd + 2263 NVMe SSD (DRAM-less) 1f44 VVDN Technologies Private Limited 1f4b Axera Semiconductor Co., Ltd 1f52 MangoBoost Inc. @@ -25890,6 +26057,14 @@ 1fd4 SUNIX Co., Ltd. 0001 Matrix multiport serial adapter 1999 Multiport serial controller +1fde Kratos Defense & Security Solutions, Inc. + 1125 OpenEdge 1125P + 2500 OpenEdge 2500P +1fe0 Allwinmeta Co., Ltd. + 1010 AWM 1 + 2000 AWM 2 + 2010 AWM 2-M +1fe4 HippStor Technology 2000 Smart Link Ltd. 2800 SmartPCI2800 V.92 PCI Soft DFT 2001 Temporal Research Ltd @@ -25909,13 +26084,24 @@ 2010 8142 100VG/AnyLAN 2646 Kingston Technology Company, Inc. 0010 HyperX Predator PCIe AHCI SSD - 2262 KC2000 NVMe SSD +# KC2000 and KC2500 share the same DID + 2262 KC2000/KC2500 NVMe SSD 2263 A2000 NVMe SSD 5008 U-SNS8154P3 NVMe SSD + 500b DC1000M NVMe SSD + 500c OM8PCP Design-In PCIe 3 NVMe SSD (DRAM-less) 500d OM3PDP3 NVMe SSD - 500e SNVS2000G [NV1 NVMe PCIe SSD 2TB] - 5012 DC1500M U.2 Enterprise SSD - 5013 FURY Renegade NVMe SSD + 500e NV1 NVMe SSD + 5010 OM8SBP NVMe PCIe SSD (DRAM-less) + 5012 DC1500M NVMe SSD +# KC3000 and Renegade share the same DID + 5013 KC3000/Renegade NVMe SSD + 5014 Design-In PCIe 4 NVMe SSD (TLC) + 5016 OM3PGP4 NVMe SSD + 501b OM8PGP4 NVMe PCIe SSD (DRAM-less) + 501d NV2 NVMe PCIe 4 SSD 500GB (DRAM-less) + 501f FURY Renegade NVMe SSD with heatsink + 5021 Design-In PCIe 4 NVMe SSD (QLC) 270b Xantel Corporation 270f Chaintech Computer Co. Ltd 2711 AVID Technology Inc. @@ -27193,6 +27379,7 @@ 0960 80960RP (i960RP) Microprocessor/Bridge 0962 80960RM (i960RM) Bridge 0964 80960RP (i960RP) Microprocessor/Bridge + 0975 Optane NVME SSD H10 with Solid State Storage [Teton Glacier] 0998 Ice Lake IEH 09a2 Ice Lake Memory Map/VT-d 09a3 Ice Lake RAS @@ -27200,6 +27387,7 @@ 09a6 Ice Lake MSM 09a7 Ice Lake PMON MSM 09ab RST VMD Managed Controller + 09ad Optane NVME SSD H20 with Solid State Storage [Pyramid Glacier] 09c4 PAC with Intel Arria 10 GX FPGA 0a03 Haswell-ULT Thermal Subsystem 0a04 Haswell-ULT DRAM Controller @@ -28923,6 +29111,7 @@ 15fb Ethernet Connection (13) I219-LM 15fc Ethernet Connection (13) I219-V 15ff Ethernet Controller X710 for 10GBASE-T + 1014 0000 PCIe3 4-port 10GbE Base-T Adapter 1137 0000 X710TLG GbE RJ45 PCIe NIC 1137 02c1 X710T2LG 2x10 GbE RJ45 PCIe NIC 1137 02c2 X710T4LG 4x10 GbE RJ45 PCIe NIC @@ -30436,6 +30625,7 @@ 2522 NVMe Optane Memory Series 8086 3806 Optane Memory 16GB 8086 3810 Optane Memory M10 16GB + 2525 Optane NVME SSD P1600X Series 2526 Wireless-AC 9260 2530 82850 850 (Tehama) Chipset Host Bridge (MCH) 1028 00c7 Dimension 8100 @@ -32555,9 +32745,17 @@ 34aa Ice Lake-LP Serial IO SPI Controller #0 34ab Ice Lake-LP Serial IO SPI Controller #1 34b0 Ice Lake-LP PCI Express Root Port #9 + 34b1 Ice Lake-LP PCIe Port #10 + 34b4 Ice Lake-LP PCIe Port #13 + 34b5 Ice Lake-LP PCIe Port #14 34b7 Ice Lake-LP PCI Express Root Port #16 + 34b8 Ice Lake-LP PCIe Port #1 34ba Ice Lake-LP PCI Express Root Port #3 + 34bb Ice Lake-LP PCIe Port #4 34bc Ice Lake-LP PCI Express Root Port #5 + 34bd Ice Lake-LP PCIe Port #6 + 34be Ice Lake-LP PCIe Port #7 + 34bf Ice Lake-LP PCIe Port #8 34c4 Ice Lake-LP SD Host Controller 34c5 Ice Lake-LP Serial IO I2c Controller #4 34c6 Ice Lake-LP Serial IO I2c Controller #5 @@ -33348,13 +33546,29 @@ 8086 1216 WiMAX/WiFi Link 5150 ABG 8086 1311 WiMAX/WiFi Link 5150 AGN 8086 1316 WiMAX/WiFi Link 5150 ABG - 4389 WM590 Chipset LPC Controller - 438b Tiger Lake-H LPC/eSPI Controller + 4384 Q570 LPC/eSPI Controller + 4385 Z590 LPC/eSPI Controller + 4386 H570 LPC/eSPI Controller + 4387 B560 LPC/eSPI Controller + 4388 H510 LPC/eSPI Controller + 4389 WM590 LPC/eSPI Controller + 438a QM580 LPC/eSPI Controller + 438b HM570 LPC/eSPI Controller + 438c C252 LPC/eSPI Controller + 438d C256 LPC/eSPI Controller + 438e H310D LPC/eSPI Controller + 438f W580 LPC/eSPI Controller + 4390 RM590E LPC/eSPI Controller + 4391 R580E LPC/eSPI Controller 43a3 Tiger Lake-H SMBus Controller 43a4 Tiger Lake-H SPI Controller 43b0 Tiger Lake-H PCI Express Root Port #9 + 43b8 Tiger Lake-H PCIe Root Port #1 43ba Tiger Lake-H PCIe Root Port #3 + 43bb Tiger Lake-H PCIe Root Port #4 43bc Tiger Lake-H PCI Express Root Port #5 + 43c0 Tiger Lake-H PCIe Root Port #17 + 43c7 Tiger Lake-H PCIe Root Port #24 43c8 Tiger Lake-H HD Audio Controller 43d3 Tiger Lake SATA AHCI Controller 43e0 Tiger Lake-H Management Engine Interface @@ -33436,6 +33650,9 @@ 193d 4000 UN-GPU-XG310-32GB-FHFL 4908 DG1 [Iris Xe Graphics] 4909 DG1 [Iris Xe MAX 100] + 4940 4xxx Series QAT + 4942 4xxx Series QAT + 4944 4xxx Series QAT 4b00 Elkhart Lake eSPI Controller 4b23 Elkhart Lake SMBus Controller 4b24 Elkhart Lake SPI (Flash) Controller @@ -33524,6 +33741,7 @@ 5182 Alder Lake PCH eSPI Controller 1028 0b10 Precision 3571 5187 Alder Lake LPC Controller + 519d Raptor Lake LPC/eSPI Controller 51a3 Alder Lake PCH-P SMBus Host Controller 1028 0b10 Precision 3571 51a4 Alder Lake-P PCH SPI Controller @@ -33538,6 +33756,7 @@ 51c6 Alder Lake-P Serial IO I2C Controller #1 51c8 Alder Lake PCH-P High Definition Audio Controller 1028 0b10 Precision 3571 + 51ca Raptor Lake-P/U/H cAVS 51cc Alder Lake Smart Sound Technology Audio Controller *** 178 LINES SKIPPED *** From nobody Mon Dec 4 10:34:15 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkKlr24XSz53CpF; Mon, 4 Dec 2023 10:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKlr1bWhz4QpR; Mon, 4 Dec 2023 10:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DoolnQAKGXcUy3s2MtMeEMQHf3DwKDQC3eh7TpVABAs=; b=ePld/ZdlAEc6TMLCZvUsFdG+vJLmHs9IepEb/QfIKfWN+DfXZGi/+qja7LPuGk3ZoLqSWy 2eaQlujTUwttTLj/549nygvMyVd90J708NmDq7MxGXH47w+/iKRGVjI2Pyx/YoPdXUHTPy zWT2kJgqae3lSTWhqzVMJFzE0RfuSJXCbz84e0RoCdszG8PhU+n9kcwfMXOQVoYJ+CN+NW SI1q1JX68t/3mjBEVdai3VPIieOTdKd5p1C8uCgnKuXIgGStcSfhbAc51QBsjmnvA0ztdR HaTiKDaV6vCzhoaUbvT/hoPtvHhiv1FbtoZrCOqo49rd1kc8yYtHIUN0jx0szA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DoolnQAKGXcUy3s2MtMeEMQHf3DwKDQC3eh7TpVABAs=; b=PPxpQaiTsaPoKnnO/6rsk7Of5sVMo6LUmBJgo5m5kKXoK90AhMBxgS1w04NVJbP8U0rW88 SU9U5b+SCrfvLNWSufgGkh6J7sbjDrNUuot8NcCwEkxYLuusHwY3IjORkPswANfZPlZSZD CWGnKqHxYlMqSEukah2x8BO3AR+qAZKRd2bYxlaQD6AKPG8O/bDhlVaEgARzaszVD+dlOz truZHTd/2cjOSUCwX0yXe35E6ATEby1D6GYehdhFgVNdxGj9Dozpwt2BHoTUlGz8gaUy+x hW8tJZPm28xSa16q4v3IGgFt8+FReWV/4d34ACm1zMLjiwMb4SR1F33kM8WvMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686056; a=rsa-sha256; cv=none; b=R2N5ewAQb7S9jM4ZBAbTRqhI5Od5SagmqwkEqdx2CecezQsSA++BNk/bSNCLASiDbdqkYj XWqfpOqR4NUovkWlbmhNDvFQ+bNmLJuWigpv3WmIx40UQ7Rycdis4SH5eg1dcOtH8XvyEE Nghtr6oQEIb8W1Imc/bY7VwsoxKuMG9Px4dVHUqoPAdf6CZCv4b6TiChuS2dbCiEy09LQA PbvzvC4U4DntTEWy1576YUuWSvzVMls5TPFewx5UGCVbTkIFnl8wVIchOmkPE7fli6f1jO gli0xDe4UZ06+vqz+FRE3nGmqn0RWDQeWsAWyImhMHnQ+mhr2TtQ2gQq55g8Rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkKlr07V9z80C; Mon, 4 Dec 2023 10:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AYG3L009264; Mon, 4 Dec 2023 10:34:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AYF5t009261; Mon, 4 Dec 2023 10:34:15 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:34:15 GMT Message-Id: <202312041034.3B4AYF5t009261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 146471559803 - stable/13 - pci_vendors: update to 2023-09-22 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 14647155980320c1bfc29d841ad1860870b1ee56 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=14647155980320c1bfc29d841ad1860870b1ee56 commit 14647155980320c1bfc29d841ad1860870b1ee56 Author: Baptiste Daroussin AuthorDate: 2023-11-03 16:32:35 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:34:08 +0000 pci_vendors: update to 2023-09-22 (cherry picked from commit dbffadd8c28e3ab7dc8b5d38e3c5d7f96a5ad62d) --- share/misc/pci_vendors | 390 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 318 insertions(+), 72 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index d3988731c30a..50115d979327 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.08.12 -# Date: 2023-08-12 03:15:02 +# Version: 2023.09.22 +# Date: 2023-09-22 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -773,7 +773,6 @@ 1028 2142 HBA465e Adapter 1028 2209 HBA465i Adapter 1028 220a HBA465i Front - 1028 228a HBA465e-s Adapter 15d9 1d03 AOC-S4116L-H16IR (16DD/96DD) RAID Adapter 15d9 1d07 AOC-S4016L-L16IT Storage Adapter 15d9 1d08 AOC-S4016L-L16IR Storage Adapter @@ -803,6 +802,20 @@ 1d49 0204 ThinkSystem 430-8i SAS/SATA 12Gb Dense HBA 00b2 PCIe Switch management endpoint 1d49 0003 ThinkSystem 1611-8P PCIe Gen4 NVMe Switch Adapter +# 24G SAS/PCIe storage adapter chip + 00b3 Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx +# 9760W 32 internal port RAID controller + 1000 5000 MegaRAID 9760W-32i 24G SAS/PCIe Storage Adapter +# 9760W 16 internal port RAID controller + 1000 5001 MegaRAID 9760W-16i 24G SAS/PCIe Storage Adapter +# 9760W 16 internal and 16 external port RAID controller + 1000 5010 MegaRAID 9760W-16i16e 24G SAS/PCIe Storage Adapter +# 9700W 32 internal port Storage controller + 1000 5020 eHBA 9700W-32i 24G SAS/PCIe Storage Adapter +# 9700W 16 internal port Storage controller + 1000 5021 eHBA 9700W-16i 24G SAS/PCIe Storage Adapter +# 9700 16 external port Storage controller + 1000 5030 eHBA 9700-16e 24G SAS/PCIe Storage Adapter 00be SAS3504 Fusion-MPT Tri-Mode RAID On Chip (ROC) 00bf SAS3404 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) 00c0 SAS3324 PCI-Express Fusion-MPT SAS-3 @@ -1039,8 +1052,9 @@ 15d9 1c6e AOC-SLG4-2H8M2 Storage Adapter 1d49 0505 ThinkSystem RAID 540-8i PCIe Gen4 12Gb Adapter 1d49 0506 ThinkSystem RAID 540-16i PCIe Gen4 12Gb Adapter - 1d49 0700 ThinkSystem M.2 SATA/NVMe 2-Bay Non-Hot-Swap RAID Enablement Kit - 1d49 0701 ThinkSystem 7mm SATA/NVMe 2-Bay Rear Hot-Swap RAID Enablement Kit + 1d49 0700 ThinkSystem M.2 RAID B540i-2i SATA/NVMe Enablement Kit + 1d49 0701 ThinkSystem 7mm RAID B540p-2HS SATA/NVMe Enablement Kit + 1d49 0702 ThinkSystem M.2 RAID B540p-2HS SATA/NVMe Enablement Kit 10e7 MegaRAID 12GSAS/PCIe Unsupported SAS38xx 1960 MegaRAID 1000 0518 MegaRAID 518 SCSI 320-2 Controller @@ -1152,6 +1166,7 @@ 13e9 Ariel/Navi10Lite 13f9 Oberon/Navi12Lite 13fe Cyan Skillfish [BC-250] + 145a Dummy Function (absent graphics controller) 1478 Navi 10 XL Upstream Port of PCI Express Switch 1479 Navi 10 XL Downstream Port of PCI Express Switch 1506 Mendocino @@ -3932,6 +3947,7 @@ 1462 5022 RX 6600 MECH 2X 148c 2412 PowerColor Red Devil RX 6600 XT 1849 5218 Radeon RX 6600 Challenger ITX 8GB + 1da2 448e Radeon RX 6600 XT Pulse 7408 Aldebaran/MI200 [Instinct MI250X] 740c Aldebaran/MI200 [Instinct MI250X/MI250] 740f Aldebaran/MI200 [Instinct MI210] @@ -3948,6 +3964,7 @@ 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] 745e Navi 31 [Radeon Pro W7800] + 747e Navi 32 [Radeon RX 7700 XT / 7800 XT] 7480 Navi 33 [Radeon RX 7700S/7600/7600S/7600M XT/PRO W7600] 1849 5313 RX 7600 Challenger OC 7483 Navi 33 [Radeon RX 7600M/7600M XT] @@ -4981,6 +4998,8 @@ 1455 Zeppelin/Renoir PCIe Dummy Function 1456 Family 17h (Models 00h-0fh) Platform Security Processor (PSP) 3.0 Device 1457 Family 17h (Models 00h-0fh) HD Audio Controller + 1458 XGMAC 10GbE Controller + 1459 XGMAC 10GbE Controller 145a Zeppelin/Raven/Raven2 PCIe Dummy Function 145b Zeppelin Non-Transparent Bridge 145c Family 17h (Models 00h-0fh) USB 3.0 Host Controller @@ -5037,6 +5056,7 @@ 14b5 Family 17h-19h PCIe Root Complex 14b6 Family 17h-19h IOMMU 14b7 Family 17h-19h PCIe Dummy Host Bridge + 14b8 Family 17h-19h PCIe GPP Bridge 14b9 Family 17h-19h Internal PCIe GPP Bridge 14ba Family 17h-19h PCIe GPP Bridge # Server device @@ -5044,6 +5064,7 @@ 14cd Family 19h USB4/Thunderbolt PCIe tunnel 14de Phoenix PCIe Dummy Function 14ef Family 19h USB4/Thunderbolt PCIe tunnel + 1502 AMD IPU Device 1510 Family 14h Processor Root Complex 174b 1001 PURE Fusion Mini 1512 Family 14h Processor Root Port @@ -12492,7 +12513,7 @@ 1c2d GP106M 1c30 GP106GL [Quadro P2000] 1c31 GP106GL [Quadro P2200] - 1c35 GP106M [Quadro P2000 Mobile] + 1c35 GP106M [Quadro P2000 Mobile / DRIVE PX 2 AutoChauffeur] 1c36 GP106 [P106M] 1c60 GP106BM [GeForce GTX 1060 Mobile 6GB] 103c 8390 GeForce GTX 1060 Max-Q 6GB @@ -12548,6 +12569,8 @@ 1d52 GP108BM [GeForce MX250] 1d56 GP108BM [GeForce MX330] 1d81 GV100 [TITAN V] + 1d83 GV100 [CMP 100-200] + 1d84 GV100 [CMP 100-210] 1db1 GV100GL [Tesla V100 SXM2 16GB] 1db2 GV100GL [Tesla V100 DGXS 16GB] 1db3 GV100GL [Tesla V100 FHHL 16GB] @@ -12560,6 +12583,7 @@ 1dba GV100GL [Quadro GV100] 10de 12eb TITAN V CEO Edition 1dbe GV100 Engineering Sample + 1dc1 GV100 [CMP 100-200] 1df0 GV100GL [Tesla PG500-216] 1df2 GV100GL [Tesla PG503-216] 1df5 GV100GL [Tesla V100 SXM2 16GB] @@ -12649,7 +12673,7 @@ 1f96 TU117M [GeForce GTX 1650 Mobile / Max-Q] 1f97 TU117M [GeForce MX450] 1f98 TU117M [GeForce MX450] - 1f99 TU117M + 1f99 TU117M [GeForce GTX 1650 Mobile / Max-Q] 1f9c TU117M [GeForce MX450] 1f9d TU117M [GeForce GTX 1650 Mobile / Max-Q] # via Lenovo 496.90 @@ -12688,9 +12712,10 @@ 20b8 GA100 [A100X] 20b9 GA100 [A30X] 20bb GA100 [DRIVE A100 PROD] + 20bd GA100 [A800 SXM4 40GB] 20be GA100 [GRID A100A] 20bf GA100 [GRID A100B] - 20c0 GA100 + 20c0 GA100 [Initial DevID] 20c2 GA100 [CMP 170HX] 20f0 GA100 [A100-PG506-207] 20f1 GA100 [A100 PCIe 40GB] @@ -12699,7 +12724,7 @@ 20f5 GA100 [A800 80GB PCIe] 20f6 GA100 [A800 40GB PCIe] 20fd GA100 [AX800 Converged Accelerator] - 20fe GA100 + 20fe GA100 [INT SKU] 20ff GA100 2182 TU116 [GeForce GTX 1660 Ti] 2183 TU116 @@ -12742,6 +12767,7 @@ 228b GA104 High Definition Audio Controller 228e GA106 High Definition Audio Controller 2296 Tegra PCIe Endpoint Virtual Network + 22a3 GH100 [H100 NVSwitch] 22ba AD102 High Definition Audio Controller 2302 GH100 2313 GH100 [H100 CNX] @@ -12859,6 +12885,7 @@ 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] 2730 AD103GLM [RTX 5000 Ada Generation Laptop GPU] 2757 GN21-X11 + 2770 AD103GLM [RTX 5000 Ada Generation Embedded GPU] 2782 AD104 [GeForce RTX 4070 Ti] 2785 AD104 [AC AD104 20GB] 2786 AD104 [GeForce RTX 4070] @@ -12870,17 +12897,21 @@ 27ba AD104GLM [RTX 4000 Ada Generation Laptop GPU] 27bb AD104GLM [RTX 3500 Ada Generation Laptop GPU] 27e0 AD104M [GeForce RTX 4080 Max-Q / Mobile] + 27fa AD104GLM [RTX 4000 Ada Generation Embedded GPU] + 27fb AD104GLM [RTX 3500 Ada Generation Embedded GPU] 2803 AD106 [GeForce RTX 4060 Ti] 2805 AD106 [GeForce RTX 4060 Ti 16GB] 2820 AD106M [GeForce RTX 4070 Max-Q / Mobile] 2838 AD106GLM [RTX 3000 Ada Generation Laptop GPU] 2860 AD106M [GeForce RTX 4070 Max-Q / Mobile] + 2878 AD106GLM [RTX 3000 Ada Generation Embedded GPU] 2882 AD107 [GeForce RTX 4060] 28a0 AD107M [GeForce RTX 4060 Max-Q / Mobile] 28a1 AD107M [GeForce RTX 4050 Max-Q / Mobile] 28b8 AD107GLM [RTX 2000 Ada Generation Laptop GPU] 28e0 AD107M [GeForce RTX 4060 Max-Q / Mobile] 28e1 AD107M [GeForce RTX 4050 Max-Q / Mobile] + 28f8 AD107GLM [RTX 2000 Ada Generation Embedded GPU] 10df Emulex Corporation 0720 OneConnect NIC (Skyhawk) 103c 1934 FlexFabric 20Gb 2-port 650M Adapter @@ -13126,7 +13157,7 @@ 5289 RTL8411 PCI Express Card Reader 1043 1457 K55A Laptop 5760 RTS5763DL x2 NVMe SSD Controller - 5762 RTS5763DL NVMe SSD Controller + 5762 RTS5762 NVMe SSD Controller 5763 RTS5763DL NVMe SSD Controller (DRAM-less) 5765 RTS5765DL NVMe SSD Controller (DRAM-less) 8029 RTL-8029(AS) @@ -14093,6 +14124,7 @@ 5409 VX855/VX875 APIC and Central Traffic Control 5410 VX900 Series APIC and Central Traffic Control 6100 VT85C100A [Rhine II] + 6122 VN1000 Graphics [Chrome 520 IGP] 6287 SATA RAID Controller 6290 K8M890CE Host Bridge 6327 P4M890 Security Device @@ -17094,7 +17126,7 @@ 12a2 Newgen Systems Corporation 12a3 Lucent Technologies 8105 T8105 H100 Digital Switch -12a4 NTT Electronics Corporation +12a4 NTT Innovative Devices Corporation 12a5 Vision Dynamics Ltd. 12a6 Scalable Networks, Inc. 12a7 AMO GmbH @@ -19948,6 +19980,8 @@ 103c 3383 Ethernet 1Gb 4-port 331T Adapter 14e4 1904 4-port 1Gb Ethernet Adapter 14e4 1909 Broadcom NetXtreme 5719 Quad Port Gigabit NIC + 14e4 d146 BCM95719-P41 4x1GBT Ethernet NIC + 14e4 d346 BCM95719-N41 4x1GBT Ethernet NIC 193d 1025 NIC-ETH330T-LP-4P 1659 NetXtreme BCM5721 Gigabit Ethernet PCI Express 1014 02c6 eServer xSeries server mainboard @@ -20251,6 +20285,8 @@ 117c 00ce FastFrame N4T2 Dual-port 10GBASE-T Ethernet Adapter 14e4 4163 NetXtreme-E Dual-port 10GBASE-T Ethernet OCP 2.0 Adapter (BCM957416M4163C) 14e4 4166 NetXtreme-E Dual-port 10GBASE-T Ethernet OCP 3.0 Adapter (BCM957416N4160C) + 14e4 d140 BCM957416-P410 4x10GBT Ethernet NIC + 14e4 d340 BCM957416-N410 4x10GBT Ethernet NIC 1590 020c Ethernet 10Gb 2-port 535T Adapter 1590 0212 Ethernet 10Gb 2-port 535FLR-T Adapter 16d9 BCM57417 NetXtreme-E 10GBASE-T RDMA Ethernet Controller @@ -20303,15 +20339,19 @@ 117c 00cf FastFrame N412 Dual-port 100Gb Ethernet Adapter 14e4 2100 NetXtreme-E Dual-port 100G QSFP56 Ethernet PCIe4.0 x16 Adapter (BCM957508-P2100G) 14e4 5208 NetXtreme-E Dual-port 100G QSFP56 Ethernet OCP 3.0 Adapter (BCM957508-N2100G) + 14e4 520a NetXtreme-E Dual-port 100G DSFP Ethernet OCP 3.0 Adapter (BCM957508-N2100GD) 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 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) 14e4 5045 NetXtreme-E BCM57504 4x25G OCP3.0 14e4 5100 NetXtreme-E Single-port 100G QSFP56 Ethernet OCP 3.0 Adapter (BCM957504-N1100G) 14e4 5105 NetXtreme-E Single-port 100G DSFP Ethernet OCP 3.0 Adapter (BCM957504-N1100GD) 14e4 5250 NetXtreme-E BCM57504 4x25G KR Mezz + 14e4 5425 NetXtreme-E Quad-port 25G SFP28 Ethernet OCP 3.0 Adapter (BCM957504-N425G) 14e4 d142 NetXtreme-E P425D BCM57504 4x25G SFP28 PCIE 1752 BCM57502 NetXtreme-E 10Gb/25Gb/40Gb/50Gb Ethernet 1800 BCM57502 NetXtreme-E Ethernet Partition @@ -21447,8 +21487,11 @@ 193d 1051 NIC-IB1040i-Mb-2P 1018 MT27800 Family [ConnectX-5 Virtual Function] 1019 MT28800 Family [ConnectX-5 Ex] + 1014 0617 PCIe4 x16 2-Port EDR IB-only ConnectX-5 CAPI Capable Adapter [IBM EC64] + 1014 0635 PCIe4 2-port 100 GbE RoCE x16 adapter [IBM EC66] 15b3 0008 ConnectX-5 Ex EN network interface card, 100GbE dual-port QSFP28, PCIe4.0 x16, tall bracket; MCX516A-CDAT 15b3 0125 Tencent ConnectX-5 EN Ex network interface card for OCP 3.0, with host management, 50GbE Dual-port QSFP28, PCIe4.0 x16, Thumbscrew (pull-tab) bracket + 15b3 0126 PCIe4 x16 2-port EDR 100GbE ConnectX-5 CAPI Capable adapter [IBM AJP1] 101a MT28800 Family [ConnectX-5 Ex Virtual Function] 101b MT28908 Family [ConnectX-6] 101c MT28908 Family [ConnectX-6 Virtual Function] @@ -21583,14 +21626,14 @@ 15b7 Sandisk Corp 2001 Skyhawk Series NVME SSD 5001 WD Black NVMe SSD - 5002 WD Black 2018/SN750 / PC SN720 NVMe SSD + 5002 SanDisk Extreme Pro / WD Black 2018/SN750/PC SN720 NVMe SSD 5003 WD Blue SN500 / PC SN520 NVMe SSD 5004 PC SN520 NVMe SSD 5005 PC SN520 NVMe SSD - 5006 WD Black SN750 / PC SN730 NVMe SSD + 5006 WD Black SN750 / PC SN730 / Red SN700 NVMe SSD 5007 IX SN530 NVMe SSD (DRAM-less) 5008 PC SN530 NVMe SSD (DRAM-less) - 5009 WD Blue SN550 NVMe SSD + 5009 SanDisk Ultra 3D / WD Blue SN550 NVMe SSD 15b7 5009 WD Blue SN550 NVMe SSD 500b PC SN530 NVMe SSD 1414 500b Xbox Series X @@ -21601,13 +21644,14 @@ 5016 WD PC SN740 NVMe SSD 512GB (DRAM-less) 5017 WD Black SN770 / PC SN740 256GB / PC SN560 (DRAM-less) NVMe SSD 5019 WD Green SN350 NVMe SSD 240GB (DRAM-less) - 501a WD Blue SN570 NVMe SSD 1TB + 501a WD Blue SN570 NVMe SSD 501d WD Blue SN550 NVMe SSD 2TB (DRAM-less) 501e PC SN735 NVMe SSD (DRAM-less) 501f WD PC SN735 NVMe SSD 512GB (DRAM-less) 5025 WD Blue SN570 NVMe SSD 2TB 5026 WD PC SN735 NVMe SSD 1TB (DRAM-less) - 5030 Western Digital WD Black SN850X NVMe SSD + 5030 WD Black SN850X NVMe SSD + 5041 WD Blue SN580 NVMe SSD (DRAM-less) 15b8 ADDI-DATA GmbH 1001 APCI1516 SP controller (16 digi outputs) 1003 APCI1032 SP controller (32 digi inputs w/ opto coupler) @@ -22781,7 +22825,8 @@ 188a ARC-1886 series PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller 17d3 1217 ARC-1217 4-Port PCIe 4.0 to SAS/SATA 12/6Gb RAID Controller 17d3 1227 ARC-1227 8-Port PCIe 4.0 to SAS/SATA 12/6Gb RAID Controller - 17d3 1686 ARC-1686 PCIe 4.0 to SAS/SATA 12/6Gb Tape drive Controller + 17d3 1686 ARC-1686 PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller + 17d3 1688 ARC-1688 PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller 17d3 1886 ARC-1886 PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller # nee Neterion Inc., previously S2io Inc. 17d5 Exar Corp. @@ -23865,6 +23910,14 @@ 1a0d SEAKR Engineering 1a0e DekTec Digital Video B.V. 083f DTA-2111 VHF/UHF Modulator + 0860 DTA-2144(B) Quad ASI/SDI in+out + 0861 DTA-2145 ASI/SDI in+out with bypass relay + 087c DTA-2172 Dual 3G-SDI/ASI ports + 087e DTA-2174 Quad 3G-SDI/ASI in+out + 087f DTA-2175 3G-SDI/ASI input+output with bypass relay + 0882 DTA-2178 Octal 12G-SDI/ASI ports with genlock + a882 DTA-2178-ASI Octal ASI Ports + b87e DTA-2174B Quad 3G-SDI/ASI ports (1x12G) with genlock 1a17 Force10 Networks, Inc. 8002 PB-10GE-2P 10GbE Security Card 1a1d GFaI e.V. @@ -23974,6 +24027,8 @@ 0017 SEL-3350 GPIO Expansion Board 0018 SEL-3390E4 Ethernet Adapter 001c SEL-3390E4 Ethernet Adapter +1aab Silver Creations AG + 7750 Sceye 10L 1aae Global Velocity, Inc. 1ab4 Distributed Management Task Force, Inc. (DMTF) 1ab6 CalDigit, Inc. @@ -24158,6 +24213,7 @@ 2142 ASM2142/ASM3142 USB 3.1 Host Controller 1462 7a72 H270 PC MATE 2824 ASM2824 PCIe Gen3 Packet Switch + 3042 ASM3042 USB 3.2 Gen 1 xHCI Controller 3242 ASM3242 USB 3.2 Host Controller 1b26 Netcope Technologies, a.s. c132 COMBO-LXT155 @@ -24237,6 +24293,9 @@ 1b4b 2241 Santa Cruz NVMe Host Adapter 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit 1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit + 2b43 NXP 88W9098 Wi-Fi 6 (ax) MAC #1 + 2b44 NXP 88W9098 Wi-Fi 6 (ax) MAC #2 + 2b45 NXP 88W9098 Bluetooth 5.3 9120 88SE9120 SATA 6Gb/s Controller 9123 88SE9123 PCIe SATA 6.0 Gb/s controller dc93 600e DC-6xxe series SATA 6G controller @@ -24321,6 +24380,7 @@ 2404 Ultrastar DC SN640 NVMe SSD 2500 Ultrastar DC SN840 NVMe SSD 2600 Ultrastar DC ZN540 ZNS NVMe SSD + 3001 RapidFlex C2000 NVMe Initiator 3714 PC SN730 NVMe SSD 3734 PC SN730 NVMe SSD 1b9a XAVi Technologies Corp. @@ -24438,7 +24498,7 @@ 1bb1 01a1 Nytro XP7102 5012 FireCuda/IronWolf 510 SSD 5013 BarraCuda Q5 NVMe SSD (DRAM-less) - 5016 FireCuda 520 SSD + 5016 FireCuda 520/IronWolf 525 SSD 5018 FireCuda 530 SSD 1bb3 Bluecherry 4304 BC-04120A MPEG4 4 port video encoder / decoder @@ -24505,6 +24565,7 @@ 1bf4 VTI Instruments Corporation 0001 SentinelEX 7011 RX0xxx +1bf5 Greenliant 1bfc Duagon AG 1bfd EeeTOP 1c00 Nanjing Qinheng Microelectronics Co., Ltd. @@ -24703,6 +24764,12 @@ 1c5f 4b51 NVMe SSD PBlaze6 6936 12800GB 2.5" U.3 1c5f 4b61 NVMe SSD PBlaze6 6936 25600GB 2.5" U.3 003f PBlaze7 7940/7946 NVMe SSD + 1c5f 1431 NVMe SSD PBlaze7 7940 3840G 2.5" U.2 + 1c5f 1441 NVMe SSD PBlaze7 7940 7680G 2.5" U.2 + 1c5f 1451 NVMe SSD PBlaze7 7940 15360G 2.5" U.2 + 1c5f 5431 NVMe SSD PBlaze7 7946 3200G 2.5" U.2 + 1c5f 5441 NVMe SSD PBlaze7 7946 6400G 2.5" U.2 + 1c5f 5451 NVMe SSD PBlaze7 7946 12800G 2.5" U.2 0540 PBlaze4 NVMe SSD 0550 PBlaze5 700/900 0555 PBlaze5 510/516 @@ -24853,47 +24920,55 @@ 0714 ZX-100/ZX-200 PCI Express Root Port 0715 ZX-100/ZX-200 PCI Express Root Port 0716 ZX-D PCI Express Root Port - 0717 KX-5000/KX-6000/KX-6000G Express Root Port - 0718 KX-5000/KX-6000/KX-6000G Express Root Port - 0719 KX-5000/KX-6000/KX-6000G Express Root Port - 071a KX-5000/KX-6000/KX-6000G Express Root Port - 071b KX-5000/KX-6000/KX-6000G Express Root Port - 071c KX-5000/KX-6000/KX-6000G Express Root Port - 071d KX-5000/KX-6000/KX-6000G Express Root Port - 071e KX-5000/KX-6000/KX-6000G Express Root Port + 0717 KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 0718 KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 0719 KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071a KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071b KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071c KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071d KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071e KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port 071f ZX-200 Upstream Port of PCI Express Switch 0720 ZX-200 PCIE RC6 controller 0721 ZX-200 Downstream Port of PCI Express Switch 0722 ZX-200 PCIE P2C bridge + 0731 KH-40000 Express Root Port + 0732 KH-40000 Express Root Port 1000 ZX-D Standard Host Bridge - 1001 ZX-D/ZX-E Miscellaneous Bus + 1001 ZX-D/ZX-E/KH-40000 Miscellaneous Bus 1003 ZX-E Standard Host Bridge + 1005 KH-40000 Standard Host Bridge 1006 KX-6000G Standard Host Bridge 3001 ZX-100 Standard Host Bridge 300a ZX-100 Miscellaneous Bus - 3038 ZX-100/ZX-200/KX-6000/KX-6000G Standard Universal PCI to USB Host Controller - 3104 ZX-100/ZX-200/KX-6000/KX-6000G Standard Enhanced PCI to USB Host Controller - 31b0 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge - 31b1 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge - 31b2 ZX-100/KX-5000/KX-6000/KX-6000G DRAM Controller - 31b3 ZX-100/KX-5000/KX-6000/KX-6000G Power Management Controller - 31b4 ZX-100/KX-5000/KX-6000/KX-6000G I/O APIC - 31b5 ZX-100/KX-5000/KX-6000/KX-6000G Scratch Device - 31b7 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge + 3038 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 Standard Universal PCI to USB Host Controller + 3104 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 Standard Enhanced PCI to USB Host Controller + 31b0 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge + 31b1 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge + 31b2 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 DRAM Controller + 31b3 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Power Management Controller + 31b4 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 I/O APIC + 31b5 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Scratch Device + 31b7 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge 31b8 ZX-100/ZX-D PCI to PCI Bridge - 3288 ZX-100/KX-5000/KX-6000/KX-6000G High Definition Audio Controller - 345b ZX-100/KX-5000/KX-6000/KX-6000G Miscellaneous Bus + 3288 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 High Definition Audio Controller + 345b ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Miscellaneous Bus 3a02 ZX-100 C-320 GPU 3a03 ZX-D C-860 GPU 3a04 ZX-E C-960 GPU + 3b01 KH-40000 OPI Controller + 3b02 KH-40000 OPI Controller + 3b03 KH-40000 OPI Controller + 3b04 KH-40000 OPI Controller + 3c00 KH-40000 DRAM Controller 3c02 KX-6000G DRAM Controller 3d01 KX-6000G C-1080 GPU - 9002 ZX-100/ZX-200 EIDE Controller + 9002 ZX-100/ZX-200/KH-40000 EIDE Controller 9003 ZX-100/KX-6000/KX-6000G EIDE Controller - 9043 KX-6000G RAID Controller + 9043 KX-6000G/KH-40000 RAID Controller 9045 ZX-100/ZX-D/ZX-E RAID Accelerator 0 9046 ZX-D/ZX-E RAID Accelerator 1 - 9083 ZX-100/ZX-200/KX-6000/KX-6000G StorX AHCI Controller + 9083 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 StorX AHCI Controller 9084 ZX-100 StorX AHCI Controller 9100 ZX-200 Cross bus 9101 ZX-200 Traffic Controller @@ -24902,11 +24977,14 @@ 9144 ZX-E High Definition Audio Controller 9145 KX-6000G High Definition Audio Controller 9180 ZX-200 Networking Gigabit Ethernet Adapter + 91c1 KH-40000 ZPI Controller + 91c2 KH-40000 ZPI Controller 9202 ZX-100 USB eXtensible Host Controller 9203 ZX-200 USB eXtensible Host Controller 9204 KX-6000/KX-6000G USB eXtensible Host Controller + 9205 KH-40000 USB eXtensible Host Controller 9286 ZX-D eMMC Host Controller - 9300 ZX-100/KX-5000/KX-6000/KX-6000G eSPI Host Controller + 9300 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 eSPI Host Controller 95d0 ZX-100 Universal SD Host Controller f410 ZX-100/KX-5000/KX-6000/KX-6000G PCI Com Port 1d18 RME @@ -24944,6 +25022,7 @@ 1d44 DPT a400 PM2x24/PM3224 1d49 Lenovo + 0522 ThinkSystem RAID 5350-8i PCIe 12Gb Internal Adapter 1d4c Diamanti, Inc. 1d5c Fantasia Trading LLC 1d61 Technobox, Inc. @@ -25075,8 +25154,9 @@ 1d78 7208 Aliflash V2 U.2 15mm 7.68TB NVMe SSD 1d79 Transcend Information, Inc. 2262 NVMe PCIe SSD 220S - 2263 NVMe PCIe SSD 120S/112S (DRAM-less) + 2263 NVMe PCIe SSD 110S/112S/120S/MTE652T2 (DRAM-less) 2264 NVMe PCIe SSD 250H + 2267 NVMe PCIe SSD 240S/MTE710T 5766 NVMe PCIe SSD 110Q (DRAM-less) 1d7c Aerotech, Inc. # Fiber-optic HyperWire motion control bus from Aerotech. @@ -25207,10 +25287,17 @@ 0010 N-10m2 NVMe SSD 1dd8 AMD Pensando Systems 0002 DSC2 Elba Upstream Port + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1000 DSC Capri Upstream Port 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB @@ -25223,6 +25310,7 @@ 1dd8 400e DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1001 DSC Virtual Downstream Port + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25235,9 +25323,16 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1002 DSC Ethernet Controller + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25250,9 +25345,16 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1003 DSC Ethernet Controller VF + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25265,9 +25367,16 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1004 DSC Management Controller + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25280,19 +25389,40 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1005 DSC NVMe Controller + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1006 DSC NVMe Controller VF + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1007 DSC Storage Accelerator + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25305,33 +25435,74 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1009 DSC Ethernet Controller UPT + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100a DSC Serial Port Controller + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100b DSC vDPA Network Device VF + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100c DSC PDS Core Management + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100d DSC Virtio Network Device VF + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1ddd Thorlabs 1de0 Groq 0000 TSP [GroqChip] @@ -25495,26 +25666,6 @@ 1028 2193 NVMe CD7 E3.S 1.92TB 1028 2194 NVMe CD7 E3.S 3.84TB 1028 2195 NVMe CD7 E3.S 7.68TB - 0013 NVMe SSD Controller CM7 2.5" - 1028 222d Ent NVMe CM7 FIPS U.2 RI 30.72TB - 1028 222e Ent NVMe CM7 FIPS U.2 RI 15.36TB - 1028 222f Ent NVMe CM7 FIPS U.2 RI 7.68TB - 1028 2230 Ent NVMe CM7 FIPS U.2 RI 3.84TB - 1028 2231 Ent NVMe CM7 FIPS U.2 RI 1.92TB - 1028 2232 Ent NVMe CM7 U.2 RI 30.72TB - 1028 2233 Ent NVMe CM7 U.2 RI 15.36TB - 1028 2234 Ent NVMe CM7 U.2 RI 7.68TB - 1028 2235 Ent NVMe CM7 U.2 RI 3.84TB - 1028 2236 Ent NVMe CM7 U.2 RI 1.92TB - 1028 2237 Ent NVMe CM7 FIPS U.2 MU 12.8TB - 1028 2238 Ent NVMe CM7 FIPS U.2 MU 6.4TB - 1028 2239 Ent NVMe CM7 FIPS U.2 MU 3.2TB - 1028 223a Ent NVMe CM7 FIPS U.2 MU 1.6TB - 1028 223b Ent NVMe CM7 U.2 MU 12.8TB - 1028 223c Ent NVMe CM7 U.2 MU 6.4TB - 1028 223d Ent NVMe CM7 U.2 MU 3.2TB - 1028 223e Ent NVMe CM7 U.2 MU 1.6TB - 1028 228c Ent NVMe CM7 U.2 MU 6.4TB 0014 NVMe SSD Controller CM7 EDSFF 1028 223f Ent NVMe CM7 FIPS E3.S RI 15.36TB 1028 2240 Ent NVMe CM7 FIPS E3.S RI 7.68TB @@ -25527,6 +25678,10 @@ 1028 2247 Ent NVMe CM7 E3.S MU 6.4TB 1028 2248 Ent NVMe CM7 E3.S MU 3.2TB 1028 2249 Ent NVMe CM7 E3.S MU 1.6TB + 1028 22b7 Ent NVMe CM7 FIPS E3.S MU 1.6TB + 1028 22b8 Ent NVMe CM7 FIPS E3.S MU 3.2TB + 1028 22b9 Ent NVMe CM7 FIPS E3.S MU 6.4TB + 1028 22ba Ent NVMe CM7 FIPS E3.S MU 12.8TB 0018 Exceria Pro NVMe SSD 001f NVMe SSD Controller CD8 1028 2223 DC NVMe CD8 U.2 SED 15.36TB @@ -25539,6 +25694,25 @@ 1028 222a DC NVMe CD8 U.2 3.84TB 1028 222b DC NVMe CD8 U.2 1.92TB 1028 222c DC NVMe CD8 U.2 960GB + 0025 NVMe SSD Controller CM7 2.5" + 1028 222d Ent NVMe CM7 FIPS U.2 RI 30.72TB + 1028 222e Ent NVMe CM7 FIPS U.2 RI 15.36TB + 1028 222f Ent NVMe CM7 FIPS U.2 RI 7.68TB + 1028 2230 Ent NVMe CM7 FIPS U.2 RI 3.84TB + 1028 2231 Ent NVMe CM7 FIPS U.2 RI 1.92TB + 1028 2232 Ent NVMe CM7 U.2 RI 30.72TB + 1028 2233 Ent NVMe CM7 U.2 RI 15.36TB + 1028 2234 Ent NVMe CM7 U.2 RI 7.68TB + 1028 2235 Ent NVMe CM7 U.2 RI 3.84TB + 1028 2236 Ent NVMe CM7 U.2 RI 1.92TB + 1028 2237 Ent NVMe CM7 FIPS U.2 MU 12.8TB + 1028 2238 Ent NVMe CM7 FIPS U.2 MU 6.4TB + 1028 2239 Ent NVMe CM7 FIPS U.2 MU 3.2TB + 1028 223a Ent NVMe CM7 FIPS U.2 MU 1.6TB + 1028 223b Ent NVMe CM7 U.2 MU 12.8TB + 1028 223c Ent NVMe CM7 U.2 MU 6.4TB + 1028 223d Ent NVMe CM7 U.2 MU 3.2TB + 1028 223e Ent NVMe CM7 U.2 MU 1.6TB 1e17 Arnold & Richter Cine Technik GmbH & Co. Betriebs KG 1e18 Beijing GuangRunTong Technology Development Co.,Ltd 1e24 Squirrels Research Labs @@ -25570,10 +25744,10 @@ 8032 S6 [Enflame] # FHFL PCIe card, single slot, 3rd generation from Enflame c031 S30 [Enflame] -# HHHL PCIe card, dual slot, 3rd generation from Enflame - c032 S60 [Enflame] # FHFL PCIe card, single slot, 3rd generation from Enflame, 48GB device memory - c033 S30 [Enflame] + c032 S90 [Enflame] +# FHFL PCIe card, single slot, 3rd generation from Enflame, 48GB device memory + c033 S60 [Enflame] # nee Thinci, Inc 1e38 Blaize, Inc 0102 Xplorer X1600 @@ -25657,6 +25831,10 @@ 1e3b 0084 Enterprise NVMe SSD U.2 3.2TB (H5300) 1e3b 0085 Enterprise NVMe SSD U.2 6.4TB (H5300) 1e3d Burlywood, Inc +1e43 MaxLinear Inc + 8904 MxL8904 + 8906 MxL8906 + 8908 MxL8908 1e44 Valve Software 1e49 Yangtze Memory Technologies Co.,Ltd 0001 ZHITAI PC005 NVMe SSD @@ -25957,6 +26135,7 @@ 1f60 Accelecom 0001 XELE-NIC 25K5 0054 XELE-NIC 25K5 +1f67 Yunsilicon Technology Co,. Ltd. 1faa Hexaflake (Shanghai) Information Technology Co., Ltd. 0c10 Compass C10 PF 0c11 Compass C10 VF @@ -26065,6 +26244,14 @@ 2000 AWM 2 2010 AWM 2-M 1fe4 HippStor Technology + 1600 HP600 Series NVMe SSD + 1fe4 0075 Enterprise NVMe SSD U.2 3.84TB(HP610) + 1fe4 0076 Enterprise NVMe SSD U.2 7.68TB(HP610) + 1fe4 0077 Enterprise NVMe SSD U.2 6.40TB(HP630) + 1fe4 0078 Enterprise NVMe SSD U.2 3.20TB(HP630) +1ff4 DEEPX Co., Ltd. + 0000 DX_M1 + 0001 DX_M1A 2000 Smart Link Ltd. 2800 SmartPCI2800 V.92 PCI Soft DFT 2001 Temporal Research Ltd @@ -26088,6 +26275,7 @@ 2262 KC2000/KC2500 NVMe SSD 2263 A2000 NVMe SSD 5008 U-SNS8154P3 NVMe SSD + 500a DC1000B NVMe SSD 500b DC1000M NVMe SSD 500c OM8PCP Design-In PCIe 3 NVMe SSD (DRAM-less) 500d OM3PDP3 NVMe SSD @@ -26533,6 +26721,8 @@ 5053 Voyetra Technologies 2010 Daytona Audio Adapter 50b2 TerraTec Electronic GmbH +50ce System-on-Chip Engineering S.L. + 0001 RELY-MIL-XMC-TSN-SWITCH 5136 S S Technologies 5143 Qualcomm Inc 5145 Ensoniq (Old) @@ -26696,6 +26886,17 @@ 544d 6905 TBS6905 DVB-S2 Quad Tuner PCIe Card 6205 0001 TBS6205 DVB-T2/T/C Quad TV Tuner PCIe Card 6209 0001 TBS6209 DVB-T2/C2/T/C/ISDB-T OctaTV Tuner + 6590 0001 TBS6590 DVB-S/S2/S2X/T/T2/C/C2/ISDB-T + 2xCI + 6590 0002 TBS6590SE DVB-S/S2/S2X/T/T2/C/C2 + 2xCI + 6704 ffff TBS6704 (Quad ATSC/QAMB) + 6903 0020 TBS6903x (Dual DVB-S/S2/S2X) + 6903 0021 TBS6903x (Dual DVB-S/S2/S2X) + 6903 8888 TBS6903x (Dual DVB-S/S2/S2X) + 6909 0009 TBS6909x (Octa DVB-S/S2/S2X) + 6909 0010 TBS6909x (Octa DVB-S/S2/S2X) + 6909 0019 TBS6909x (Octa DVB-S/S2/S2X) + 6910 0001 TBS6910 DVB-S/S2 + 2xCI + 6910 0002 TBS6910SE DVB-S/S2/S2x + 2xCI 5452 SCANLAB AG 3443 RTC4 5455 Technische Universitaet Berlin @@ -26737,6 +26938,7 @@ 6409 Logitec Corp. 6549 Teradici Corp. 1200 TERA1200 PC-over-IP Host +6590 TBS Technologies (wrong ID) 6666 Decision Computer International Co. 0001 PCCOM4 0002 PCCOM8 @@ -26754,16 +26956,24 @@ 1400 CooVOX TDM GSM Module 1600 CooVOX TDM E1/T1 Module 1800 CooVOX TDM BRI Module +6704 TBS Technologies (wrong ID) 6766 Glenfly Tech Co., Ltd. 3d00 Arise-GT-10C0 3d02 Arise1020 3d03 Arise-GT-1040 3d04 Arise1010 - 3d40 Arise-GT-10C0 High Definition Audio Controller - 3d41 Arise1020 High Definition Audio Controller + 3d06 Arise-GT-10C0t + 3d07 Arise2030 + 3d08 Arise2020 + 3d40 GLF HDMI/DP Audio + 3d41 GLF HDMI/DP Audio + 3d43 GLF HDMI/DP Audio 6899 ZT Systems # nee Qumranet 6900 Red Hat, Inc. +6903 TBS Technologies (wrong ID) +6909 TBS Technologies (wrong ID) +6910 TBS Technologies (wrong ID) 7063 pcHDTV 2000 HD-2000 3000 HD-3000 @@ -29010,6 +29220,7 @@ 1bd4 0058 Ethernet Network Adapter E810-XXVAM2 for OCP 3.0 1bd4 006e Ethernet Network Adapter E810-XXVAM2 for BD 1bd4 0083 Ethernet Network Adapter E810-XXVAM2 for lldp + 1bd4 00a0 S252IE810 1eec 0102 VSE-225-41E Dual-port 10Gb/25Gb Etherent PCIe 8086 0001 Ethernet 25G 2P E810-XXV OCP 8086 0002 Ethernet 25G 2P E810-XXV Adapter @@ -29181,8 +29392,10 @@ 188b Ethernet Connection E823-C for QSFP 188c Ethernet Connection E823-C for SFP 1028 0abd Ethernet Connection 25G 4P E823-C LOM + 17aa 405e E823 25G/10G Ethernet LOM Controller 188d Ethernet Connection E823-C/X557-AT 10GBASE-T 188e Ethernet Connection E823-C 1GbE + 17aa 405f E823 1G Ethernet LOM Controller 1890 Ethernet Connection E822-C for backplane 1891 Ethernet Connection E822-C for QSFP 1892 Ethernet Connection E822-C for SFP @@ -33629,7 +33842,7 @@ 46a0 AlderLake-P GT2 46a1 UHD Graphics 46a3 Alder Lake-P GT1 [UHD Graphics] - 46a6 Alder Lake-P Integrated Graphics Controller + 46a6 Alder Lake-P GT2 [Iris Xe Graphics] 46a8 Alder Lake-UP3 GT2 [Iris Xe Graphics] 46aa Alder Lake-UP4 GT2 [Iris Xe Graphics] 46b0 AlderLake-P [Iris Xe Graphics] @@ -33750,7 +33963,9 @@ 51a9 Alder Lake PCH UART #1 51aa Alder Lake SPI Controller 51ab Alder Lake SPI Controller + 51b0 Alder Lake PCI Express Root Port #9 51b1 Alder Lake PCI Express x1 Root Port #10 + 51bb Alder Lake-P PCH PCIe Root Port #4 51bf Alder Lake PCH-P PCI Express Root Port #9 51c5 Alder Lake-P Serial IO I2C Controller #0 51c6 Alder Lake-P Serial IO I2C Controller #1 @@ -34229,7 +34444,7 @@ 7d0b Volume Management Device NVMe RAID Controller Intel Corporation 7d40 Meteor Lake-M [Intel Graphics] 7d45 Meteor Lake-P [Intel Graphics] - 7d55 Meteor Lake-P [Intel Graphics] + 7d55 Meteor Lake-P [Intel Arc Graphics] 7d60 Meteor Lake-M [Intel Graphics] 7dd5 Meteor Lake-P [Intel Graphics] 7e01 Meteor Lake-P LPC/eSPI Controller @@ -35294,12 +35509,18 @@ a3eb Comet Lake PCI Express Root Port #21 a3f0 Comet Lake PCH-V cAVS a620 6400/6402 Advanced Memory Buffer (AMB) + a707 Raptor Lake-P/U 4p+8e cores Host Bridge/DRAM Controller a708 Raptor Lake-P/U 2p+8e cores Host Bridge/DRAM Controller a71d Raptor Lake Dynamic Platform and Thermal Framework Processor Participant + a71e Raptor Lake-P Thunderbolt 4 USB Controller a720 Raptor Lake-P [UHD Graphics] a721 Raptor Lake-P [UHD Graphics] + a72f Raptor Lake-P Thunderbolt 4 PCI Express Root Port #2 + a73e Raptor Lake-P Thunderbolt 4 NHI #0 a74d Raptor Lake PCIe 4.0 Graphics Port a74f GNA Scoring Accelerator module + a76d Raptor Lake-P Thunderbolt 4 NHI #1 + a76e Raptor Lake-P Thunderbolt 4 PCI Express Root Port #0 a77d Raptor Lake Crashlog and Telemetry a77f Volume Management Device NVMe RAID Controller Intel Corporation a780 Raptor Lake-S GT1 [UHD Graphics 770] @@ -35314,6 +35535,10 @@ a7a1 Raptor Lake-P [Iris Xe Graphics] a7a8 Raptor Lake-P [UHD Graphics] a7a9 Raptor Lake-P [UHD Graphics] + a7aa Raptor Lake-P [Intel Graphics] + a7ab Raptor Lake-P [Intel Graphics] + a7ac Raptor Lake-U [Intel Graphics] + a7ad Raptor Lake-U [Intel Graphics] abc0 Omni-Path Fabric Switch Silicon 100 Series ad0b Volume Management Device NVMe RAID Controller Intel Corporation b152 21152 PCI-to-PCI Bridge @@ -35439,12 +35664,16 @@ # Wuxi Micro Innovation Integrated Circuit Design Co.,Ltd. 8848 MUCSE *** 42 LINES SKIPPED *** From nobody Mon Dec 4 10:39:34 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkKsy6b1Mz53CvV; Mon, 4 Dec 2023 10:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKsy5pzcz4RgF; Mon, 4 Dec 2023 10:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q0Zvw0eDTVWHYj4RIQrEs/QDqyIuEDBd4IRfd6xFrGY=; b=QobtVoMcwq6b0Uf4r6WwDPy+knQ9BxT70i0asQ49YTOkk7EsrwvYdEW8bwT+ArszMdXcyS zQmBtjgDzBlDY9R1luh2bWyEZ/IdeB6fQFOmGRLN/+0ogO7Tupf4H6QM8+l1mVADDz5Ng/ cG9OEMCdxOUh890nsf7pTyFa74FmK4g99tZMg0qX/cF2mDgVdnU14kgcrqr5KkiY7jIj2D vYgj69aZPV1B6NnREndZRK2JGKW7u4zqajJ42cswUynI6EFfptGEzIQg/emJsIRIy5c+v9 vvULzeMJFqQu5yY2ns7HzX9FzFFFYp6aU8rNxWcYvL+y4mQVzrB88kvZ7GRS4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q0Zvw0eDTVWHYj4RIQrEs/QDqyIuEDBd4IRfd6xFrGY=; b=PlIuUnBPQlvaMNyp91EJWy41MxomHpoGn7Q/ZlcLzBo0g4hnuib9N71E+5jubMSSVCvM6i peujiQjulmc83CnhkkzAYr9Un7otwPQLoWRmxoUs71KBhkK+EpO5ui5NDa0VpFjT3+V0R6 rYy44zDJncqbCgSVV7XbYPu7WZ0YzFHWMDwHcCrxuXCC8kufQC2xiVSbQM0b8GRKaBUixU 3F8W+hKL1XTle/3GoeHctaqePDduWrW2UUqpjeLjHXSqI+/w00CwKXsIdMlABVV9nOtw3r t91+d0COyOuChmp8fxlNgJ1tbr9Q3waCAwSL6piG+YLIsXtUJoHX19eUsL/mmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686374; a=rsa-sha256; cv=none; b=eZDhfFL0Dwa/X5NigLtAQ9QP9UNUCTPoMI0JHGqO2nPCRAy7ekhH4o3wM7K2OtNwaKHdnF uajIpIMKxEaJbNtJfmGOTrbnJZ89wrNk3dJyTU1HqaFyzj1Tp6KPXxYnWjtIPDAJT9h+dY PqTky9fgPj+VuJvzaded3FzaRDcoX4J0YpwHD7YF68q1XeU+qAoUlpF3dZsMty4FXVAPIW l8OmeT8l0Hi0WCTmd9s7aEdcBfj7vHpFXRZ4ImbSB9bS5sdv/K2JwO33QcEPsIVF1RmVdt X4FjGNwM8lZQ09iYJA+ksOnsgpNBTBfIk5DcB3Dc08SMqK0g45sx2BYP9avEwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkKsy4mVbz7ps; Mon, 4 Dec 2023 10:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AdYTb010095; Mon, 4 Dec 2023 10:39:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AdYpi010092; Mon, 4 Dec 2023 10:39:34 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:39:34 GMT Message-Id: <202312041039.3B4AdYpi010092@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 0a586dc5ed04 - stable/13 - pkgbase: compress packages with zstandard List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0a586dc5ed04acb51d9ec4fd89544335737f16c0 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0a586dc5ed04acb51d9ec4fd89544335737f16c0 commit 0a586dc5ed04acb51d9ec4fd89544335737f16c0 Author: Baptiste Daroussin AuthorDate: 2023-10-26 20:34:00 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:37:51 +0000 pkgbase: compress packages with zstandard MFC After: 3 days Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D42375 (cherry picked from commit 820fbcf25bb2c7f1c570c0d408b2ab7d05bd771c) --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index d648be2f3064..5b2876ea2b45 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1893,7 +1893,7 @@ PORTSDIR?= /usr/ports WSTAGEDIR?= ${OBJTOP}/worldstage KSTAGEDIR?= ${OBJTOP}/kernelstage REPODIR?= ${OBJROOT}repo -PKG_FORMAT?= txz +PKG_FORMAT?= tzst PKG_REPO_SIGNING_KEY?= # empty PKG_OUTPUT_DIR?= ${PKG_VERSION} From nobody Mon Dec 4 10:39:35 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkKt036lrz53CvW; Mon, 4 Dec 2023 10:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKsz6T9Wz4Rtl; Mon, 4 Dec 2023 10:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/9O0+gDy8FntjiZtTUPWBMKu8FERNGPWnRJwFcpKuYM=; b=v3OpcGN3j1EEZeKrMTh16u29RpSzNjYLiCzevXA2KzTEgWj3Bztj43/s/6+8oZUirCSJne 9a3+btvtfKoXZem+9sYcn0i+h49cbqxRzfaD6AzsilQhzMLR08PqaFdfhmakPZEOY+/RGm agqTyQV33A0FYDzAq1bWd7zPGjauhxuya4Now7wLLPH05y4ETTJimS2hMWGXemMKAls7LU rqfCMiQNQfueHT6mNtDm0e6RT6LYwX99evQLCMIN3cV96qV6vduzSkaNHi28DFsBMZwUTC fZGh+MTW/H4uIr4N9WEhYf74+/HXN2hVTy+/cewIovebtjJ5+xJRU9uFswbvXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/9O0+gDy8FntjiZtTUPWBMKu8FERNGPWnRJwFcpKuYM=; b=MCXeXN/Qh4u/1PYdvnCFRO9dF2sGDE6XBv1YjcFf44cmJj1I8msCjxpSosxaMG4InNrorv QCX3ufkWpkChZzQuBVdNSswST+U9HLNDpWZ7hEUK2B77E+SBeEQcFCbzvdv0rtmBSclYYo VV3g75EpAduThb3oUDOdjMN65CxPX5Xo8VwVBieQqm1F5fin9PnNSYjllGpBaijtVYpUBu 6acfgW15ZP8NtTdD4zQzZjl0IVfUZvqNfeBzHvpXqUxMmYf//YRiuYAkNsyl6ggh9jesbW REw9xZc9Iiz29wK89Z5z/ukK5+kqG2Uv0eWDDT7PXw1pISgdtCfyDm201YSL3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686375; a=rsa-sha256; cv=none; b=OAUMcrjPvuXf0Kl/pVb3wJKFk99UlnivM7A10o+tGfF1NA3sOL+VozPJ5Qo0ERbEdVbOCr QrdVb/nNa8nsaz+RD7tECbxpPkbw/aRZLjOv+sXS1Q4iWU41GZFqD58luS3OsY8n/4Z1LX MHvTYiqhQtGNPJmvO4LuU/T+nPjiGbnlKine6PWeCSOwoqYKqc0QQrjjFmcChI+wuR88R4 bntxiTmXYIySnaUtY0PGxjxTyv2szUYn0Bim0W9c27X/FDfkmlXf6OpiLZbSy8NxY5aRXH qTAeqJfTiWLAgL+Zxz4Rx0JXu1jT9ISy0mLuwMV9rUQICoUMhQXP5L3iomy7Zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkKsz5YkCz7b7; Mon, 4 Dec 2023 10:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AdZOD010155; Mon, 4 Dec 2023 10:39:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AdZbo010152; Mon, 4 Dec 2023 10:39:35 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:39:35 GMT Message-Id: <202312041039.3B4AdZbo010152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 8bc5e4f54b40 - stable/13 - pkgbase: set a default set of kernel for when PACKAGE_BUILDING=1 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8bc5e4f54b40d2be2900bb1a6c3640b803882ab1 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8bc5e4f54b40d2be2900bb1a6c3640b803882ab1 commit 8bc5e4f54b40d2be2900bb1a6c3640b803882ab1 Author: Baptiste Daroussin AuthorDate: 2023-11-02 13:20:11 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:38:05 +0000 pkgbase: set a default set of kernel for when PACKAGE_BUILDING=1 PACKAGE_BUILDING is already known in the ports tree as a variable use to defined when the packages is being actually built in an automation process, reuse that variable to define the default set of kernel we plan to build for the default pkgbase. Reviewed by: manu, jrtc27 Accepted by: manu MFC After: 1 week Differential Revision: https://reviews.freebsd.org/D42444 (cherry picked from commit df6e7e11c5f660cbd5381819718e3c947325fa2e) --- Makefile.inc1 | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 5b2876ea2b45..ccd65be4402f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1628,15 +1628,10 @@ NO_KERNELOBJ= t KERNCONF=${KERNFAST} .endif .endif -.if ${TARGET_ARCH} == "powerpc64" -KERNCONF?= GENERIC64 -.elif ${TARGET_ARCH} == "powerpc64le" -KERNCONF?= GENERIC64LE -.elif ${TARGET_ARCH} == "powerpcspe" -KERNCONF?= MPC85XXSPE -.else -KERNCONF?= GENERIC -.endif +GENERIC_KERNCONF_SUFX_powerpc64= 64 +GENERIC_KERNCONF_SUFX_powerpc64le= 64LE +GENERIC_KERNCONF_powerpcspe= MPC85XXSPE +GENERIC_KERNCONF?= ${GENERIC_KERNCONF_${TARGET_ARCH}:UGENERIC${GENERIC_KERNCONF_SUFX_${TARGET_ARCH}}} INSTKERNNAME?= kernel KERNSRCDIR?= ${.CURDIR}/sys @@ -1644,6 +1639,23 @@ KRNLCONFDIR= ${KERNSRCDIR}/${TARGET}/conf KRNLOBJDIR= ${OBJTOP}${KERNSRCDIR:C,^${.CURDIR},,} KERNCONFDIR?= ${KRNLCONFDIR} +.for _k in ${GENERIC_KERNCONF} MINIMAL${GENERIC_KERNCONF_SUFX_${TARGET_ARCH}} ${GENERIC_KERNCONF}-MMCCAM +.if exists(${KERNCONFDIR}/${_k}) +PKG_KERNCONF+= ${_k} +.for _dbg in NODEBUG DEBUG +.if exists(${KERNCONFDIR}/${_k}-${_dbg}) +PKG_KERNCONF+= ${_k}-${_dbg} +.endif +.endfor +.endif +.endfor + +.if defined(PACKAGE_BUILDING) +KERNCONF?= ${PKG_KERNCONF} +.else +KERNCONF?= ${GENERIC_KERNCONF} +.endif + BUILDKERNELS= INSTALLKERNEL= .if defined(NO_INSTALLKERNEL) From nobody Mon Dec 4 10:39:36 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkKt10VT9z53CjQ; Mon, 4 Dec 2023 10:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKt073Jlz4S5B; Mon, 4 Dec 2023 10:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dkM3MaMJWPCSPiGAkr5P7dDQk5J7cO3wGFE9NJCVFmI=; b=tXvnZSYWYhMNofTwlbv/VUawdtYq0AI0xDzpb5wMUZbaQNO/nnn5we7rQOzcv67dVAMK8O pMGalCwazlTM9Fx1Z3HDfGtquAnxM6OuTVglnegzTX+V1UfybLYCXkuIhyYIlN6Ar9z8/X gM9VlTXBD9BC3DNpN96APcQyZJJpqiz86S90XQCCItD6WVrPNT5al7FjSt5wSNO/Gczg/S X2YmsHCMx3+UTCmc57JoTov2vG2nc33j68FHK/N3S4tyt9Iefe8prHPvEqNcw3LmbIUyTy U0PqzNiJ/8P+XnBir2le/qBfl3ISxm0+fOv8mljhIte8rithgotiwtOkEwBMew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dkM3MaMJWPCSPiGAkr5P7dDQk5J7cO3wGFE9NJCVFmI=; b=bso6EstSuyt1F3U+y7ThnmahkslU9EYnn2VsVG7WtelQkmBw3Evf6RZzpoCs1UpUwXRI5O MB/I7hSu/w64J0f3iPfCGFfG6nAcabBIY+3R65xpJA87m5m34+/3t48THWXLFcwCPaBzbi Aal5xOxYw4FvhaHTdoUYuSK9o7rlGVQgh8zBBEce4M1QlnbdKy38C5ND+DRYF7nfCjdVck Ze1BtK+wiUI9jHAwaETsIxaJ/d2NbYSBzTp6krYLUSEf76SLbGzgCYSJIK9aBoJtJdNpSg 7Y5Y63T8FlWibKkrfj/StcZlleu4qtjMfPEFQ5ItERa26d0saJU0WOZuutRlMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686377; a=rsa-sha256; cv=none; b=KZNqaPgWApMgnHrI0fhxuYJUI5VkTei8w5bGbA77iLM4KhnBrw7A1AdkZkP2DeGOmtlM7H Pl4WSwod2nC+hN8vys7mAKfT9c6Uk//O+tcah0oML0HKHU7wtigJzXEkXvPy3W8CaXjmmx daRVULe3d3jazlyrp/Fy42vLSqQuxOEzb02NX/dES6WcPT28OQL2Xs+uvggX/6mxmxiXzb DQMBYY+bs9G2u5kMcgLQkWFULuSvQlqk21Ezr0doqWGnY4F2SbQE5EIKLi9hRmhTfrdsBi hH+4iXrW+vNcmFgpT1fZDGmf7bKpFN5V7J/w+9EiUmZe7AV09JGZosoALGSIkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkKt068LWz7mk; Mon, 4 Dec 2023 10:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4Adafh010198; Mon, 4 Dec 2023 10:39:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AdaU2010195; Mon, 4 Dec 2023 10:39:36 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:39:36 GMT Message-Id: <202312041039.3B4AdaU2010195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: ee89da102bf0 - stable/13 - pkgbase: force OSVERSION List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ee89da102bf020a2289d5b5e618c421098cba1b9 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ee89da102bf020a2289d5b5e618c421098cba1b9 commit ee89da102bf020a2289d5b5e618c421098cba1b9 Author: Baptiste Daroussin AuthorDate: 2023-11-03 08:29:23 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:38:33 +0000 pkgbase: force OSVERSION This is used to the package annotation helping pkg to know about backward compatibility is set to the version of the packages not the version of the host building the packages (cherry picked from commit 188fe88ec50eac7c10e1d8350bf1180f8c16e463) --- Makefile.inc1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index ccd65be4402f..ba842b7769a6 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2139,6 +2139,7 @@ sign-packages: _pkgbootstrap .PHONY @[ -L "${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest" ] && \ unlink ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest ; \ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname repo \ + -o OSVERSION="${OSRELDATE}" \ -m ${WSTAGEDIR}/meta \ -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ From nobody Mon Dec 4 10:39:37 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkKt21NkNz53CrT; Mon, 4 Dec 2023 10:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKt20pd2z4RvX; Mon, 4 Dec 2023 10:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UHka3IO3K5gRXJMJ42LoXhn5bOBGeB3LsmXuQFJnLGU=; b=jeoePDLVr6HfMMuh7qXned//m5oZrfaqveYq9aFLMTDDBRx8Jb1QGgO9NbDw5gVg3sAFMe yEw2MCBUdk1+skxFErsNVVf9dCIapv8N1RL1lnGzuCvzu1M9RKzx8xGio3KpxBDdBCslt3 L3jBqXgr7sb/wvrkxhyT6QPFPFutFgPr1ahOch3N5Sh6j0A5uM7PSbjERX2IgiwNClfb3y rfhl51HmjVHtaHJBmKA2hvigYvTqhH0+Y4KK0mr7KlYUWyKKyDrMvmUsx+Ig9iFl3rGQt+ z6J0w/dIeC2FUHf/P3RUIm3z+R1Zv6BAaPhiW0zs1ioeWZQcD9NGBwm2Q9zutQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UHka3IO3K5gRXJMJ42LoXhn5bOBGeB3LsmXuQFJnLGU=; b=dGcDnZ6rqV6EgGIWIeqIU7vieOKS7DUJYsh6VCv5NnBiGk+70IMcTedo3Wd863TQOivVZC lUgehOYcieCcTBt3E9iV5k8GvehLn/aMkWp4YmfH0nVIjyNcSKweFy9/Jysx6S7p1+tTis NbxQMWelPzf9FaHouRMwo3dSgUTUOOTckK8iLLZFRxfc0DURU9Q6DjLkj10Tdb2w9hdx7t aC9aKX+uPK3uvX3Hj9k/LxjWl6P7XMngEDvBbUpTIcvhiLKh0fH+Scog3PxueXLfmU//iB r8+eHjmhACq6hMhz8KHmG8bPuHE9oUwP7OXHL8xTcbiSGFjzrx4Vzv9T3dBOiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686378; a=rsa-sha256; cv=none; b=t/3gVCFMB3lQk2BcJ63gPgtSxKQ5esND/0Xmqz/9cw0uq03GutEn0EqsZ1QGliumM3EcI4 Iuja+fIWULweb5b1+kDVgK1lcCyo7Jp6IaUBQrtbivyaqeOBqnMK80TTliTeIvY2PGFw5F QNDTiXjBV7+/U3G1q9FQSP80yAoAbuMLaIsk1aIvxHK+sTM1vxk1N5k1/ytXUeU/aF/jZ5 3B8nCHvBtTZudbLbyAXN46CtUzmrMaEyJJ5nd6Z/OA9d8niWq41mkEpUIOya/SaHEfnssy AsMlkJuwDXrGGt/LQQ3ulc5t6nXe1zZBYKPs4+qGRfdM9e3/JQ0gAdcmIjo2TA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkKt1703Xz7pt; Mon, 4 Dec 2023 10:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AdbWe010255; Mon, 4 Dec 2023 10:39:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AdbAj010252; Mon, 4 Dec 2023 10:39:37 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:39:37 GMT Message-Id: <202312041039.3B4AdbAj010252@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: ff38a8c780d0 - stable/13 - pkgbase: create package with SRCRELDATE not OSRELDATE as OSVERSION List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ff38a8c780d0fb16d1973f80211b268c5e2d2751 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ff38a8c780d0fb16d1973f80211b268c5e2d2751 commit ff38a8c780d0fb16d1973f80211b268c5e2d2751 Author: Baptiste Daroussin AuthorDate: 2023-11-14 07:41:47 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:38:33 +0000 pkgbase: create package with SRCRELDATE not OSRELDATE as OSVERSION In 188fe88ec50eac7c10e1d8350bf1180f8c16e463 OSVERSION has been set to OSRELDATE which is the RELDATE of the building OS while we wanted to use SRCRELDATE which is the RELDATE of the target system (cherry picked from commit 051d69d6f8b51dc1d7bba58af99be76185312222) --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index ba842b7769a6..423c5924d39c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2139,7 +2139,7 @@ sign-packages: _pkgbootstrap .PHONY @[ -L "${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest" ] && \ unlink ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest ; \ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname repo \ - -o OSVERSION="${OSRELDATE}" \ + -o OSVERSION="${SRCRELDATE}" \ -m ${WSTAGEDIR}/meta \ -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ From nobody Mon Dec 4 10:39:39 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkKt33PmGz53CrX; Mon, 4 Dec 2023 10:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkKt32fM7z4S2J; Mon, 4 Dec 2023 10:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MwKcHwlQ7lCMioJyp/vGstBigVg0BTZFd5c2JAsqngc=; b=dG9FdJGiuHUmda4uwmvXmG+XSEeZU8KQPjZOjwgeLH3FAuWI/1P/E99cuGy2eO39rMBzEL QPZayb4KaVHpH1JOB12z8CcHe3tzGqKQ7gmszLcWUvsdPbmXocGuo0g01Uf8CyKhbrqL6M 22c8JJK2H7ROrW4AGmSHkV3vTRh9RDLbLAFpSRLrmHOXLqWSFn9Ohg7OGuCQEnWZrX7scD NtPzz5ajyRyNzTZfRO2qQAZ4uaxMAK4zjlMrl/pZ36gWO9Yhxt9X9nLAXerTz1NwADjxvW nUgu63bN0ZvhvWHXQ2kDjDVWJbFaklExICxGGo3zMdMeR2TguWa8zJxV44lWBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MwKcHwlQ7lCMioJyp/vGstBigVg0BTZFd5c2JAsqngc=; b=yKg8yg+iqYub4yCMVMdJhMabthZNDpZmaZmywdktH5TorVzEcLr50uYeOeDVOAhdyF46X6 VXvfCgP5D4FeKvDCQsIvo4EO2br5ueUBaTLWw2kHt5r8H0+BDyC8phvBlGnOSahEzsh80m 6iuaeGqvH3JUGsaXW7c13de2XarfSsAlYVyEs8K3ag9LnbXiALN1c0vvrHDjt/5o6Sdwc6 MkADl2gU9IlV3+mh6xkRS0e9mqyAlULjicAOm8vCtRsEUX+BtsXAeWcHjFL/qWICwHcvGs 2WRtHvsil2Yc+RqWr1pBhYX8WbkFDtPTVTcMOLSRcLdh89c06UyZr12rcO7ueg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686379; a=rsa-sha256; cv=none; b=S+58FoQwEDp5QwZS8jBJ0nfG0+pF8/B/ErLpIwIMOHo0bgpyLpwBrxP94ExlaF6Cwy8bsi jBBcit+qSJOCEIoc1j29aI3H0CxPzzDG3tDwTeROlKcOF62kJUJc4QWnlnEBPTUEjmoYfV yssn63LEjxtRMsW6dHJJf+lPhLRG2LOIvfWkL7RKwqUM9rdzSOo34bV8u/gDdWGjFufwHz q1M1U+arfHrYDNLrJEAbLg3iLuIKk2xipTvdaaKMJWOJk8sKvpLzx1WuFFuqt91F81ClZT 7qRDO72fLOB69JAz6uqvDROzkxPnQHewUBdr2Q95hNfIW0tRhby1ASqj6HOREA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkKt318ypz80G; Mon, 4 Dec 2023 10:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AddBS010315; Mon, 4 Dec 2023 10:39:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4Addwm010312; Mon, 4 Dec 2023 10:39:39 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:39:39 GMT Message-Id: <202312041039.3B4Addwm010312@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 7b68016c7678 - stable/13 - pkgbase: set the prefix of debug files and macros to /usr/src List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7b68016c7678db478cb8ac7a15fa821c0231fccc Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=7b68016c7678db478cb8ac7a15fa821c0231fccc commit 7b68016c7678db478cb8ac7a15fa821c0231fccc Author: Baptiste Daroussin AuthorDate: 2023-11-13 17:18:58 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:39:16 +0000 pkgbase: set the prefix of debug files and macros to /usr/src When the macro PACKAGE_BUILDING is set, then consider we are building package for pkgbase, this has already been used in Makefile.inc1 and reuse the PACKAGE_BUILDING macros already used for that purpose in the ports tree In the future this should be tied to REPRODUCIBLE_BUILD MFC After: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42569 (cherry picked from commit 030af1b62d7b9a86f5ecdceff5a1fa23e9570be1) --- share/mk/src.sys.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk index edf369638d9d..d5c2af0c559d 100644 --- a/share/mk/src.sys.mk +++ b/share/mk/src.sys.mk @@ -38,6 +38,9 @@ __postrcconf_${var}:= ${MK_${var}:U-}${WITHOUT_${var}:Uno:Dyes}${WITH_${var}:Uno # default over to -fno-common, making this redundant. CFCOMMONFLAG?= -fno-common CFLAGS+= ${CFCOMMONFLAG} +.if defined(PACKAGE_BUILDING) +CFLAGS+= -fmacro-prefix-map=${SRCTOP}=/usr/src -fdebug-prefix-map=${SRCTOP}=/usr/src +.endif DEFAULTWARNS= 6 From nobody Mon Dec 4 15:21:30 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkS7H1W9Xz53StV; Mon, 4 Dec 2023 15:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkS7H13rHz4rnN; Mon, 4 Dec 2023 15:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701703291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zoQJrjsgyVnsDLxY/gIqA78jiyfhTCRwRR8EG6RfpvQ=; b=hpgAqoeoZCwZrrduhHnewScCwp1NFmLWXkXUPDHM2MEpJEr8sSp0qH3yaw7trkk7Ow756P JeGaWauGBeEv9euqXOukebxCm0rvivjepnzgX4nBSXWdtTAPQoxEmYL4mDWAsKLQ2MGcxw EfmOx2NWplS033qog8Qt4vmj4EVklP7LQIn6sPk7D3rmFuZyu8eWccGPaX2pzGzTQvKEXC rZMvpHevr1XaBd6LN4k+iRcCFs0GCP3SiGO51nCPKLO5NpK4jh4ZdZTsFz+ZAP43CLYRZl vPF6NKBEamskgY/RfPMzAbjISVxIbh7FmjY98OqC2hBxhxwMe3IfclxIcXxfUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701703291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zoQJrjsgyVnsDLxY/gIqA78jiyfhTCRwRR8EG6RfpvQ=; b=lQEs57vHd3XwEA3q3vZ4Lh5p4ua/w1Z8LeRRS8r5NSpEzYGdTOT3LinUchcPfZxhxWYwF6 +jwdisI6U2Q1ta0znMa30U1+0EfOoQ2PSC8KvxI3MMA5Rnqacw7qmtV5r8comZsyjrbs1H WgHKKZnJCdAWXpWkq+F1QLjO4/ZB8Uat8fNlkAP063QRweZ4jsNteJldPZe/OXztuzvMnW 92c7mxreyn7e/SnXWwWIYO2uitq9So4Pt9oBDE5GxlW6FjB7Jk3mZ484g3Y9rEJnUDGhnq VKgoI0XiObUxI1iHsNOX3lp5BYyGZQmuh1LpXKOx9TVQRP21XFiHs/PMI/vMSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701703291; a=rsa-sha256; cv=none; b=B/6J0Fq2q04lN5yKhAySn61Mepn9OikQc88n6JPGVCcA4LJpDLHzWC0plSnd3wCcekKdx/ lmcWCLvECSjGfDAdyS3hofPNu86WXo11ng6y+APX1lt459fintcIF0rPP0yhNFwfgjz49g H1InIoQT5u1BrXNyE3EozGkb94HMxe4PEHZHy8C3GPox0gXSdMny/k8+Dd0jEIGybMGK0I mvaFhwRwrWfAyEtkWTqhWt3zQmmaTPEGmY1Cd26otVt27uOEJ3EgnbITlGqnIphuZhnPdY IgWabGoxyYzcbcsp7tmAhlKx7BFJEQpInPMxD0xoEtcArH2v/H+anIaj43ayiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkS7H077YzXFB; Mon, 4 Dec 2023 15:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4FLUC3087772; Mon, 4 Dec 2023 15:21:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4FLUwY087769; Mon, 4 Dec 2023 15:21:30 GMT (envelope-from git) Date: Mon, 4 Dec 2023 15:21:30 GMT Message-Id: <202312041521.3B4FLUwY087769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: ec990152c655 - stable/14 - pfctl: use libpfctl instead of DIOCGETRULES directly List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ec990152c6553a658c40e78a94b0032af901397e Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ec990152c6553a658c40e78a94b0032af901397e commit ec990152c6553a658c40e78a94b0032af901397e Author: Kristof Provost AuthorDate: 2023-11-24 23:43:48 +0000 Commit: Kristof Provost CommitDate: 2023-12-04 15:20:57 +0000 pfctl: use libpfctl instead of DIOCGETRULES directly MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 47a0b59379c3bec547e7c829eb12de8276227dff) --- sbin/pfctl/pfctl_optimize.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c index a377f9eb04dc..98da986b0aeb 100644 --- a/sbin/pfctl/pfctl_optimize.c +++ b/sbin/pfctl/pfctl_optimize.c @@ -878,24 +878,23 @@ block_feedback(struct pfctl *pf, struct superblock *block) int load_feedback_profile(struct pfctl *pf, struct superblocks *superblocks) { + char anchor_call[MAXPATHLEN] = ""; struct superblock *block, *blockcur; struct superblocks prof_superblocks; struct pf_opt_rule *por; struct pf_opt_queue queue; - struct pfioc_rule pr; + struct pfctl_rules_info rules; struct pfctl_rule a, b, rule; int nr, mnr; TAILQ_INIT(&queue); TAILQ_INIT(&prof_superblocks); - memset(&pr, 0, sizeof(pr)); - pr.rule.action = PF_PASS; - if (ioctl(pf->dev, DIOCGETRULES, &pr)) { + if (pfctl_get_rules_info(pf->dev, &rules, PF_PASS, "")) { warn("DIOCGETRULES"); return (1); } - mnr = pr.nr; + mnr = rules.nr; DEBUG("Loading %d active rules for a feedback profile", mnr); for (nr = 0; nr < mnr; ++nr) { @@ -904,15 +903,14 @@ load_feedback_profile(struct pfctl *pf, struct superblocks *superblocks) warn("calloc"); return (1); } - pr.nr = nr; - if (pfctl_get_rule(pf->dev, nr, pr.ticket, "", PF_PASS, - &rule, pr.anchor_call)) { + if (pfctl_get_rule(pf->dev, nr, rules.ticket, "", PF_PASS, + &rule, anchor_call)) { warn("DIOCGETRULENV"); return (1); } memcpy(&por->por_rule, &rule, sizeof(por->por_rule)); - rs = pf_find_or_create_ruleset(pr.anchor_call); + rs = pf_find_or_create_ruleset(anchor_call); por->por_rule.anchor = rs->anchor; if (TAILQ_EMPTY(&por->por_rule.rpool.list)) memset(&por->por_rule.rpool, 0, From nobody Mon Dec 4 15:21:38 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkS7Q4FYHz53Sqm; Mon, 4 Dec 2023 15:21:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkS7Q3npfz4sRD; Mon, 4 Dec 2023 15:21:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701703298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D+A5mTWPeFE5jnbPXeIfhrrmJQb4Nk0WHTgUkeUzBLY=; b=I3mWQyl7Oe7ucKtWsGSEQ5yZxxsURo9SUc43xyHN9hWF/W0Q2wgDMYMsBCqezk0pIhhdBc JA8E2ndFrVi7r5F0cv1aq37vDA5fE+DlWabUlwtqkXkDGqaBnsqmjfsRiOAucgUTbX/O3I Sq3Voh5DonPtXu5kgWPoht882itWb6bHA7xG1A9EjGmmrNjD4cqb3wnSABWxCoJpcNLpan KW9bam7YYYAnp4OGgUIs8bmu7RvY6RIFiNWy+YbF88D2qYKkCajCddqhzoOAw/hxgaQp33 QoKpO31NWeQpO0kTEqCoGuWmV49siocruy0szjllYyJAMBuRmOsx1oka1663rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701703298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D+A5mTWPeFE5jnbPXeIfhrrmJQb4Nk0WHTgUkeUzBLY=; b=Pf7uPJsAjk/q+etini7bA8MaiTVOiGpNNPWjfEpz4MfqJ/t/HA326zKY91D4lXwtK6M7zX pRQlwrsD/4zztyXA63g2vJ6mSD2lZMSA7RGZV2kHa5UUtctLqJVfRDYPjHqI4VvJL5833c KebsXcBW+bfuPKAaDTqb1695ZGgcohf3WfC1mEaPv7qlRVnSIcR1Jx4oKpF9ywDryFf/oI BT/ie8wBVcSiJxxm2uA8lxBBL8E5cyGUMMlgUQgXzWv/Znq8g9fXy7QJ+JijMvV2opd2SB cAFfrwmKXGu2NKcvTZEb9TbAvFH1S59CDocCRJayEaynMBizCf9uLw3tdkMepA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701703298; a=rsa-sha256; cv=none; b=Wl2daS+s8dts00ST4eUXx7zH3rbclfRr59fsq13OoJBecBcymLQvDok7YxvfzHtWwq7UsQ krTLH0VtW1/FxsxP1sjaG0ykYDqHEs8PQHhxgMVljOZZBYuDyEBeyXDldRJ5/uHeJpTaOL 2JrQJWMxlIxwzRai85tAcmQ65alVeG2Po+2S0OSYoSBF5O/hVF8xm4yiWDB6M8ip6jWdMy N13VcxxzHI+f2G56pN0aXLZzVupY+Nj/qbGkkHJ/R/Ps+kvNrA697ht6grB89ylXQ9D7Sc wbeJ48GXv0pqVlmVc0/iZPbbh4EpKmbo6R9f7coqD6xMRdrBAXL/wozCMzgJfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkS7Q2tvWzX1m; Mon, 4 Dec 2023 15:21:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4FLcM1087920; Mon, 4 Dec 2023 15:21:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4FLc8Q087917; Mon, 4 Dec 2023 15:21:38 GMT (envelope-from git) Date: Mon, 4 Dec 2023 15:21:38 GMT Message-Id: <202312041521.3B4FLc8Q087917@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 9b2326333e88 - stable/13 - pfctl: use libpfctl instead of DIOCGETRULES directly List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9b2326333e884bc239d06be7cbd8a4eef571c5eb Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9b2326333e884bc239d06be7cbd8a4eef571c5eb commit 9b2326333e884bc239d06be7cbd8a4eef571c5eb Author: Kristof Provost AuthorDate: 2023-11-24 23:43:48 +0000 Commit: Kristof Provost CommitDate: 2023-12-04 15:21:05 +0000 pfctl: use libpfctl instead of DIOCGETRULES directly MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 47a0b59379c3bec547e7c829eb12de8276227dff) --- sbin/pfctl/pfctl_optimize.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c index 8aadccbb2178..00e1cf86e6fe 100644 --- a/sbin/pfctl/pfctl_optimize.c +++ b/sbin/pfctl/pfctl_optimize.c @@ -878,24 +878,23 @@ block_feedback(struct pfctl *pf, struct superblock *block) int load_feedback_profile(struct pfctl *pf, struct superblocks *superblocks) { + char anchor_call[MAXPATHLEN] = ""; struct superblock *block, *blockcur; struct superblocks prof_superblocks; struct pf_opt_rule *por; struct pf_opt_queue queue; - struct pfioc_rule pr; + struct pfctl_rules_info rules; struct pfctl_rule a, b, rule; int nr, mnr; TAILQ_INIT(&queue); TAILQ_INIT(&prof_superblocks); - memset(&pr, 0, sizeof(pr)); - pr.rule.action = PF_PASS; - if (ioctl(pf->dev, DIOCGETRULES, &pr)) { + if (pfctl_get_rules_info(pf->dev, &rules, PF_PASS, "")) { warn("DIOCGETRULES"); return (1); } - mnr = pr.nr; + mnr = rules.nr; DEBUG("Loading %d active rules for a feedback profile", mnr); for (nr = 0; nr < mnr; ++nr) { @@ -904,15 +903,14 @@ load_feedback_profile(struct pfctl *pf, struct superblocks *superblocks) warn("calloc"); return (1); } - pr.nr = nr; - if (pfctl_get_rule(pf->dev, nr, pr.ticket, "", PF_PASS, - &rule, pr.anchor_call)) { + if (pfctl_get_rule(pf->dev, nr, rules.ticket, "", PF_PASS, + &rule, anchor_call)) { warn("DIOCGETRULENV"); return (1); } memcpy(&por->por_rule, &rule, sizeof(por->por_rule)); - rs = pf_find_or_create_ruleset(pr.anchor_call); + rs = pf_find_or_create_ruleset(anchor_call); por->por_rule.anchor = rs->anchor; if (TAILQ_EMPTY(&por->por_rule.rpool.list)) memset(&por->por_rule.rpool, 0, From nobody Mon Dec 4 21:03:42 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Skbk70wB5z52pTC; Mon, 4 Dec 2023 21:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skbk70RTpz4Gsg; Mon, 4 Dec 2023 21:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701723823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vElxVXgw5O9XcA6MEP4+5/Broa6PoITK/mqjeJtA5hM=; b=F3F5vooSqdkPZUN7LjIQSaQcfhT8bl3uFXgQWYJ4E+IAHM1Wi8r9+dXPr1rB/Chwk3ym/5 OroUiGb7jOjktj9n+KDnmJObSFdI1gbH/gQBKMpSkTHRHq3iPET9taQaQR1CLcqc++PJdN hg9ofdP33tHUNSEjUHLHAwc8YaEt/4BDDibmvJCGd0kFMnGV7C9ZAvYvm6+vkSOdxiny1L gWaJqFHMexHoVoZCiEI8+146QMkoi5KSBhRWn+YLBxSzjUOvPaXrvRejqFL+ejgk19Mo8K C9eWcWGj2hCJg5b1v2FSWRLFpjd+0syjdlbvo8l6j5D9Lxj8uso38BkYZwPCHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701723823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vElxVXgw5O9XcA6MEP4+5/Broa6PoITK/mqjeJtA5hM=; b=X2vMg+3nB1DkKcrHIWsJ3yvMuB3uJ1JLfxFz8p54+qIF5YtY15La9bWrvJdwzWal06DbuR 3X/Et+wOBjCBBZ4d1M6ZADaEbBxwumhPpVW9SsmGvQo4rfL0xdX3zgamkC1kv9QAQ1DyHR xH2nXzGiFWPJjJeK8ME2xXxHTXGSSrR795PLWncrryTU7+HUIN6BktPi7xNcvGzDv4Tff1 q+Nh3Pgqe9KvrlmNeb9EkKGK9yWg/iIX49hvJB7xaj8T4lxWw+N5omMEEDYR5+zzKOv4ee aMcvGQR0DfRmXwR5OcLblUkmZYP365YNMxFCz6mHqlfHMDCjOotPfp/KI0K7xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701723823; a=rsa-sha256; cv=none; b=TFzWlVsIcH+0oYynDoSvUBg11Xt3hZmRlbP9zVhYz4uRTD+8pJZuP1cIgaIyL6nG9A+ame klF6hQraJu4G4OW8upWIQRpWNy2bq4eLn3n1+6CKeih9zwjLj0mNZfUe5YDVoftEBNOyp9 zcwkVEck+eyHknmFPf0SpTI2b890nTYkBLXCBH3jO5qBnTsCJeh+izuyPu/GhcwcwTuBXE xT8meDsFfhZYHHGSXcFpd4pEZoU/giKNyC9uUXEQsBQlxTFqu9LoMBOE/MDOcSO8aUaZo3 JvlxSx7YifUONKeHwoHY51fbd8Vs3KWV0qbT67Lhku/GI2jtyMXaxaDqG7kJlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Skbk66fYpzj0c; Mon, 4 Dec 2023 21:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4L3gAU061963; Mon, 4 Dec 2023 21:03:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4L3g1x061960; Mon, 4 Dec 2023 21:03:42 GMT (envelope-from git) Date: Mon, 4 Dec 2023 21:03:42 GMT Message-Id: <202312042103.3B4L3g1x061960@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 00f0b99e63c3 - stable/13 - OpenZFS: Fix ZFS so that snapshots under .zfs/snapshot are NFS visible List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 00f0b99e63c3b27174b89dae426a2d87435d991a Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=00f0b99e63c3b27174b89dae426a2d87435d991a commit 00f0b99e63c3b27174b89dae426a2d87435d991a Author: rmacklem <64620010+rmacklem@users.noreply.github.com> AuthorDate: 2023-11-28 00:31:03 +0000 Commit: Ed Maste CommitDate: 2023-12-04 21:03:30 +0000 OpenZFS: Fix ZFS so that snapshots under .zfs/snapshot are NFS visible Call vfs_exjail_clone() for mounts created under .zfs/snapshot to fill in the mnt_exjail field for the mount. If this is not done, the snapshots under .zfs/snapshot with not be accessible over NFS. This version has the argument name in vfs.h fixed to match that of the name in spl_vfs.c, although it really does not matter. External-issue: https://reviews.freebsd.org/D42672 Reviewed-by: Alexander Motin Signed-off-by: Rick Macklem Closes #15563 (cherry picked from commit 522414da3b283dada175161e49ea7f3fe46436ff) --- sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h | 2 +- sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c | 9 ++++++++- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h index a432f6c56739..62986b7fc525 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h @@ -103,7 +103,7 @@ void vfs_setmntopt(vfs_t *vfsp, const char *name, const char *arg, void vfs_clearmntopt(vfs_t *vfsp, const char *name); int vfs_optionisset(const vfs_t *vfsp, const char *opt, char **argp); int mount_snapshot(kthread_t *td, vnode_t **vpp, const char *fstype, - char *fspath, char *fspec, int fsflags); + char *fspath, char *fspec, int fsflags, vfs_t *parent_vfsp); typedef uint64_t vfs_feature_t; diff --git a/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c b/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c index 53ef46fb8ce5..177a059e88a1 100644 --- a/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c +++ b/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c @@ -120,7 +120,7 @@ vfs_optionisset(const vfs_t *vfsp, const char *opt, char **argp) int mount_snapshot(kthread_t *td, vnode_t **vpp, const char *fstype, char *fspath, - char *fspec, int fsflags) + char *fspec, int fsflags, vfs_t *parent_vfsp) { struct vfsconf *vfsp; struct mount *mp; @@ -220,6 +220,13 @@ mount_snapshot(kthread_t *td, vnode_t **vpp, const char *fstype, char *fspath, mp->mnt_opt = mp->mnt_optnew; (void) VFS_STATFS(mp, &mp->mnt_stat); +#ifdef VFS_SUPPORTS_EXJAIL_CLONE + /* + * Clone the mnt_exjail credentials of the parent, as required. + */ + vfs_exjail_clone(parent_vfsp, mp); +#endif + /* * Prevent external consumers of mount options from reading * mnt_optnew. diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c index cfc4bab2fa96..3c9311098696 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -1025,7 +1025,8 @@ zfsctl_snapdir_lookup(struct vop_lookup_args *ap) "%s/" ZFS_CTLDIR_NAME "/snapshot/%s", dvp->v_vfsp->mnt_stat.f_mntonname, name); - err = mount_snapshot(curthread, vpp, "zfs", mountpoint, fullname, 0); + err = mount_snapshot(curthread, vpp, "zfs", mountpoint, fullname, 0, + dvp->v_vfsp); kmem_free(mountpoint, mountpoint_len); if (err == 0) { /* From nobody Mon Dec 4 23:26:41 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Skfv61h8Bz52xY7; Mon, 4 Dec 2023 23:26:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skfv60sGfz4XLb; Mon, 4 Dec 2023 23:26:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701732402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mIL7QPcK7FrFlpkyAHqkwdLNvLraEvuFa+E7U1J5kUQ=; b=YlOwLyaB41llbtgPWVNkt7ePPqpKKVv3JG7sDevU4NUVi9ON9c7cfxm4r6JvBwuPd1XhvL f7cDnGJZoNUXGFnEuElzAx4VGrVuN/Q++CmQPF50oXnlIJlOlHJJlLHjHDY90imZ/7aMow HJxJVZW+B29Yi55NUFUDNlOg+FsCG4dtb0YKYDkTNcLWMWT3khtUyp6VZH+oxaPVz3DMgd ovnWycHfna3KRXwQ1hPxDNOm67kXFM3Ngz+pYo8HM7bmTqsCH5LFMbp64wvUQPDNIKBUff zsFvuT5kXZZLOEhf4gYt5eCJZiVZED5WfMwgqHJR/bhl/Je4HrlHHEnCjyEl/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701732402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mIL7QPcK7FrFlpkyAHqkwdLNvLraEvuFa+E7U1J5kUQ=; b=AXlyVqlzVkaLp7ozyAFcyRnLb/B0WeuwgmWPLoWo48YJ+MbRADQyboNuBMAd/1EYbNELrn 4Y2goFd9eBqa950WkIyTiILBgVG5oNuOm4R9ctOXaruxRk44m8qwMyiB+Wclcck1uvWNDO PAZ6JwDIKw2AFPNeD2pRJmCSkwTBtPAeYbPjLjtbLF9bqXY0q6PJxnF6K9PKyUrpdI7eXR nul8IY9C78zMJKJE8QQ1HFPB/D6MZWEFARlPpkVhCEpyuz03txnNQI8+RN/yx+LnunkjPe y1ld66FL+uMMn4XvPW4Z+tEmUSTZrjO68H6Qk9+j3442IP+6NHUn+C+vP/FUaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701732402; a=rsa-sha256; cv=none; b=BG1UmFDMCPRvJMBVs4V71vgIVFgJwqAs5f6YNWvymCIMtqvLsJQhF5MjVw2Zp9SGIdjqxZ amj5hHgewA1AWEzyTlv2wJcNt8SjO+0xGZCoWfYCbaMF4nW/+XEFnG3SedEsSgPj7dV6RY u90S2jkJU9PZR9YnPzbQ3F8u0NRPaOOvy1Kcc0ujb0E/TBkFIKWnlRxkrJp+Hii+8DDPXK CWyMjmkmxnKohqdsWodAUWDPQRD5HKvHCjmWsdafBW9L3WeqaYEW3Wlnuwf4etuafBtVOS s9V5cHB8dgGh1kfhtlOHc1YBf5hfXb23xHQk34yCQf93HQLmXX521EteKzQd8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Skfv56xhKzm6y; Mon, 4 Dec 2023 23:26:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4NQfPB096122; Mon, 4 Dec 2023 23:26:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4NQf5U096119; Mon, 4 Dec 2023 23:26:41 GMT (envelope-from git) Date: Mon, 4 Dec 2023 23:26:41 GMT Message-Id: <202312042326.3B4NQf5U096119@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 468605fd3c38 - stable/14 - Spacing and alignment cleanups. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 468605fd3c389545645ed4d9e5ed889752cf8a0e Auto-Submitted: auto-generated The branch stable/14 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=468605fd3c389545645ed4d9e5ed889752cf8a0e commit 468605fd3c389545645ed4d9e5ed889752cf8a0e Author: Kirk McKusick AuthorDate: 2023-11-17 22:39:13 +0000 Commit: Kirk McKusick CommitDate: 2023-12-04 23:26:09 +0000 Spacing and alignment cleanups. No functional change. (cherry picked from commit bde3cdf18d9881abfbe45337020e996dbeabca76) --- sys/ufs/ufs/inode.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h index 454dc725386b..81500e10ebb1 100644 --- a/sys/ufs/ufs/inode.h +++ b/sys/ufs/ufs/inode.h @@ -79,10 +79,10 @@ struct iown_tracker { * exclusive. */ struct inode { - TAILQ_ENTRY(inode) i_nextsnap; /* snapshot file list. */ - struct vnode *i_vnode;/* Vnode associated with this inode. */ - struct ufsmount *i_ump;/* Ufsmount point associated with this inode. */ - struct dquot *i_dquot[MAXQUOTAS]; /* Dquot structures. */ + TAILQ_ENTRY(inode) i_nextsnap; /* Snapshot file list. */ + struct vnode *i_vnode; /* Vnode associated with this inode. */ + struct ufsmount *i_ump; /* Ufsmount point associated with this inode. */ + struct dquot *i_dquot[MAXQUOTAS]; /* Dquot structures. */ union { struct dirhash *dirhash; /* Hashing for large directories. */ daddr_t *snapblklist; /* Collect expunged snapshot blocks. */ @@ -96,7 +96,7 @@ struct inode { } dinode_u; ino_t i_number; /* The identity of the inode. */ - uint32_t i_flag; /* flags, see below */ + uint32_t i_flag; /* flags, see below */ int i_effnlink; /* i_nlink when I/O completes */ /* @@ -129,12 +129,12 @@ struct inode { * Copies from the on-disk dinode itself. */ uint64_t i_size; /* File byte count. */ - uint64_t i_gen; /* Generation number. */ + uint64_t i_gen; /* Generation number. */ uint32_t i_flags; /* Status flags (chflags). */ - uint32_t i_uid; /* File owner. */ - uint32_t i_gid; /* File group. */ + uint32_t i_uid; /* File owner. */ + uint32_t i_gid; /* File group. */ + int16_t i_nlink; /* File link count. */ uint16_t i_mode; /* IFMT, permissions; see below. */ - int16_t i_nlink; /* File link count. */ }; /* * These flags are kept in i_flag. From nobody Mon Dec 4 23:29:50 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Skfyk360gz52y3f; Mon, 4 Dec 2023 23:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skfyk2dglz4XmC; Mon, 4 Dec 2023 23:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701732590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kDTWZDULz655Dh9ajP7huz4d7vny7uqMe9U5jTtQYIY=; b=awrEvUrBjXNiLxTMaswegXTjzKlmIzBhz5Ju9QatHtjMgAvOi5ihutWQzD86qOXBt7Ia6N KyLFBj2NkIY2yj68iuSafjNvpZucvorMEZAajF2c+qvEbopsEYERHb105ue6Q7Xrp3JxxH MV8qunPZmyoBQ0ucfMCDVDZUx0H6CGkWB8oOTPYHiXyK1Jnmgxi/Y/8ICFn/xl2ljRAASB fwQ1KtJ8wcLnqjHSuZRNZ4XjGiO3mYePkds4TlCDIKY8v8DKDPsSZq6zg8GMt8wAdkcLTf CO26X4O5kHvcJG7W54uwdFg6crhRXxF95MZ/IoGbhCwGKf+7/k6dDh0yEFNWpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701732590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kDTWZDULz655Dh9ajP7huz4d7vny7uqMe9U5jTtQYIY=; b=QDueB0ytq3FS8zOzvBQ4ZsjskytWujT4sJHqacivw4oZ/+OaJs9WE0vdNtpv+N/L3lqFzj qPQQti1DN6IwLvtMPqrM19C3dHd4yzQm784dTg+DMXOQ0BNjGmsfnek0rPIFz0YRyE5Mua xbo64oxl0dADE4PAlzRaOxf//79eQeBXdwf3utiA9hjv0naq8NsyU7IrphlNigDcydAjw7 gjc0Ly88vg2gL1C5PQeAofy/0CNkxxJmAyK5IAK9izo1TOt3g7Ji1HMEHSrgjZg38+7L8d xUDuStzvHlyW7R51jwSrHCrfEpxpSwVLm1x5+O0rfYEcmwF8UXEcOj49LJsd8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701732590; a=rsa-sha256; cv=none; b=OTK5qxqJxbM3Fuy4yOStw/BSPPS3v0eoyUtF4j6oKyej7ua6N5RzzccXYprpHn+NMcQoOy xZpNVF0jpiZZbrZei8SPlqeYzuwOQN19mG/8xwaeLHLPtwJ9YJFsfaAX95wZvO5pvV/ZL/ 7sJYpN3XaXbDi+NUYkFv8eB3rZ4chRQu+AO5ErZQgetNz4YhrWYCng1GkQ70BoKok9uIxh u2D1MysnevkkT0ipJdFBwmXbc6ThSKCs4NzUGjf7Fbl9aoe2xMn+EsWt4Y77eWHOCtlP5/ oPR0EtsbAzqJ4G5FzPCqoqe2w3nvMdLb65Y+j3mEIZeWvaSSLwk9JdoqJfHAtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Skfyk1Zmmzm8c; Mon, 4 Dec 2023 23:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4NTo9f096628; Mon, 4 Dec 2023 23:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4NTo6g096625; Mon, 4 Dec 2023 23:29:50 GMT (envelope-from git) Date: Mon, 4 Dec 2023 23:29:50 GMT Message-Id: <202312042329.3B4NTo6g096625@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 42bcec08a25f - stable/13 - Spacing and alignment cleanups. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 42bcec08a25fad52ed1f83de2f3216a816e9a2d1 Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=42bcec08a25fad52ed1f83de2f3216a816e9a2d1 commit 42bcec08a25fad52ed1f83de2f3216a816e9a2d1 Author: Kirk McKusick AuthorDate: 2023-11-17 22:39:13 +0000 Commit: Kirk McKusick CommitDate: 2023-12-04 23:29:33 +0000 Spacing and alignment cleanups. No functional change. (cherry picked from commit bde3cdf18d9881abfbe45337020e996dbeabca76) --- sys/ufs/ufs/inode.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h index eb66aaae1f10..898f30204b00 100644 --- a/sys/ufs/ufs/inode.h +++ b/sys/ufs/ufs/inode.h @@ -78,10 +78,10 @@ struct iown_tracker { * exclusive. */ struct inode { - TAILQ_ENTRY(inode) i_nextsnap; /* snapshot file list. */ - struct vnode *i_vnode;/* Vnode associated with this inode. */ - struct ufsmount *i_ump;/* Ufsmount point associated with this inode. */ - struct dquot *i_dquot[MAXQUOTAS]; /* Dquot structures. */ + TAILQ_ENTRY(inode) i_nextsnap; /* Snapshot file list. */ + struct vnode *i_vnode; /* Vnode associated with this inode. */ + struct ufsmount *i_ump; /* Ufsmount point associated with this inode. */ + struct dquot *i_dquot[MAXQUOTAS]; /* Dquot structures. */ union { struct dirhash *dirhash; /* Hashing for large directories. */ daddr_t *snapblklist; /* Collect expunged snapshot blocks. */ @@ -95,7 +95,7 @@ struct inode { } dinode_u; ino_t i_number; /* The identity of the inode. */ - uint32_t i_flag; /* flags, see below */ + uint32_t i_flag; /* flags, see below */ int i_effnlink; /* i_nlink when I/O completes */ /* @@ -126,12 +126,12 @@ struct inode { * Copies from the on-disk dinode itself. */ uint64_t i_size; /* File byte count. */ - uint64_t i_gen; /* Generation number. */ + uint64_t i_gen; /* Generation number. */ uint32_t i_flags; /* Status flags (chflags). */ - uint32_t i_uid; /* File owner. */ - uint32_t i_gid; /* File group. */ + uint32_t i_uid; /* File owner. */ + uint32_t i_gid; /* File group. */ + int16_t i_nlink; /* File link count. */ uint16_t i_mode; /* IFMT, permissions; see below. */ - int16_t i_nlink; /* File link count. */ }; /* * These flags are kept in i_flag. From nobody Tue Dec 5 00:43:56 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkhcD2hr9z532MD; Tue, 5 Dec 2023 00:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkhcD2C1Nz4cPt; Tue, 5 Dec 2023 00:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eNKZ/NCQPb5lkHtg1j/i3scFugaeqmrA9RJa1C73fB8=; b=AlIxnNl0aelmXJfnoq+feST6YRTLFw7dCOESqXGaH/DUNldFmlHGt6PaqgZUFPx/rZGwQn jTJ9vq0AT3WCizy63KmZRNY/UIrR2miBMrW5No0T42lL+U7U8quQrNiBCz3bu76U9iieNv qSeAkkby/B67g3ZJhsXIZ3Q9vo+yZIe8dTfJl/ZbCSEPoculpeQhfDbyiKqq8YgZMsl6rM oQMimJWJTjp3u+vCoWN2wetahtpCwUpvzLRZ8XrAcs0M6v18eDk/MNUpwEkTOqon9lf100 6rnY3lAGXNuTGjen6ZDeZj4+xqOvhU4ad1W8hLmXTXtdoHwdK6WBKRc1CstAvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eNKZ/NCQPb5lkHtg1j/i3scFugaeqmrA9RJa1C73fB8=; b=ddeBIB7NyI6PHM0PrnnI5wN1VfTUo9TebSfpnAwwajt/9ZdzX0pU96KVVmXzzN85m4d6hS dmQ95XYuszxklROB9LsKwcxH5b823t1GhQ1R3FB7qXzIz/boXpdiFwsIVZ2/C3sKLCKP6l htPB3j1n6DlIq0BFQyaKAmLP8Z/1vpw6+oHi8yee3N30MQl93vA6IJpVPTEK2GnI00Njof SSPbSo0UdhrwYxWGcCxov04oa3sSl8gM8hnliPp6VcT60tziEG1S5Z+pBcg1IfNe3XiiR7 G2u0RnVLB4TNri1/1KalsnKi9xTO8+hOytoHhiu4OxI4nYvlsjfnpTK6wIwF0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737036; a=rsa-sha256; cv=none; b=JS536rZleX0FSx9M3jb9zEHcoUpIBnaCHeCDy29njziXwqAIISdgGIoSFh//7cVWHfMQ5A JPFUhB+gk+Bm7rCQPj+v3Tks3nhx1f7nj+HBMW8LdvFbG5uz7sLcM8qr/aHqmdcnQVy5Em X5cdqBTVoprye+KxKywox50Kv+MMneunHpY/ghwOAw9cuzXbwUMdYj0nA3h9cX+L4rtVh/ cpRVXjN0Mr4rXd27gkIyZ+9sFYtQ4mqPURjQPqblC8AgnpUOSqEPmfnZPnghIhFfAVxE6d LRwuWSAEKJaxzsLxmx9/WPxZTVAMho+cda1IPn4wCUFJhInV0o+MQpMQNE4UTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkhcD1Gf3zpM7; Tue, 5 Dec 2023 00:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50huj7029723; Tue, 5 Dec 2023 00:43:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50hukj029720; Tue, 5 Dec 2023 00:43:56 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:43:56 GMT Message-Id: <202312050043.3B50hukj029720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 24346a2f7775 - stable/14 - EVFILT_SIGNAL: do not use target process pointer on detach List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 24346a2f777598272caffbd7e4fb6d85cafe64ed Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=24346a2f777598272caffbd7e4fb6d85cafe64ed commit 24346a2f777598272caffbd7e4fb6d85cafe64ed Author: Konstantin Belousov AuthorDate: 2023-11-28 12:51:54 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:43:27 +0000 EVFILT_SIGNAL: do not use target process pointer on detach PR: 275286 (cherry picked from commit ed410b78edc53e17b5a3e93ace2adbeb3a734ae9) --- sys/kern/kern_sig.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index c847783cd3da..d35c35a534f9 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -4298,9 +4298,7 @@ filt_sigattach(struct knote *kn) static void filt_sigdetach(struct knote *kn) { - struct proc *p = kn->kn_ptr.p_proc; - - knlist_remove(p->p_klist, kn, 0); + knlist_remove(kn->kn_knlist, kn, 0); } /* From nobody Tue Dec 5 00:43:57 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkhcF3fcBz532FX; Tue, 5 Dec 2023 00:43:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkhcF3GNrz4cbh; Tue, 5 Dec 2023 00:43:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XYhrMssC8MoA4Y8F+4yDEGbCRJcf/xZtMnDi1BjwtDg=; b=Ggbx2J5tMwnrPwrgR5dQq/b9XODfn6yAVVn5q8M6NE2LuhuWnX81lsdGjRlKeiZ6qZDVar fFfplLa+JwsZiy0ry6u1nPO4Rhq9A8u/9yFJJxV4hywT1kfspbTCvja8/hDDodfhUwkfr5 W1AKtm7zz5nfYD8sUpA7G2tG6jgoRWA+3x5pLTb9v3qSZNQNfjBMl/elCdgnsX1xk77rst I2FHHc520OU8lo3jGJw/C4FbSbNippHkIjApTOc88Ycq3SC6cDxCnWIX/P2xYlkxVQaCtp D/iB1Gqe9GynqA8j/HF/IX+ciHOHpNlJDUnYpzY0SiN9zP/tbXGVbXgO2+xHFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XYhrMssC8MoA4Y8F+4yDEGbCRJcf/xZtMnDi1BjwtDg=; b=cAMWE84pwmaDFvU7N/lbfqcff+lJSisTKed9AQyM6sM8EWA/jyFhQ1lK1adtxaEjixXS+J SfcTda+K9H1M4Z4tmcv8tvVT01y37DgS7ROBo4tdab85pHTlX+OZaWocGaTQpXq3oPZuer uwq3fe6y/A7PSbtX7CVGPEyvULfj5YMuZNE4Qdxonm9z9xeizrcMAPLxJXc+a1/6+kl2tZ bdQqpEGXNJzS8mybkx+JvJZ0UIBa7qHI7gGsFTJdtH3C4X16aw9h+sgPw0pU94DEEF7GW5 wTAJd7wGuFmhV0t129Tc9ogWX+evPZeuPRWE6rFM5UUmZws+Erk4J8MPpxOufQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737037; a=rsa-sha256; cv=none; b=vlcrpQY3Ykvp26NmUtrb8UD0p0SmlLc/3AbVmHJgM9P3mmhyws3zLTLxzPycXvwV0CO+KQ r5tZG7TpWSrdy8f7qgfshyAmE5N7oj3QWEsVcthKc3Rmh3ItrWTIOuVD2she7xQDAxfsPa KT8DKbrYOA9zltj2hG2rBEAXePvVz37xRisptStrkim+t5mc4hh0VDDiH2/FjKpxXqqNTE L5BPM03G9nf6f/Eu2p5Pccuax8HKcOyobSo08Ihz3JwmosgQv7HduG24o+fpN+NZTmWr/R xGYNhgTT9AFsgvtlXxpAo7FKamMV7hjJrD6OMIUgUy/8CGFhPrHvdPnisRgMIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkhcF25Qtznx7; Tue, 5 Dec 2023 00:43:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50hvql029794; Tue, 5 Dec 2023 00:43:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50hv3m029791; Tue, 5 Dec 2023 00:43:57 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:43:57 GMT Message-Id: <202312050043.3B50hv3m029791@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 71f01edb5459 - stable/14 - EVFILT_TIMER: intialize stop timer list in type-stable proc init, instead of fork List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 71f01edb545968ae42967fa989cb818a3991f0cb Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=71f01edb545968ae42967fa989cb818a3991f0cb commit 71f01edb545968ae42967fa989cb818a3991f0cb Author: Konstantin Belousov AuthorDate: 2023-11-28 15:42:49 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:43:27 +0000 EVFILT_TIMER: intialize stop timer list in type-stable proc init, instead of fork (cherry picked from commit 171f0832c5b15f2f66d2fe59967348a42814b0c1) --- sys/kern/kern_fork.c | 1 - sys/kern/kern_proc.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index aaa46a64ef9f..edcd8a1f2139 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -624,7 +624,6 @@ do_fork(struct thread *td, struct fork_req *fr, struct proc *p2, struct thread * LIST_INIT(&p2->p_orphans); callout_init_mtx(&p2->p_itcallout, &p2->p_mtx, 0); - TAILQ_INIT(&p2->p_kqtim_stop); /* * This begins the section where we must prevent the parent diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 2daf39b398b5..936d410133eb 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -277,6 +277,7 @@ proc_init(void *mem, int size, int flags) EVENTHANDLER_DIRECT_INVOKE(process_init, p); p->p_stats = pstats_alloc(); p->p_pgrp = NULL; + TAILQ_INIT(&p->p_kqtim_stop); return (0); } From nobody Tue Dec 5 00:43:58 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkhcG6LJ3z532pP; Tue, 5 Dec 2023 00:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkhcG4G41z4cZf; Tue, 5 Dec 2023 00:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8t3lDZmLrl79nc7+1ztE+2KJ3pGXB8U1D38FbPkdCI=; b=usxbY0NiZ4WZ7nhhOGvh9IO3vBkg+RG2osUfvTACdGHPvVcyOiZrVH731o4J+5EWNWvwak vcCOzYVR4B8tgM69yvSzZZ8lYVo2tzwpp8wCVMEGaPED2excLqTXvbq7JzeKuQWELpgLvg 83LXR2XdXSYHHvNyAMOV4FyanjNndF5rnJL0gNx6Ln0tt8OpKs+hwA1J+v6NJEY9W9yQQy Darx3Gr7dCgnJIoILze8oa9/5WL3dRxeNtTiPyQlTgXs5ajt+2+JDvw73CGi9swqaqQPDi R1LIwb9hRFoLxLTD9Q9NxJxGvcbtN4pqUDGrL9rHIglzpcaggw8gj4KVOpsyfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8t3lDZmLrl79nc7+1ztE+2KJ3pGXB8U1D38FbPkdCI=; b=ujN6siZhbUB4FdDS9EFI3Wtfut/vqIf9TY0Um9jtLA+dqB0rpg9kybwHC4u63L2ph7vYTn v3URwYvZyY1RE85FKL4dmMboU4w6qXeNqd7zfjQ0nBkNOma2S8MVBHBLhhDH/oUA7LXkS8 ym5AWAWBOSuH9IG6LKZR5P0txeG9wQGsOvwS+AZDQLoDLQdEBkKhT8+gDOACg59CeJZM70 fk9Pbar55qAFB6zV10oTmjQvc3bsulbhkDQfIuIhaFqUbA9buj1uYRjIJUTQnJLU0SvqTf hF0zgX65CV7nowcD3eokj8oykdKGKg+lQJEtyjCOpEzQgejSk2ZNQRDH1wlDyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737038; a=rsa-sha256; cv=none; b=YpJlGcszhUuq2NHprN3JE9HriX0IxkIigADahqwORewyifHo5bEBleypjH+T6RspvIrG+X 29YcLrPyuFtTpAz2wMIN7Gq18w25e1FSj7cfoVov1O5ng/HkO0TAOp66zyshymZuG7pxcS IgrlmLqZLtAWdNEutPBS2SOvk4LkeRh1DTXi3kad/1ewF+9yOychW644utTizEb2p8rxH9 bJ3rzDC0rlc+bvYUpUlcubtMfVZR5/Qfcp0xziOVOrFHGibYsEJ08OQPq/TovJ3MlT7S+G uVQpmLzC8iQfscCY+B2akvV6RYJBdkAkPXDXCE+Q3BPDdbhaI97sr3wWUlF9jQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkhcG3LJNzpM8; Tue, 5 Dec 2023 00:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50hwKX029830; Tue, 5 Dec 2023 00:43:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50hwN6029827; Tue, 5 Dec 2023 00:43:58 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:43:58 GMT Message-Id: <202312050043.3B50hwN6029827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6bed0f65fb68 - stable/14 - VFS: add VOP_GETLOWVNODE() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6bed0f65fb68f0f96bfbf5dcdbab26babdafc655 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6bed0f65fb68f0f96bfbf5dcdbab26babdafc655 commit 6bed0f65fb68f0f96bfbf5dcdbab26babdafc655 Author: Konstantin Belousov AuthorDate: 2023-11-18 08:55:48 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:43:27 +0000 VFS: add VOP_GETLOWVNODE() (cherry picked from commit 4cbe4c48a7e574ec1bb919351d7a57d252b00b62) --- sys/fs/nullfs/null_vnops.c | 18 ++++++++++++++++++ sys/kern/vfs_default.c | 10 ++++++++++ sys/kern/vnode_if.src | 7 +++++++ 3 files changed, 35 insertions(+) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 9898bf010a21..7db7a352f176 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -1131,6 +1131,23 @@ null_vput_pair(struct vop_vput_pair_args *ap) return (res); } +static int +null_getlowvnode(struct vop_getlowvnode_args *ap) +{ + struct vnode *vp, *vpl; + + vp = ap->a_vp; + if (vn_lock(vp, LK_SHARED) != 0) + return (EBADF); + + vpl = NULLVPTOLOWERVP(vp); + vhold(vpl); + VOP_UNLOCK(vp); + VOP_GETLOWVNODE(vpl, ap->a_vplp, ap->a_flags); + vdrop(vpl); + return (0); +} + /* * Global vfs data structures */ @@ -1143,6 +1160,7 @@ struct vop_vector null_vnodeops = { .vop_bmap = VOP_EOPNOTSUPP, .vop_stat = null_stat, .vop_getattr = null_getattr, + .vop_getlowvnode = null_getlowvnode, .vop_getwritemount = null_getwritemount, .vop_inactive = null_inactive, .vop_need_inactive = null_need_inactive, diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index c28478f0973d..82076c84279d 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -85,6 +85,7 @@ static int vop_stdgetpages_async(struct vop_getpages_async_args *ap); static int vop_stdread_pgcache(struct vop_read_pgcache_args *ap); static int vop_stdstat(struct vop_stat_args *ap); static int vop_stdvput_pair(struct vop_vput_pair_args *ap); +static int vop_stdgetlowvnode(struct vop_getlowvnode_args *ap); /* * This vnode table stores what we want to do if the filesystem doesn't @@ -115,6 +116,7 @@ struct vop_vector default_vnodeops = { .vop_fsync = VOP_NULL, .vop_stat = vop_stdstat, .vop_fdatasync = vop_stdfdatasync, + .vop_getlowvnode = vop_stdgetlowvnode, .vop_getpages = vop_stdgetpages, .vop_getpages_async = vop_stdgetpages_async, .vop_getwritemount = vop_stdgetwritemount, @@ -1610,3 +1612,11 @@ vop_stdvput_pair(struct vop_vput_pair_args *ap) vput(vp); return (0); } + +static int +vop_stdgetlowvnode(struct vop_getlowvnode_args *ap) +{ + vref(ap->a_vp); + *ap->a_vplp = ap->a_vp; + return (0); +} diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src index 3b16d4c0ada8..d13e7efb4bb5 100644 --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -471,6 +471,13 @@ vop_getwritemount { OUT struct mount **mpp; }; +%% getwritevnode vp = = = + +vop_getlowvnode { + IN struct vnode *vp; + OUT struct vnode **vplp; + IN int flags; +}; %% print vp - - - From nobody Tue Dec 5 00:43:59 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkhcJ0XXmz532Td; Tue, 5 Dec 2023 00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkhcH5gM2z4crq; Tue, 5 Dec 2023 00:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0+Kw8UFadf7dKWDj9blN4QNCXTUOqVNX6otwF/zFvuI=; b=J27p7pOYSaG9ndaEy494ZklLilxNGIg1QqyvLAH2U9LFyuE65flVmAGiuSDWGvZ5P0MAU0 Xw+swO3YBJZJ+I//dWsh34C/jgTMf5mrptR/SvSSScTYUxK87Xd8noc8Rfsxt5Z0dgfjuV WAvnKU48BWoFylF536Uc8u+XcNcxH7ufDoTuYzhdQE3hzv9tosmSkvIjGMd33elz601WzY nbhqOF8IF22dUL4CeFtkP/Oa0EStCUHCKYAL8WIvnruVDLriIhObEUWWHdB/+bKXS8m9uh Ul4t4cy5TO1eVZ9XOGUthBaEVUJufbMSZnbRvrYxWjlwu+jPc+lw3OcvD2MExw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0+Kw8UFadf7dKWDj9blN4QNCXTUOqVNX6otwF/zFvuI=; b=PG4iMBTSqpi01W0GelmJc+AZLDdDygBOTf1ydq4J/7cwJQgnluLpTH6WixNAR6H/Awt3Rj +7tjpSMsV7jw7iHf4p5+IgW0rm3S9LhpknAeknH1ADiPUCYq4gr9MwldUoBTzSKrRXLgMh GisD/xgnZSPQF6tcqrrjJpg5W1+jXLTo3C72Zb9PTyABkRCefAE/NzAQurQqcWP2xg8AW4 x0PKzFGV5Rd5i6OBZwQ1V6C6TZ/8cDqjKjs4hpOX+XFaoSMLEBWOKCEbxkCpXcBbzECVm3 MYk0CwtYh5WzhfzLvbePs3s4aQN66H20VuLmabWseyW/KVEZR0mxkvGmY4Ffug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737039; a=rsa-sha256; cv=none; b=WEfVWePjP28wqpYmkkANPoGbDhw4STL4XOoybsctSb+tQ8Dni7CSh8+xArx/dupD2pBIiY ljQkufM7xehsSUli2yZCE36MK3Cuy5WX7Mv1Z/BiQmwzTEItzdRK3WAyWiNn54Psl0v4mC iG9ATk5RALi4+3KARCURB+8SQ8akcx8j8qguNXLbZIBRb2mJtsxeAP+Jnw7tCY2VTQVx3t eoO3WZxBKjafHuaGQ7+4pNojCPhNebiNACPuU4RE1JnsWRt1mGei052i35ZAUYVVzKB1s/ DbNSQXpdKEeF6DeXkqqocqqKK79XDctTG9EMm6p67I3grSzg+2ZwoclWhf1bvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkhcH46jZzp06; Tue, 5 Dec 2023 00:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50hxd6029895; Tue, 5 Dec 2023 00:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50hx5Z029892; Tue, 5 Dec 2023 00:43:59 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:43:59 GMT Message-Id: <202312050043.3B50hx5Z029892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7dc643fe15f9 - stable/14 - vn_copy_file_range(): find write vnodes on which to call the VOP List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7dc643fe15f9b18e6821fa17402a0a2005095742 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7dc643fe15f9b18e6821fa17402a0a2005095742 commit 7dc643fe15f9b18e6821fa17402a0a2005095742 Author: Konstantin Belousov AuthorDate: 2023-11-18 08:57:44 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:43:27 +0000 vn_copy_file_range(): find write vnodes on which to call the VOP (cherry picked from commit a9bc8637690ce29496650a41d3c25e225ed22e3d) --- sys/kern/vfs_vnops.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 4669296750e4..6e8a6b23eec6 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3072,10 +3072,12 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, struct ucred *outcred, struct thread *fsize_td) { struct mount *inmp, *outmp; + struct vnode *invpl, *outvpl; int error; size_t len; uint64_t uval; + invpl = outvpl = NULL; len = *lenp; *lenp = 0; /* For error returns. */ error = 0; @@ -3101,17 +3103,22 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, if (len == 0) goto out; - inmp = invp->v_mount; - outmp = outvp->v_mount; - if (inmp == NULL || outmp == NULL) { - error = EBADF; + error = VOP_GETLOWVNODE(invp, &invpl, FREAD); + if (error != 0) goto out; - } + error = VOP_GETLOWVNODE(outvp, &outvpl, FWRITE); + if (error != 0) + goto out1; + + inmp = invpl->v_mount; + outmp = outvpl->v_mount; + if (inmp == NULL || outmp == NULL) + goto out2; for (;;) { error = vfs_busy(inmp, 0); if (error != 0) - goto out; + goto out2; if (inmp == outmp) break; error = vfs_busy(outmp, MBF_NOWAIT); @@ -3122,7 +3129,7 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, vfs_unbusy(outmp); continue; } - goto out; + goto out2; } break; } @@ -3133,16 +3140,21 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, * which can handle copies across multiple file system types. */ *lenp = len; - if (inmp == outmp || strcmp(inmp->mnt_vfc->vfc_name, - outmp->mnt_vfc->vfc_name) == 0) - error = VOP_COPY_FILE_RANGE(invp, inoffp, outvp, outoffp, + if (inmp == outmp || inmp->mnt_vfc == outmp->mnt_vfc) + error = VOP_COPY_FILE_RANGE(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); else - error = vn_generic_copy_file_range(invp, inoffp, outvp, + error = vn_generic_copy_file_range(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); vfs_unbusy(outmp); if (inmp != outmp) vfs_unbusy(inmp); +out2: + if (outvpl != NULL) + vrele(outvpl); +out1: + if (invpl != NULL) + vrele(invpl); out: return (error); } From nobody Tue Dec 5 00:44:00 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkhcJ71K5z532pS; Tue, 5 Dec 2023 00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkhcJ6Nj4z4csm; Tue, 5 Dec 2023 00: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=1701737040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UXgSFZu2YfDUqiuITjvWBY5d8R4XcndiHzHkaS4xWeI=; b=KzlEPq/4QQnk2LD0EJMwIhCjPBa/8O9TrG5sSl6LmoADG2J6a5bIDLTqjw7dWRYRutn9iN jra44nVmlDHouZfC97tC3SnQzeRnYOFIwmNtKdvcpNQMoOgc27aNNz0EcjtL5lNpQfBHwZ D1r3Ed3GGXf+5IYcSTykezzwf5rHbvGlaozmVwE+H5UPPiN7pNU10irTn/tS7JLhxUJX6B J0iwq562/ipQprcMksdlpoCv3c04yrTEPDqX2wbvXz/vBXZzisDgDMOm0ZHQiJrgZzG5CD 5Kxv5jQzIVENHD9oUb4Dnrgs7OBb7lnP54B0C+3htZVMH3wQIG29kjUQQlTNEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UXgSFZu2YfDUqiuITjvWBY5d8R4XcndiHzHkaS4xWeI=; b=t9FqFcudfLS0IHJgPx5Wf9Pfe1hLv0kXEEMAkihJQXPHwKVwATlThH2rtujvB7WpbAUPrO 2632hCdVzsbRPdygiVn5ye+SpKf1Ol1+O/npOHmnWxEdV2oJ+OSSdBxV+iVFh3GFHLJjbJ qNF4NeqHY4qBJBHOERG2fgXXLk7nIS4y50ALgafQ0hclGABHXxyDGMjMUEUrdQMUss/O87 tO9SES7kQ4aQBR68m2Pbnq9VWGcxw8CFGrm7BfIVAWtjz48KMcoa3WLd8XC7NPequ2ZT1U 8PV7+VkKz0UZbEmPKjGC8dmFfjGqslICX6SzngWpsMK1rb9GqaZW2rsv2vXKFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737040; a=rsa-sha256; cv=none; b=frsrB72OwoaKndQODl9D+M4y6OS4GHXbqXvcqD9Rafh7sRl5cKiq100H6tuJLhZiAzwyNJ xU7TNKLgcC5RbGmU6fWuAHZjxxlWyuavkBfv1d0qNtcCte7jdcLipeK0G2U93m90BHq/dL UNcgItSP8fxmfDAvkK7dcag9YHVPpwrCb/PkCVySwTxMnUMpCxzX9d9gxrTY8cWaENaRjU d2vPomuU9YeP2F1mNUM864bcCrnDo7oZditcDGF7gm6E7FxINSJQpZ33YCBynqUUkvhXY5 hIaKLdDlaWQH1zZ5GlpJaMuOKv4uUwsSSG5MiXH/xpKyyks6JfEP1Yo/ZEUdqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkhcJ5PgGzpLK; Tue, 5 Dec 2023 00:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50i04i029965; Tue, 5 Dec 2023 00:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50i0m4029962; Tue, 5 Dec 2023 00:44:00 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:44:00 GMT Message-Id: <202312050044.3B50i0m4029962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c99f50351c73 - stable/14 - vn_copy_file_range(): provide ENOSYS fallback to vn_generic_copy_file_range() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c99f50351c7390dbd370f836361dfce0d738f566 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c99f50351c7390dbd370f836361dfce0d738f566 commit c99f50351c7390dbd370f836361dfce0d738f566 Author: Konstantin Belousov AuthorDate: 2023-11-18 08:59:19 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:43:27 +0000 vn_copy_file_range(): provide ENOSYS fallback to vn_generic_copy_file_range() (cherry picked from commit c5405d1c850765d04f74067ebb71f57e9a26b8ea) --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 4 +--- sys/fs/fuse/fuse_vnops.c | 7 ++----- sys/fs/nfsclient/nfs_clvnops.c | 4 +--- sys/kern/vfs_vnops.c | 2 ++ 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index 05f28033be6a..3302f043620a 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -6315,9 +6315,7 @@ bad_locked_fallback: bad_write_fallback: if (mp != NULL) vn_finished_write(mp); - error = vn_generic_copy_file_range(ap->a_invp, ap->a_inoffp, - ap->a_outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, - ap->a_incred, ap->a_outcred, ap->a_fsizetd); + error = ENOSYS; return (error); } #endif diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index b9e4e48e6dbd..9728afb66654 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -861,6 +861,7 @@ fuse_vnop_copy_file_range(struct vop_copy_file_range_args *ap) pid_t pid; int err; + err = ENOSYS; if (mp == NULL || mp != vnode_mount(outvp)) goto fallback; @@ -943,13 +944,9 @@ unlock: VOP_UNLOCK(invp); VOP_UNLOCK(outvp); - if (err == ENOSYS) { + if (err == ENOSYS) fsess_set_notimpl(mp, FUSE_COPY_FILE_RANGE); fallback: - err = vn_generic_copy_file_range(ap->a_invp, ap->a_inoffp, - ap->a_outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, - ap->a_incred, ap->a_outcred, ap->a_fsizetd); - } /* * No need to call vn_rlimit_fsizex_res before return, since the uio is diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 63cb9eaec7b7..cfb5e90739a4 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3888,9 +3888,7 @@ nfs_copy_file_range(struct vop_copy_file_range_args *ap) */ if (invp == outvp || invp->v_mount != outvp->v_mount) { generic_copy: - return (vn_generic_copy_file_range(invp, ap->a_inoffp, - outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, - ap->a_incred, ap->a_outcred, ap->a_fsizetd)); + return (ENOSYS); } /* Lock both vnodes, avoiding risk of deadlock. */ diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 6e8a6b23eec6..e6a4b074b4e5 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3144,6 +3144,8 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, error = VOP_COPY_FILE_RANGE(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); else + error = ENOSYS; + if (error == ENOSYS) error = vn_generic_copy_file_range(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); vfs_unbusy(outmp); From nobody Tue Dec 5 00:44:01 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SkhcL12ZJz532Fq; Tue, 5 Dec 2023 00:44:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkhcL0F5Bz4cxk; Tue, 5 Dec 2023 00:44:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3V2Ie9/4zA7LfyIN1fhyih3UOriYL94uj2WkMeba03U=; b=mLiqJPi3K8sPzOBF/pb5IjM8m6aorVgBQuhxGJB1VlFB3SLR8okbcdATT7J9VS8E1Sp+1I ek+NWWpS6DKN4G4TCDmJIEdyNb/thcfMu8RmN3r30Wrd1q8e+NefjvUgCfXYchkubUT4y7 47GofmGM+xxm64dVWGCij8tp9cSzi1D+/Wp5oAu+9+8r29nyWZ/Mn1j2ykQFRoC/RjHfmK jWLq/HNuydm8B/6MsEQPUpdoSpvA/vUBKuh7yjHkUuf4dBDEtPDtRtpF+gZ/qX5r1NkQxS PGWRquN4PPqykN1QbikBXawIj4uWhXVe9CsNPDOMbWw5mt+vFtbNgqRt6Kcr6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3V2Ie9/4zA7LfyIN1fhyih3UOriYL94uj2WkMeba03U=; b=bFeYsgeoNISv7uuNzL29QCbhxRlpksBPNme4MmYf+Aj50Ek1SH51NdzhUtKrxEz0fF3Q+J btJDYmIwr8qnWY+7bISmRZkyMvCIWwS+OzSxTjlpiZTkY+jqvC+jJggXTOGBLP/5t86Zdf HJ4WUsUTb6+qe5MjE5JBp3ovtyUPHY00WOikD4IbP2sxE/G2BUVDx9aXduklv2zDSJ91yE wheTNpZEzkcNyGF05ScI82KBceOTjq2DfVfa+M0nfh5FAQLg2HuGoTUDT/b4Js1jyHjKbJ 1I8kE0kKxohQAzoZhpV0SPXQH0QkYbAgi8pKfBfcsQfgfizoZW5dzdlyZEz/uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737042; a=rsa-sha256; cv=none; b=c9wDfKkn3FmWcO7aDtMu4xqkCgSaTTPWinnzrIk0Yvc3lK6X8FS0rW20IWcDseM13KV5cg UJrvR6qGxlvamcOjmoo2Yr7oKt+fNr4ikmHMNnB3uAtvk1XJJwaOPnqDuF1t9I0+V1opWy v1njz3OHYVrz1rlfGhzagPwF28pTHcky8bGkEPJZ2HDj0lM7fCIcXltIDCeP4GKL450z3n 3qXXlMbSgajDOJ/nAw6ZsyJjXL+tW35KKHirU4JDjKx/Isu0lAUJxERnN6fbkPHBWsoh5x TaupBk+VGmWO/XtMbxXH6pzwUOANFumkRkF0/9UMWWdh6L4mAg1eWftSwnUt9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkhcK6RZMzpLL; Tue, 5 Dec 2023 00:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50i1Ot030015; Tue, 5 Dec 2023 00:44:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50i14U030012; Tue, 5 Dec 2023 00:44:01 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:44:01 GMT Message-Id: <202312050044.3B50i14U030012@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6dec97eeaf14 - stable/14 - nullfs: do not allow bypass on copy_file_range() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6dec97eeaf146484da880d996a5bc98b4a7516d8 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6dec97eeaf146484da880d996a5bc98b4a7516d8 commit 6dec97eeaf146484da880d996a5bc98b4a7516d8 Author: Konstantin Belousov AuthorDate: 2023-11-18 09:23:22 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:43:27 +0000 nullfs: do not allow bypass on copy_file_range() (cherry picked from commit 326836a1ebc6ce9b28c8f2bc1d177a444fba8ea6) --- sys/fs/nullfs/null_vnops.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 7db7a352f176..5daa302bedd1 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -1181,5 +1181,6 @@ struct vop_vector null_vnodeops = { .vop_vptofh = null_vptofh, .vop_add_writecount = null_add_writecount, .vop_vput_pair = null_vput_pair, + .vop_copy_file_range = VOP_PANIC, }; VFS_VOP_VECTOR_REGISTER(null_vnodeops); From nobody Tue Dec 5 00:54:53 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Skhrt1Bnzz532yb; Tue, 5 Dec 2023 00:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skhrt0hCxz4fjp; Tue, 5 Dec 2023 00:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ex5qlqbe8WlaiiPFVKDtF0/D0WBloEf2a4G0vNBbIAQ=; b=rOxq6mi7Dw+Q9SRHllKelyWqGwNxL/haqjLIWWbqRZTThCXjnZnB8XPtOD0QA0JEERECm6 Gzv/n9bXIGXB6SIIztQH49eCwHRJWnEY/9SgMlbrVC+LCghXtO72A/gNQ5YHMGc+R+++SY UU5oYmWvp/iUIK+/JL1HLzHFM+gpWrlmO0deyghnPmjSEC3JWDyL8nxqamEz4nTYQ1SAdy zyAG2qLzNZmT8HFksPS3bwNCVA6CBb+Ox/4GqVvlphrqCvs9Bs9CIEUgeMFgZ3vCAodtDJ U3CasAFGPCoRqI5aENuH/bUv56qd5n5SHsdTrnwOebvWNjoGT9o0FupO/OSP/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ex5qlqbe8WlaiiPFVKDtF0/D0WBloEf2a4G0vNBbIAQ=; b=IyvmzWBGZnF6/WjxvmxkXCsZEJXALtd5ZtlzOioWGYqr4NOcbXKTedmK78xRzzaSfXlrVo r5DrHWBQQ6CoIXBk1wPoOjs9MWtPxvnIrTadVXDxPMx66Cq4XCZgviiTt3EfnhQZ6FyctT lY1ClRddzA2J+Y2ESFTjdn2Lj3pFIFsBIB/HgcJd3a2Os2rJLS6Tm6xd3Tnfnv8o5LA9bN xyaX7y+q4DArftBdCnP9Nsw33VYXgmSckIYNW7d8Ea/wLKPL6WLCjDtBR2Gr6bkCMXutcX 6qjxjpN6yDyiUZyKG7YggBkzLmYBIJ2+tPLVBh2cAWq7uSXvyjFbrjxg0vkQJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737694; a=rsa-sha256; cv=none; b=q3NJshpdhWrPt2joSxICbH5v6DZtlKkCbrH58TNhPrIFjJbQ/1c4lk2Ls2XD/dL+ICnKdn jJ8b5vUS+zrc8tkiFBkG8NLs/DpH7IF0C5fdl+l6TJb24/V7ivXbsqOT+IxOIIdiC02Pzn 2eoLKSlqMUsadj1Smd+uZaBUYo3zNhk+vCAiTCz4JRCBoUPoPKreU+Y72rs1eF47O8sd/J yfGo7AifsrmMNrfQMzzzfuxgc5S/gDj/dAzbC46bV6pVOKhSvWjtOJMAN9MS/TxupDfZrz Iqgen5eRawpwwXSX8d+ncRuhtIMhEka9q6C+8h5GYHOyKW3DoN5PP7gbRoVNJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Skhrs6rc3zpB8; Tue, 5 Dec 2023 00:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50sraH046621; Tue, 5 Dec 2023 00:54:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50srut046618; Tue, 5 Dec 2023 00:54:53 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:54:53 GMT Message-Id: <202312050054.3B50srut046618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 55e91944998c - stable/13 - EVFILT_SIGNAL: do not use target process pointer on detach List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 55e91944998c128d74b94b9b48a04ef41ff5e9d0 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=55e91944998c128d74b94b9b48a04ef41ff5e9d0 commit 55e91944998c128d74b94b9b48a04ef41ff5e9d0 Author: Konstantin Belousov AuthorDate: 2023-11-28 12:51:54 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:44:13 +0000 EVFILT_SIGNAL: do not use target process pointer on detach PR: 275286 (cherry picked from commit ed410b78edc53e17b5a3e93ace2adbeb3a734ae9) --- sys/kern/kern_sig.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index f25ff1ed55a6..6b9ea8d110c3 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -4207,9 +4207,7 @@ filt_sigattach(struct knote *kn) static void filt_sigdetach(struct knote *kn) { - struct proc *p = kn->kn_ptr.p_proc; - - knlist_remove(p->p_klist, kn, 0); + knlist_remove(kn->kn_knlist, kn, 0); } /* From nobody Tue Dec 5 00:54:55 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Skhrv2Gscz533M0; Tue, 5 Dec 2023 00:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skhrv1pxgz4fvG; Tue, 5 Dec 2023 00:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NiJpuim5x4kC0NJrzRO5jgcYNV/NAnBbaMlwfDa3M/0=; b=phO8nUyxbFyFge90SbPYYXdQv8HiVXCtFy6ELn6+UN86li1OUVYo8ciAdl9wm8kxONaGRw pPhWohpaUwFjmDlBs/smxQg0mOr2EewVfnFgTJlj12lSCkB4YQiriNAqndoBIFgwz28t/R or4qPszhdOL9OL1ZEnZkwu/khBYtO8s/y1+d9kSBVSeI5fFCh37gBFi/b8zENa95TdvdKf OMC1vZp+JSl9CNv/iUNKomM/dI7wnRlpRUcyGhLKMGP/NKDnQpYT5Uhsae19WzzbQ3wBiJ T5EOlOnMCb3LLv7TyCB9ifbYaopiwY9zkJdTjGWIV5fcJQLdQAoGpLqBwa2msA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NiJpuim5x4kC0NJrzRO5jgcYNV/NAnBbaMlwfDa3M/0=; b=oP0nowHjrjFEYjwMbhKtkxWq2sANwKnU45s1fFJtJcAggEUXIiNHzWkROT3PKxdlqagCIG abnnqCM5I7d2630DyVspCVxyn7BKjPG5/IivFmAIuQ3gCXaVFxdA2NTNppe6putxg+EWLI vj69dxfhhW549YekSsOMW2NAdLVoIjHTUkXPMCyPQITskrlmV6Y9cFhurCR/bFz19SvCDQ 5vMBlraxnMCkgUkGBpyTcsNf+iSHmcM1elF9KcHPD1z/NNYiPAeT7HhYlCeryziswuT0EE WQCqFQw7Suf57M+vWsXAr3as5OBy2cIan10UnEH49PKwfW+egzcdTyZntiaacg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737695; a=rsa-sha256; cv=none; b=V2HYNhTYhzpjmDdkhi7Ezq+FEkmlw6Oz4hPdKDdNyLOtJbKC4p2xBgR/es5at6qyjv9hQR 8boga9fFNescTXcDqyYs82Svbdd6yvGS8hxF2jLnoxweLhS5GlHhzbkm4JZmoqOZcGVEGa PY8xCq46rP7ISGzr5avkFyT+8CO1MS746k50auLhKjIDqhy68LN7BN6igkxp7qQujxKTYl svOIe6lzuTn9dd8LHyG9C9mcfddaKETDO07/CzVzRe+LP/DPs0dsWxPUC++fguH9KhoYzR GWuy1DFtgUMMit0x6RipPze3SSUbAoAAMiyO+I5j2z7tUFMlmG+5dS5nCIvN7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Skhrv0bLtzpSX; Tue, 5 Dec 2023 00:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50stTa046692; Tue, 5 Dec 2023 00:54:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50stgs046689; Tue, 5 Dec 2023 00:54:55 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:54:55 GMT Message-Id: <202312050054.3B50stgs046689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ca50304272a6 - stable/13 - EVFILT_TIMER: intialize stop timer list in type-stable proc init, instead of fork List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ca50304272a673f4bacce824261dfa4999182c1c Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ca50304272a673f4bacce824261dfa4999182c1c commit ca50304272a673f4bacce824261dfa4999182c1c Author: Konstantin Belousov AuthorDate: 2023-11-28 15:42:49 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:44:13 +0000 EVFILT_TIMER: intialize stop timer list in type-stable proc init, instead of fork (cherry picked from commit 171f0832c5b15f2f66d2fe59967348a42814b0c1) --- sys/kern/kern_fork.c | 1 - sys/kern/kern_proc.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index e3148763b460..59ffcce70966 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -619,7 +619,6 @@ do_fork(struct thread *td, struct fork_req *fr, struct proc *p2, struct thread * LIST_INIT(&p2->p_orphans); callout_init_mtx(&p2->p_itcallout, &p2->p_mtx, 0); - TAILQ_INIT(&p2->p_kqtim_stop); /* * This begins the section where we must prevent the parent diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 2a6c9bb977a3..61c389f0b345 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -277,6 +277,7 @@ proc_init(void *mem, int size, int flags) EVENTHANDLER_DIRECT_INVOKE(process_init, p); p->p_stats = pstats_alloc(); p->p_pgrp = NULL; + TAILQ_INIT(&p->p_kqtim_stop); return (0); } From nobody Tue Dec 5 00:54:56 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Skhrw3vGYz532yf; Tue, 5 Dec 2023 00:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skhrw316cz4fsp; Tue, 5 Dec 2023 00:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LweAo2zK31yX5wlQwcNJzCjI0UCJJSu40kMmXBm8JcU=; b=LUKEp2rl4F3fJuT/YbQ4HzfmihHD/gWNuLSHM3R5rtdf7e6CnmQ/l0DIJ9EXonQt8zZaBp y8RxFhLwPn2gewPM+xvB6bhbuPmcFcnDEaW7uU/1v1++ha97RPZTNZTb3se4Mlt7ZrjG9E dtyfHgAEfA7Ssltbt6SWuLikjA5jVJ9q9cH0CabJ73wQ2mKyKo5126paUk6GKSi5lNexgC LFM6+2N+5fovGEXlXG2uUOw2xcrtWVWC/AfHjRApggKQqtrrgD5vxKfmGL/v1Zyum22wWi X+chjuo4x7LuqkaI2BH8j//olthhHz+bGovNJI+mPM+EyHhEblCFX6Im8t5IYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LweAo2zK31yX5wlQwcNJzCjI0UCJJSu40kMmXBm8JcU=; b=IVmxH3Oppjrwqak6DjVrMj+5Sg2OxHpqcoaX01I6hGaJNZMhbtWrvvrZmj8wWFi9ycwnoQ /LFS+5WRgD1togNBfD3yZQDT0oTOlcMUn98Ht74FI2doXS0bx19seeHw9bl4A03iEewTrE GQ4YehqSouLBss2Zs3xYH+jX60YJU/CjQv4mUSvc8kmb+9youYdEobgwwKYQGvvP1uutvd BoucBI/MfNzRERR/BhtNz4hn+npfjnyMWUnszaVTcUelpNvQKJBz2NGOI7okziva+Y50x9 dqD/aPuf23HWx50TOn8M7JrOwS9XAhsIpcBlXigzoLBIqSRXC5uZXLfn+K6lCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737696; a=rsa-sha256; cv=none; b=jwqaUm/fADuKcWTICicU69qMtnnmTawIowEk2VAJSvt1DkwOZ1KeIs9JZSmLZCeB+XM2OV NST/UMM/AWSikbV47J/fYq2Vg4kxBwqFM9q2xkHtbXrge4M5NqAiEnRAFes8LKFu33XgSS r5iaXtdj8r7neMz2RmKjFlRSKNGp1TbIEuz9jtDI3wCf3vjimC7+7C/fWcV43dLNAfQojB U0qBgn7S017M719Nz6pNBXOINUCIAsTyao5Z0SlrgFbyTmRiLASKZC6Lr0NOJUjN9fF/IL bwFDFiBVqhHB32cRZbpXXLC/cQU648F+gmBrS4XxVCvfbw0i4k0b9vZYoRHbAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Skhrw1mtvzpdR; Tue, 5 Dec 2023 00:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50suTe046730; Tue, 5 Dec 2023 00:54:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50suAq046727; Tue, 5 Dec 2023 00:54:56 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:54:56 GMT Message-Id: <202312050054.3B50suAq046727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 62ed7f98a2db - stable/13 - VFS: add VOP_GETLOWVNODE() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 62ed7f98a2db5018a5336398df37f60cb157ec6d Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=62ed7f98a2db5018a5336398df37f60cb157ec6d commit 62ed7f98a2db5018a5336398df37f60cb157ec6d Author: Konstantin Belousov AuthorDate: 2023-11-18 08:55:48 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:44:13 +0000 VFS: add VOP_GETLOWVNODE() (cherry picked from commit 4cbe4c48a7e574ec1bb919351d7a57d252b00b62) --- sys/fs/nullfs/null_vnops.c | 18 ++++++++++++++++++ sys/kern/vfs_default.c | 10 ++++++++++ sys/kern/vnode_if.src | 7 +++++++ 3 files changed, 35 insertions(+) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 9898bf010a21..7db7a352f176 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -1131,6 +1131,23 @@ null_vput_pair(struct vop_vput_pair_args *ap) return (res); } +static int +null_getlowvnode(struct vop_getlowvnode_args *ap) +{ + struct vnode *vp, *vpl; + + vp = ap->a_vp; + if (vn_lock(vp, LK_SHARED) != 0) + return (EBADF); + + vpl = NULLVPTOLOWERVP(vp); + vhold(vpl); + VOP_UNLOCK(vp); + VOP_GETLOWVNODE(vpl, ap->a_vplp, ap->a_flags); + vdrop(vpl); + return (0); +} + /* * Global vfs data structures */ @@ -1143,6 +1160,7 @@ struct vop_vector null_vnodeops = { .vop_bmap = VOP_EOPNOTSUPP, .vop_stat = null_stat, .vop_getattr = null_getattr, + .vop_getlowvnode = null_getlowvnode, .vop_getwritemount = null_getwritemount, .vop_inactive = null_inactive, .vop_need_inactive = null_need_inactive, diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index 966f0c7ab497..c378d05e449f 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -85,6 +85,7 @@ static int vop_stdgetpages_async(struct vop_getpages_async_args *ap); static int vop_stdread_pgcache(struct vop_read_pgcache_args *ap); static int vop_stdstat(struct vop_stat_args *ap); static int vop_stdvput_pair(struct vop_vput_pair_args *ap); +static int vop_stdgetlowvnode(struct vop_getlowvnode_args *ap); /* * This vnode table stores what we want to do if the filesystem doesn't @@ -114,6 +115,7 @@ struct vop_vector default_vnodeops = { .vop_fsync = VOP_NULL, .vop_stat = vop_stdstat, .vop_fdatasync = vop_stdfdatasync, + .vop_getlowvnode = vop_stdgetlowvnode, .vop_getpages = vop_stdgetpages, .vop_getpages_async = vop_stdgetpages_async, .vop_getwritemount = vop_stdgetwritemount, @@ -1463,3 +1465,11 @@ vop_stdvput_pair(struct vop_vput_pair_args *ap) vput(vp); return (0); } + +static int +vop_stdgetlowvnode(struct vop_getlowvnode_args *ap) +{ + vref(ap->a_vp); + *ap->a_vplp = ap->a_vp; + return (0); +} diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src index 8f9a8503f22a..dd4a3a738089 100644 --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -472,6 +472,13 @@ vop_getwritemount { OUT struct mount **mpp; }; +%% getwritevnode vp = = = + +vop_getlowvnode { + IN struct vnode *vp; + OUT struct vnode **vplp; + IN int flags; +}; %% print vp - - - From nobody Tue Dec 5 00:54:57 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Skhrx4V3Hz533GD; Tue, 5 Dec 2023 00:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skhrx3jyVz4fr6; Tue, 5 Dec 2023 00:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ufdyKhAUDXvQNVjC/1ummreqrILzKuNC2COtazkR9Pg=; b=w0TRjMPrcvZTbTGiIYx8XJ5Ya13P0eb3EkyA8wTgKgks2fm9xmj7/we3cZTGMY7xWTKjkp 8ntBkec4wImUq4eg9XdrkPEI/ytuhJUc7TPJALSTe16VZ9F2WKxHIMj8AUqG+eoV8PEkxI EpCPuWGJyXHCM+AT1JjFv7QRgdP5BQ8dA62q8pA2feUVpOiJDlS8Oov2TXmprTqVbZzKLc uikwzOxbwPT46XoDatBRwyXH720pM/iEEmEMuWY9FHub31e22izhNels2OsXmY/ZV0aRva 7H42KHxnR3lZmBgM3wGKozBHOASF4bP4RDAEMUH3/OGT0i7K12XpnKC82ftzrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ufdyKhAUDXvQNVjC/1ummreqrILzKuNC2COtazkR9Pg=; b=Ltt9DU7c+rUGma1iziMtKWJ/fSgAISbZZeR6SRCYI/8bnu1j9GUuwD4Uq5080LptsqcZhu rn1hT5uoo7kl3yH/g8yZL+Qk9aZKvuywVNu/fje+KuCcDFpc2urkgXf7yo5rGt/YtIAn9w JqveJWQN9dmeq0IJ5Eml5C5h5NS5t65UYUz6LOcYzBpnOAP75FrWE6SNgJcr3eqI2TO1p/ gq25gwrppNJnV3xL3TsZBD/JzyBT7uUoz5wPZ79TLM1Kf4PTB8sv/Xi0sD3xsBG0rNDVOo Wl6RcPUVPCJPA0TrZFlO3AfnINu7s9YFT7/92nS6E7zuGLJvyyR92SHaVpLilA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737697; a=rsa-sha256; cv=none; b=Q5SrLd3j5WWnRYrYXeRemUTVMfevhDrEHRjjLKVe4VOnlwTCYWVf42/94EXofj74c2UCVX TsBrlmjW0TXDEojRr9tHs/Rwd54P/Cb7L3bydX60EDgxd+ZPCeyqEyGrbci/hDK8UwPf/f qiK47sr6l1wDRVkI3jW3oHEFmx9dX9bTQqlQesY5sGXHHL/MdofDc1XkxfhOrI2jHpo1TL jMdpqRxm4KO4alFN26k12dNWGm9jabeFpPB36VW3AIi5ScFFwzcQ2Si+caFtg0/yfemHO4 qLIUTl3lojvwkrJfGGy93PQiPUW0l3PHQkncKdouPEQQnbWqB3DF9RNx8KdoPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Skhrx2pm2zpdS; Tue, 5 Dec 2023 00:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50svOb046787; Tue, 5 Dec 2023 00:54:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50sv8u046785; Tue, 5 Dec 2023 00:54:57 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:54:57 GMT Message-Id: <202312050054.3B50sv8u046785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 045d603aa158 - stable/13 - vn_copy_file_range(): find write vnodes on which to call the VOP List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 045d603aa1580752d5c7a9a8c6021e4dddd7d8b2 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=045d603aa1580752d5c7a9a8c6021e4dddd7d8b2 commit 045d603aa1580752d5c7a9a8c6021e4dddd7d8b2 Author: Konstantin Belousov AuthorDate: 2023-11-18 08:57:44 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:44:13 +0000 vn_copy_file_range(): find write vnodes on which to call the VOP (cherry picked from commit a9bc8637690ce29496650a41d3c25e225ed22e3d) --- sys/kern/vfs_vnops.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 48737be64beb..e37518ebaaa1 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3027,10 +3027,12 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, struct ucred *outcred, struct thread *fsize_td) { struct mount *inmp, *outmp; + struct vnode *invpl, *outvpl; int error; size_t len; uint64_t uval; + invpl = outvpl = NULL; len = *lenp; *lenp = 0; /* For error returns. */ error = 0; @@ -3056,17 +3058,22 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, if (len == 0) goto out; - inmp = invp->v_mount; - outmp = outvp->v_mount; - if (inmp == NULL || outmp == NULL) { - error = EBADF; + error = VOP_GETLOWVNODE(invp, &invpl, FREAD); + if (error != 0) goto out; - } + error = VOP_GETLOWVNODE(outvp, &outvpl, FWRITE); + if (error != 0) + goto out1; + + inmp = invpl->v_mount; + outmp = outvpl->v_mount; + if (inmp == NULL || outmp == NULL) + goto out2; for (;;) { error = vfs_busy(inmp, 0); if (error != 0) - goto out; + goto out2; if (inmp == outmp) break; error = vfs_busy(outmp, MBF_NOWAIT); @@ -3077,7 +3084,7 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, vfs_unbusy(outmp); continue; } - goto out; + goto out2; } break; } @@ -3089,14 +3096,20 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, */ *lenp = len; if (inmp == outmp) - error = VOP_COPY_FILE_RANGE(invp, inoffp, outvp, outoffp, + error = VOP_COPY_FILE_RANGE(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); else - error = vn_generic_copy_file_range(invp, inoffp, outvp, + error = vn_generic_copy_file_range(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); vfs_unbusy(outmp); if (inmp != outmp) vfs_unbusy(inmp); +out2: + if (outvpl != NULL) + vrele(outvpl); +out1: + if (invpl != NULL) + vrele(invpl); out: return (error); } From nobody Tue Dec 5 00:54:58 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Skhry5Hf4z533MB; Tue, 5 Dec 2023 00:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skhry4n2mz4g6N; Tue, 5 Dec 2023 00:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5BDOnJjWqWBvwzWkSXIMmsTRmtLN35CAiH8bsDT/AOw=; b=SisVe5SAbw6NxOF3EFXoo5k0edvLTkWjykeO9CJt9wHyuDL84PE7WKZrfVVLvFtPBJ3YNG PW0fQys5NktymRn4rsdvX7J6YRXRyZHZBIH/n9B+D6WOm2ucCsvq+hAzeF5PipiFBlDzOD jjWD7Nw2arwYlcGlTnsBsNql/W30otfhf1wGZdM2FiApJCzFyy2dYHKX2JB90mU52pULRI epdqdm64WwfflFiIydsrQNiwDPDNMGSNR16em82ic27SiV4W4fGjyTx89QwYaKI5YH+nsa RGxyjN96q3040sftEHzpMch/1akDD0lRVUljmm2zWz75MlJg20PSNYwowWph6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5BDOnJjWqWBvwzWkSXIMmsTRmtLN35CAiH8bsDT/AOw=; b=vOmO4rFNbZYGj2OD8bYZfIlIqy3UOBiDipx4w1m/Jt1Gg9lz/0u3HD7WQDtjWPIF9uuz7Z B1YKA1fTAS56WyKeMnttDDR0ttmg0lEXiQcVMmanNMOWQBZ874Y/XO2PZIPWg9L2qv/8WQ 6Af7DFDV30ovpLlgMrdH8248FbIi4RNHsvkZF2gaeaxPsVuOkjaVs7es2TP3IsqoIWMXJR +FRTpX4Je6W21D8/El9V6D9qPJ8QULMkypmh7owp+CG7BFSI/dHM0+KeCYkSlufoWpIucY PgI9V8/QhJefydgTLc42U4EL64gpv4WtQAE8OxJ46j5EI9SouXqZxrhGSCb1vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737698; a=rsa-sha256; cv=none; b=Sgx/7+Ebl2cpgpmBFrbWWZ1iAcU8dXyuTOgkTrAdE7LYgHINqVSxku4P+5li8LeWrbSXVp 5eh/7sO8XJijVix5/PzYReU1b/RxG3yUhTIFBkZzDiUMx1162ILgtlCns+J6aRAox2gXUI k7MiqruTsR6D9xu71JeCeAn54NS1qbQ/pCrWqrnlaQLQvyireRRjt+lYqP48fd+3D6w9im Z9Ud/7pGT+BqKTZ/N8udwv0Veqd0HXbMIhThNEsmTfpdHwiYqbIfxd3OxDwzMLbYfP1TSW rd2cFt7OcvTKyCV+0gWjADQQ7UXFBaMKHAB7/pEU63S3VH5GgdzjBtOnXCJaBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Skhry3tQPzpQB; Tue, 5 Dec 2023 00:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50swAm046846; Tue, 5 Dec 2023 00:54:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50swn5046843; Tue, 5 Dec 2023 00:54:58 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:54:58 GMT Message-Id: <202312050054.3B50swn5046843@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6c23d1fbeaa4 - stable/13 - vn_copy_file_range(): provide ENOSYS fallback to vn_generic_copy_file_range() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6c23d1fbeaa44f1cc4695d0a53f31b3734446730 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6c23d1fbeaa44f1cc4695d0a53f31b3734446730 commit 6c23d1fbeaa44f1cc4695d0a53f31b3734446730 Author: Konstantin Belousov AuthorDate: 2023-11-18 08:59:19 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:44:13 +0000 vn_copy_file_range(): provide ENOSYS fallback to vn_generic_copy_file_range() (cherry picked from commit c5405d1c850765d04f74067ebb71f57e9a26b8ea) --- sys/fs/fuse/fuse_vnops.c | 7 ++----- sys/fs/nfsclient/nfs_clvnops.c | 4 +--- sys/kern/vfs_vnops.c | 2 ++ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 6871461d26f1..6de23cf71cf3 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -862,6 +862,7 @@ fuse_vnop_copy_file_range(struct vop_copy_file_range_args *ap) pid_t pid; int err; + err = ENOSYS; if (mp == NULL || mp != vnode_mount(outvp)) goto fallback; @@ -944,13 +945,9 @@ unlock: VOP_UNLOCK(invp); VOP_UNLOCK(outvp); - if (err == ENOSYS) { + if (err == ENOSYS) fsess_set_notimpl(mp, FUSE_COPY_FILE_RANGE); fallback: - err = vn_generic_copy_file_range(ap->a_invp, ap->a_inoffp, - ap->a_outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, - ap->a_incred, ap->a_outcred, ap->a_fsizetd); - } /* * No need to call vn_rlimit_fsizex_res before return, since the uio is diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 3e9daad09706..02449e64e508 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3813,9 +3813,7 @@ nfs_copy_file_range(struct vop_copy_file_range_args *ap) /* NFSv4.2 Copy is not permitted for infile == outfile. */ if (invp == outvp) { generic_copy: - return (vn_generic_copy_file_range(invp, ap->a_inoffp, - outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, - ap->a_incred, ap->a_outcred, ap->a_fsizetd)); + return (ENOSYS); } /* Lock both vnodes, avoiding risk of deadlock. */ diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index e37518ebaaa1..e720ef151c9e 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3099,6 +3099,8 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, error = VOP_COPY_FILE_RANGE(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); else + error = ENOSYS; + if (error == ENOSYS) error = vn_generic_copy_file_range(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); vfs_unbusy(outmp); From nobody Tue Dec 5 00:54:59 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Skhs01J76z533GK; Tue, 5 Dec 2023 00:55:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skhrz5nwkz4fp2; Tue, 5 Dec 2023 00:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OBhco8qbIZV2qyubI1uBUBDFE2YsecAfFyWgAq08Rjs=; b=RVFz8wN2Tti9M1VVcx83yv07M4M6h3IKCNs681agMK7RMIOh1LuXyF4vgXk3nEVXRg/RXU 3RbXOp2GboxGaJqVT7/TjybVn4gozX49Ds1A34dnxdhCTmBfVjk42cSYe5/f++cm8b/Fc/ dALnZloCWp89s1/Ojicf7t+mWlhetIZjlrW4e25FsEwWKoDWHRqsAveWC3dLeitn4yBLt9 9RhQssa/rq+YtbF/kko+jVtgCoHZDt3+VJnaLEdFU6FN8bkXOU+mABwNvdia3HuLjj7bV8 +t7v69Y2cHQSnNyVmjln0RbYpIwoA4P2RoM+kfsxg/1zqOv6tUuwFR5Y15z43A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OBhco8qbIZV2qyubI1uBUBDFE2YsecAfFyWgAq08Rjs=; b=eO65FuzXGfxb8owJP4oyIqDI0abG5cDxD7B3UYVIZpZRgmvfbbWQlK8HZ83U2gHhDgqP1E MFV1SUshc9N5Km4DQTwjgpkmwItrgjAgDunb/+4yZMbhc0C/s8XWJG+s5DDxJLPRO+TM2F XZ9I0aUM76Bsn9MNoGyFWgok9549UbLg44TfxICsasgvgeTOG4n0HAgNkG8NKjiPjyCDRH KHC3SGjw6hK9O5cX8VjCsu0+lwKid6W8RoVlDRF9BXUVd5LweShlt6VYZpq5dDBoJcdCo7 DlMt+5Xh+V/DKY+gB8X+7MdatQ5mBp+oBTFaRR291vWXG3wNwUPWLgihmWnrYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737699; a=rsa-sha256; cv=none; b=Q8E5ADbfRoHtuil3nStsUZPzhyBnXb/5/X0elYbg31fn224+5be/2ASoXFVhYzjRgS78Lv hOV15AqWsP4eRPNZ2D3a96FCZXMRYGl8s4Rc1S/X9BYKWFDX3VfxlPwCslcvnycRik7NjO AFCL/3/qW/MgVEmrmsNdYa4WdNe5pAtcoBWOgUKgYBV0yCiwCac0/UepDNmvRbi6QD0HAN S/v78cISivdYKyot2pRkTv+CRPs7iDpdH85Z/TU6c8xfpmVuwqUtJp3jE1+Rw1OwfAqUZG MQdT+ULms4/2TgEF8IYmBjo+uN7VPqZbZrFrkPf0456EuVnPNC93zW8z+lwogA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Skhrz4v0kzp0b; Tue, 5 Dec 2023 00:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B50sxLI046895; Tue, 5 Dec 2023 00:54:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50sxmR046892; Tue, 5 Dec 2023 00:54:59 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:54:59 GMT Message-Id: <202312050054.3B50sxmR046892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6c5e70a22c41 - stable/13 - nullfs: do not allow bypass on copy_file_range() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6c5e70a22c41bf3ebe3e9a68f1c9ac29775809fb Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6c5e70a22c41bf3ebe3e9a68f1c9ac29775809fb commit 6c5e70a22c41bf3ebe3e9a68f1c9ac29775809fb Author: Konstantin Belousov AuthorDate: 2023-11-18 09:23:22 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:44:13 +0000 nullfs: do not allow bypass on copy_file_range() (cherry picked from commit 326836a1ebc6ce9b28c8f2bc1d177a444fba8ea6) --- sys/fs/nullfs/null_vnops.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 7db7a352f176..5daa302bedd1 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -1181,5 +1181,6 @@ struct vop_vector null_vnodeops = { .vop_vptofh = null_vptofh, .vop_add_writecount = null_add_writecount, .vop_vput_pair = null_vput_pair, + .vop_copy_file_range = VOP_PANIC, }; VFS_VOP_VECTOR_REGISTER(null_vnodeops); From nobody Tue Dec 5 01:47:25 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Skk1T3kktz535yR; Tue, 5 Dec 2023 01:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skk1T38ktz3Hlp; Tue, 5 Dec 2023 01:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701740845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=henwYUPudXg/5ZPSepqdcP67wYC4pIilUnLCNxCFY9g=; b=LoY1ZZodOsrLKXtS2zPEOWnhSx+/5vYJnaXVHkFE3D/ZVK68BtOJwhErQHyqm/Va4hiBB4 lvTTQWNyAR6exLzzW7QW69ujOge9OqEWQy48b8+T4NFqWDvhcAD29PvRyE25sUYZubwlqg IN+OFXFf7poV/UunxH+VHkaVEh5zziABywxwT/aAEOtPNSMFRks8vtuGE2VSoBj6Xa/Q0j 8qjkfAM7Ac2VcMAQiZxCiMv/czRE1ayleMf6JMaBGoEIiEkU8YvjiaFnjd1zeI8YhmrXzw S35LItmdrWhwNMlHYIz4B4ZBMBvqrvI/fUs0TO2u/a2KbtkdN5yoBgp/YszwYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701740845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=henwYUPudXg/5ZPSepqdcP67wYC4pIilUnLCNxCFY9g=; b=Ltm96xnzJqa0MNYlLfgENUC4DmOT6CfL8vl+/wxcpwxon4sJFh+VSOHM5Zj180D/ZY2tVZ HllqCBQie+LUIjVKwqSzGJM35Jczy6/FK4tEudUuzW+qAq4Cu0zVVlIqIcElXWx6Q1uDgR xPU0xQRuONBXlzptDWgwOXQt6kwOHNSSF8ljJGhwbKXtPZ+8mT1nohFNL1z6RJKytwBwo1 ZMPRp/wWmJCH5WlbW/Ve4uut+3T/sVvD3BIGNBqtbeW6cqnTSdQshQc8oXjZO8h44mkJDr zjHi++5IdifZ9Yb2S92RihMWVYPhM42z/5Vjuf036WbdXpC5n2PKm4stVMQyHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701740845; a=rsa-sha256; cv=none; b=PNca+FCiCfE++j3rPzZyLPJS3l5QoyXpH2tmpLeKNhqU92FmcDqE//Pj0r9x42M0HCm85f Ic7sLO/guudXrvZ0nQJh7NLNZq4MC/bEvOXqcn/72dyLn5cGVrtI6/jsxoADb7HzSgZWXj Voje8/4Gry4QkcLWkhaEGzjvCm/AuVYW8MyLbSqpZNrrJnbq3kvYCChN2EErbeL7KsX3SN jY35JHqXa9Hi/R4AdWdFiVTIvih/9YcsVrtNkohHYNHusv8yPdGRYIpA22uTSaUowgiHzg 73DiPMosiMMknD1Un7CBZNN3E8W6HK8tlHmJUm+J4C8yHVS2di65wVTM30at2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Skk1T2668zqPt; Tue, 5 Dec 2023 01:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B51lP8t031364; Tue, 5 Dec 2023 01:47:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B51lPrD031361; Tue, 5 Dec 2023 01:47:25 GMT (envelope-from git) Date: Tue, 5 Dec 2023 01:47:25 GMT Message-Id: <202312050147.3B51lPrD031361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Maxim Sobolev Subject: git: 020432848ee5 - stable/14 - vmstat: fix column names broken in c168508655720 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sobomax X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 020432848ee52adf37e5b073b1bdadb84be4dddb Auto-Submitted: auto-generated The branch stable/14 has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=020432848ee52adf37e5b073b1bdadb84be4dddb commit 020432848ee52adf37e5b073b1bdadb84be4dddb Author: Maxim Sobolev AuthorDate: 2023-12-05 01:39:21 +0000 Commit: Maxim Sobolev CommitDate: 2023-12-05 01:46:57 +0000 vmstat: fix column names broken in c168508655720 Loss of the trailing space in the multi-line format string has resulted in column name being emitted as "FAILSLEEP", instead of two columns "FAIL" and "SLEEP". (cherry picked from commit 62d47a4db4579315d7b89002d7de696b44ae1415) --- 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 a03c28f19d00..fd161a3f93ee 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1488,7 +1488,7 @@ domemstat_zone(void) } } xo_open_container("memory-zone-statistics"); - xo_emit("{T:/%-20s} {T:/%6s} {T:/%6s} {T:/%8s} {T:/%8s} {T:/%8s} {T:/%8s}" + xo_emit("{T:/%-20s} {T:/%6s} {T:/%6s} {T:/%8s} {T:/%8s} {T:/%8s} {T:/%8s} " "{T:/%4s} {T:/%4s}\n", "ITEM", "SIZE", "LIMIT", "USED", "FREE", "REQ", "FAIL", "SLEEP", "XDOMAIN"); xo_open_list("zone"); From nobody Tue Dec 5 01:48:38 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Skk2t73BSz5368w; Tue, 5 Dec 2023 01:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skk2t6Vz8z3JDj; Tue, 5 Dec 2023 01:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701740918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8UOx8taW1PZIxLYeVZRlYbCjDXNrk66kNzh7ZXiQb9o=; b=WWEENVDp6Exgki+vTyDvS8TkCHxR5yBHxuuIGHi7pxRHUjNLc1kO0CdJodiumxPTvGO5ZY hBDhxQ/7RSHK/WTL7YADAG1tTfJV1kk6RTbKwTY9qu6JrsVzI6gxYTW8az9eeCk//EYJXQ hX6wCXYhwt1TuyW0r1sVYKglcpsBKrWNQcg6zbqDRnb6UfP0lMSgResDq8oXdDpbv4agNo ieqwXegBsJuADCC48zqEIjH4JkEBJoWL+baQU2ZjfcGEj7d6EyLCzx4HN7hu2qlR1Bvh/5 YHyZv1MwDlfSdQ4FSZLfFZEvxKskbo7+I5NlQlpEBnxi/OmaYuydxfNblurtRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701740918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8UOx8taW1PZIxLYeVZRlYbCjDXNrk66kNzh7ZXiQb9o=; b=u3AOWuQrVKUi5LKp9m38lfSFkzBdNPpyM4PS8pZ+Gg429tojkjlskucegF3raxHbY5xT6N kX4wcInB5mg9xwkI1Zxei1RDS8I/d8S/xcMQEo16WMmlK+Dz/UIu3pA0nIwY16dsyvY21p HM7KjHypfPtv6HQB9hJ5AxwHjkuyVg8CF1IeB6DIbxYzpMfhXqsx10EXTZK3CCRBcJrx1z 6ZEITdN/mROv6ocsv/17wuzxAiO5gugTX/kBVpCJnHAy1Kmw0Bvsr3gW5FrNq+lShrj0IT Uv1XN/b4EUbS/ojQtzaaOSMtDwJo9hioYjAk+p++wKIY7VoVKUj2HniOEPiNWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701740918; a=rsa-sha256; cv=none; b=b/B4YaT8vMiGIc7Z/YPMW7kSA0K5TWafQPvATz/+rDra+RkqJHzBsVqG2v7a5gqgQUHZPL DkNhaC0oGBLdVbrBywxS1BiBYE/YivfAY8PBXuUp5d3Xi5hF6fbXdtPwdLXqFncrxZr51b Axd5DBEMwxT/Oo+aHL7U7EzOCHuyBIEPSX8gBYrLgKPY/UkJVNDJVG51Afy6KlpsBFEx8O dJm7uMeyidhkfCM1meWvDgKvoOwUgirFs6btStCMllo9MieRlQ3WWD3jAo7O0k4SSiZuNj yJMXJ+zp3WdrWWFn06p+isLGjf+gtpPq6tJ6ggsXc1SFLVFbT/R46Y45ndAjBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Skk2t5Yznzqt7; Tue, 5 Dec 2023 01:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B51mc2w031675; Tue, 5 Dec 2023 01:48:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B51mc6s031672; Tue, 5 Dec 2023 01:48:38 GMT (envelope-from git) Date: Tue, 5 Dec 2023 01:48:38 GMT Message-Id: <202312050148.3B51mc6s031672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Maxim Sobolev Subject: git: 4d4b3a342677 - stable/13 - vmstat: fix column names broken in c168508655720 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sobomax X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4d4b3a34267787a03f03125fc01532ff2f8539d1 Auto-Submitted: auto-generated The branch stable/13 has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=4d4b3a34267787a03f03125fc01532ff2f8539d1 commit 4d4b3a34267787a03f03125fc01532ff2f8539d1 Author: Maxim Sobolev AuthorDate: 2023-12-05 01:39:21 +0000 Commit: Maxim Sobolev CommitDate: 2023-12-05 01:48:21 +0000 vmstat: fix column names broken in c168508655720 Loss of the trailing space in the multi-line format string has resulted in column name being emitted as "FAILSLEEP", instead of two columns "FAIL" and "SLEEP". (cherry picked from commit 62d47a4db4579315d7b89002d7de696b44ae1415) --- 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 50a31dc287f7..bb465eda4966 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1488,7 +1488,7 @@ domemstat_zone(void) } } xo_open_container("memory-zone-statistics"); - xo_emit("{T:/%-20s} {T:/%6s} {T:/%6s} {T:/%8s} {T:/%8s} {T:/%8s} {T:/%8s}" + xo_emit("{T:/%-20s} {T:/%6s} {T:/%6s} {T:/%8s} {T:/%8s} {T:/%8s} {T:/%8s} " "{T:/%4s} {T:/%4s}\n", "ITEM", "SIZE", "LIMIT", "USED", "FREE", "REQ", "FAIL", "SLEEP", "XDOMAIN"); xo_open_list("zone"); From nobody Tue Dec 5 16:18:01 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl5L14jJJz539Zl; Tue, 5 Dec 2023 16:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl5L14CjQz3L7p; Tue, 5 Dec 2023 16:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701793081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J+nAJOaviU8TTRXoiFPhNtEiU8aWdAIJFoohyjVw5Hc=; b=aiZxcecuGKY927byC+2CBu/vtyRzCImtX6Mz46iQy50kvtIvzQm3SLf1hBQsXaOgiaor1/ LmxPUmlsgROlo1qxkcj576mvdfOX8Mzr8aCLwlkDfISxYJ0f/ZxoI/MdYuC4oXwmiyI8Fa jsT52dvtrKeCprGmlBFVUPQtaHHrl95W5BXwpRc8t1IoJQKh9SGPopPnVvqWbCX9h0zQxd 9IMR8atMokeNKGKH0Ddyso/x0Nxd+206yySbgB80iXbYbKffUUQh9YkXNIXhA7s4YdkOpb Ch2V0FaVSon4z9mFdcI1XtxbZVDb40E25OqYWoq3Z1uR+HWOMiI/7Wew7P51iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701793081; a=rsa-sha256; cv=none; b=PTXZYsUVksSJ3ZPcwbRWcVuiMcmpKERX6U/fJ0pWr5uhixjv3eNxKEvJPxC4iGRKxXT/pq h+I+EEpG1AZcL7Fhl/wIKen0P4hYvq8+haT/CmjJSeS5IjJE7OfoppNONbv/PY8GE5zWLr icLNbRbvN444Hc8qnKscwDhsx3N8bx6ct+lYAHnFaHe161JVaWirhiHRcftkwo81eM+iV4 N+Gf8S44AM6C7pwt93mdeZHQyU7LlywIX8chJd9f9TPH/fQcLhHxfrRrfDGdiZFcI/+6Vz OLD6/jnFCZrDSUOXWMkPA4i4cmivBDHuNAckYfwXG1NlQKvyTyi85K09EWxdcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701793081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J+nAJOaviU8TTRXoiFPhNtEiU8aWdAIJFoohyjVw5Hc=; b=KPsVaDHIQGO5P3eTT39dXUD2V8ogQx0kVp4exWJlyjqgajOm24arMSstZCOZ3MGvlYMNHr wATVmJzdOzSIQgU0LkuBiHCeAW9mDrIdKpksvmjHPox47dOhAGFcahe+83wyjwj9Sowwsh ettnHwn2kXCwwLGS/g4yzK09YsccG1C+CZISQTu0nYuP8gDJ2o2SxkDavmq0Z2ZILq9bLi om+4R1PQVuP0hec8baFXgUq6qycirv8/jLaN+uGHJ+pOxlfwrMuNskXmCyD/aMkgtOT65A pdDeVzKKUpo1Th0Jjb7QR3PIxx7zKy9qAB6F+VCbRakp8bYvmGgDeKHuwPU4Ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl5L13Gzvz1Xv; Tue, 5 Dec 2023 16:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5GI1sT089587; Tue, 5 Dec 2023 16:18:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5GI1aR089584; Tue, 5 Dec 2023 16:18:01 GMT (envelope-from git) Date: Tue, 5 Dec 2023 16:18:01 GMT Message-Id: <202312051618.3B5GI1aR089584@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 9b8515f71bd4 - stable/14 - ifconfig: add -D option to print driver name for interface List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9b8515f71bd413520ba7d8e2b92a60deb2c7a528 Auto-Submitted: auto-generated The branch stable/14 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=9b8515f71bd413520ba7d8e2b92a60deb2c7a528 commit 9b8515f71bd413520ba7d8e2b92a60deb2c7a528 Author: Mike Karels AuthorDate: 2023-11-28 19:47:37 +0000 Commit: Mike Karels CommitDate: 2023-12-05 16:17:47 +0000 ifconfig: add -D option to print driver name for interface Add -D option to add the drivername and unit number to ifconfig output for normal display, including -a. Use ifconfig_get_orig_name() from libifconfig to fetch the name. Note that this is the original name for many drivers, but not for some exceptions like epair (which appends 'a' or 'b' to the unit number). epair interface pairs both display as "epair0", etc. Make -v imply -D; might as well be fully verbose. Reviewed by: zlei, kp Differential Revision: https://reviews.freebsd.org/D42721 (cherry picked from commit cd201c090858e5cfae3be005453ec634c1fca36a) --- sbin/ifconfig/ifconfig.8 | 10 ++++++++-- sbin/ifconfig/ifconfig.c | 5 ++++- sbin/ifconfig/ifconfig.h | 1 + sbin/ifconfig/ifconfig_netlink.c | 17 +++++++++++++++++ 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 3b1774606b21..a538981608cd 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -36,7 +36,7 @@ .Sh SYNOPSIS .Nm .Op Fl j Ar jail -.Op Fl kLmn +.Op Fl DkLmn .Op Fl f Ar type Ns Cm \&: Ns Ar format .Ar interface .Op Cm create @@ -55,7 +55,7 @@ .Nm .Op Fl j Ar jail .Fl a -.Op Fl dkLmuv +.Op Fl dDkLmuv .Op Fl f Ar type Ns Cm \&: Ns Ar format .Op Fl G Ar groupname .Op Fl g Ar groupname @@ -104,6 +104,12 @@ with no additional information. Use of this flag is mutually exclusive with all other flags and commands. .It Fl d Display only the interfaces that are down. +.It Fl D +Include the driver name and unit number of the interface in the output. +This is normally the original name of the interface, +even if it has been renamed; it may differ from the original name +in some cases, such as +.Xr epair 4 . .It Fl f Xo .Ar type Ns Cm \&: Ns Ar format Ns .Op Cm \&, Ns Ar type Ns Cm \&: Ns Ar format Ar ... diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 1a7823fedd67..7a78e9a934f7 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -465,7 +465,7 @@ args_parse(struct ifconfig_args *args, int argc, char *argv[]) int c; /* Parse leading line options */ - strlcpy(options, "G:adf:j:klmnuv", sizeof(options)); + strlcpy(options, "G:adDf:j:klmnuv", sizeof(options)); for (p = opts; p != NULL; p = p->next) strlcat(options, p->opt, sizeof(options)); while ((c = getopt(argc, argv, options)) != -1) { @@ -476,6 +476,9 @@ args_parse(struct ifconfig_args *args, int argc, char *argv[]) case 'd': /* restrict scan to "down" interfaces */ args->downonly = true; break; + case 'D': /* Print driver name */ + args->drivername = true; + break; case 'f': if (optarg == NULL) usage(); diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h index 80e6b9bc2289..0ae317aca409 100644 --- a/sbin/ifconfig/ifconfig.h +++ b/sbin/ifconfig/ifconfig.h @@ -230,6 +230,7 @@ struct ifconfig_args { bool supmedia; /* Supported media */ bool printkeys; /* Print security keys */ bool allfamilies; /* Print all families */ + bool drivername; /* Print driver name */ int verbose; /* verbosity level */ int argc; char **argv; diff --git a/sbin/ifconfig/ifconfig_netlink.c b/sbin/ifconfig/ifconfig_netlink.c index 7be340e18ab5..bb0d242f21f6 100644 --- a/sbin/ifconfig/ifconfig_netlink.c +++ b/sbin/ifconfig/ifconfig_netlink.c @@ -369,6 +369,7 @@ status_nl(if_ctx *ctx, struct iface *iface) { if_link_t *link = &iface->link; struct ifconfig_args *args = ctx->args; + char *drivername = NULL; printf("%s: ", link->ifla_ifname); @@ -413,6 +414,22 @@ status_nl(if_ctx *ctx, struct iface *iface) args->afp->af_other_status(ctx); print_ifstatus(ctx); + if (args->drivername || args->verbose) { + if (ifconfig_get_orig_name(lifh, link->ifla_ifname, + &drivername) != 0) { + if (ifconfig_err_errtype(lifh) == OTHER) + fprintf(stderr, "get original name: %s\n", + strerror(ifconfig_err_errno(lifh))); + else + fprintf(stderr, + "get original name: error type %d\n", + ifconfig_err_errtype(lifh)); + exit_code = 1; + } + if (drivername != NULL) + printf("\tdrivername: %s\n", drivername); + free(drivername); + } if (args->verbose > 0) sfp_status(ctx); } From nobody Tue Dec 5 18:22:03 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8573RM4z53HqN; Tue, 5 Dec 2023 18:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8572wlHz3XT4; Tue, 5 Dec 2023 18:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ebgot7seZQKahHfOGha6AIcc8304Da2PKgbWJ+dhCPo=; b=VorqWLXFG8H3esC7FVcA9vHUPwzfn9D4vTyGxdsPiyIBKJnqBG3jK5Az+k1n1C8BE+Z8n9 38f7WaNBdXfSHpH7yHfLS5LVljmZYROqAUmI3QglwA/UGQ485mxcTBtlbc95raaTfceEUX XmXvGpkxDcLPyPfhvljU7zduz62BtvBBloa/GOaGQI+qu3JoWe5gZUfDI0jmP51YoT97vD g9penrp0Q/vAZkh77IDIF902jUNqyy+VfzUIi0mocYpOHMaNr+A5TgvMtWjNzYUgWLCHHa kb/wJXOPJYZTzD9v14/5Y9TmjLe3BgKxl4v4wtSNU8GDuNMgVv76xLvg1Fd9ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800523; a=rsa-sha256; cv=none; b=EwzKjRJzeil7Eu+HvZn7YGAagChEnR66e/7oXbpMMgdTKojha63LKum7IZWxnJMovxWPdd O7RQPB/fj4ccJvJjXRtyPV6hHBIfN9jwq2XabbMMKlcfzA9JedY6/5KbMz9oGapS4dWlwY FUtLpMpUFYqaV2i+7nh2ZOlt81OpCjMDdBIM2+bdqMXjKOnuWwLhSo4kH1RqjQr6nRFbAW CEVJvLVh/j7jVI3FmIb6CnZWDLtCxpT0NEsjKPPdP2Cj0TjU+gsoiLcbStrRJb69NREXeU wAsDYg3F1T6nVCTCiCP3/9LYAqPoERPG80XxlpST7FZDIzTSRgaib+SmNGFF6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ebgot7seZQKahHfOGha6AIcc8304Da2PKgbWJ+dhCPo=; b=KNrpwX/eBOE7b8yoXYxptrFOuJeowTf39EKm8kZZs9T7w8eBSslCzVxOdzGsXtraAVmfQN D7T1sMuGC6ILZIu3QKRVy7EbfXc+T5+qm3cZfUsnhzqixlu+KTkM6wGLtk5hjnuAXsfpLd AzKAmrMt69VMrMFtbWTltjCPGfWjYe75N7w9ZNfNZ7niejp9EWCpPsHcAgKnIZheC6+S+o sf9uyhGpUsrUF+sSWzrf1VO91iFtg3DhwQEMrl3MayFCggLHxeTWwzkmyU//1dFsLYBY42 ZCXderm56a485EwdMzqeYZQkWCvYVXDhIKVA2dPmA22iZpnewdkRDyX9Q9wu+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 4Sl85720nWz5Y7; Tue, 5 Dec 2023 18:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IM3al003803; Tue, 5 Dec 2023 18:22:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IM32m003800; Tue, 5 Dec 2023 18:22:03 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:22:03 GMT Message-Id: <202312051822.3B5IM32m003800@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6d94fc2b0db9 - releng/13.2 - compiler-rt: avoid segfaults when re-exec'ing with ASLR List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 6d94fc2b0db9c2f0b0d5b116513d745122bc37c4 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6d94fc2b0db9c2f0b0d5b116513d745122bc37c4 commit 6d94fc2b0db9c2f0b0d5b116513d745122bc37c4 Author: Dimitry Andric AuthorDate: 2023-11-22 18:23:06 +0000 Commit: Ed Maste CommitDate: 2023-12-05 18:20:00 +0000 compiler-rt: avoid segfaults when re-exec'ing with ASLR The ReExec() function that re-executes the binary after turning off ASLR should not call elf_aux_info(3) and realpath(3), since these will also be intercepted. Instead, loop directly over the elf aux info vector to find the executable path, and avoid calling realpath(3) since it is actually unwanted for this use case. Fixes: 930a7c2ac67e, 96fe7c8ab0f6 (cherry picked from commit 4c9a0adad18263ec8725d9bfc5f560c6ad1da8bd) (cherry picked from commit 7c25a53a2cb975e516cfea78898bfb850db88524) Note: This is a partial cherry-pick, as only the ReExec change from the original applies to FreeBSD 13.2. Security: EN-23:15.sanitizer Approved by: so --- .../lib/sanitizer_common/sanitizer_linux_libcdep.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp index 15a6a4998bd0..6e2c51ea3e8d 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp @@ -55,6 +55,7 @@ // that, it was never implemented. So just define it to zero. #undef MAP_NORESERVE #define MAP_NORESERVE 0 +extern const Elf_Auxinfo *__elf_aux_vector; #endif #if SANITIZER_NETBSD @@ -905,11 +906,11 @@ void ReExec() { const char *pathname = "/proc/self/exe"; #if SANITIZER_FREEBSD - char exe_path[PATH_MAX]; - if (elf_aux_info(AT_EXECPATH, exe_path, sizeof(exe_path)) == 0) { - char link_path[PATH_MAX]; - if (realpath(exe_path, link_path)) - pathname = link_path; + for (const auto *aux = __elf_aux_vector; aux->a_type != AT_NULL; aux++) { + if (aux->a_type == AT_EXECPATH) { + pathname = static_cast(aux->a_un.a_ptr); + break; + } } #elif SANITIZER_NETBSD static const int name[] = { From nobody Tue Dec 5 18:26:11 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl89w2LjLz53JJr; Tue, 5 Dec 2023 18:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl89w1Vx4z3YQ6; Tue, 5 Dec 2023 18:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0AYsK3r47Dylsqe6Yx4pXJfhnXrIPoHC4kdbEvebKzY=; b=yV+P0KBrHTxs2hQJauG7dd5iDCeFU4ce8iBpey+DN08+S3rJph8d5PQTHp4K0loXlo1VfB symbw0Ko/18S2PeQyeWSu6PozbU6rg/dK1iBuZRPWBuG5fO37zWPLvPJ+rruGva5eNdyco 8zCNvE5PojddCT77Qh2jdWtSuxf2VGzjvz+UA4dqtUoKIfOoHzqjwVWdjl8ZX0HXKZ77qi 58mcmRTKbHCQsEK/GiQ78xxjXexiOGpVLJxuKSNpEnM2KRvbJLuvl0PlmAodOXhEwrsZRj iThkml/qsa04yrg1wxhIXSNn7hPlLPlKmI3nqpyS6rGcidjSC6gR1xlhDHfIFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800772; a=rsa-sha256; cv=none; b=prmTfY4cC2frkBbxgglU6XWLe+4EbFgasCM6TLR4r+aaJWwKreDyI3ErMc0hOkON190UVZ Kn/BwzGoXoy1WmZzRtDM4rs55b3T6ZPGhJJtIP4ptTW+qPLUTriDP/7GR4y/fJlOUTniNe X6cxT1vq8SOR4RNKsvzHhuSodisnpM9o+0l358Dh681tK39AsrG0xSFkUjJazjzSD26VzR hlwgNbRJDVIHWPkniatNGwtKLo95lN+TvSiMVUUrDJBfrGuBIKvwsCOxhQ3Dstl1yn8FxU CjDgcX7u8UOrugNY3YE31nrr2ZCn/6Mibtcsj439qe0q0m70YhHb9Iw/5RVaGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0AYsK3r47Dylsqe6Yx4pXJfhnXrIPoHC4kdbEvebKzY=; b=WQGY0Sn+fJyjoTNbof29ncL0l4Z9HHCIFLezhpksxFUZgt+RTiVrNn3nAsoBSJcC85UYr5 jhkfHUxSVwyhHqojMnwwKMG+5bP/UIAj9o6ltBZcZ8iqBuyDVao3kRwUZLllxD9LnrBpdj pOw48vP23Yaz+DKBwQSdbs0GTJinmuJz2cvZbUs1imTfaZ93wJWAB+9lbKMe1Hc6jLIULZ 5umUP3DFhgO3qNhDMcNObt7CLK/iptcfttxhs5k7RONCznAXgIFCD/FMrXYuwoGlwxr7/E NRaOCIPO2/NFFxg8FxjSaxz+8a/DVxsRm2WPxc4Cjx5jy1NIPmj5nOTN9Jj+uA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl89w0Zltz59t; Tue, 5 Dec 2023 18:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IQBQb008671; Tue, 5 Dec 2023 18:26:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IQBin008668; Tue, 5 Dec 2023 18:26:11 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:26:11 GMT Message-Id: <202312051826.3B5IQBin008668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a47a44c0d69c - stable/14 - pf: remove incorrect fragmentation check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a47a44c0d69ce82f302b02da940538a99b47037f Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a47a44c0d69ce82f302b02da940538a99b47037f commit a47a44c0d69ce82f302b02da940538a99b47037f Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:24:35 +0000 pf: remove incorrect fragmentation check We do not need to check PFDESC_IP_REAS while tracking TCP state. Moreover, this check incorrectly considers no-data packets (e.g. RST) to be in-window when this flag is not set. Sponsored by: Rubicon Communications, LLC ("Netgate") Approved by: so Security: FreeBSD-SA-23:17.pf (cherry picked from commit 6284d5f76d6bd2d97fe287c5adabf59c79688eda) --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 84bd75276af7..e19370cc7333 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5367,8 +5367,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (ackskew <= (MAXACKWINDOW << sws)) && /* Acking not more than one window forward */ ((th->th_flags & TH_RST) == 0 || orig_seq == src->seqlo || - (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo) || - (pd->flags & PFDESC_IP_REAS) == 0)) { + (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo))) { /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { From nobody Tue Dec 5 18:27:10 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8C30kVcz53JV9; Tue, 5 Dec 2023 18:27:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8C30DpPz3YRk; Tue, 5 Dec 2023 18:27:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ptipanaAwOrC0RySEtGyiK9hhh4eRuOATM+i37tmYhU=; b=u5RhPDByMjzj4LhLkY98UfwYhkJs6tviff04VOK19ZInaUhXBFTUSMz46xezkGzZHc8lPX d1OuJu8tUctjUAiu5SQQt4dMwl/EFfPBrqKCic1nieIAmU3F8s2PmhJfo4m1SvFHRhvxAX IZKGTEVm3TGatTjWqVVQphsfh2mka8+NI9LYn5lsFzzBOtBs/CMxoDuauckev+BovEE7ch Jpjy08v4pEWzLuUqzu9XJsyyAoe1bNBhkMqznpp8hCCh7JN1lOXZZeJ5qQVnTLCqSZ3Kma 7C0Va2U+3yoyI6Fxf7QxyMUUaP07qoz3niPEYNO8RhqIhxnbzBHqD1J6bv8+LA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800831; a=rsa-sha256; cv=none; b=FH/xeLYcNB8ePHxaDkYNwSbmnxJZM4gC8p8vjhYXZ4f0NkkYTteRYjcmzRC8eBlE5woWBF 2H8UC68DMH+hQlCrFACj/DmucF4rx6ttz9DGSi06g9V0ddvmCw4gyGKOQurfHe8pbKvd2+ 6FhdDuRKcWhX9oFrHRaCOo1qkaSyNM4PDrznQYl6XvFYR0NgO+GOO0PThaD3GdpuPGwfYs YSYer2i8NWZW/WVthGZ6H2D7R2SyN8HPj9RSlg2I9RLhrhxf6mjTYMVgEo54TMyh9fi7/5 Lfwt7l0qAXWi5wPYU9wBZ7AegGnAkLSHUkevzyf6rUUaFnOdKiDBMVSk51Gt/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ptipanaAwOrC0RySEtGyiK9hhh4eRuOATM+i37tmYhU=; b=vGXaGQFECNALwFEE99tWwhlzOueVC+dk5uEGtPId9wFwO7Hn10Jq6sPzW6sK4Dz/jt/z0f wXBqgAqZ2zaX/tqhW0HFk4uxNsFXW0dubmBHpzJ1SYeDHkpUiZBk7TO0vjkm9GAx623rdq DeJj+DdPWzlqD8WbPW4gCzM3v1KIbUgw4M/DiU+/mcHDSXrzlVqKNmzvhd7pYXYTMHWSnk ZVv8JXKR2PSGBM0ELVOyibJdsTWMwz2zrrjX5x7U/5i+4OmGdhfJBNRT5w5TsZb805AuTu vpQOs/v9w0vAGPPtFv4xtVpBxQNgxyFFkRU1gUOR4JQrj7P1jL0f6N7OSxY+cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8C26NSNz5R1; Tue, 5 Dec 2023 18:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRAun008924; Tue, 5 Dec 2023 18:27:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRArV008921; Tue, 5 Dec 2023 18:27:10 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:10 GMT Message-Id: <202312051827.3B5IRArV008921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ee1d1e38fae6 - stable/13 - pf: remove incorrect fragmentation check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ee1d1e38fae65d045b113a7053651bbd7b780e1d Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ee1d1e38fae65d045b113a7053651bbd7b780e1d commit ee1d1e38fae65d045b113a7053651bbd7b780e1d Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:25:22 +0000 pf: remove incorrect fragmentation check We do not need to check PFDESC_IP_REAS while tracking TCP state. Moreover, this check incorrectly considers no-data packets (e.g. RST) to be in-window when this flag is not set. Sponsored by: Rubicon Communications, LLC ("Netgate") Approved by: so Security: FreeBSD-SA-23:17.pf (cherry picked from commit 6284d5f76d6bd2d97fe287c5adabf59c79688eda) --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index c09f80d2f82b..e03fcbbe37a9 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4780,8 +4780,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (ackskew <= (MAXACKWINDOW << sws)) && /* Acking not more than one window forward */ ((th->th_flags & TH_RST) == 0 || orig_seq == src->seqlo || - (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo) || - (pd->flags & PFDESC_IP_REAS) == 0)) { + (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo))) { /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { From nobody Tue Dec 5 18:27:31 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8CS0dqfz53J4g; Tue, 5 Dec 2023 18:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8CS073zz3Yvh; Tue, 5 Dec 2023 18:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IqIq1SDqK58FTcBGdtiMaq8pipmUvrSLiHQfU7XPYfA=; b=cnpbtyzDeD53KzfVC4vZbzDienzCvuQc3xxnMbB3JtPEtxsoElq7kmnU9lYrsDN9Uxxzd+ 9lk9/xFh8fdV7SBXY8oHUQGtYu20zo9THz0QS6dO2bVfPdlKjQIzv4xzE482k1v9g9YQoj Hg3LkxB+0qflc9CKcMi4CidYts5/B4zr/jP7/ZeUS49qYNjKhCDaEbyIbZTkU+NDCMkrNh Hqx6sA08MHov5mC68YLO9wc8igatAH/aUVl22Tx64YJHQU0ySLpQQf4+VpqkJG3+rnvxQ7 aSOeFwJF5LHWihyzXnIdEM4bbEDXr6f9gmjX4hvkpDCGLORPlbacOScxvHkrGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800852; a=rsa-sha256; cv=none; b=YtbpDmHxvcNNTcvwkQQ1nCoECSY2xwsUpmwFY9k9A2u+rKEtKjJAPUFIHDaBzI4SjLNsBW lRVrmZKQQ6CyYsk3zwB/FYvR7wOid5+OnfzkXhXhFnVMleHzJ7GvPmZErtvCjeuFi83ygv 2vwpkTOBSYnp44ILc7dn1NHA3HKPf7ldVySzGp9OWRYRnIX2HIe3dHO5pmX1Rv0ev90VoG 3Mz0JguZtg0qTf1fM3988tlVrqGPDPzNGtaiDaZzci5N/9+D/NK96kLfwNayt+wwexk9fF c0FmKZyh0EKd9XnIrshmO5PK2oWTZ4tfsV0vC9PAa+xQARFeUCnOJQcPFzxk7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IqIq1SDqK58FTcBGdtiMaq8pipmUvrSLiHQfU7XPYfA=; b=nI7gEMeffwRx40PJLi2wDqBYaBy9UZYL9klNwMnpiyqSpkhA9F6h7QLwDKYZDiBMaXElw6 7723S2BA/41kz77FRBA696ZymMBK88SOkrpFLyXf/WCRjwbLxdqYaZ8hIH0BF+xaDlKWb7 I2ivf6N6QM0zPkPg7Dz6T5fzzdem1+MoDmmY4p7VqCtwEQCHUT3fwotU5OFB4DD6NAti79 kxfi+Z+5uKVaASPxYiKlbZWY2lifS3eHPsqgjQZDWbWzoLbUUuKdOgx5TDbUd1dnAui/Gw bmrFyJNAdARjBGoK4fdXogm+sMBdv8KWW8ozHnPV2Advdlf/H1W/ZKuQn5jkaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8CR6LKzz59v; Tue, 5 Dec 2023 18:27:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRVSX009140; Tue, 5 Dec 2023 18:27:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRVOf009137; Tue, 5 Dec 2023 18:27:31 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:31 GMT Message-Id: <202312051827.3B5IRVOf009137@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7e9e6d5d491c - releng/14.0 - ossl: Fix handling of separate AAD buffers in ossl_aes_gcm() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 7e9e6d5d491cd844677331980cc2ea92b9130ed1 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7e9e6d5d491cd844677331980cc2ea92b9130ed1 commit 7e9e6d5d491cd844677331980cc2ea92b9130ed1 Author: Mark Johnston AuthorDate: 2023-11-28 19:35:49 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 14:01:24 +0000 ossl: Fix handling of separate AAD buffers in ossl_aes_gcm() Consumers may optionally provide a reference to a separate buffer containing AAD, but ossl_aes_gcm() didn't handle this and would thus compute an incorrect digest. Fixes: 9a3444d91c70 ("ossl: Add a VAES-based AES-GCM implementation for amd64") Reviewed by: jhb MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D42736 Approved by: so Security: FreeBSD-EN-23:17.ossl (cherry picked from commit 87826c87c63b2995cb69e9c1a624c7e20dd70fcd) (cherry picked from commit 24cd42aeb6232b4678f45dc6d242e8982dbea8e6) --- sys/crypto/openssl/ossl_aes.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/crypto/openssl/ossl_aes.c b/sys/crypto/openssl/ossl_aes.c index 84d694a7199f..40162b6943df 100644 --- a/sys/crypto/openssl/ossl_aes.c +++ b/sys/crypto/openssl/ossl_aes.c @@ -199,14 +199,20 @@ ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, crypto_read_iv(crp, iv); ctx->ops->setiv(ctx, iv, csp->csp_ivlen); - crypto_cursor_init(&cc_in, &crp->crp_buf); - crypto_cursor_advance(&cc_in, crp->crp_aad_start); - for (size_t alen = crp->crp_aad_length; alen > 0; alen -= seglen) { - inseg = crypto_cursor_segment(&cc_in, &inlen); - seglen = MIN(alen, inlen); - if (ctx->ops->aad(ctx, inseg, seglen) != 0) + if (crp->crp_aad != NULL) { + if (ctx->ops->aad(ctx, crp->crp_aad, crp->crp_aad_length) != 0) return (EINVAL); - crypto_cursor_advance(&cc_in, seglen); + } else { + crypto_cursor_init(&cc_in, &crp->crp_buf); + crypto_cursor_advance(&cc_in, crp->crp_aad_start); + for (size_t alen = crp->crp_aad_length; alen > 0; + alen -= seglen) { + inseg = crypto_cursor_segment(&cc_in, &inlen); + seglen = MIN(alen, inlen); + if (ctx->ops->aad(ctx, inseg, seglen) != 0) + return (EINVAL); + crypto_cursor_advance(&cc_in, seglen); + } } crypto_cursor_init(&cc_in, &crp->crp_buf); From nobody Tue Dec 5 18:27:32 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8CT1XQcz53JPR; Tue, 5 Dec 2023 18:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8CT0pG1z3Ysx; Tue, 5 Dec 2023 18:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GlOdJTsAg0ZIS8hhjNpGZ5iJCtigRia3LhBpGxue9ag=; b=rllcIFYvZ7pBrL5tCGyN6YQDY2xet1EBYqNuQxRtHl6Gu98SQ6oOPZp5wEuNxy7NLkbRxU UcEuHwULnXAuwolwTNkSYPGgnbHBUnAUdOFAzB+TbxWWqzqFaYanfbq4hBAOcjb+w2bAc8 Ui0hAnWuxkyqAgLJKF5oYG01ydrXZztXiJfhgiUbJFcw3pN1zRDe4jwFf7ocAZL6ssD7iP KP59ttz4ii91lxemSp0/jjrKoHYO72vxcW16Ey4xQVR42CIML7+hYdpuBR0ckpjo/E6wno Bgh/UN3QgAWl0MsbPNDcryF8XTT8YXUzCU/2Dg+vFoyReuc1K8ZUx/OKaAy60g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800853; a=rsa-sha256; cv=none; b=ZnJJvGhmDrgsZwLqnPJwsELWi8j+4TnBPtaXnfBkCfeeJXsyVT1Tp6wcmq6lMKcLR7CQvf uVrZfbjSDOJ8ibDHu+utmOzcbLL59DzJzLjX2cMAKPBXa/wMPllqQ3iqYF40hxKDDtkp+T v0HWUZn1b696uAWBV8qKdmV3NeMdkMrk4Cr2jTDmP2wqdyBnilpjec6Qr77y30tGDJCRmJ NA8rlOZl0Nwto28PFMqsR4HlLQEJks7u/vG/aRKOj/gPJtJyWRQCEs1A1AAaKn5MvM6vlU C2+fmJBksYx+4Wkmi2cEKBFFRWR3uHne6IoqwK1JxmciJ5IiF+Et0lSvV4MKLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GlOdJTsAg0ZIS8hhjNpGZ5iJCtigRia3LhBpGxue9ag=; b=wlRMuC9kq/axHxmXDHm+X4cm7OE5fwIKECcM5neKFXF6yVybMRtk7Dku56ufSmPh3k7pqH Wx5Y0ooRtiIze8hYY6HOt1Ht05soXyMqvKfNtjoM9VYX8ItyOV+z2Sw04c4MUR54jQnTsy Tn6HlLhFloG3z8GB4PRpVyE3YgM9qY6rrYTOaY1PyL9HkM4Q6NOSHOwmAYKy37DvW9SdTN ZNiC8FGvUYWUcE8zyUB9kelRFNhvMuuuo0e49WlHN1M5aBaYlf91e9YGe5OeK3aBIFIVH3 lsugqZzPY4ROzNX5/cGW1wWSBmJ9CuNkTlqHt9hsXgCLxHXyZdQwcTUR1aoa/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 4Sl8CS70CWz5St; Tue, 5 Dec 2023 18:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRWHm009195; Tue, 5 Dec 2023 18:27:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRWpL009192; Tue, 5 Dec 2023 18:27:32 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:32 GMT Message-Id: <202312051827.3B5IRWpL009192@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9fd62386ad6e - releng/14.0 - ossl: Keep mutable AES-GCM state on the stack List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 9fd62386ad6e6f5c5298cda66c5c1894373e4379 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9fd62386ad6e6f5c5298cda66c5c1894373e4379 commit 9fd62386ad6e6f5c5298cda66c5c1894373e4379 Author: Mark Johnston AuthorDate: 2023-11-29 17:51:55 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 14:02:05 +0000 ossl: Keep mutable AES-GCM state on the stack ossl(4)'s AES-GCM implementation keeps mutable state in the session structure, together with the key schedule. This was done for convenience, as both are initialized together. However, some OCF consumers, particularly ZFS, assume that requests may be dispatched to the same session in parallel. Without serialization, this results in incorrect output. Fix the problem by explicitly copying per-session state onto the stack at the beginning of each operation. PR: 275306 Reviewed by: jhb Fixes: 9a3444d91c70 ("ossl: Add a VAES-based AES-GCM implementation for amd64") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42783 Approved by: so Security: FreeBSD-EN-23:17.ossl (cherry picked from commit 5c0dac0b7a012f326edab06ad85aee5ad68ff120) (cherry picked from commit 84ef0a84ecaa4f5d9bcfed3ce10c288953491e7e) --- sys/crypto/openssl/ossl_aes.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/sys/crypto/openssl/ossl_aes.c b/sys/crypto/openssl/ossl_aes.c index 40162b6943df..800518e51205 100644 --- a/sys/crypto/openssl/ossl_aes.c +++ b/sys/crypto/openssl/ossl_aes.c @@ -168,10 +168,9 @@ static int ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, const struct crypto_session_params *csp) { - struct ossl_cipher_context key; + struct ossl_gcm_context ctx; struct crypto_buffer_cursor cc_in, cc_out; unsigned char iv[AES_BLOCK_LEN], tag[AES_BLOCK_LEN]; - struct ossl_gcm_context *ctx; const unsigned char *inseg; unsigned char *outseg; size_t inlen, outlen, seglen; @@ -183,24 +182,25 @@ ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, if (crp->crp_cipher_key != NULL) { if (encrypt) error = s->cipher->set_encrypt_key(crp->crp_cipher_key, - 8 * csp->csp_cipher_klen, &key); + 8 * csp->csp_cipher_klen, + (struct ossl_cipher_context *)&ctx); else error = s->cipher->set_decrypt_key(crp->crp_cipher_key, - 8 * csp->csp_cipher_klen, &key); + 8 * csp->csp_cipher_klen, + (struct ossl_cipher_context *)&ctx); if (error) return (error); - ctx = (struct ossl_gcm_context *)&key; } else if (encrypt) { - ctx = (struct ossl_gcm_context *)&s->enc_ctx; + memcpy(&ctx, &s->enc_ctx, sizeof(struct ossl_gcm_context)); } else { - ctx = (struct ossl_gcm_context *)&s->dec_ctx; + memcpy(&ctx, &s->dec_ctx, sizeof(struct ossl_gcm_context)); } crypto_read_iv(crp, iv); - ctx->ops->setiv(ctx, iv, csp->csp_ivlen); + ctx.ops->setiv(&ctx, iv, csp->csp_ivlen); if (crp->crp_aad != NULL) { - if (ctx->ops->aad(ctx, crp->crp_aad, crp->crp_aad_length) != 0) + if (ctx.ops->aad(&ctx, crp->crp_aad, crp->crp_aad_length) != 0) return (EINVAL); } else { crypto_cursor_init(&cc_in, &crp->crp_buf); @@ -209,7 +209,7 @@ ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, alen -= seglen) { inseg = crypto_cursor_segment(&cc_in, &inlen); seglen = MIN(alen, inlen); - if (ctx->ops->aad(ctx, inseg, seglen) != 0) + if (ctx.ops->aad(&ctx, inseg, seglen) != 0) return (EINVAL); crypto_cursor_advance(&cc_in, seglen); } @@ -230,10 +230,10 @@ ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, seglen = MIN(plen, MIN(inlen, outlen)); if (encrypt) { - if (ctx->ops->encrypt(ctx, inseg, outseg, seglen) != 0) + if (ctx.ops->encrypt(&ctx, inseg, outseg, seglen) != 0) return (EINVAL); } else { - if (ctx->ops->decrypt(ctx, inseg, outseg, seglen) != 0) + if (ctx.ops->decrypt(&ctx, inseg, outseg, seglen) != 0) return (EINVAL); } @@ -243,18 +243,19 @@ ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, error = 0; if (encrypt) { - ctx->ops->tag(ctx, tag, GMAC_DIGEST_LEN); + ctx.ops->tag(&ctx, tag, GMAC_DIGEST_LEN); crypto_copyback(crp, crp->crp_digest_start, GMAC_DIGEST_LEN, tag); } else { crypto_copydata(crp, crp->crp_digest_start, GMAC_DIGEST_LEN, tag); - if (ctx->ops->finish(ctx, tag, GMAC_DIGEST_LEN) != 0) + if (ctx.ops->finish(&ctx, tag, GMAC_DIGEST_LEN) != 0) error = EBADMSG; } explicit_bzero(iv, sizeof(iv)); explicit_bzero(tag, sizeof(tag)); + explicit_bzero(&ctx, sizeof(ctx)); return (error); } From nobody Tue Dec 5 18:27:34 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8CV4z9Dz53JML; Tue, 5 Dec 2023 18:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8CV1fwyz3Ywl; Tue, 5 Dec 2023 18:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wKPKruljpt9WBpEtB4V8Db9TwVNv7ekdRdPJUX1zDg8=; b=TiTIuHGUTPcCXmf1O8XVqlYF+JuX674IDaNnbo+XkLNAKZuBPu6UnVrKY+8qMLe7/oC1iP uvhNmTejPZcvT0a9OZmC93zehHRI1+R4q6YS5guutrm0sc/hLUb2n4BNoB2R3aHC0Dp0C7 FI+P4ISBqeLzSfytDxqQR2V8Kt4ZkM7OGHfSJb/EINYGBI+VaNP3OYIy4jmlmSbjkBIC4O 1jnTPP+5e2f+AVXhLSqKr06UpscxhraQFnZLx4DuL33vqRlKXlivPGs/0B+YEG3mwXATdl OCu3R6RD5rQ+sAwWX+0fFOB8+K/fAgmfSYIBCVmw9aaYKxZ6J2cPLQJyhXPe0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800854; a=rsa-sha256; cv=none; b=eVW+h4i4V2qfSKIfHk7dwgYBSqHvf9Cs2ZCiYWhyI/CoGSZf17r8Aury0OZjp59w7uN6QD VA5YboLw22cNoFkMFBb5odpDnSmwyvsMamTOJDdtl14Oi6/gvMzQelLvOUdLUDai4whzk8 CE53jd3SrdM1mUg0HsnYw63uVGr3477JT1We68PjDhJdlKMqXujmSoNaUei4HRRIXHAjg6 gcw7CkJaQHd/vRdf7550ajlk3mOAm5Y9cLvPoFCTaKIRcFZa6ETlXRALazh9dUuQzMTDa3 ZiNA/ug2Ujp/PAI4OaCkKLDw/rDcIa9ha2xPUciWstIu1c8BnSw1KA0/7J45uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wKPKruljpt9WBpEtB4V8Db9TwVNv7ekdRdPJUX1zDg8=; b=JBA+hrHkakiKm+qIaYG5IA5mHXe5djIOQ9BYQs2HIGGK5j5tuh9rgYsxj1D7zxcL8MyG7H cJQC1xVAXBE1pwdOh6vDKIUPElLfKBxbyzMES1UicBcKyk4JI7Gs08VgLjSFVKwA43UMho h8IW864eEbSkQhGY2JfaDOyzDOr8Sp7ugA0HEH9D4L+gDv3IahsOnaV+Ul6CDzJu69pKh/ x7HeVWCQhY1mXSpK88mZG6L7WaC+5PZcpZxZbhGEguKPlNU8HMH6zCx3NPnd1tbmjkkjUA IgCU/PJt076e6cQNlxIHnBeq0aopSxdhna0rjAiBmZ9DVklDL9QF+6yFTsf14A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8CV0ftxz59w; Tue, 5 Dec 2023 18:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRY5M009249; Tue, 5 Dec 2023 18:27:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRYfn009246; Tue, 5 Dec 2023 18:27:34 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:34 GMT Message-Id: <202312051827.3B5IRYfn009246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 433fe061fc59 - releng/14.0 - ossl: Fix some bugs in the fallback AES-GCM implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 433fe061fc5954fe00b33ed9d850a655920f0a2d Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=433fe061fc5954fe00b33ed9d850a655920f0a2d commit 433fe061fc5954fe00b33ed9d850a655920f0a2d Author: Mark Johnston AuthorDate: 2023-11-29 20:08:12 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 14:02:28 +0000 ossl: Fix some bugs in the fallback AES-GCM implementation gcm_*_aesni() are used when the AVX512 implementation is not available. Fix two bugs which manifest when handling operations spanning multiple segments: - Avoid underflow when the length of the input is smaller than the residual. - In gcm_decrypt_aesni(), ensure that we begin the operation at the right offset into the input and output buffers. Reviewed by: jhb Fixes: 9b1d87286c78 ("ossl: Add a fallback AES-GCM implementation using AES-NI") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42838 Approved by: so Security: FreeBSD-EN-23:17.ossl (cherry picked from commit 47d767dab54895f3ba8abac6ab2295797394659e) (cherry picked from commit 118b866d9c39da1f5a17680e2034b3eff7337988) --- sys/crypto/openssl/amd64/ossl_aes_gcm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/crypto/openssl/amd64/ossl_aes_gcm.c b/sys/crypto/openssl/amd64/ossl_aes_gcm.c index 0d205ec3ff90..d08b2ac8a759 100644 --- a/sys/crypto/openssl/amd64/ossl_aes_gcm.c +++ b/sys/crypto/openssl/amd64/ossl_aes_gcm.c @@ -459,7 +459,7 @@ gcm_encrypt_aesni(struct ossl_gcm_context *ctx, const unsigned char *in, size_t bulk = 0, res; int error; - res = (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN; + res = MIN(len, (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN); if ((error = gcm_encrypt(ctx, in, out, res)) != 0) return error; @@ -621,12 +621,12 @@ gcm_decrypt_aesni(struct ossl_gcm_context *ctx, const unsigned char *in, size_t bulk = 0, res; int error; - res = (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN; + res = MIN(len, (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN); if ((error = gcm_decrypt(ctx, in, out, res)) != 0) return error; - bulk = aesni_gcm_decrypt(in, out, len, &ctx->aes_ks, ctx->gcm.Yi.c, - ctx->gcm.Xi.u); + bulk = aesni_gcm_decrypt(in + res, out + res, len - res, &ctx->aes_ks, + ctx->gcm.Yi.c, ctx->gcm.Xi.u); ctx->gcm.len.u[1] += bulk; bulk += res; From nobody Tue Dec 5 18:27:35 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8CW5RvBz53JJy; Tue, 5 Dec 2023 18:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8CW3gxXz3Yx0; Tue, 5 Dec 2023 18:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YPbHI8056nllrlOZNi6HsDXMIg1SRfBeHO2CRb08Ko0=; b=wMaOu3rBQat/Ov0AuX4IHIzT91K9qXwGhDt//ygv6DJVJQKa9U1QkrxSdueVb02CyGL0PR t/fXZ1+w7pHg0KGB2VhOHNJOBh65Bwsiwwvkdx+0bZ1mw3Koi3Rxb+LejrKe1yp//NxpDc XYNDFU2r9VZR2BrqJAYNQfWSUOGohebRDrByDBA2vc7tTLBlLu1uCJYIbpA9QxXm3IXbd6 HnzUs49BO90/54L/S12z43B1SsgP/eKLfdBdYvJlEMQQ12zvlpf9luimfdVziuNlLWyLWn HFZQgIt3fXOVWQ1v/pYV7VPhJcqRlL7pSAyXQv/CHlrrMPnrPkzOAMBsmCXcpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800855; a=rsa-sha256; cv=none; b=R51y6YexhhJGOLJlSJsemXAX418Hv+178C/jZ55NA7OSh4+gMnXO5QQPvG2cTz/z4daTnu qjW77kpIbPnzuHVxPeb3Tr7J3tZrnafChnzHkidIo+5kM/QW2zwYWofKhWAFZ3Jzl6UkZ0 R3YaTuvz2yFBqrp7SA4GclUCLA8wRsiH2vGXG6KQN8e0lheG7u11aBq+LjIpsyUJIhGm89 AZRVJvArHB7t6BjPTXOjoLE2TuCDWx83afFf8P/GGjUNjlD1ZWSNFDZOIINmRDOxArhHSf hOWEIIoN/ecacN0VN+CCpvnELCps/w86XKDzP520MVFeVyeLczsuYsPyjeUfpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YPbHI8056nllrlOZNi6HsDXMIg1SRfBeHO2CRb08Ko0=; b=LA2CnZYFtRdD5TpjtIYEh3NV4GrVhd32yGUge8TBryXInr/FZrFKKbgo1sfi3KShOxoSux o+AuvSXrf9ORpmEIz6yKX/G6eN7mFULEx9Zq4PYWSm3X1CJO1eQ2n4Bu9WPHYzrYpNWiaa Tf2J5HUCUj438sX11L8bVPgJmHPPZpSE0UCG1s2yR3eOss73Iu2E1ier8LXw4bo0VPT/ng hI74oeWHS5G3D6NjDjbkZOgMct6hOn2fSQlGsI45wGey6vNg9GxgLm9jLhP9Rwu8yg0DzI JmV5MaJ1LXiCkdSgKMs0cvs9tH6mHQn4mBxdqspseKqNEvK43WX7C4oDGXxrVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8CW2253z5YP; Tue, 5 Dec 2023 18:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRZ5L009291; Tue, 5 Dec 2023 18:27:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRZ3T009288; Tue, 5 Dec 2023 18:27:35 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:35 GMT Message-Id: <202312051827.3B5IRZ3T009288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 64c5eaab835b - releng/14.0 - zfs: cherry-pick commit from master List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 64c5eaab835bed5d8a64ac73883457c35f3e2157 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=64c5eaab835bed5d8a64ac73883457c35f3e2157 commit 64c5eaab835bed5d8a64ac73883457c35f3e2157 Author: Alexander Motin AuthorDate: 2023-10-30 23:56:04 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 14:03:22 +0000 zfs: cherry-pick commit from master #15456 3ec4ea68d4 Unify arc_prune_async() code Obtained from: OpenZFS Approved by: so Security: FreeBSD-EN-23:18.openzfs --- sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h | 2 +- sys/contrib/openzfs/include/sys/arc.h | 2 +- sys/contrib/openzfs/include/sys/arc_impl.h | 1 - sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c | 62 ---------------------- .../openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 32 +++++++++++ sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 51 ------------------ .../openzfs/module/os/linux/zfs/zpl_super.c | 2 +- sys/contrib/openzfs/module/zfs/arc.c | 52 ++++++++++++++++++ 8 files changed, 87 insertions(+), 117 deletions(-) diff --git a/sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h b/sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h index 0bd20f64897d..a0483dfa39f2 100644 --- a/sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h +++ b/sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h @@ -60,7 +60,7 @@ extern const struct file_operations zpl_file_operations; extern const struct file_operations zpl_dir_file_operations; /* zpl_super.c */ -extern void zpl_prune_sb(int64_t nr_to_scan, void *arg); +extern void zpl_prune_sb(uint64_t nr_to_scan, void *arg); extern const struct super_operations zpl_super_operations; extern const struct export_operations zpl_export_operations; diff --git a/sys/contrib/openzfs/include/sys/arc.h b/sys/contrib/openzfs/include/sys/arc.h index 9d67dab06ca3..05307aab99e3 100644 --- a/sys/contrib/openzfs/include/sys/arc.h +++ b/sys/contrib/openzfs/include/sys/arc.h @@ -81,7 +81,7 @@ typedef struct arc_prune arc_prune_t; typedef void arc_read_done_func_t(zio_t *zio, const zbookmark_phys_t *zb, const blkptr_t *bp, arc_buf_t *buf, void *priv); typedef void arc_write_done_func_t(zio_t *zio, arc_buf_t *buf, void *priv); -typedef void arc_prune_func_t(int64_t bytes, void *priv); +typedef void arc_prune_func_t(uint64_t bytes, void *priv); /* Shared module parameters */ extern uint_t zfs_arc_average_blocksize; diff --git a/sys/contrib/openzfs/include/sys/arc_impl.h b/sys/contrib/openzfs/include/sys/arc_impl.h index adff42c55d05..defebe3b2fbb 100644 --- a/sys/contrib/openzfs/include/sys/arc_impl.h +++ b/sys/contrib/openzfs/include/sys/arc_impl.h @@ -1065,7 +1065,6 @@ extern void arc_wait_for_eviction(uint64_t, boolean_t); extern void arc_lowmem_init(void); extern void arc_lowmem_fini(void); -extern void arc_prune_async(uint64_t); extern int arc_memory_throttle(spa_t *spa, uint64_t reserve, uint64_t txg); extern uint64_t arc_free_memory(void); extern int64_t arc_available_memory(void); diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c index 12f16edb1e2b..92696c0bf1ae 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c @@ -52,11 +52,6 @@ #include #include -#if __FreeBSD_version >= 1300139 -static struct sx arc_vnlru_lock; -static struct vnode *arc_vnlru_marker; -#endif - extern struct vfsops zfs_vfsops; uint_t zfs_arc_free_target = 0; @@ -131,53 +126,6 @@ arc_default_max(uint64_t min, uint64_t allmem) return (MAX(allmem * 5 / 8, size)); } -/* - * Helper function for arc_prune_async() it is responsible for safely - * handling the execution of a registered arc_prune_func_t. - */ -static void -arc_prune_task(void *arg) -{ - uint64_t nr_scan = (uintptr_t)arg; - -#ifndef __ILP32__ - if (nr_scan > INT_MAX) - nr_scan = INT_MAX; -#endif - -#if __FreeBSD_version >= 1300139 - sx_xlock(&arc_vnlru_lock); - vnlru_free_vfsops(nr_scan, &zfs_vfsops, arc_vnlru_marker); - sx_xunlock(&arc_vnlru_lock); -#else - vnlru_free(nr_scan, &zfs_vfsops); -#endif -} - -/* - * Notify registered consumers they must drop holds on a portion of the ARC - * buffered they reference. This provides a mechanism to ensure the ARC can - * honor the metadata limit and reclaim otherwise pinned ARC buffers. This - * is analogous to dnlc_reduce_cache() but more generic. - * - * This operation is performed asynchronously so it may be safely called - * in the context of the arc_reclaim_thread(). A reference is taken here - * for each registered arc_prune_t and the arc_prune_task() is responsible - * for releasing it once the registered arc_prune_func_t has completed. - */ -void -arc_prune_async(uint64_t adjust) -{ - -#ifndef __LP64__ - if (adjust > UINTPTR_MAX) - adjust = UINTPTR_MAX; -#endif - taskq_dispatch(arc_prune_taskq, arc_prune_task, - (void *)(intptr_t)adjust, TQ_SLEEP); - ARCSTAT_BUMP(arcstat_prune); -} - uint64_t arc_all_memory(void) { @@ -228,10 +176,6 @@ arc_lowmem_init(void) { arc_event_lowmem = EVENTHANDLER_REGISTER(vm_lowmem, arc_lowmem, NULL, EVENTHANDLER_PRI_FIRST); -#if __FreeBSD_version >= 1300139 - arc_vnlru_marker = vnlru_alloc_marker(); - sx_init(&arc_vnlru_lock, "arc vnlru lock"); -#endif } void @@ -239,12 +183,6 @@ arc_lowmem_fini(void) { if (arc_event_lowmem != NULL) EVENTHANDLER_DEREGISTER(vm_lowmem, arc_event_lowmem); -#if __FreeBSD_version >= 1300139 - if (arc_vnlru_marker != NULL) { - vnlru_free_marker(arc_vnlru_marker); - sx_destroy(&arc_vnlru_lock); - } -#endif } void diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c index 8969fd6a54bd..74f18f40c612 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c @@ -2074,6 +2074,26 @@ zfs_vnodes_adjust_back(void) #endif } +#if __FreeBSD_version >= 1300139 +static struct sx zfs_vnlru_lock; +static struct vnode *zfs_vnlru_marker; +#endif +static arc_prune_t *zfs_prune; + +static void +zfs_prune_task(uint64_t nr_to_scan, void *arg __unused) +{ + if (nr_to_scan > INT_MAX) + nr_to_scan = INT_MAX; +#if __FreeBSD_version >= 1300139 + sx_xlock(&zfs_vnlru_lock); + vnlru_free_vfsops(nr_to_scan, &zfs_vfsops, zfs_vnlru_marker); + sx_xunlock(&zfs_vnlru_lock); +#else + vnlru_free(nr_to_scan, &zfs_vfsops); +#endif +} + void zfs_init(void) { @@ -2100,11 +2120,23 @@ zfs_init(void) dmu_objset_register_type(DMU_OST_ZFS, zpl_get_file_info); zfsvfs_taskq = taskq_create("zfsvfs", 1, minclsyspri, 0, 0, 0); + +#if __FreeBSD_version >= 1300139 + zfs_vnlru_marker = vnlru_alloc_marker(); + sx_init(&zfs_vnlru_lock, "zfs vnlru lock"); +#endif + zfs_prune = arc_add_prune_callback(zfs_prune_task, NULL); } void zfs_fini(void) { + arc_remove_prune_callback(zfs_prune); +#if __FreeBSD_version >= 1300139 + vnlru_free_marker(zfs_vnlru_marker); + sx_destroy(&zfs_vnlru_lock); +#endif + taskq_destroy(zfsvfs_taskq); zfsctl_fini(); zfs_znode_fini(); diff --git a/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c b/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c index 29a8802b8367..43ed087e2dbb 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c @@ -489,56 +489,5 @@ arc_unregister_hotplug(void) } #endif /* _KERNEL */ -/* - * Helper function for arc_prune_async() it is responsible for safely - * handling the execution of a registered arc_prune_func_t. - */ -static void -arc_prune_task(void *ptr) -{ - arc_prune_t *ap = (arc_prune_t *)ptr; - arc_prune_func_t *func = ap->p_pfunc; - - if (func != NULL) - func(ap->p_adjust, ap->p_private); - - zfs_refcount_remove(&ap->p_refcnt, func); -} - -/* - * Notify registered consumers they must drop holds on a portion of the ARC - * buffered they reference. This provides a mechanism to ensure the ARC can - * honor the metadata limit and reclaim otherwise pinned ARC buffers. This - * is analogous to dnlc_reduce_cache() but more generic. - * - * This operation is performed asynchronously so it may be safely called - * in the context of the arc_reclaim_thread(). A reference is taken here - * for each registered arc_prune_t and the arc_prune_task() is responsible - * for releasing it once the registered arc_prune_func_t has completed. - */ -void -arc_prune_async(uint64_t adjust) -{ - arc_prune_t *ap; - - mutex_enter(&arc_prune_mtx); - for (ap = list_head(&arc_prune_list); ap != NULL; - ap = list_next(&arc_prune_list, ap)) { - - if (zfs_refcount_count(&ap->p_refcnt) >= 2) - continue; - - zfs_refcount_add(&ap->p_refcnt, ap->p_pfunc); - ap->p_adjust = adjust; - if (taskq_dispatch(arc_prune_taskq, arc_prune_task, - ap, TQ_SLEEP) == TASKQID_INVALID) { - zfs_refcount_remove(&ap->p_refcnt, ap->p_pfunc); - continue; - } - ARCSTAT_BUMP(arcstat_prune); - } - mutex_exit(&arc_prune_mtx); -} - ZFS_MODULE_PARAM(zfs_arc, zfs_arc_, shrinker_limit, INT, ZMOD_RW, "Limit on number of pages that ARC shrinker can reclaim at once"); diff --git a/sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c b/sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c index ad52a11aada0..d98d32c1f9fb 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c @@ -375,7 +375,7 @@ zpl_kill_sb(struct super_block *sb) } void -zpl_prune_sb(int64_t nr_to_scan, void *arg) +zpl_prune_sb(uint64_t nr_to_scan, void *arg) { struct super_block *sb = (struct super_block *)arg; int objects = 0; diff --git a/sys/contrib/openzfs/module/zfs/arc.c b/sys/contrib/openzfs/module/zfs/arc.c index b5946e7604c0..d4a946b9a43a 100644 --- a/sys/contrib/openzfs/module/zfs/arc.c +++ b/sys/contrib/openzfs/module/zfs/arc.c @@ -886,6 +886,8 @@ static void l2arc_do_free_on_write(void); static void l2arc_hdr_arcstats_update(arc_buf_hdr_t *hdr, boolean_t incr, boolean_t state_only); +static void arc_prune_async(uint64_t adjust); + #define l2arc_hdr_arcstats_increment(hdr) \ l2arc_hdr_arcstats_update((hdr), B_TRUE, B_FALSE) #define l2arc_hdr_arcstats_decrement(hdr) \ @@ -6048,6 +6050,56 @@ arc_remove_prune_callback(arc_prune_t *p) kmem_free(p, sizeof (*p)); } +/* + * Helper function for arc_prune_async() it is responsible for safely + * handling the execution of a registered arc_prune_func_t. + */ +static void +arc_prune_task(void *ptr) +{ + arc_prune_t *ap = (arc_prune_t *)ptr; + arc_prune_func_t *func = ap->p_pfunc; + + if (func != NULL) + func(ap->p_adjust, ap->p_private); + + zfs_refcount_remove(&ap->p_refcnt, func); +} + +/* + * Notify registered consumers they must drop holds on a portion of the ARC + * buffers they reference. This provides a mechanism to ensure the ARC can + * honor the metadata limit and reclaim otherwise pinned ARC buffers. + * + * This operation is performed asynchronously so it may be safely called + * in the context of the arc_reclaim_thread(). A reference is taken here + * for each registered arc_prune_t and the arc_prune_task() is responsible + * for releasing it once the registered arc_prune_func_t has completed. + */ +static void +arc_prune_async(uint64_t adjust) +{ + arc_prune_t *ap; + + mutex_enter(&arc_prune_mtx); + for (ap = list_head(&arc_prune_list); ap != NULL; + ap = list_next(&arc_prune_list, ap)) { + + if (zfs_refcount_count(&ap->p_refcnt) >= 2) + continue; + + zfs_refcount_add(&ap->p_refcnt, ap->p_pfunc); + ap->p_adjust = adjust; + if (taskq_dispatch(arc_prune_taskq, arc_prune_task, + ap, TQ_SLEEP) == TASKQID_INVALID) { + zfs_refcount_remove(&ap->p_refcnt, ap->p_pfunc); + continue; + } + ARCSTAT_BUMP(arcstat_prune); + } + mutex_exit(&arc_prune_mtx); +} + /* * Notify the arc that a block was freed, and thus will never be used again. */ From nobody Tue Dec 5 18:27:36 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8CX4KDZz53JPY; Tue, 5 Dec 2023 18:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8CX3qPgz3Z8s; Tue, 5 Dec 2023 18:27:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BBo0r4Ox4YRdhsjs/I3FMcRyb9ig8PzTYM7e68RwkKM=; b=S6qlHayXZ+QdmK04rRJsJKtoGa0LUOH4YyIXxwrrEAD/iI+A/21zSFHclSR2Agi8TbSRIq WP2EEXBXgs9QZ7EY6r6iIkRE/cmFu4xHUaG4C6u6EW7R1aVsEvE1lmUbWPKJAb21482VDo a3dGn/HzqZ35rVmtTuAWvsSNxvJcYE47//E7MqqZWuaOVQJ2az9RXmOQSW+4XQa6bw5weA FSVPnJjOvA5sZ73lYKEpYo+kKIiBk3tSzpDXknBZQjuiydy7oplIrwqD7JE195pSNqjKwp cklIyU0DuhH+HzKpwXdT29iUjxtrKdaxtUleliRFxn49pUOPjUmf71hcEQdUtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800856; a=rsa-sha256; cv=none; b=FhxHkxxE5NVzhxEVu8/ph1cQ3AcF0Cyaq4A9uDQzfpHDjQKDnKbZDNyQxdi83avOXWYz+E 4ROB8ViGQHkTkBFNeV8St4g5YIBekpjwu1/KsvUiNmq8O843cHz8YLDwhbySdecO4iMZ5j ya6VLk2wI47FMI3FAhvUbjSrVXgOyJDL5ZR2pNm9NFih4sR+gwXrWYug33qv06geCFjpek UiOkkfiv5G3E0LtxVD2SLJtCz9gLRaFF7tn7zkfoDgmu5uwXWTzZhRkNUu1hKmjYnIKRI+ E1GjQ7EpWyjQ/p3RmzGXqzB+yfVPZaHobamKe11F1m63wWY0fXAj744HkWuKZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BBo0r4Ox4YRdhsjs/I3FMcRyb9ig8PzTYM7e68RwkKM=; b=pbPoEDB8MDPo18/hl8XLBZd4w4csC7Pc0U8VVsNQ1oPiZJGktvR7Tptcv64zUD2P4atYLp wQcnISK4LBJa5BbQyo/sJaQ9gnKd/8n7RcPnP0PWLiXq0DbIeAnBvlAPOiqWma7nP8FBVg xt4S8WHdOBTc19e+pCHqwK49P1AGgfsi4DBmQCPySvqrsmZhyAh0vY2A47gGrlqMWeJNhm Z775dx+/e78qdXMjES+pNVVDoiQ6F6RSgJmFIG5wpO+YQBrrjXENClualt4DqBNeDygnpe K/C6hcvxIiMqd6ZaERPA/d8O8apZ0nnfkOzXu+nBp/SQERPBjLZXsHhE5kU4jQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8CX2vsRz55C; Tue, 5 Dec 2023 18:27:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRaO9009357; Tue, 5 Dec 2023 18:27:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRaLA009354; Tue, 5 Dec 2023 18:27:36 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:36 GMT Message-Id: <202312051827.3B5IRaLA009354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ad3edd66d15e - releng/14.0 - pkgbase: use . format for alpha, beta and release package versions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: ad3edd66d15e6af1bf7e393a01f1a126dfa55fff Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ad3edd66d15e6af1bf7e393a01f1a126dfa55fff commit ad3edd66d15e6af1bf7e393a01f1a126dfa55fff Author: Doug Rabson AuthorDate: 2023-11-13 13:04:26 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 14:05:27 +0000 pkgbase: use . format for alpha, beta and release package versions This is consistent with version numbers used in releng/13.2. PR: 275051 Reviewed by: bapt MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42562 Approved by: so Security: FreeBSD-EN-23:19.pkgbase (cherry picked from commit 21e9018ae19662db643a21064150da866bc7beb4) (cherry picked from commit da7e9601a99afd3f8777f6ae62fd51e601e15085) --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 01d3328726bd..12397abeedb2 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -547,9 +547,11 @@ VERSION= FreeBSD ${_REVISION}-${_BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDA MAJOR_REVISION= ${_REVISION:R} .if !defined(PKG_VERSION) +_PKG_REVISION= ${_REVISION} _STRTIMENOW= %Y%m%d%H%M%S _TIMENOW= ${_STRTIMENOW:gmtime} .if ${_BRANCH:MCURRENT*} || ${_BRANCH:MSTABLE*} || ${_BRANCH:MPRERELEASE*} +_PKG_REVISION= ${MAJOR_REVISION} EXTRA_REVISION= .snap${_TIMENOW} .elif ${_BRANCH:MALPHA*} EXTRA_REVISION= .a${_BRANCH:C/ALPHA([0-9]+).*/\1/}.${_TIMENOW} @@ -560,7 +562,7 @@ EXTRA_REVISION= .rc${_BRANCH:C/RC([0-9]+).*/\1/}.${_TIMENOW} .elif ${_BRANCH:M*-p*} EXTRA_REVISION= p${_BRANCH:C/.*-p([0-9]+$)/\1/} .endif -PKG_VERSION:= ${MAJOR_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} +PKG_VERSION:= ${_PKG_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} .endif .endif # !defined(PKG_VERSION) From nobody Tue Dec 5 18:27:37 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8CY5dYGz53JVL; Tue, 5 Dec 2023 18:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8CY57Pxz3ZLp; Tue, 5 Dec 2023 18:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8brK5tSS0DDuJZMkcyuSZTxto0y6G2h5BBsZUus9Yg=; b=ToL+FOqGywLz2GmnldCoZNEB1xu9j5ej0vq0pty2T5GUZ6JvB7cWvt0wzylgQWPApAnldD r12rMFm5YgMHrw16wJ5qmJgAtAtUVGayVe18drB0cHxISdcSnumizqHzK6CyAN30+Pj9aW TvsGoqxC1v6DPyDcJUNoIx+hJpRoxwgyBKimJdkZS+WuwCPZcCuRH5nqLK+NnyuNAdMi8F mM1deiXrMnPUdq0+g0ehB6ECKUUuFUiX6R4bAc1uPRQyko7D9JDu+Wz2zruBar5PochTSm 3CxoKK7YA6wDhjLEGjVaKVu/oWQK34PzGOaVm/1FwZ8JecPlydhdllDtH4NEKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800857; a=rsa-sha256; cv=none; b=CMRLTx8ZVvZcDP30kjdeEC1MXeXx9bSVC0NEvvia+cMpVeE/dCVBJeSxm6UxtF3ZNqON0a q6tUQmmEgvbJ8odTyf0/0OiFwQzLCXaZ53iJ1Cb2uHSAypFXZTo9HKP3GL4U1kHsDnpk/r rvcJhgeBJ0a/NXIT5ugLsT8AI0DjqF0nDQrPLAFo699JSJxuXcHI8WRtNtWi30IO1aRWu6 4mcZP8kPX1WatZwztPrcIFY+Tw2/n+VpUx2dRPVvckfjwqyBhCOQ2nCcqjgol6H3TQGnqe +kUuMYTPBD6eco/CyVm+TR4rc8etqELTqjxQsF/tF6thiDT/dtQg/8g2hfyy7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8brK5tSS0DDuJZMkcyuSZTxto0y6G2h5BBsZUus9Yg=; b=AI0PUVnbFdanZAal+PGrHYwe+8JAuOidetyJWlCJRZQABBTEWJJewdvcd8yiFx+vU6UHTB yVwm7CukcoPnmOdQgxGnhpY6spLWVGeCIdzhRc+ebkkHbJnU/81r0Btwu6cR2xXq1P3Mrh px4dCyAWqm24M4X8wZ4oP15llCwDHjLppqHYYALy5f9VhjcrTdBIPPYG+dBy1T1ARA6Fji iSVTmjFFmFn4/zwthgtCFOf7RWZrZLwLcz7gtG45/xNyNGSnn+GNoFMm5Xsb7r7om6KIlX KONndjWKYuiSr1wEazkIuPBNS0jiMwDtgpdyGQ4dhi9uirXqN6uk+bJoZESgog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8CY3v1pz59x; Tue, 5 Dec 2023 18:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRbQr009398; Tue, 5 Dec 2023 18:27:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRb4g009395; Tue, 5 Dec 2023 18:27:37 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:37 GMT Message-Id: <202312051827.3B5IRb4g009395@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4be96902ba82 - releng/14.0 - vm_phys: fix freelist_contig List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 4be96902ba82364810b86a6a0b3c58065e45e4cd Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4be96902ba82364810b86a6a0b3c58065e45e4cd commit 4be96902ba82364810b86a6a0b3c58065e45e4cd Author: Doug Moore AuthorDate: 2023-11-15 09:25:45 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 14:05:55 +0000 vm_phys: fix freelist_contig vm_phys_find_freelist_contig is called to search a list of max-sized free page blocks and find one that, when joined with adjacent blocks in memory, can satisfy a request for a memory allocation bigger than any single max-sized free page block. In commit fa8a6585c7522b7de6d29802967bd5eba2f2dcf1, I defined this function in order to offer two improvements: 1) reduce the worst-case search time, and 2) allow solutions that include less-than max-sized free page blocks at the front or back of the giant allocation. However, it turns out that this change introduced an error, reported in In Bug 274592. That error concerns failing to check segment boundaries. This change fixes an error in vm_phys_find_freelist_config that resolves that bug. It also abandons improvement 2), because the value of that improvement is small and because preserving it would require more testing than I am able to do. PR: 274592 Reported by: shafaisal.us@gmail.com Reviewed by: alc, markj Tested by: shafaisal.us@gmail.com Fixes: fa8a6585c752 vm_phys: avoid waste in multipage allocation MFC after: 10 days Differential Revision: https://reviews.freebsd.org/D42509 Approved by: so Security: FreeBSD-EN-23:20.vm (cherry picked from commit 2a4897bd4e1bd8430d955abd3cf6675956bb9d61) (cherry picked from commit 210fce73ae0e4106a3aeb1970ffbeb30d0baa6ba) --- sys/vm/vm_phys.c | 146 +++++++++++++++++++++++-------------------------------- 1 file changed, 62 insertions(+), 84 deletions(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index bc992bdfc58b..cd75ed092691 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -1360,108 +1360,75 @@ vm_phys_unfree_page(vm_page_t m) } /* - * Find a run of contiguous physical pages from the specified page list. + * Find a run of contiguous physical pages, meeting alignment requirements, from + * a list of max-sized page blocks, where we need at least two consecutive + * blocks to satisfy the (large) page request. */ static vm_page_t -vm_phys_find_freelist_contig(struct vm_freelist *fl, int oind, u_long npages, +vm_phys_find_freelist_contig(struct vm_freelist *fl, u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary) { struct vm_phys_seg *seg; - vm_paddr_t frag, lbound, pa, page_size, pa_end, pa_pre, size; - vm_page_t m, m_listed, m_ret; - int order; + vm_page_t m, m_iter, m_ret; + vm_paddr_t max_size, size; + int max_order; - KASSERT(npages > 0, ("npages is 0")); - KASSERT(powerof2(alignment), ("alignment is not a power of 2")); - KASSERT(powerof2(boundary), ("boundary is not a power of 2")); - /* Search for a run satisfying the specified conditions. */ - page_size = PAGE_SIZE; + max_order = VM_NFREEORDER - 1; size = npages << PAGE_SHIFT; - frag = (npages & ~(~0UL << oind)) << PAGE_SHIFT; - TAILQ_FOREACH(m_listed, &fl[oind].pl, listq) { - /* - * Determine if the address range starting at pa is - * too low. - */ - pa = VM_PAGE_TO_PHYS(m_listed); - if (pa < low) - continue; + max_size = (vm_paddr_t)1 << (PAGE_SHIFT + max_order); + KASSERT(size > max_size, ("size is too small")); + /* + * In order to avoid examining any free max-sized page block more than + * twice, identify the ones that are first in a physically-contiguous + * sequence of such blocks, and only for those walk the sequence to + * check if there are enough free blocks starting at a properly aligned + * block. Thus, no block is checked for free-ness more than twice. + */ + TAILQ_FOREACH(m, &fl[max_order].pl, listq) { /* - * If this is not the first free oind-block in this range, bail - * out. We have seen the first free block already, or will see - * it before failing to find an appropriate range. + * Skip m unless it is first in a sequence of free max page + * blocks >= low in its segment. */ - seg = &vm_phys_segs[m_listed->segind]; - lbound = low > seg->start ? low : seg->start; - pa_pre = pa - (page_size << oind); - m = &seg->first_page[atop(pa_pre - seg->start)]; - if (pa != 0 && pa_pre >= lbound && m->order == oind) + seg = &vm_phys_segs[m->segind]; + if (VM_PAGE_TO_PHYS(m) < MAX(low, seg->start)) + continue; + if (VM_PAGE_TO_PHYS(m) >= max_size && + VM_PAGE_TO_PHYS(m) - max_size >= MAX(low, seg->start) && + max_order == m[-1 << max_order].order) continue; - - if (!vm_addr_align_ok(pa, alignment)) - /* Advance to satisfy alignment condition. */ - pa = roundup2(pa, alignment); - else if (frag != 0 && lbound + frag <= pa) { - /* - * Back up to the first aligned free block in this - * range, without moving below lbound. - */ - pa_end = pa; - for (order = oind - 1; order >= 0; order--) { - pa_pre = pa_end - (page_size << order); - if (!vm_addr_align_ok(pa_pre, alignment)) - break; - m = &seg->first_page[atop(pa_pre - seg->start)]; - if (pa_pre >= lbound && m->order == order) - pa_end = pa_pre; - } - /* - * If the extra small blocks are enough to complete the - * fragment, use them. Otherwise, look to allocate the - * fragment at the other end. - */ - if (pa_end + frag <= pa) - pa = pa_end; - } - - /* Advance as necessary to satisfy boundary conditions. */ - if (!vm_addr_bound_ok(pa, size, boundary)) - pa = roundup2(pa + 1, boundary); - pa_end = pa + size; /* - * Determine if the address range is valid (without overflow in - * pa_end calculation), and fits within the segment. + * Advance m_ret from m to the first of the sequence, if any, + * that satisfies alignment conditions and might leave enough + * space. */ - if (pa_end < pa || seg->end < pa_end) - continue; - - m_ret = &seg->first_page[atop(pa - seg->start)]; + m_ret = m; + while (!vm_addr_ok(VM_PAGE_TO_PHYS(m_ret), + size, alignment, boundary) && + VM_PAGE_TO_PHYS(m_ret) + size <= MIN(high, seg->end) && + max_order == m_ret[1 << max_order].order) + m_ret += 1 << max_order; /* - * Determine whether there are enough free oind-blocks here to - * satisfy the allocation request. + * Skip m unless some block m_ret in the sequence is properly + * aligned, and begins a sequence of enough pages less than + * high, and in the same segment. */ - pa = VM_PAGE_TO_PHYS(m_listed); - do { - pa += page_size << oind; - if (pa >= pa_end) - return (m_ret); - m = &seg->first_page[atop(pa - seg->start)]; - } while (oind == m->order); + if (VM_PAGE_TO_PHYS(m_ret) + size > MIN(high, seg->end)) + continue; /* - * Determine if an additional series of free blocks of - * diminishing size can help to satisfy the allocation request. + * Skip m unless the blocks to allocate starting at m_ret are + * all free. */ - while (m->order < oind && - pa + 2 * (page_size << m->order) > pa_end) { - pa += page_size << m->order; - if (pa >= pa_end) - return (m_ret); - m = &seg->first_page[atop(pa - seg->start)]; + for (m_iter = m_ret; + m_iter < m_ret + npages && max_order == m_iter->order; + m_iter += 1 << max_order) { } + if (m_iter < m_ret + npages) + continue; + return (m_ret); } return (NULL); } @@ -1508,11 +1475,10 @@ vm_phys_find_queues_contig( } if (order < VM_NFREEORDER) return (NULL); - /* Search for a long-enough sequence of small blocks. */ - oind = VM_NFREEORDER - 1; + /* Search for a long-enough sequence of max-order blocks. */ for (pind = 0; pind < VM_NFREEPOOL; pind++) { fl = (*queues)[pind]; - m_ret = vm_phys_find_freelist_contig(fl, oind, npages, + m_ret = vm_phys_find_freelist_contig(fl, npages, low, high, alignment, boundary); if (m_ret != NULL) return (m_ret); @@ -1593,6 +1559,18 @@ vm_phys_alloc_contig(int domain, u_long npages, vm_paddr_t low, vm_paddr_t high, /* Return excess pages to the free lists. */ fl = (*queues)[VM_FREEPOOL_DEFAULT]; vm_phys_enq_range(&m_run[npages], m - &m_run[npages], fl, 0); + + /* Return page verified to satisfy conditions of request. */ + pa_start = VM_PAGE_TO_PHYS(m_run); + KASSERT(low <= pa_start, + ("memory allocated below minimum requested range")); + KASSERT(pa_start + ptoa(npages) <= high, + ("memory allocated above maximum requested range")); + seg = &vm_phys_segs[m_run->segind]; + KASSERT(seg->domain == domain, + ("memory not allocated from specified domain")); + KASSERT(vm_addr_ok(pa_start, ptoa(npages), alignment, boundary), + ("memory alignment/boundary constraints not satisfied")); return (m_run); } From nobody Tue Dec 5 18:27:38 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8Cb1b6Gz53JVR; Tue, 5 Dec 2023 18:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8CZ5z4Kz3ZMH; Tue, 5 Dec 2023 18:27:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hjWd/iZOTmXXhJjrSl51Lwu89WMjz7RIRrf9uvWkdAk=; b=DnP0ipKiCCUvCkVIOCO0fsN7/h3Sbc8ccyEvXRWerenyp1r+KpsExwlTniuE0RAwwulHPy AVKlufaJ0BIplG1yoQneGFPK5Gj6TuzzdMZxsx76xgOx9uh/TTVL3rvh7HNeV53h7WuFuh yH0C6GWgIt4axz6Arlrx4KnDFRVudeeU0YKAorZtcGh2ErbopzLkjAJ2dE03+UyV6dBEG+ zZMc6I+MbEmcCuzvFmCrnThnAbHwbDO0kfUpXiVxmTzbEALHNRV/UVJCucrGwiXdZCRenb mQQUEj1PhLQwiL+LXyO7HLPWx+mBy48f1s+a3a0VXxpwJrZWYNGe8HONO1nb/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800858; a=rsa-sha256; cv=none; b=LWeQ4YxwksG/jpthWD5857PCWiEy9OFb04KuqAWgGcoXyafKgSZoCCzcXBfKtm4zb8nnqV rJtF2a15WZfwWU2ryMSmDpAv0LYpPlkBwNCRTj19NpnCyOErwXtYzKkWc+zhRSVjMfMQ9F Apy3vKfr+4GK4RsA8pyWAYYTccWc7dli4F+yxhfURLrpelR7pbMFzj4PASA5YBXDIRMF1f dC+tQ1x361KwiKRd7jwMYp48KS9PCwUD9L6xrd7WH/oTGyJdXf+iaUU0M2kWLrafVphW9R HQM/QaxPcPidamiSp0stAcVHyGkJyDRF72doUTYj2eeLBz/sq+t8ToJgGV63sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hjWd/iZOTmXXhJjrSl51Lwu89WMjz7RIRrf9uvWkdAk=; b=j0A8OtrZtoBZRbFJK5aRLiKZM2qw9zoYMNOc2mrAe0ANAcrmGF6OcvF6LvwFSFtY3rfy7a EauWgG03g7/vzEzu7HS5OXaVPPcSANoDQs3DaKlqd/4BVyo9AdLtBaP4HvQ7LJAmqJYxG1 iyZIa4sEutAKKUDYlVvLPCUBW8Zh7p17XS62mSlJ2j7W8DpIgNRasC2MmYFqIEyhPv7Szb kwEuSl4iGpmiiMhPoXgGbhdu5pqWkfpcPA7fOExm8sJGMlzOmbWgabliXb8iXet+uunlP2 xJ1UDe56vQmWoB4KZyDbMWZ4B8NjoycnX/11Wic7CjfZNtGLkxvDNmk3LLB+0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8CZ4xRDz59y; Tue, 5 Dec 2023 18:27:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRcuL009453; Tue, 5 Dec 2023 18:27:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRcmC009450; Tue, 5 Dec 2023 18:27:38 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:38 GMT Message-Id: <202312051827.3B5IRcmC009450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 31f6cfca851f - releng/14.0 - tty: properly check character position when handling IUTF8 backspaces List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 31f6cfca851f20099162352dac8d044857b2e1f9 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=31f6cfca851f20099162352dac8d044857b2e1f9 commit 31f6cfca851f20099162352dac8d044857b2e1f9 Author: Bojan Novković AuthorDate: 2023-11-13 18:02:30 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 14:06:29 +0000 tty: properly check character position when handling IUTF8 backspaces The tty_rubchar() code handling backspaces for UTF-8 characters didn't properly check whether the beginning of the current line was reached. This resulted in a kernel panic in ttyinq_unputchar() when prodded with certain malformed UTF-8 sequences. PR: 275009 Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D42564 Approved by: so Security: FreeBSD-EN-23:21.tty (cherry picked from commit c6d7be214811c315d234d64c6cbaa92d4f55d2c1) (cherry picked from commit ae8387cc818a0d6a2229ee049b671482e1549519) --- sys/kern/tty_ttydisc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/kern/tty_ttydisc.c b/sys/kern/tty_ttydisc.c index c46579cefbb1..cb5bf672d040 100644 --- a/sys/kern/tty_ttydisc.c +++ b/sys/kern/tty_ttydisc.c @@ -822,7 +822,13 @@ ttydisc_rubchar(struct tty *tp) /* Loop back through inq until we hit the * leading byte. */ while (CTL_UTF8_CONT(c) && nb < UTF8_STACKBUF) { - ttyinq_peekchar(&tp->t_inq, &c, "e); + /* + * Check if we've reached the beginning + * of the line. + */ + if (ttyinq_peekchar(&tp->t_inq, &c, + "e) != 0) + break; ttyinq_unputchar(&tp->t_inq); bytes[curidx] = c; curidx--; From nobody Tue Dec 5 18:27:39 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8Cc2vyZz53JVS; Tue, 5 Dec 2023 18:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8Cc06KNz3ZMY; Tue, 5 Dec 2023 18:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/7m2mu4bd274o5cMXYMdo1T/ooSwpXb7+tJ8EntoJRQ=; b=u2xAco1XXlGkJvdXAOC+sUUr7Lj9OPjpd0wgQdiEBGy6MNkhupB8GVlzv/XxaE7loAnMyJ v47SlgPJkyv0rzjXFdTj6WQvvwcVZPyBG3mU3t2NDbQNdBrnjt5hEYYYXBiuirHGsg9PSK i9zZpa39cjAElj5uD777TuI58JyJu02bDEDjjbgI2/3ZDuMFSmFCSZ6r9cb2zmBqHiUsCL R7jx9S12ky7iSd1++XcTD9gfP4YgnHHth6NYvUY2a8U2MNOAa5xSL/j3SFnybQ5vrUkgVF 9kAmLvMd7LD9uINiulwdmsRe8Cz+V4YD+n/PVwvgL2pGVjblhwl/YrWKfcg8iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800860; a=rsa-sha256; cv=none; b=lqPHfOUc/K7+yFCRmtzp4fWQjC29r8qcyiJspLisqvqjq39R+zXEOsC2rugGcXBhpao7km Fqm/+0mZ5bqP2Q/VDGirovbm4QtrIMMiXrV9jDFlrPhWwmUh5v18BKfKMG5ulm6oik2zaO joOrD3Gg1LyS5sR22WPY+x1bmFM/4N1YUs3DO5MIfC4MfcXE3i3zHsVT9GCM6CDF/6DIW6 GnB6mteauVccmBQP+b/Hzzjap8qwPk7evYNa/mm/k/OiokotIuhLU9kdhEPQ8AbX7OrJ2+ QB8FkvwcLOIa31wIg8IBYdagq5Vea+nZI0Be1WKbenLkaEii1rQy6Qu55HNVuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/7m2mu4bd274o5cMXYMdo1T/ooSwpXb7+tJ8EntoJRQ=; b=GnmXPz5N9GAJyotYjptsY/l6WTTo9XVVCHckTb2WvKKDJjjFdROqNtbzgxn9vhFtH/OsTc +oX0Sb8Y6ct44eNdBYfLMeBKUq5ajMvSCtHTfKMId90Ie+xGwV9S9bYRgdVfceicZVuY5V mOJAvRWd9VVBh7B1csGkV1QmJLFfesc15yNnFOpwpsYHDk0D+bS3TpFNUqcLqFypn0Gy54 uWuH5avUxTI22viIrydWBD+nHoap0r+wOmRFG7BhRbBA8/QWqvZpdEAAjdmtN16/rYBqhK 2ZZ8ZpVO2yc1jH+S1wSXLkRYYQODpFfqNXweIRMJGwhSZ9x1+BySfR0V3S0GdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8Cb5p0rz5B0; Tue, 5 Dec 2023 18:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRdr3009501; Tue, 5 Dec 2023 18:27:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRdRd009498; Tue, 5 Dec 2023 18:27:39 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:39 GMT Message-Id: <202312051827.3B5IRdRd009498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4fd0162652a2 - releng/14.0 - nfsd: Fix NFS access to .zfs/snapshot snapshots List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 4fd0162652a2e0f51aad99055ec837049febaee2 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4fd0162652a2e0f51aad99055ec837049febaee2 commit 4fd0162652a2e0f51aad99055ec837049febaee2 Author: Rick Macklem AuthorDate: 2023-11-23 15:23:33 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 15:45:11 +0000 nfsd: Fix NFS access to .zfs/snapshot snapshots When a process attempts to access a snapshot under //.zfs/snapshot, the snapshot is automounted. However, without this patch, the automount does not set mnt_exjail, which results in the snapshot not being accessible over NFS. This patch defines a new function called vfs_exjail_clone() which sets mnt_exjail from another mount point and then uses that function to set mnt_exjail in the snapshot automount. A separate patch that is currently a pull request for OpenZFS, calls this function to fix the problem. PR: 275200 Approved by: so Security: FreeBSD-EN-23:22.vfs (cherry picked from commit f5f277728adec4c5b3e840a1fb16bd16f8cc956d) (cherry picked from commit a7c25f0d064425bc7a3b170aa441fecf0ae38600) --- sys/kern/vfs_mount.c | 35 +++++++++++++++++++++++++++++++++++ sys/sys/mount.h | 4 ++++ 2 files changed, 39 insertions(+) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 45ab9cfc93cc..25757356f86a 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -3119,6 +3119,41 @@ suspend_all_fs(void) mtx_unlock(&mountlist_mtx); } +/* + * Clone the mnt_exjail field to a new mount point. + */ +void +vfs_exjail_clone(struct mount *inmp, struct mount *outmp) +{ + struct ucred *cr; + struct prison *pr; + + MNT_ILOCK(inmp); + cr = inmp->mnt_exjail; + if (cr != NULL) { + crhold(cr); + MNT_IUNLOCK(inmp); + pr = cr->cr_prison; + sx_slock(&allprison_lock); + if (!prison_isalive(pr)) { + sx_sunlock(&allprison_lock); + crfree(cr); + return; + } + MNT_ILOCK(outmp); + if (outmp->mnt_exjail == NULL) { + outmp->mnt_exjail = cr; + atomic_add_int(&pr->pr_exportcnt, 1); + cr = NULL; + } + MNT_IUNLOCK(outmp); + sx_sunlock(&allprison_lock); + if (cr != NULL) + crfree(cr); + } else + MNT_IUNLOCK(inmp); +} + void resume_all_fs(void) { diff --git a/sys/sys/mount.h b/sys/sys/mount.h index c4e1f83e9683..70f4bc2b834e 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -980,6 +980,9 @@ enum vfs_notify_upper_type { * exported vnode operations */ +/* Define this to indicate that vfs_exjail_clone() exists for ZFS to use. */ +#define VFS_SUPPORTS_EXJAIL_CLONE 1 + int dounmount(struct mount *, uint64_t, struct thread *); int kernel_mount(struct mntarg *ma, uint64_t flags); @@ -1016,6 +1019,7 @@ int vfs_setpublicfs /* set publicly exported fs */ (struct mount *, struct netexport *, struct export_args *); void vfs_periodic(struct mount *, int); int vfs_busy(struct mount *, int); +void vfs_exjail_clone(struct mount *, struct mount *); void vfs_exjail_delete(struct prison *); int vfs_export /* process mount export info */ (struct mount *, struct export_args *, bool); From nobody Tue Dec 5 18:27:40 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8Cd1Yxgz53JRq; Tue, 5 Dec 2023 18:27:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8Cd0g7gz3ZMw; Tue, 5 Dec 2023 18:27:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C0KXcY9jN6DK2AluvOvC7kNxjxlCUnOztF/AXFEODyU=; b=O9HivpOHaiEFGaQ0Jp6cvyJf/EI60XWig9c48EX8wtMawX2pQGBy7Hkf6Ky9mGkzbbgYwg zdzEMcdiLIXZMhJaEqbzRTdbB6OvDsHRnM8rFiSasl27+J3tl2TsNU3w0G01ibSj4O39XL v/a7sz0m4WaTpWussNB2xz11IaiGm4ok9asqOJdhjGTt7r8dxXAsQaHdR3cejQXrDdPpYY DKJfVw8qHfmTf9O28cbv/M2SrUGvDJHx/Y1RTH1dICegQ1hEKNOYLY//4286bDJnbr1kzp dOaz2zsdIvTAeirURYEKe00AL0YdnBTInZs+X90g2ROZ6X6yBsxmpWW81TF2kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800861; a=rsa-sha256; cv=none; b=uyufS8CM5q2K872o6wg37AehCmRkAfZYGs3tGvAHOoKcKh95Nwug+1PxydJ39QEwxAvA+i oj3klLqmFQVPV7WAqBBOS7KHI4xfh95BpUrWRRlMcfivCyzm1cvmlVWGVpgK4QsBmVC5jN R8dQMrUVpVTCChgNJK56n8SyWk4qThqp+ePOoFbBl9yKLG2n2RLs09/TEx4Xz772TNQ2Ui CtBEAH5Z9P5xs8hrEgCBp/eEKkmAhZuq8RggR4FsUlfCylIpKKJ02cVG9NteWo4R2+gmo5 XR2wiQki3+JFEhQWHu6ahfmPTly+UAc7OOLkUwbviGfkpIZJca8wzHt9V+0GsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C0KXcY9jN6DK2AluvOvC7kNxjxlCUnOztF/AXFEODyU=; b=Pw8GL9FxHD8fGC+9jeubEqbJed6CvJJQoY+3erjSKQVf8/W2QLY6SWgkZ/3qhaVtj7Tf2w 02FTve7smr6A+cb046DmrHc4qxKQoLy5Wl/xfanmABSleVAwDQlMdNBHwI13ZDV2Uh/ikl /B/AlUrrrwstNAJmerPGNLRXxTY/BiGKPaV7zmRcsqSVVlmrcJ46fKmeH3Kl5pjNBwv2/H iNSN+wdoWXamOSZJ6JM11ay0dBL/wIt2DAReZfpygvmyJEIi5FQ/J1lQ2gbosNYN9iCf4I gheCd99YCZ9x/p8PrPl4+cEwKfaW08+XQQX2JV3QW1ldDKZ33ehhJxTrT0zG6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8Cc6h45z5B1; Tue, 5 Dec 2023 18:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IResQ009544; Tue, 5 Dec 2023 18:27:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IReBI009541; Tue, 5 Dec 2023 18:27:40 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:40 GMT Message-Id: <202312051827.3B5IReBI009541@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 889ecd8fd178 - releng/14.0 - zfs: cherry-pick commit from master List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 889ecd8fd178c4779e10e208f4845c9bb7f4d616 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=889ecd8fd178c4779e10e208f4845c9bb7f4d616 commit 889ecd8fd178c4779e10e208f4845c9bb7f4d616 Author: rmacklem <64620010+rmacklem@users.noreply.github.com> AuthorDate: 2023-11-28 00:31:03 +0000 Commit: Mark Johnston CommitDate: 2023-12-04 15:45:56 +0000 zfs: cherry-pick commit from master #15563 522414da3b FreeBSD: Fix ZFS so that snapshots under .zfs/snapshot are NFS visible Obtained from: OpenZFS Approved by: so Security: FreeBSD-EN-23:22.vfs --- sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h | 2 +- sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c | 9 ++++++++- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h index 7f163fcfdb1e..f2196da56bc8 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h @@ -101,7 +101,7 @@ void vfs_setmntopt(vfs_t *vfsp, const char *name, const char *arg, void vfs_clearmntopt(vfs_t *vfsp, const char *name); int vfs_optionisset(const vfs_t *vfsp, const char *opt, char **argp); int mount_snapshot(kthread_t *td, vnode_t **vpp, const char *fstype, - char *fspath, char *fspec, int fsflags); + char *fspath, char *fspec, int fsflags, vfs_t *parent_vfsp); typedef uint64_t vfs_feature_t; diff --git a/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c b/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c index a07098afc5b4..3f33547216eb 100644 --- a/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c +++ b/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c @@ -120,7 +120,7 @@ vfs_optionisset(const vfs_t *vfsp, const char *opt, char **argp) int mount_snapshot(kthread_t *td, vnode_t **vpp, const char *fstype, char *fspath, - char *fspec, int fsflags) + char *fspec, int fsflags, vfs_t *parent_vfsp) { struct vfsconf *vfsp; struct mount *mp; @@ -220,6 +220,13 @@ mount_snapshot(kthread_t *td, vnode_t **vpp, const char *fstype, char *fspath, mp->mnt_opt = mp->mnt_optnew; (void) VFS_STATFS(mp, &mp->mnt_stat); +#ifdef VFS_SUPPORTS_EXJAIL_CLONE + /* + * Clone the mnt_exjail credentials of the parent, as required. + */ + vfs_exjail_clone(parent_vfsp, mp); +#endif + /* * Prevent external consumers of mount options from reading * mnt_optnew. diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c index 420d887b661e..79909415178a 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -1026,7 +1026,8 @@ zfsctl_snapdir_lookup(struct vop_lookup_args *ap) "%s/" ZFS_CTLDIR_NAME "/snapshot/%s", dvp->v_vfsp->mnt_stat.f_mntonname, name); - err = mount_snapshot(curthread, vpp, "zfs", mountpoint, fullname, 0); + err = mount_snapshot(curthread, vpp, "zfs", mountpoint, fullname, 0, + dvp->v_vfsp); kmem_free(mountpoint, mountpoint_len); if (err == 0) { /* From nobody Tue Dec 5 18:27:42 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8Cf2ldwz53JMW; Tue, 5 Dec 2023 18:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8Cf1tPRz3ZSm; Tue, 5 Dec 2023 18:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uEHmnYtTGLcjMZBAF0Wsb8U5ysSdtbqpJi0QUnh1VJg=; b=nuU9zQdUKfa98wEX8maXDvXSQTGjTEXNudwKGQQFcBuUeJB09BCIaQSTzMJ/TSlXsEBFuG TdZcS/epdXGxoBtZvFMg+im8+zuGyC1aGNaGKd8+OS4VB7ovmdzuB/OFYVAgf/Nyc5wxz4 jccyzAokRRSPUHAEG2PB+GlfM+MuWdEi/4kt97p3xSnQ6X5aQG06Z9elckqA8Vk1hy8muz NVyMA2EsxuVnXUX421mxWznK4Klvjvpr0BxMnKbUQhU031Z2eJxVlmvLJRZ1pNoyxeHlXU 1ymmd7j9w+rjfINyRP5wtXg2RjuvGU+LqJyGGPpYaLzuEskLG89NR+CaRnXwpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800862; a=rsa-sha256; cv=none; b=CB7G1M1Ycw5pKRp6LXoJh6z2K8Z1hyJ1A6R+vYUgfH2e0YtDTj3lUJXsdpmJR14fK4ZpeY l3oKBYU9QNYHPM8WzdkAkDAF/mSZJ84dLY9NZl7H4O3IIicPTw1SVr/QkrI+woTrcJBWuB oDJIkC16rEk1B+K6J27+8DW5SzJmItpAi0F5J4KAw/gpFIxNDO87vV7Yk7YMmhNhsJojZu 7tPFIfPSsk85P+zALCHSYz+brkqd6150s1r7dkSpFSV4cxA5KPj/jKUqSSJGk86AJtR0QW f0QY+L1BK4OkrsLswGUYrfYpe46a53gSv/H6T9jt8omk8uvt4cQC2W4LvuyPRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uEHmnYtTGLcjMZBAF0Wsb8U5ysSdtbqpJi0QUnh1VJg=; b=mHVGH8+o03r57WMm/nrg1A7dAEE9tWBjDxAhHCbU5chOZA0IREplraLxnlBh78W/YKdJwG 3rFqmvMWPA5K6weY3D9YOQ24Y5fs+aCf/+s9MmZvIIzm6/owx0EuP1ub1cLQ99IF7/ZE7z mNVTs8Fixx/Ldy2ie+Af66oYwMPV5HEN6RCPuZaX9IgYzx2oHlJJaTw63LG5jy36h2EAkW P4DSBNmniSQZbDD2kBsPfF3OghNTFSzwERdTynl+7IIbmp6wI2cT0jsd+130W1N8Z2Nc0j 9JTnEsyvt04iqKhtJK8QIqTEtMFycpy+SFkThYXaNERvM8LSCcBLN0JpkqLNZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8Cf0n9Nz5R2; Tue, 5 Dec 2023 18:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRgxq009586; Tue, 5 Dec 2023 18:27:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRgUY009583; Tue, 5 Dec 2023 18:27:42 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:42 GMT Message-Id: <202312051827.3B5IRgUY009583@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0019b7058a7a - releng/14.0 - pf: remove incorrect fragmentation check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 0019b7058a7acbea72da214cb393dd3c933e4748 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0019b7058a7acbea72da214cb393dd3c933e4748 commit 0019b7058a7acbea72da214cb393dd3c933e4748 Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:26:28 +0000 pf: remove incorrect fragmentation check We do not need to check PFDESC_IP_REAS while tracking TCP state. Moreover, this check incorrectly considers no-data packets (e.g. RST) to be in-window when this flag is not set. Sponsored by: Rubicon Communications, LLC ("Netgate") Approved by: so Security: FreeBSD-SA-23:17.pf (cherry picked from commit 6284d5f76d6bd2d97fe287c5adabf59c79688eda) (cherry picked from commit a47a44c0d69ce82f302b02da940538a99b47037f) --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 0973c829644a..eab79387e867 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5316,8 +5316,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (ackskew <= (MAXACKWINDOW << sws)) && /* Acking not more than one window forward */ ((th->th_flags & TH_RST) == 0 || orig_seq == src->seqlo || - (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo) || - (pd->flags & PFDESC_IP_REAS) == 0)) { + (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo))) { /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { From nobody Tue Dec 5 18:27:43 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8Cg3bMRz53JPp; Tue, 5 Dec 2023 18:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8Cg2mHPz3ZbW; Tue, 5 Dec 2023 18:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RlItZYbnHtgS9Zg6ybA0Nn3JK14MdgWjP2+X+y8wQIU=; b=cPvvWTe0YWXuG8SGIQ7MYDrsnmuKdMVx01crNUQPR8063W/0c7g/owXbjUSKDf/CQt0GPy McXwLPQCUZJJILbDMn35YXmXi2mEkltvZ43DcoHnkfDlV8S6d33OKCICdQ5dCHMi6brHIS HRnM4tObiA40MmqeU3DsedND+JT10nSQZB1TC4hQH7BZSOQOq5ZoDS1RTKdW+EBHvBuMjL M46ZFKqISiGShBN5QLTYMrt6EwYxzikeCDiwhXkfpebFJk0Jp+Eh1thqkq02V+nh44ejRP pje+wAYRYzQ4V13W8xaiwyjRv8Zlcz+ROswILiXEKe0qlccxDjKselG9bCwjFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800863; a=rsa-sha256; cv=none; b=a1LbCIxFRniYvp0Dd8okjW+JYtZSpWoasjHwgwgDdfy/uFmfwrqcJMjYWXv+dNIejw1TpE NArxfcnk1N2TAgDlZfpU7jkOKxSKexnM9QT2jEaqo2FtbzkaRdRxTyMYDgOWFQObn6RP0Y 4JTtZXN+ruBCvo2rCpArFEQ+SSLeM4H033wXDH4sd7CDiJg6ovChUZtodFhUSRI5uEv5VL Ma/hunxU+A3K65DVTbOdCS4jajBU3/6axw+JhbePTq+aR2DPA/Uu4Ep3Ucb9et6h6bZosn MDXTk+nz6HcuGzIzAKA4ttVmjyQJejXgf4yx0awuAYK0rYa/mh4sUSh+mC9UaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RlItZYbnHtgS9Zg6ybA0Nn3JK14MdgWjP2+X+y8wQIU=; b=PBmdPyojGmzStgnyaN5I9HjlTDzaeIPWMDhlp70EV2hy4Y9zJizu4IWJ/Tno79UeWF350j 6a159HFAwqtIRQ3egLUjMiE55UuDquGibKKghRSxfv0So3ive7jOqaB3/6K5wWGcMdrzAj mDw+1hNaIzaOjRI55fY7ReVcpJHBowY3ClUaq/dk8RsHr/eAQsJc98VzbQ+t8AViUukFQT Fi17eB1NAcXpDEJJpu+wivBGhyIbUtVs9C2ZK/BdSePagosEhmiM7I9AerPFzo9KGjZGY2 QVhwpkomvhD2QTghPeoHPmYGSwgxV87RU5dDu9pKougC/08ISy5IK19LE65Acw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8Cg1jY1z5WG; Tue, 5 Dec 2023 18:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IRhDQ009640; Tue, 5 Dec 2023 18:27:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRhWA009637; Tue, 5 Dec 2023 18:27:43 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:43 GMT Message-Id: <202312051827.3B5IRhWA009637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 06497fbd52e2 - releng/14.0 - Add UPDATING entries and bump version List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 06497fbd52e2f138b7d590c8499d9cebad182850 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=06497fbd52e2f138b7d590c8499d9cebad182850 commit 06497fbd52e2f138b7d590c8499d9cebad182850 Author: Mark Johnston AuthorDate: 2023-12-05 18:16:40 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:26:28 +0000 Add UPDATING entries and bump version Approved by: so --- UPDATING | 23 +++++++++++++++++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 996c5744405d..0af118a3f624 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,29 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20231205: + 14.0-RELEASE-p2 SA-23:17.pf + EN-23:17.ossl + EN-23:18.openzfs + EN-23:19.pkgbase + EN-23:20.vm + EN-23:21.tty + EN-23:22.vfs + + TCP spoofing vulnerability in pf(4) [SA-23:17.pf] + + ossl(4)'s AES-GCM implementation may give incorrect results [EN-23:17.ossl] + + High CPU usage by ZFS kernel threads [EN-23:18.openzfs] + + Incorrect pkgbase version number for FreeBSD 14.0 [EN-23:19.pkgbase] + + Incorrect results from the kernel physical memory allocator [EN-23:20.vm] + + tty(4) IUTF8 causes a kernel panic [EN-23:21.tty] + + ZFS snapshot directories not accessible over NFS [EN-23:22.vfs] + 20231130: 14.0-RELEASE-p1 EN-23:15.sanitizer EN-23:16.openzfs diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 3ba43dc02fe4..d78502b8c4a5 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.0" -BRANCH="RELEASE-p1" +BRANCH="RELEASE-p2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Tue Dec 5 18:30:11 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8GW6sHlz53Jgs; Tue, 5 Dec 2023 18:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8GW6Ng3z3d0k; Tue, 5 Dec 2023 18:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aK4oRH7SpZ8cbrxdhSQ7EN4CqfYmTUyEPWwkwgtWdGk=; b=DWgRsaezd0FjZ84+jehEGXUsnNSf11tD1xxP+g3FSUR+Jqji1HxwYsPswtJLdMnu1pdVXv 5CZUeqbuRyQjIZEnz3QL1qbsIJDI7jeWNEpoSobYK61D+r7NOBqJOwP1YPed6TMK4sNLgK Im7siNFqy1txldlEJoVpizYDBgNvkqw5JeTkYV0D0dI6kfOLf6f+UCyYUARM+km7ihfH1g n4zFKNA1guUEs+4aOsJxILZ73ujyFJQ/QOQmV/RhPAYl2IGYKy5I8FYj7piZrQ/QWQFU/f dItlP04METSAAc3lAp3uYxBLcSwKury0xIHJq/JmrZDAmjNOqwIpsrwDoRO6XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801011; a=rsa-sha256; cv=none; b=TgwhnPXbtKBpAsBFs60yLjhkKIRYYmUamo8bOwo/xXG1BTr5Lkr5mU2aDfgcB7U6TvCC+1 f9HIGojDLVzsMYDT3jngmnAnocB6JbU9pY4gFmmWfGvut3e5xucti5s0KoyW5+RcpOjUcH dkUJrjOXXi9cmp6QkClK2yfv7870a48tByHINeQSdxlvoCKJfLwePXTyNSuFtRp1dX3WTX YwuNlYz80rDfl7lljznB4AXkRNSOxOo76k/YhGVEJwEc0FbYNoWcWoS7osdkIr0kYfOTCK 2DwjDkVIa5fbhtwis6/kogzgg1E1ey7hn74No6ggjtakoVX+A3TuDabKnftecw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aK4oRH7SpZ8cbrxdhSQ7EN4CqfYmTUyEPWwkwgtWdGk=; b=klAfVYOFrHsv7jDrshc6Bnpb7/i8UaA9o5ZBP9cR8kuDI0RpUmU+gBWCr42/SIsvB0u6PE nhZONzIzKbvG7lti3TB8w7qZBOrko5GAkL7W7Pg6WauPtPHTDpzfEzMmoNFqgJUtKmCspL 3aWOH7SW+XO2uJLAAtAkxBebUJBc8N3NOeAAHYj//BiKp9wKKRdikjKTf9eFhxY9eV0iOS u37SKEao/XggxWv2WCHPttAeGwiROaX7Y2svBOMzVvGoaQ2vcDKjiFOhRzio4rVdm8ZUpx o++xqLg4spzocYYisoiPI7ojiFJFvA/P9wXJCw+ztaY8x4ZH72+LZ5P5oCqDVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8GW5NDhz5BB; Tue, 5 Dec 2023 18:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IUB6l015156; Tue, 5 Dec 2023 18:30:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IUBn6015147; Tue, 5 Dec 2023 18:30:11 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:30:11 GMT Message-Id: <202312051830.3B5IUBn6015147@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 45e256e24c97 - releng/13.2 - pf: remove incorrect fragmentation check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 45e256e24c976a55dc856907a57564cbc30cfb60 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=45e256e24c976a55dc856907a57564cbc30cfb60 commit 45e256e24c976a55dc856907a57564cbc30cfb60 Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:28:12 +0000 pf: remove incorrect fragmentation check We do not need to check PFDESC_IP_REAS while tracking TCP state. Moreover, this check incorrectly considers no-data packets (e.g. RST) to be in-window when this flag is not set. Sponsored by: Rubicon Communications, LLC ("Netgate") Approved by: so Security: FreeBSD-SA-23:17.pf (cherry picked from commit 6284d5f76d6bd2d97fe287c5adabf59c79688eda) (cherry picked from commit ee1d1e38fae65d045b113a7053651bbd7b780e1d) --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index c9c0995cc4e7..a52e29bf3e58 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4563,8 +4563,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (ackskew <= (MAXACKWINDOW << sws)) && /* Acking not more than one window forward */ ((th->th_flags & TH_RST) == 0 || orig_seq == src->seqlo || - (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo) || - (pd->flags & PFDESC_IP_REAS) == 0)) { + (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo))) { /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { From nobody Tue Dec 5 18:30:12 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8GY4lvxz53JSW; Tue, 5 Dec 2023 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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8GY09sMz3dG6; Tue, 5 Dec 2023 18:30:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ztRWt9XBZX991oDkDnMOpkl5taCyBR37ltHgqjAVOo8=; b=cf1utNDZiNiCOJvBh5GiiYlvWu3n1AeFi/Zh6Ju2K6IiWIr72vVL3jQelKY7Zu+r+A0S/X MdY1C86PD3sv6lQ+rjQWORNl5tn+oj4dXww1ESdKVOAtb4dPAASVoksgeTvXcDnamqIqgp O8Gy33Q4X8ZxUXFKhse4fLEMvtbl5CEMXaxODhH0gcLD3DaF2cWWcomn026L1IuuVOpNUj DVAFFZqfSkE+Ud72Lh4gcHhhYJX2LP1O9V0P0jCd1bdoEz/HponcqIJLqJ2T7LmO9MsXZJ uW7bSa327vVos5xnr9ZQS0cghWNhKNlIfK/V8GJhc2wp+Xk3YacIXbb1tbE7Ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801013; a=rsa-sha256; cv=none; b=YxM5OuNLotpb0hS6d2PT1AbVOiyNJrfD7dhaRkxmj3yH01+dq5M/fty0LkfQqZ97eL5pE0 uVHUBDtpCIoV5Jz6X/29qvfEMw3xMt0zNNN+EpQ4j8i98ydpnyAh8RKRAHk0lZzbBa7TW/ gSSdwVKms9Ussk50my1j3GY8o5aOW/kOUqdgcEQhWfqkad8urRKlbZ0iM+Xiz5ib95eGJZ hj3htBYNHFmPr5Ooxmdk/RyY/3i7JJo4IFGfCGIx1iBTdmnh75k1hLSQo8ZBIrbMNapyrk KHY/E+P9ZN9Tp2OBxL9mTKxeKUwClZNXkDO9OMRTEreF508zPdmeksvoU+uLYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ztRWt9XBZX991oDkDnMOpkl5taCyBR37ltHgqjAVOo8=; b=MiY/Cq5mGYsMr8nMYoofid8Xk4idsORBKqlfzPen04UwmkcDwFRHAwcYNm1rmLqltGXsS3 9MTXyWDAhBWLCOrePhvv8JhsYoUjXUPefd0TaTcA7yngA1gtRlOmOe2KK4twot+SY47sgh IMwq9OtIbznR+kj7T5BJIc8DsYxt+RPi8O/754hwl+UqE1sGGuuHRZsyr2fnXGllNYGYPo da4kgnpJK7gtYuxFti2fspmdOCaHqFzu2lewmfbWPbyipY/Sb0rBpNHDqsy6qGahY/eUQH 3kCo6ms8dpyS0reAG/HRNw4sF6sU0pCBEMQw4Tbem4MzlM5qBl861o8HeACeaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8GX5zDjz55M; Tue, 5 Dec 2023 18:30:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IUClx015827; Tue, 5 Dec 2023 18:30:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IUCxT015817; Tue, 5 Dec 2023 18:30:12 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:30:12 GMT Message-Id: <202312051830.3B5IUCxT015817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e8439726cfa5 - releng/13.2 - Add UPDATING entries and bump version List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: e8439726cfa5bd0059a65117447d8c4160bfed43 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e8439726cfa5bd0059a65117447d8c4160bfed43 commit e8439726cfa5bd0059a65117447d8c4160bfed43 Author: Mark Johnston AuthorDate: 2023-12-05 18:29:45 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:29:45 +0000 Add UPDATING entries and bump version Approved by: so --- UPDATING | 8 ++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 9e997c89f59b..d03d434a87d8 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,14 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20231205: + 13.2-RELEASE-p7 SA-23:17.pf + EN-23:15.sanitizer + + TCP spoofing vulnerability in pf(4) [SA-23:17.pf] + + Fix clang sanitizer failure with ASLR enabled [EN-23:15.sanitizer] + 20231130: 13.2-RELEASE-p6 EN-23:16.openzfs diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 9e399bc19d20..627c99e8b973 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -54,7 +54,7 @@ TYPE="FreeBSD" REVISION="13.2" -BRANCH="RELEASE-p6" +BRANCH="RELEASE-p7" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Tue Dec 5 18:30:41 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8H61MsJz53JkP; Tue, 5 Dec 2023 18:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8H54KS8z3dj3; Tue, 5 Dec 2023 18:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xF4dOphHBfITMG7bAtvmYjxx1Rbs7j6FEV67JP1VZKc=; b=j3n/t+OPMeGa0HfERtMja+iP1D3WH0q5BnIHb+Jsm88ZRvCO3Lq+2cHBi1DPs+K885YBh/ lwnuIyhn+zFQOdj+TVLtlqE2RblDYSQZkl92znhkcP9sBd1rg3V2VCLIrlmGmGxWpZ6j1N guRy6LRwnh1sXkpR09QR0RbC0YoMUhP4T2qF6g6aE8NCtGQwGYsQs2GPKE8f/E3UTjskaj 0t2H19ECQqQnZVQRLv4yKLZ1k2yqdc3r7sGdiyKzYraDdzxlP/fbPS9rgaUSstq51CujOy +/znjr2QX9fIubCzMcov5vUREccag7Wcf0Jn/VvTgXaqVvsdBaNkDEhuCjiCNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801041; a=rsa-sha256; cv=none; b=e53Q5fFjkXirA8VPT/glhG62mFedI08Ymcf9kfYCPhOt/12K2Kx6UdsTiMIaowMyojkuIG 85VkmB3LZQTRutXydyRfTpPHyn586uu7eaxhMEM6LbYluJAbIrQKxat+f0VBAvrb+8TY6k KGq4f82fYZ+M2lEaan4uavQdXXWErhgYDIQa6dFfX4SMl05Gv8noe0bbeNtIfIJL9DDy2G V6Xd/f7gyDbR/9nJVBXf+fZoWgXIBTBpMn6lcTIGb956MrUDrd+gECK/5lQp0/Us7btKNZ dOGhRvMKllrtlxCdeITKxlR0KPZTQaAhadw1aurAA+XPNzUZMrWSvBsFibUHqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xF4dOphHBfITMG7bAtvmYjxx1Rbs7j6FEV67JP1VZKc=; b=RA0lTfiOagLhlHTFbPyN7hQAd8mcSZFv2+OiibiqhADWAqaR+b2h3oj+/f5iCboCa7oeCe 4x6DRRWvb//gu0Yogb9fzBV+NXgJa/TYxsfTDkKfsHCkODxz8gZAuO19uN7X5yP4nyQuGp i4BoaAvaPhMIhZcO6L+sT8ywmGB0uP/c3hLq8DnWjW70mP2uMT1y2z3ONOaRKGYKipM76E Bm3n7YPuMK3OmQhWN7cwzrI0nmfzRT3uESjBYSL3F6uwDR9tGrTK8ANIl3cMj/A9031bL+ kAbLgk0QeM/XOlZ0i3wZfZUFvHQwqafTUEvyFmPiogRojgJfpCrT5/i/YHgcig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8H52jHHz5RC; Tue, 5 Dec 2023 18:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IUfeS019077; Tue, 5 Dec 2023 18:30:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IUfk5019074; Tue, 5 Dec 2023 18:30:41 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:30:41 GMT Message-Id: <202312051830.3B5IUfk5019074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0415f0554b72 - stable/12 - pf: remove incorrect fragmentation check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0415f0554b72b93a1986292d28f679594f6ce6a6 Auto-Submitted: auto-generated The branch stable/12 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0415f0554b72b93a1986292d28f679594f6ce6a6 commit 0415f0554b72b93a1986292d28f679594f6ce6a6 Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:25:58 +0000 pf: remove incorrect fragmentation check We do not need to check PFDESC_IP_REAS while tracking TCP state. Moreover, this check incorrectly considers no-data packets (e.g. RST) to be in-window when this flag is not set. Sponsored by: Rubicon Communications, LLC ("Netgate") Approved by: so Security: FreeBSD-SA-23:17.pf (cherry picked from commit 6284d5f76d6bd2d97fe287c5adabf59c79688eda) --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index fbc6c9640f43..b9fb9ce7b1e4 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4601,8 +4601,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (ackskew <= (MAXACKWINDOW << sws)) && /* Acking not more than one window forward */ ((th->th_flags & TH_RST) == 0 || orig_seq == src->seqlo || - (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo) || - (pd->flags & PFDESC_IP_REAS) == 0)) { + (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo))) { /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { From nobody Tue Dec 5 18:34:02 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8Ly2qZMz53Jbt; Tue, 5 Dec 2023 18:34:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8Ly2FVkz3dt6; Tue, 5 Dec 2023 18:34:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=djOApggBRE/l9ozMCW63pWItVvjAFDeHKKrdAZK1sBY=; b=ZdcnN+V4//AjUv6bjuuK0TuKoXCKw9oj0ZsIyk3NnEIXcWDav3IEyAAc7rQncrQgDxLc+s +92yuSR5e2EjxrQThLB5k5idUNVP7GH/xqQqjts2pxuqjfJwhqJ5ZPB/TkK9te/8eD3ghG IxpWMovV/wafUbESogJliHHY27wLKxLcbTWRer/77yHv3/NgutYuevpR22sVK3J8kdgaVI TYv0mVmhZNYhlOl0XC84FulX/8MnTyLef89RAuiwdB72DjIDndHC1HCJThHqffRR2s7TiH c+fbiDRPYB4L3hSIN8OW/BRexog1P64FRnqPdm60rI+xl/YO5RHrUqRBZVlfVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801242; a=rsa-sha256; cv=none; b=IxySFXAfDtN/mlDSkeui+X0XOMc6kgp56WvmwTpfVuKUquFJeiocV/VmuOIXp1pmk/dVEz zQHVPp7fZjuZHzu/yzKS2FPp0r6k6s65QT1AZekm90h1zDXf9eN1JcJq3l53XBB7EtcqYb CY/VN8QqdHfvmsb5nEMrpOcVqSAhtPQme5TyrkDQxlePsPF3HZB535i9BavtfZdoep6H95 KWehqS4ifrCD3S3vyfkUYfsIz+i1xZsMYEW/rXSMzOzCF5+TB2F7ZU8zdGvZdTg8iK9ahq EMFbsTmgdfDZvSGXHxrwWlxK8KzGfpcH6bh050rp1PCKevMKGNHnNBPQkC6BYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=djOApggBRE/l9ozMCW63pWItVvjAFDeHKKrdAZK1sBY=; b=ytRn7WcsBLS1HlIzwPKMffvVGM8+Cvj0IWoX4iqANP/LhkXmPwEph14OoVbRT93rA7R6gw FXGq1HOEcaCTwoOZ3FFPWjx0nFJNxZArXFpvdMwRqetAz41Z4xjFxO3RbEQB1TkbLWG8AD k07gGpWCfcNx6TQ/isLVVKIZ9YYoQf0Y+TMTihcMdfUsX3UiaAno3Mb62ndaCI/IpqXlkn 2ZLQc6sxTfDKciRcho1QMrCm+UsYBwRSux95jnFc63W8IIDHBSHZa+K+h0ivijx2FfqaDb VdNK2nWpOw75shDVxedqolyIxQ5oH8RmMze3muzUMy8Q9jpV0L27wZ8FKnYRLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8Ly1JMLz5XL; Tue, 5 Dec 2023 18:34:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IY2sh026080; Tue, 5 Dec 2023 18:34:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IY2h2026077; Tue, 5 Dec 2023 18:34:02 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:34:02 GMT Message-Id: <202312051834.3B5IY2h2026077@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1f8724dd18b0 - releng/12.3 - pf: remove incorrect fragmentation check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.3 X-Git-Reftype: branch X-Git-Commit: 1f8724dd18b0d57ccc74086040411bb1f0059be0 Auto-Submitted: auto-generated The branch releng/12.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1f8724dd18b0d57ccc74086040411bb1f0059be0 commit 1f8724dd18b0d57ccc74086040411bb1f0059be0 Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:31:14 +0000 pf: remove incorrect fragmentation check We do not need to check PFDESC_IP_REAS while tracking TCP state. Moreover, this check incorrectly considers no-data packets (e.g. RST) to be in-window when this flag is not set. Sponsored by: Rubicon Communications, LLC ("Netgate") Approved by: so Security: FreeBSD-SA-23:17.pf (cherry picked from commit 6284d5f76d6bd2d97fe287c5adabf59c79688eda) (cherry picked from commit 0415f0554b72b93a1986292d28f679594f6ce6a6) --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index dd4c49959a60..cd3403b1bd22 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4477,8 +4477,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (ackskew <= (MAXACKWINDOW << sws)) && /* Acking not more than one window forward */ ((th->th_flags & TH_RST) == 0 || orig_seq == src->seqlo || - (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo) || - (pd->flags & PFDESC_IP_REAS) == 0)) { + (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo))) { /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { From nobody Tue Dec 5 18:34:03 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8Lz4WHvz53Jkn; Tue, 5 Dec 2023 18:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8Lz3sgGz3f4f; Tue, 5 Dec 2023 18:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KsoWGZofMQF//9VKJ0mPzHfNpvou+pnIzAI9Y3ncuNw=; b=fOPE9P6CeXAHVhmLpVVmZrJhO94xFmBFkNaBij+plc68uG3AGMLapQArzw7HB68ke+BPf3 Sgv1uHyHjTxR5HfFXgLkSNy9wLWzW2ydAoyIN/TasCngpjS1Apa1HNkw8sXt/CUy2hPCH1 IPpBiSj/14PVmnMBGDCnegZtcKHo0BKye3QPeLe+9hpM9k4E6Ufrjg6AgxQ+oyx1X4QBbW 9luGKcScW0X6U67vIAUA612X/dxzfyP+h9QZq2pRJ+r3B+dWQhxtPsaJ0hB37Yv593uUGD qFCmGhUWiIr7CRX6qMpzPSKm1Ek6BY9fB0lSaMoE8VZszka9xouOZzZDtfTBTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801243; a=rsa-sha256; cv=none; b=pEquFwxiX09zlorLZietxq6tChEOok2pdoXZjdCVPzJKaqT2/PC1IIzVItMEb1spD2SLMh Sm8q6EZAoSZcbj1OZYFVw9EF1BLjXVe+bpS4xfeb285vsS5kPasbzxmGT3qdzAQYkEfCdJ nKddoZaLQZQMvE92tDlFzNHQz7SahYT0JfpwGGJ7zQKCdXaKbuMonTMkNMCA9IoZfgBiwo hHTQHPQSimwUHnbu4Uensdoa5tmDBPkEqRJtlREiVPLMA19Ldbw2bV0h1ZaEd6VrTRdP6J zHaZEqwNzE5/gRmytFMgmO12Wb+BR6le3xZEJSJSoIMGX/ox4FnB+qxebWM57A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KsoWGZofMQF//9VKJ0mPzHfNpvou+pnIzAI9Y3ncuNw=; b=IChbwNEYfPzoTaiU/isQJHZsKG8PvQkTTKF/HT68vEv3CR4BrgwiKqGU8PLKevy327k2tD +OUyIG5Q3O/rlCj8h6rZNN/OLHdjoY59F2A+zTKYWsGbf2cWZLgLePsMonoruuyE4EeS9F 3TVWw/czhhmsufK+g++lP8ZyzAk5ctVsSVR6yYydAEJ8hM7sh3kTbLJBi6QEkQMCMpgTyY 2D531mW3UAz/QtgyU77sZq2wvuScFbjeGFhaVo0loz7NO9N0OfMzOrCvNnxFG03/QnEbQK oc2j5h+teIi3uvvKcb4NXgdrYPun457x7qtkytlh0JbH0rJFgUFIa3rGDdoV2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8Lz2rm5z5XM; Tue, 5 Dec 2023 18:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IY3pM026131; Tue, 5 Dec 2023 18:34:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IY3Zh026129; Tue, 5 Dec 2023 18:34:03 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:34:03 GMT Message-Id: <202312051834.3B5IY3Zh026129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: da6997b05390 - releng/12.3 - Add UPDATING entries and bump version List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.3 X-Git-Reftype: branch X-Git-Commit: da6997b05390d57773aa1bd66993942438aa8258 Auto-Submitted: auto-generated The branch releng/12.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=da6997b05390d57773aa1bd66993942438aa8258 commit da6997b05390d57773aa1bd66993942438aa8258 Author: Mark Johnston AuthorDate: 2023-12-05 18:32:16 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:32:16 +0000 Add UPDATING entries and bump version Approved by: so --- UPDATING | 5 +++++ sys/conf/newvers.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 77598db595c6..5d0c2cfadb43 100644 --- a/UPDATING +++ b/UPDATING @@ -17,6 +17,11 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20231205: + 12.3-RELEASE-p13 FreeBSD-SA-23:17.pf + + TCP spoofing vulnerability in pf(4) [SA-23:17.pf] + 20230216: 12.3-RELEASE-p12 FreeBSD-SA-23:03.openssl diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 6170c6c193ed..f4b1406ebd45 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -49,7 +49,7 @@ TYPE="FreeBSD" REVISION="12.3" -BRANCH="RELEASE-p12" +BRANCH="RELEASE-p13" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Tue Dec 5 18:37:51 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8RN0SmPz53K5G; Tue, 5 Dec 2023 18:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8RM6zLQz3fw8; Tue, 5 Dec 2023 18:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RMTa6ynPMyhCcM+PKmfzvaV+bki8mrHWrJB2NdN/ugg=; b=PYlRz0VXffXN/J2Wd/IReo9PG70CjSoDyXkZI7J/ZWHSUwK93D7u9BcmIu711pQqM1wjq1 CPvwbdNuJeU6f88mN1RPQ0PgnaSc9Q/DZ+15mhctbTmTGUnHYGYiTHXSfmvPc/hzKByUAE b2z6VdEW6Q+8QTvEbPC1F3MvEyXLuX+6TFkE8FlpwfdatQAGAubbjUvjF7EGolYd5a2ooO EVYTO3pGl5EO1w+XWZ6SSuwkUAOqHww872oYLpK8GSTR5s+qhGbSeVEJjE9JNOx3BNpyAT 32t15vdXAN3zOYl5vwTx8DtxSdOpvWR7MAR8YcecwCB4ZJbTp5O27TwpzBTldw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801472; a=rsa-sha256; cv=none; b=Xt6ZoLRw51/BgFzez3+TZDZDzatQTFuF79Jrn6kJOtkjTUgFbTqnHZ3AS/ddtfEN3YIFZo wRhyV5CEHACxxbXE29TPM5jefDkr3Uq5D3wCgvs9izZHMtj00/j0JHAe3dlyF3SqLI743f WYeap+XwJjJe27+LfyFdqdmwCVbSGtsqwYGURP7q1f7XlnDC2NU1egiPVBabVR1X8OahIm 5t9Zvdte+JCihkHdp33RyziEAgsHRozkCVJQHN301ucRO8cNW9nAuqDeS4cEgVuCQ/+Lhk qb0BjNbaU5K8NTUp4vro/qUUSyUzxIoJ/47zbGbtVbvt30bFlJ3bKDXCHn6DDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RMTa6ynPMyhCcM+PKmfzvaV+bki8mrHWrJB2NdN/ugg=; b=P3RH9QmeN6Y17E/KE2ywr0nwj4nZiJ/OiT3TeRqSU45CnIRGUmnIkNKxg3VZGu0ohU6JZZ XGxxJUHm1DYMMeTgARg7X785+owfH/HBSALnuF3/U5m7enSN8zSPuXulhS4yUZ01ihwk8z UJ/8XKWn6vuMb1dZeRinbuD0o9CsPSOSXcF1f8jPctALFj2cNI7vOyKKWYQV8xGs14jEjz SkSwNl+zTimFjynpT++xkYavNjA2zH9Smyjzm/2KS0bd8MIfXu/CCVaSqE/afPA+KiLJVM N6KmiFtN7p4tw57FNZ+nen3grbY20zUIyviNjf9VmkUK1Znef7VgsE1zQx+tRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8RM62Gmz5Tw; Tue, 5 Dec 2023 18:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IbpFp026746; Tue, 5 Dec 2023 18:37:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5Ibpww026743; Tue, 5 Dec 2023 18:37:51 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:37:51 GMT Message-Id: <202312051837.3B5Ibpww026743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f0327f9d86aa - releng/12.4 - pf: remove incorrect fragmentation check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: f0327f9d86aa54ab6de42ca7694899b97064bde7 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f0327f9d86aa54ab6de42ca7694899b97064bde7 commit f0327f9d86aa54ab6de42ca7694899b97064bde7 Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:36:44 +0000 pf: remove incorrect fragmentation check We do not need to check PFDESC_IP_REAS while tracking TCP state. Moreover, this check incorrectly considers no-data packets (e.g. RST) to be in-window when this flag is not set. Sponsored by: Rubicon Communications, LLC ("Netgate") Approved by: so Security: FreeBSD-SA-23:17.pf (cherry picked from commit 6284d5f76d6bd2d97fe287c5adabf59c79688eda) (cherry picked from commit 0415f0554b72b93a1986292d28f679594f6ce6a6) --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 0a6928e3d4eb..eeb4a2c1cc78 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4601,8 +4601,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (ackskew <= (MAXACKWINDOW << sws)) && /* Acking not more than one window forward */ ((th->th_flags & TH_RST) == 0 || orig_seq == src->seqlo || - (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo) || - (pd->flags & PFDESC_IP_REAS) == 0)) { + (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo))) { /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { From nobody Tue Dec 5 18:37:52 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl8RP1ljMz53Jcm; Tue, 5 Dec 2023 18:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8RP14Jxz3fwc; Tue, 5 Dec 2023 18:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tfbDdfIh7C0Al7pSl54v1onSt29zKPx8yaX16q4fnoc=; b=Ft4DyVsUUushv79th/FG7rnT6u9QxwV2+EHcQFwm5ql37K7i3bJZSDniyBX5yNDcCRN9gS npB5+s3F+omJrI6m3HT+8T/HQRrgvgawNIY6WCGTSJxVa2d1NkCU1jVFynBG6y537egjlN n0AAsc8p65tTwwbPEYWifnfzM/y1Wtg1+/BKYoDs2kZpSVcwFWb1RChUmxuZQJxR2fMDTN zomKU67BLpPMNZivLgXaepCeif3tReJ6Bj5HWcZtLh2t5t8xQW5Ne6o9MvZK3gTHauxGOH 3bq3CG0VHhoLWlAw9IEzlkQaje+6Iri4saXGpb6rNaqsz2NkzaPqtAMQNiuFQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801473; a=rsa-sha256; cv=none; b=g8Km7I/vl+MfzouVDMqOucMMLNYrxdarCKBa+lfY/HgOmv7IEMmtuowihh2NTG7mRD2mfG mWd2CGcE/GqQaEwsi3Mm+2nsdvfBxbv6MggagQKk18U+1VQHNyXrG4Rd+4NKZm0jOrtPww LoK+b8Hh/cy3OwWFeKjwNwWAk0tOoDbOJ+20+HJw8IpoPSFV3slrnddA0JP7NHh4u2UhB8 3SGAawd1C076V9lm8BEP/uItSz11dOeDOfyGZBs6m4kbMlcx+yXgbpYjpzCE52GSk0OI3Q rTNNrTJSGvLLi8WHP80eWerbe92cOrWnvXh9OSON8mQEs+xyXqpVSpYwSgV5gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tfbDdfIh7C0Al7pSl54v1onSt29zKPx8yaX16q4fnoc=; b=LZv120FGmG7Ym/++221TnuoP95xChwEvjSrdUjo86r4zp0L4XymqiO3726CDJlKjh2UvgM ZRwJJ0/cmtKD1vjGNaZbsvnXTS2sEDHZrTe5BXApiFGHYRSAsc9bDfZxpyTEuHaM12E8Xj Db9IX2zeIc4Wfo7QVsciYIP8iYs3uL3o0vCGPnrNjUyUfOl8hPveR4jTgcHDpYSCjxWNfy QhY3UqAMDn5ByIEHvSr+OxWxqBEmHAAlmOWOs6IzouUd5gJWKEoE8IW6VHWvPnDD7zxLdd VThLBbBG6xXehg+lsHZS+8Iqawafp04yMq2MU8mdWzci6ZUEqJ5pv5x3YH9UDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl8RN71gTz61J; Tue, 5 Dec 2023 18:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5Ibq61026792; Tue, 5 Dec 2023 18:37:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IbqZc026789; Tue, 5 Dec 2023 18:37:52 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:37:52 GMT Message-Id: <202312051837.3B5IbqZc026789@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b5ad6b488d9e - releng/12.4 - Add UPDATING entries and bump version List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: b5ad6b488d9e62d820fe90fdce4aee4f4d3d7162 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b5ad6b488d9e62d820fe90fdce4aee4f4d3d7162 commit b5ad6b488d9e62d820fe90fdce4aee4f4d3d7162 Author: Mark Johnston AuthorDate: 2023-12-05 18:37:34 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:37:34 +0000 Add UPDATING entries and bump version Approved by: so --- UPDATING | 5 +++++ sys/conf/newvers.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index b951bf259ed6..bc54cc1cab16 100644 --- a/UPDATING +++ b/UPDATING @@ -17,6 +17,11 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20231205: + 12.4-RELEASE-p9 FreeBSD-SA-23:17.pf + + TCP spoofing vulnerability in pf(4) [SA-23:17.pf] + 20231130: 12.4-RELEASE-p8 EN-23:16.openzfs diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index a264cb661e72..2abe405f83b7 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -49,7 +49,7 @@ TYPE="FreeBSD" REVISION="12.4" -BRANCH="RELEASE-p8" +BRANCH="RELEASE-p9" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Tue Dec 5 23:40:17 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlH8L1cv1z53d43; Tue, 5 Dec 2023 23:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlH8L153dz4JJK; Tue, 5 Dec 2023 23:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zGkAv4Hht4Ssqg6FFLzLQvPkmOqsdLQdHybqw1u13M0=; b=MCxBTqt2YZ5kOQCM3vEBy2CFO29IqM0b6XOJSebvzQ7ozFXMW66ObyNzwk8WsnYYGOGWNn pft65MoWEjfJg4xrdOYNaMJCXFjnJog8Xlplkg/+ozVfq6hNeYrooHDsAFChTkmXkQf+9w B+BjWzb4tT+UIS6QqrABEFJO0nA3NX2c+uEWdfoyXkmV3x4wM+5OhqljrC7knteIDYB4nn n2Jx29LgrokhrmBIaTQy8XcNobSErMwMHzZClC/7bddA2ISR9qCJMexUEhLdy0lprQN2dW DWUXUcoGkC8egNHTKTmG+HAFLnsYe/Iu70IjNDVuOY9s8r2x0+/0dyHQOlrxyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701819618; a=rsa-sha256; cv=none; b=DItxd+AD9lE0+elFGv4TCd+6llXcU3XAzxzehKSRwtIORdzxIAkCZKwMNPVadvOHdh6aLM DgESAvi8QHBLcKrzNZ1eeCwZ/KnQ3I0bQqRbC+FIn1RCmxT2vrPsZNmgESU+PSCHJX6yfU IDoZHpIXBlNAVqnmqMNISGVI9YDtll8tEoewTH1hZyN4TXXCtm8000C41fkCIR9ExcVjD2 fW+YoJ5IISdO9+fPUcpBbPnB2TLundL3EMxf7/b2KeONk7yiOZEAVvdqvaRYJHUBtP6etP wb2KrsQ3XJp4XJaGnsZlNhvWNaKVmt5FGM+CEq0fc10/VHe2OeIcbYNdtg0aBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zGkAv4Hht4Ssqg6FFLzLQvPkmOqsdLQdHybqw1u13M0=; b=MJENBVblRlyrVnz88cVXEJ1bGxlbaUB+X70z59anDGBq81EmswnaFcrncaN2N4mR5jVLgM Re2qJm10kVlzCztrWAEUAsaQEJ9WSSkUY6IF0l/bUhJYgpoQCd0ntDNx9NL0auwhy3GHsx hd0zy5lJh5euoCUvaUvT/BhPTslCYqWz22GWTQhvebQvtgX/8I7Gcg79u8sy3sVe8x4XlL 7lm9mGHd40l8oqDUZ6TGS7y1ZCVA95dF67pD4R55hgogZ5SzscnYFZheYPiu6L74QHbHXP TatUK0wNFTBS5ZGKsGQysrZv7be6arl2m5ZR/BpE/wf26osgkWdOxGUa5yCpHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SlH8K6xWmzWJF; Tue, 5 Dec 2023 23:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5NeHBX037947; Tue, 5 Dec 2023 23:40:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5NeHG2037929; Tue, 5 Dec 2023 23:40:17 GMT (envelope-from git) Date: Tue, 5 Dec 2023 23:40:17 GMT Message-Id: <202312052340.3B5NeHG2037929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 9b92ce7bd3a3 - stable/14 - Makefile.vm: Fix duplicate rc.conf files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9b92ce7bd3a3cd4f127628a09bd4a9e9fdffe18a Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9b92ce7bd3a3cd4f127628a09bd4a9e9fdffe18a commit 9b92ce7bd3a3cd4f127628a09bd4a9e9fdffe18a Author: Colin Percival AuthorDate: 2023-11-27 21:29:05 +0000 Commit: Colin Percival CommitDate: 2023-12-05 23:40:05 +0000 Makefile.vm: Fix duplicate rc.conf files Two bugs in Makefile.vm resulted in disk images being "built" multiple times, resulting in lines added to /etc/rc.conf being duplicated: 1. The vm-image target reused the same "staging tree" directory for all of its builds (multiple disk image types and multiple filesystem types). 2. The cw-type-flavour-fs target depends on emulator-portinstall, which did not have a 'touch ${.TARGET}' and thus re-ran every time -- and caused the cw-type-flavour-fs target to be re-run. This was triggered by release builds running `make cloudware-release` (creating the disk images) followed by `make ec2amis` (which re-created the disk images prior to uploading them). MFC After: 1 week Sponsored by: https://www.patreon.com/cperciva (cherry picked from commit 97bd53ef4d20b7d15e0b0976e885af9438f5637e) --- release/Makefile.vm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 1a58a548b9f4..a7624775d48c 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -81,6 +81,7 @@ emulator-portinstall: env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static .endif .endif + touch ${.TARGET} QEMUSTATIC=/usr/local/bin/qemu-${TARGET_ARCH}-static .endif @@ -137,10 +138,11 @@ vm-image: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) . for FORMAT in ${VMFORMATS} . for FS in ${VMFSLIST} - mkdir -p ${.OBJDIR}/${.TARGET} + mkdir -p ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ ${.CURDIR}/scripts/mk-vmimage.sh \ - -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} -F ${FS} \ + -C ${.CURDIR}/tools/vmimage.subr \ + -d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \ -i ${.OBJDIR}/${FORMAT}.${FS}.img -s ${VMSIZE} -f ${FORMAT} \ -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FS}.${FORMAT} . endfor From nobody Tue Dec 5 23:40:19 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlH8M2lDcz53d5w; Tue, 5 Dec 2023 23:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlH8M2Gbpz4JtZ; Tue, 5 Dec 2023 23:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6K2Zr0bcqNLzEnduvEJ5CmLHksjtcid+Do6v2a8sWp8=; b=ZyRabkGq2AzWrGyA/TaoAQchgxnHkTebH0L90bCw9olzBbirCk40nDTGFxUDZE5t00WI2w zlCHilLqYEzvpUu4HOl3wzwZhHu17nNwWf1hyRw6DrAiAnPhvY4IeJcUk5gMQ7krfV7e6X JIySjYYE/knGhkDwnKTU8hpkJMRodKXdAF3Juw22ZHzEIwT2KGBpkhjbo4cjn4OUVHiMFF dERULe6UhpJjpNMlx436ucxkv8jjP6cY21ighrIODCEiGw3eWRF4ZZwLbNWvEY8GJSTART LwuhMB6v0KFu0vumHpmLeijKrOk7Zf6Jj/PyHzZz0CpUIuRan0R8cmWz/5qTlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701819619; a=rsa-sha256; cv=none; b=kZ1JYOXuVkB816kBUTPnigeXv5odmotYtTko1e0kj+SgTYPjUyQbSeO1J12J0XqkyQ87ah QYrkvrf7t7oQX7WI3M4hmXHAZXyapSxj9O2GQAUxSqNRYNBy11jOWK9/ubslUiMxA/3i6M yM0FSywh45gZAaKkI1v+84Aof9oZAQGZVLL47Fb1PjVtvmFMfViD9f1Mg9tPegYdUV7OOc FcxobDybp2T+WUZ7OyMM2iHQ0oj0XXhsBk1v50r1nBXcDesBdr4MCh19oZRUVoZGuhf821 xOLFX5nYGg+27Bf7pJ6udKH5mLw9I2jgA2nkwRRuch/ROC4bHXhHTItOA4fhQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6K2Zr0bcqNLzEnduvEJ5CmLHksjtcid+Do6v2a8sWp8=; b=xXCA3vIBoIJPmThWL/pThiTtMNzCd3cyYAhBnYSeO8asBDvK5BXIcQlSvInsu1IpMdWHT8 FV+ygbnkRc+4Y0sTWdlx5jg9XPNTmY+xOoB0f611+FHAzGPkadgo02ZlZIacK3YfXmqSCu 2A9nMcG+0a4lu554jB0tw/Sn2vWmadiqfxcyZWgZt5wii+GxxpnHTvLWWk7Xh3sB9NrPkY E3XL6HkcfxZwfFuEO6N00GZ+xc8eQL5LBTGHKVX7AVnOsB+JFva1n2R9f8jhCnOkjujh0L d7rKDp6+ZG3aIrOlImSFC+H5Dwv0jeo/bRiM7DmKEz08/Qs7k8nRIpCo4plu/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 4SlH8M11cQzVsl; Tue, 5 Dec 2023 23:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5NeJFL038011; Tue, 5 Dec 2023 23:40:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5NeJw2038008; Tue, 5 Dec 2023 23:40:19 GMT (envelope-from git) Date: Tue, 5 Dec 2023 23:40:19 GMT Message-Id: <202312052340.3B5NeJw2038008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 9fc78b60eda4 - stable/14 - release/Makefile.vm: Rework emulator-portinstall List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9fc78b60eda4d3912b8277405eff8dbb6bba5ad9 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9fc78b60eda4d3912b8277405eff8dbb6bba5ad9 commit 9fc78b60eda4d3912b8277405eff8dbb6bba5ad9 Author: Colin Percival AuthorDate: 2023-12-03 21:39:30 +0000 Commit: Colin Percival CommitDate: 2023-12-05 23:40:06 +0000 release/Makefile.vm: Rework emulator-portinstall The emulator-portinstall target now unconditionally ensures that qemu is installed; but is only invoked if needed (aka. when cross building VM images). MFC After: 3 days MFC With: 97bd53ef4d20 ("Fix duplicate rc.conf files") (cherry picked from commit 7d0ee5ebd052d35e323f2d303e467c2cf305ca39) --- release/Makefile.vm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index a7624775d48c..58703de16cf3 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -69,8 +69,6 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo .endfor emulator-portinstall: -.if ${TARGET_ARCH} != ${MACHINE_ARCH} -.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) .if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile) env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean @@ -83,9 +81,13 @@ emulator-portinstall: .endif touch ${.TARGET} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) QEMUSTATIC=/usr/local/bin/qemu-${TARGET_ARCH}-static +QEMUTGT=emulator-portinstall .endif .endif +QEMUTGT?= .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) . for _CW in ${CLOUDWARE} @@ -100,7 +102,7 @@ CLEANFILES+= ${_CW:tl}.${_FS}.img \ ${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT}.raw ${_CW:tu}${_FS:tu}IMAGE= ${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT} -cw-${_CW:tl}-${_FS}: emulator-portinstall +cw-${_CW:tl}-${_FS}: ${QEMUTGT} mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ QEMUSTATIC=${QEMUSTATIC} \ From nobody Tue Dec 5 23:42:58 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlHCR1F20z53dVL; Tue, 5 Dec 2023 23:42:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlHCR01pnz4KHS; Tue, 5 Dec 2023 23:42:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C7o5sgF1zYFWv5Ghhz5eAoNcHSy8GLpJsxzXkaEzbxU=; b=YYjEMoGoy+XNM8lE/vEb9CqTsTKTLhJQALSD8v7tbrVhLz7LyAwdBi5RPNh8M3gRLcsJZ4 tq/UV+43mqE1ZweJEDsaLEkTbH6q7kvkRKkaBhBPNuD7i8zp3G6witdc6olONbFood36VB VdyderGCUTc8raXkyknL/wbn0S7sUIAmgDbKU5giwrVv8h+/TIB8UZwM9bd4o17SeUwaOI FMem491fmBupggfnAUyMMXrFbPDenxSO+gcmRtG64aSRa2N5stUsjeuho7jhW/MHLKbq3A cMI+8HaRJBGnh5e+DwUmvIEOPhY8Y0Qwnye6vm1t0fWr/YAQ4KufV9zHZaS1vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701819779; a=rsa-sha256; cv=none; b=h/wBGy1jpKNrmJ8+1ZaJRdidK6SWrXy6QEWEjo13FYYLCBiIanWiRXVvW5/cZWB8gtq3+O G9qmQJfzxZ4LGH/T3HNuqawJoNj828TXBSthqsFFSzHuBX9v6RuJx5prWJ5VqemZhmMxRZ GMeDITTWRO9z1rayPuItVL26tv2FLrXeFfNzKCe9KX9gMPqogcZrJAo8oWEEV7Gpec4uvC +BpV8McpVpv64Ljpm/eDif0D3IBZCGvcy0Pl9ASC3wh1DE9wJVID+HfxDKtBh8LiImE27H XY30Qm3PpF875Ukl+RTNgFEWsrmQHJEedA/V395ui3jh9q7bpCW/G/K36v6QAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C7o5sgF1zYFWv5Ghhz5eAoNcHSy8GLpJsxzXkaEzbxU=; b=sX4ZGtWL2n7CjPdX3rMcLHiVscgmSCZdclEIrrGGLfFp3sDpWsRSv1RNdBxjI8gJLOAEpE DnDIxhgV1uq6yqX/OXTI2InhBJ8ROWbMccX3nBWCQCbZEaIq39qBylfiWitvNipUHtVF59 9jc7XT3zx6ODX99RqnzbBSGDKtxOzql44wjBj2crpQg0AK2cRRpYYyov8vXfjQcrV6SaBv o3MM90GFRMF52O8mxzHo/itbZw4cbQ78h1i6psq5pIc0xJZNBlCHWux9tRHwpr4Wwf0wcS 2FptNEfhuvltYy4B6kb4stM2pDZC3C9/DA2At/ECBTTjKXRqjOrONAu/XD7sJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SlHCQ6BNwzWJh; Tue, 5 Dec 2023 23:42:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5NgwZn045202; Tue, 5 Dec 2023 23:42:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5NgwLt045199; Tue, 5 Dec 2023 23:42:58 GMT (envelope-from git) Date: Tue, 5 Dec 2023 23:42:58 GMT Message-Id: <202312052342.3B5NgwLt045199@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 91cb6905e927 - stable/13 - Makefile.vm: Fix duplicate rc.conf files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 91cb6905e927e034ad14fe698879e5043f2bd329 Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=91cb6905e927e034ad14fe698879e5043f2bd329 commit 91cb6905e927e034ad14fe698879e5043f2bd329 Author: Colin Percival AuthorDate: 2023-11-27 21:29:05 +0000 Commit: Colin Percival CommitDate: 2023-12-05 23:40:59 +0000 Makefile.vm: Fix duplicate rc.conf files Two bugs in Makefile.vm resulted in disk images being "built" multiple times, resulting in lines added to /etc/rc.conf being duplicated: 1. The vm-image target reused the same "staging tree" directory for all of its builds (multiple disk image types and multiple filesystem types). 2. The cw-type-flavour-fs target depends on emulator-portinstall, which did not have a 'touch ${.TARGET}' and thus re-ran every time -- and caused the cw-type-flavour-fs target to be re-run. This was triggered by release builds running `make cloudware-release` (creating the disk images) followed by `make ec2amis` (which re-created the disk images prior to uploading them). MFC After: 1 week Sponsored by: https://www.patreon.com/cperciva (cherry picked from commit 97bd53ef4d20b7d15e0b0976e885af9438f5637e) --- release/Makefile.vm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 5c47ff9367a8..171ef227a7f0 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -65,6 +65,7 @@ emulator-portinstall: env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static .endif .endif + touch ${.TARGET} QEMUSTATIC=/usr/local/bin/qemu-${TARGET_ARCH}-static .endif @@ -120,10 +121,11 @@ vm-base: vm-image vm-image: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) . for FORMAT in ${VMFORMATS} - mkdir -p ${.OBJDIR}/${.TARGET} + mkdir -p ${.OBJDIR}/${.TARGET}-${FORMAT} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ ${.CURDIR}/scripts/mk-vmimage.sh \ - -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ + -C ${.CURDIR}/tools/vmimage.subr \ + -d ${.OBJDIR}/${.TARGET}-${FORMAT} \ -i ${.OBJDIR}/${FORMAT}.img -s ${VMSIZE} -f ${FORMAT} \ -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FORMAT} . endfor From nobody Tue Dec 5 23:42:59 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlHCS1lBZz53ddS; Tue, 5 Dec 2023 23:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlHCS18Wwz4Kkb; Tue, 5 Dec 2023 23:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N8ufzVJNEt5cHzuo8pVq23lK4L5gQkBOesINpojKQ3E=; b=vTHIvYGk7ranT0hMuqdrGSrFiYKcXInwrqC7ZedioIEgYzaYI3i6CXwpcai5sPVlQAEAzU kl7/ZIW/GONI7GJBuaYMnU+esDIM1qG3UubbmrKAWl6XWim21aGM2ujoXUEM1aebhs0RWU XI733HClUs68KZOUGJGJ1XqcHS+yKLz5MmUp+eZNCkJejPLRCd8n7WWsDcqlevkNpYu/TU Rs0AaIQDPDwFF3hZraH4Wmo058CVGQa0nahOC1QQ86dfRLff2AsRGuvwNBUtziEh3vGRT0 kV8+MRHiCkkwcr1UQuRD+CA4yi+8Qsb+kQ1pMEYyG7Kw5qurgOyd75r3SW6WXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701819780; a=rsa-sha256; cv=none; b=NWK8MesC8fhkgNLF32pXEMxmp2XibGpPo/PsTsLbV4vuUuRnq8dyjumDaz3H3rx2oqty0K tyzBh9sW0o8UwqyULM6cxiyBHEfxDClQ+aH0GUaCKQ0kaivBDoryrmhE7JGGsTDdr2sodK 16CbKcAyfaz1qgq+bWsEwCKS2JbGGICYDBCF4BWlKHyep4sKM67pNox8b/OH+tN5jhvvLw iMl/SrcaweI7I9dAgaBeuwyFX/7uwH/kLZDmuLt5hGuiwFlS14c0zYQoSH+rrd5XzqgW78 dZ2WLqLj1tDtuDkcP3d0zeK2IlEIjz/eU0yPv0BE7EyYOV4MHfGFEpx0QWW8qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N8ufzVJNEt5cHzuo8pVq23lK4L5gQkBOesINpojKQ3E=; b=i5nXwMl29cZkuUFbHWlFRetWkZ6CMRbF5NlrHh7mLC5SGwe4IL9HkrRf8bbWDfhzJUwYV7 eoCam+6ojb1BbEmQFhsoaL93P5AuWjrDdhlznxInp4xPnUySQ0QnSXCYx1G+No9A1OkvDQ 8vIXw0ylK4BC0YrDWVeKPwdg4dXRg06CSl2/Y5LRW/A/ePEFmioPUo7M95X/Y7s5DY61TY +f5kXVADvSgAv0DOl6Nf1bVe+goYW4XLQECFQzK/NX9JkgcDz3YzHAkkHq4u4VQZmkFDUd q5ClTnw9Wx3ZdS3t235JIVx6VSIWB29OYuy6AuQR1KWZo743dAep3xUHh7hXeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SlHCS058PzVLJ; Tue, 5 Dec 2023 23:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5Ngxg0045239; Tue, 5 Dec 2023 23:42:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5NgxE0045236; Tue, 5 Dec 2023 23:42:59 GMT (envelope-from git) Date: Tue, 5 Dec 2023 23:42:59 GMT Message-Id: <202312052342.3B5NgxE0045236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c2c7340fefe9 - stable/13 - release/Makefile.vm: Rework emulator-portinstall List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c2c7340fefe98db6917af02616c21b53db1d0d56 Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c2c7340fefe98db6917af02616c21b53db1d0d56 commit c2c7340fefe98db6917af02616c21b53db1d0d56 Author: Colin Percival AuthorDate: 2023-12-03 21:39:30 +0000 Commit: Colin Percival CommitDate: 2023-12-05 23:40:59 +0000 release/Makefile.vm: Rework emulator-portinstall The emulator-portinstall target now unconditionally ensures that qemu is installed; but is only invoked if needed (aka. when cross building VM images). MFC After: 3 days MFC With: 97bd53ef4d20 ("Fix duplicate rc.conf files") (cherry picked from commit 7d0ee5ebd052d35e323f2d303e467c2cf305ca39) --- release/Makefile.vm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 171ef227a7f0..27053208c689 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -53,8 +53,6 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo .endfor emulator-portinstall: -.if ${TARGET_ARCH} != ${MACHINE_ARCH} -.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) .if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile) env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean @@ -67,9 +65,13 @@ emulator-portinstall: .endif touch ${.TARGET} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) QEMUSTATIC=/usr/local/bin/qemu-${TARGET_ARCH}-static +QEMUTGT=emulator-portinstall .endif .endif +QEMUTGT?= .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) . for _CW in ${CLOUDWARE} @@ -85,7 +87,7 @@ ${_CW:tu}IMAGE= ${_CW:tl}.${${_CW:tu}_FORMAT} ${_CW:tu}CONF?= ${.CURDIR}/tools/${_CW:tl}.conf . endif -cw-${_CW:tl}: emulator-portinstall +cw-${_CW:tl}: ${QEMUTGT} mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ QEMUSTATIC=${QEMUSTATIC} \ From nobody Wed Dec 6 00:28:24 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlJCr4QgGz53grq; Wed, 6 Dec 2023 00:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlJCr3jQbz4NNn; Wed, 6 Dec 2023 00:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701822504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=roFt87bEtczL2T5gHGwBxhIqwGl6io6ijzBD0Ow3vMQ=; b=aa01putXEHqD2fsbhTDIgfCSRoPQNhQCw6d0HT8RlngNwQZEygJ3aYbzcdiTaaY52Jt7+d jHBU2/LdifisIq8oyMaWv2oPczedzwOE6MF9zvncSNDqktTCXPGU/sesXS3p/j9OzDc0HM vNJ0+JfLHveLvl+i/IZPbuysHuwUazvH1gzacfWCoCA7P+6/kYFrduiXb5QOboTGRaJwz+ CtyGf2wNOFy7UDo6ou8vbggI70KKvsbpJt6Iy5DWhotaa0iMHXQ46WLk2YXd/ZIqUqsYLZ CZVgpxjnPyin+5MuUpiDybEQ1H38c97cA1Oo9wa3C8k8SHhrL1a9IYfu6PfQTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701822504; a=rsa-sha256; cv=none; b=Fyjt2Yg9BDGfgQthJqxisbl1d6C7MSdT/5gCaESWmHMIbTld4+i6VbT5Dc7wBCzrLoAnqX kqVh8O7FOhQk00P6k5yWIy2u7jaFc9nRae35KYJMYLFxGj9pCPBMwNOf1qVFFCpndaSTsi k88oJhgSVC9QFiyFqi/kBISviU415Ah1Hp2Mz/FwYTvV5cq3oKRYpqTWZMsr0ua5/v+3t4 Pj3OLQ0PkOUokbixgwBbfMwVR0GgChqFqy6XYNIoAX7JqXiNB8RegnQXfMYKSsr/io7Db+ x/53z/erea4SCc1B0wywOwWOwp0rP+G8Y6ngvUUp+eLaeAY6Uyoj9xNwPO/b/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701822504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=roFt87bEtczL2T5gHGwBxhIqwGl6io6ijzBD0Ow3vMQ=; b=dyWc0jEH2ObiID2KVaSm7P8Sg5MIe67ESMpTNFyz3aHjv2OIeLu1oBO875ptooGk7G16GN UkAl6ywArUOO+jvvSXkUbQvnvx6YCOCvdRQwjze4KwtU4RzwcnIEDs5x2NQTrpyhCKJTe+ mZ5JfnBdQDjaUgRbUi9F1vAFpI82SmdsmOlAtWCGY/RxFzxsi+k5wjmYpaS/IpGwyXuwT2 BQYReI8oXBPdv2ioKFNKmGC+T+nYCEh0uiA4EZEOA1UZp3p8kvxEfmgCu3qqPgYf0Ffy6e Y8iMRq5mpG+B/ajuVdrG4fk5xzVwIPc7tRF/IYIR4M+JX8ZIN/g4ke8fURophw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SlJCr2n5mzXZg; Wed, 6 Dec 2023 00:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B60SO8N012796; Wed, 6 Dec 2023 00:28:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B60SOHr012792; Wed, 6 Dec 2023 00:28:24 GMT (envelope-from git) Date: Wed, 6 Dec 2023 00:28:24 GMT Message-Id: <202312060028.3B60SOHr012792@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0312449c67a8 - stable/14 - mlx5: Fix HCA cap 2 query List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0312449c67a841ca73f0b54307112724ce5b9875 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0312449c67a841ca73f0b54307112724ce5b9875 commit 0312449c67a841ca73f0b54307112724ce5b9875 Author: Patrisious Haddad AuthorDate: 2023-05-11 09:48:26 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-06 00:27:14 +0000 mlx5: Fix HCA cap 2 query (cherry picked from commit 0cd90ee598cef68cef72db8b912241868d1067d0) --- sys/dev/mlx5/mlx5_core/mlx5_main.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_main.c b/sys/dev/mlx5/mlx5_core/mlx5_main.c index efaf726e19e5..f6dc1158f085 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_main.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c @@ -561,39 +561,15 @@ static int handle_hca_cap_atomic(struct mlx5_core_dev *dev) static int handle_hca_cap_2(struct mlx5_core_dev *dev) { - void *set_ctx; - void *set_hca_cap; - int set_sz = MLX5_ST_SZ_BYTES(set_hca_cap_in); int err; if (MLX5_CAP_GEN_MAX(dev, hca_cap_2)) { err = mlx5_core_get_caps(dev, MLX5_CAP_GENERAL_2); if (err) return err; - } else { - return 0; } - /* To be added if sw_vhca support was added */ - /*if (!MLX5_CAP_GEN_2_MAX(dev, sw_vhca_id_valid) || - !(dev->priv.sw_vhca_id > 0)) - return 0;*/ - - set_ctx = kzalloc(set_sz, GFP_KERNEL); - if (!set_ctx) - return -ENOMEM; - - MLX5_SET(set_hca_cap_in, set_ctx, op_mod, - MLX5_CAP_GENERAL_2 << 1); - set_hca_cap = MLX5_ADDR_OF(set_hca_cap_in, set_ctx, capability); - memcpy(set_hca_cap, dev->hca_caps_cur[MLX5_CAP_GENERAL_2], - MLX5_ST_SZ_BYTES(cmd_hca_cap_2)); - //MLX5_SET(cmd_hca_cap_2, set_hca_cap, sw_vhca_id_valid, 1); - - err = set_caps(dev, set_ctx, set_sz); - - kfree(set_ctx); - return err; + return 0; } static int set_hca_ctrl(struct mlx5_core_dev *dev) From nobody Wed Dec 6 04:22:51 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlPQM4680z540HP; Wed, 6 Dec 2023 04:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlPQM3HxGz4fm5; Wed, 6 Dec 2023 04:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701836571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RdZcQ4w56fq7MicA7HRrXcV9qoaxCgB9Q7DZP5p0M1U=; b=ifEr/8a8bJbqFzmGdaISKkDBaGeebP7DFJPkb5CIcjJdbuaDZBElQETeyyfSJ9y+FQNkH3 CXsKsWnVbVv8zz2vopc3ltedLJx19YgelefGv4o+dun0qUizZsZ4vOGIUfWyLnh7i2xzXG R6deFBf1fTS6c8likRwzi3muqrLClqbc7SzOSXTDyuMmaieLCn4YkGPaIjuCFJ435EKtpc wEwV3/MFeXrdWQemrtkmTgF5RDZQwnaXIy7lV5+O6uO4soAl8CA3YzqaxOPwqCO2SOAMfM xKmUIyECsR7vKf3C/1z2kuGogTZPA+vcfLlKMPjWqAyCq4f5p0Um96IRkFINtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701836571; a=rsa-sha256; cv=none; b=K92QbY8WLWV/xWaNY+x+dqCKfOVTd+4cklgyxAJctZODH8xqo6Xj9wy3S4UGuUpjsZbCE1 y2LlF8xBiDspOw9xTI+ORkA+CUy1vateNTfd4Jl508eAJtNqPkRh2YWAqH1Rt8krkZi9Go 4QZI4abLowMdOnlX01DXyFysjYLZyqOB56e27EsVPir1qFUjHOr3lzcY2sjKH5anBG3rk8 B2lMWAyPOIRZLTxZA3uQgMj5rfb2MsOE5qiIsRTiZr63IzE/+2RftArQtLrbV6SBxSW2AV G6OKqilTqo7K7CFCpVYK5QVhZg/J0+OAgww3Cw+k+ZJYnRD8uHfBRmrpb38+Ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701836571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RdZcQ4w56fq7MicA7HRrXcV9qoaxCgB9Q7DZP5p0M1U=; b=YDLiYZmmin4jjyJoUIIywou6xHtiudGWauIBvCG7VAZSjr5mvNLnsN7PHkRKIWfccFCm4I yP2n7Xl7aO3bWdG20e474uazw18inJ5b+e0nnLXwV2TomRkDgKj8I9hotI3GjXYrH87C+y gIrXEdRv/wIb8DkBGHP0bntDetLnL3+6o4D535er6lmhm6OCA61McFZa4wEZqMEpF8KGZ5 dEI85eMSdCrIIjgMQkNnNBXO15mACRnMBr/d7LRBKaRKQWmnXBUKLauwQaXVqibZI+wYlU sGw4ntnPr3c5ylha5R/bcwFtV2dA5Lbz+SNfp6Jx3FJ/L0Ld6gWkIF6iy3BmMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SlPQM2MqHzfCS; Wed, 6 Dec 2023 04:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B64MpMg013470; Wed, 6 Dec 2023 04:22:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B64Mp4t013467; Wed, 6 Dec 2023 04:22:51 GMT (envelope-from git) Date: Wed, 6 Dec 2023 04:22:51 GMT Message-Id: <202312060422.3B64Mp4t013467@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 8c165cbaf02d - stable/14 - usbdevs: add quirk for WD MyPassport Ultra External HDD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8c165cbaf02dabb3fa446d1ad355dc5c0167e978 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=8c165cbaf02dabb3fa446d1ad355dc5c0167e978 commit 8c165cbaf02dabb3fa446d1ad355dc5c0167e978 Author: Eugene Grosbein AuthorDate: 2023-12-03 16:48:34 +0000 Commit: Eugene Grosbein CommitDate: 2023-12-06 04:21:42 +0000 usbdevs: add quirk for WD MyPassport Ultra External HDD WD MyPassport Ultra External HDD needs quirk UQ_MSC_NO_TEST_UNIT_READY to attach. (cherry picked from commit 970d73856b626a68597de19d37b68c376e2c0491) --- sys/dev/usb/quirk/usb_quirk.c | 1 + sys/dev/usb/usbdevs | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index bf2de35a149e..eaf3851bbbca 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -558,6 +558,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(WESTERN, MYPASSPORTES_07, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(WESTERN, MYPASSPORTES_08, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(WESTERN, MYPASSPORTES_09, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), + USB_QUIRK(WESTERN, MYPASSPORTUL_00, 0x0000, 0xffff, UQ_MSC_NO_TEST_UNIT_READY), USB_QUIRK(WINMAXGROUP, FLASH64MC, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY), USB_QUIRK(YANO, FW800HD, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 6543f0cbaa29..221761af4fe7 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4944,6 +4944,7 @@ product WESTERN MYPASSPORTES_06 0x0750 MyPassport Essential External HDD product WESTERN MYPASSPORTES_07 0x0752 MyPassport Essential External HDD product WESTERN MYPASSPORTES_08 0x07A0 MyPassport Essential External HDD product WESTERN MYPASSPORTES_09 0x07A2 MyPassport Essential External HDD +product WESTERN MYPASSPORTUL_00 0x0743 MyPassport Ultra External HDD /* WeTelecom products */ product WETELECOM WM_D200 0x6801 WM-D200 From nobody Wed Dec 6 04:26:53 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlPW13HC9z5409K; Wed, 6 Dec 2023 04:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlPW12fMbz4fkr; Wed, 6 Dec 2023 04:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701836813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5HTzi2+PLUp+wG93DjJCntNPOlgb7E65GJAUuxdMNak=; b=R3jC7iWAQx6IZmaEu5SG4ntNrTJO/S+cX0vu8A9u7NF3Pl8kE1CGLiLRghSYtnYiRB/aDm 26krEoTU4hg7EjkA2C4N701e6sUytltnL4Rw9Uc6VAxN52UW9SB2TNKur21qfdQSe4dIqD DCv0/rmlwZ+nLMDtxPOSpuDBl1poLbGt2mRuMxwDO47kiaNEu+G8VxLG+mGtulIqWR9Q7H deUBbog7u71HwjCiZCil7YFYKuvjxfZSNvv8wbk3L9RzmCcHPsgly34iDLs9LV9+J7uYYj 0501fYVpKWdGNu7cJ6QG7g19ZoN7aVPBLbrpKU2xG9nNHaPwVQPhG0IRnbqT5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701836813; a=rsa-sha256; cv=none; b=fnDW298Rg5TChg5HqBerpeWC+nY9JcEXCIviUbfRnqlQkfVD32NnKMxGNrPlHFmeW/eRb8 WBEpfKNaELewEcxWn3AlxA4inwwentcKPACv+b79w++SEgaE9z3c2rT/GchGqa9bwwE3C0 Q85JS2GBzypTeJtHW9z/GDUMMo7n1lBmx2mImU3qFaZi++Bf608/gXmAKu0q41fmh3JyEs l/fogz57gPEDWMFV3KJhSYnHrtGzF4PO+q6/fHRgmojZ1oR7EQIXo9Lw2XuPs/0bir/bj2 3M1iZYiiG5JP+2jAF2nHqdxafN+AEqB7GdD2WnxDvWNEj8Qs4B5bY6KL2tosIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701836813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5HTzi2+PLUp+wG93DjJCntNPOlgb7E65GJAUuxdMNak=; b=UVCbWqG8YJ0zQmxWFcjk0nRHCeAUwttoTyRkQEf6Kb8IrbDprkYnOYhKAKHZEGw45hLQAl dd3XMMQgHNQQGHQxjJX48JlBjTGGEGDvUa2zMIUY5tm+oFIovMGfrbs/9Ukoboqh4u1b9U i9FuUFJotdI5n0D+Jwg4r1PRzfg3/XHM85Wlx5mvfYb1ixMBDfuGfnhvgRGHJWMEZNc4Gy CfrfEfiYnMwHf5rQCBFQvToGDQQRmsBt7fUPB7KZ1WFE7St9o9jeR8vCcldTrot3qY9WRZ WDf+Aw5U3jfModHIYu0xh55sSUj9gMEhEPtxdhFC8NOLNOVyyrqfVD3mi6fnkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SlPW11bMWzfLB; Wed, 6 Dec 2023 04:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B64Qrxo014157; Wed, 6 Dec 2023 04:26:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B64QruK014154; Wed, 6 Dec 2023 04:26:53 GMT (envelope-from git) Date: Wed, 6 Dec 2023 04:26:53 GMT Message-Id: <202312060426.3B64QruK014154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: e8c442442de2 - stable/13 - usbdevs: add quirk for WD MyPassport Ultra External HDD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e8c442442de21fb9d683690672f12dd237f983d0 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=e8c442442de21fb9d683690672f12dd237f983d0 commit e8c442442de21fb9d683690672f12dd237f983d0 Author: Eugene Grosbein AuthorDate: 2023-12-03 16:48:34 +0000 Commit: Eugene Grosbein CommitDate: 2023-12-06 04:25:53 +0000 usbdevs: add quirk for WD MyPassport Ultra External HDD WD MyPassport Ultra External HDD needs quirk UQ_MSC_NO_TEST_UNIT_READY to attach. (cherry picked from commit 970d73856b626a68597de19d37b68c376e2c0491) --- sys/dev/usb/quirk/usb_quirk.c | 1 + sys/dev/usb/usbdevs | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 284f5add72c1..91d47935221f 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -556,6 +556,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(WESTERN, MYPASSPORTES_07, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(WESTERN, MYPASSPORTES_08, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(WESTERN, MYPASSPORTES_09, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), + USB_QUIRK(WESTERN, MYPASSPORTUL_00, 0x0000, 0xffff, UQ_MSC_NO_TEST_UNIT_READY), USB_QUIRK(WINMAXGROUP, FLASH64MC, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY), USB_QUIRK(YANO, FW800HD, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 0f817109367f..a54b0b0956b8 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4923,6 +4923,7 @@ product WESTERN MYPASSPORTES_06 0x0750 MyPassport Essential External HDD product WESTERN MYPASSPORTES_07 0x0752 MyPassport Essential External HDD product WESTERN MYPASSPORTES_08 0x07A0 MyPassport Essential External HDD product WESTERN MYPASSPORTES_09 0x07A2 MyPassport Essential External HDD +product WESTERN MYPASSPORTUL_00 0x0743 MyPassport Ultra External HDD /* WeTelecom products */ product WETELECOM WM_D200 0x6801 WM-D200 From nobody Wed Dec 6 04:37:00 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlPkh2R1tz540c5; Wed, 6 Dec 2023 04:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlPkh1w9Qz4ggc; Wed, 6 Dec 2023 04:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701837420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BU1sh8IqjMFtMc5ZFu9yiyLS1wiU5OccvxWBrUBncZs=; b=B2JiE9PDOiFGkfj18Xjagd3WK3chcYDDzm2k4x0YN1RJVo56ZeIQFFhp1gUELf4YV07QpW JC0xrSNtO+zP+fGgZkxZzpFV1bU0ACSlorEa9mijL9XrLaIGzRk/7C9xEgtM1LLrm4PcZl +9XVpbYZ/xJTVmiT5b3EGJFmf2hjkWKHqIPPji7mtoSlEgdi2JH/FUTmZ1ahjaxl9D15N1 SBqcA/1AxPgTOEY9QCnc77HAm0IjTTjrBnJsYeZDuuZ1muUiDoBv6Al+dj4DCU6HEttQ78 38+LUEkNDFowzE87Z93tjcb7hgN5Z8vEuJKPcD9Lj6mSs9QMsT1vAqLPzGGslQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701837420; a=rsa-sha256; cv=none; b=gYTr/wjH95dkDgGXm6FDEn6KU0zeVIgT2AZw41vCF8BGFjoVd/JKHbPBt4gxP9N1lUxHi2 PH1jE1ce1UPx3dq9cd8a0hpLqjXjqEctUEo+FMDMBVEJJO01oyiZ8nfPV6ZP/1U7ZFY2cL Bfb4Z5ax1z1NtWG6JHerMVUX5BRs23BZCweFWcc1OjAUBWoad3owr06kfdJv/9FSbQewiD TBp9obccvtVZE1u+6LH8D7QQiY4LgDG4lsbmm5yr36PtYWUcjq+YIekXSJ975ycRgVFkrn HCR+7E1EuPwRpEoUojApvbLbk8VO8auDXrWsFAnGeR4wGks+4q0383VBISRj6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701837420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BU1sh8IqjMFtMc5ZFu9yiyLS1wiU5OccvxWBrUBncZs=; b=uCk6RtuEm0yyHMKhF3+bVUx5Vno9a5hCid1R2zNeYcyA3ROY+n0oYhSR8CZHmQ/K9gUnyI 5SIm+xXQ0v514FMMDGTzJ9fp1KuhmtKy1f92l4YjUIPe+zi5H5vmQXrKNnaw7Zr6u6Isr5 j87GGOcAE7Hc/Ks/w+wFxxuZV/P56dNAmofCl7Vqus9i2eQfNaX0dfesEDS6ZmCOTDrRuQ snHngLvhVpmvRGNCKMVXht21G5pjn6AMFLGFEYTx4dQzS8kUDL5oRdPbFyC1b+hMPll4Br KWndhwLnB3gkU+K9Fq8eI9TlP854bbMPJjjFwQ/FvEWzJRdI5K0oe2yUhYHbAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SlPkh0zprzfkN; Wed, 6 Dec 2023 04:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B64b0aD031073; Wed, 6 Dec 2023 04:37:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B64b07Q031070; Wed, 6 Dec 2023 04:37:00 GMT (envelope-from git) Date: Wed, 6 Dec 2023 04:37:00 GMT Message-Id: <202312060437.3B64b07Q031070@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: b743fda10257 - stable/12 - usbdevs: add quirk for WD MyPassport Ultra External HDD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b743fda10257b8381cc5461207da720dc305d20e Auto-Submitted: auto-generated The branch stable/12 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=b743fda10257b8381cc5461207da720dc305d20e commit b743fda10257b8381cc5461207da720dc305d20e Author: Eugene Grosbein AuthorDate: 2023-12-03 16:48:34 +0000 Commit: Eugene Grosbein CommitDate: 2023-12-06 04:32:41 +0000 usbdevs: add quirk for WD MyPassport Ultra External HDD WD MyPassport Ultra External HDD needs quirk UQ_MSC_NO_TEST_UNIT_READY to attach. (cherry picked from commit 970d73856b626a68597de19d37b68c376e2c0491) --- sys/dev/usb/quirk/usb_quirk.c | 1 + sys/dev/usb/usbdevs | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 0a23eb29c177..a7cde883014d 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -511,6 +511,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(WESTERN, MYPASSPORTES_07, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(WESTERN, MYPASSPORTES_08, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(WESTERN, MYPASSPORTES_09, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), + USB_QUIRK(WESTERN, MYPASSPORTUL_00, 0x0000, 0xffff, UQ_MSC_NO_TEST_UNIT_READY), USB_QUIRK(WINMAXGROUP, FLASH64MC, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY), USB_QUIRK(YANO, FW800HD, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 5ec3a33d0b1f..4e7a0d934fe3 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4871,6 +4871,7 @@ product WESTERN MYPASSPORTES_06 0x0750 MyPassport Essential External HDD product WESTERN MYPASSPORTES_07 0x0752 MyPassport Essential External HDD product WESTERN MYPASSPORTES_08 0x07A0 MyPassport Essential External HDD product WESTERN MYPASSPORTES_09 0x07A2 MyPassport Essential External HDD +product WESTERN MYPASSPORTUL_00 0x0743 MyPassport Ultra External HDD /* WeTelecom products */ product WETELECOM WM_D200 0x6801 WM-D200 From nobody Wed Dec 6 06:34:04 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlSKn1VBTz52tvy; Wed, 6 Dec 2023 06:34:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlSKn100bz4nk9; Wed, 6 Dec 2023 06:34:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701844445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DIZNNCdXpa8NFAu/3flQQKoXNxUO8TuKg2hOKPIGhIg=; b=C9HZDnecMxwGgPhLsFFI0xyMrU42Hsxyho84Gs3QYGPrMjd+vZRTIf6eSIwGrEVJuq5+SF TPNvhvTa3v/Ab9KpeN4bJj88YejZqxuDDsDeN1ui/705acD86hOuNlsuiWycd3xl6F0lqm FSoFafXKKKt2Hzn0Fu4zJ3ybUj3JnYF+oB+PjdvJ2BmRXeftcG5V/Z/D7+k8nNep7UDLaM i/z7BIpVJjyTkJZn0vdsIqlPwd1YooSTZ0bnceRWQVAr4Zbg4TUkFiDPmR99kmN4yYNA2t xUheRkK0UoMCCfwGsedTERMlBu5w1QyLVtvgI2HZhP21vrnN0/S93w1+TqUutw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701844445; a=rsa-sha256; cv=none; b=TkZWYrQy7FVdn/Xo3MrUhZjJNezQONvliImuvmwe78ZGQVfVqCVCs3CJwXCtdVyoBRGXeG LqHFoIqPX2LyvZyc2gbucqZ30JF1Cc084Za2K6EVHijTW0WL1ZxwhZrMjgh+mSxwXP5Muq 4XRc+M2BmS89zhf15rfIyh/zSO1jhQAGlaCD58yfM6uEBo2iqIolrm/xik5gj+E8bvRZyQ wNCJTTlGPUdxuyEpCM40HeesYIMjFB9322SNewvqYtOfFTZAY+4PhWTL+wFS6X7FLr6zYQ FIiU2p2LvUiIoGu7HVkwJNGXO2f3J1qspdwqLDVcLO2R2k7tWIdH+yO35a0Zgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701844445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DIZNNCdXpa8NFAu/3flQQKoXNxUO8TuKg2hOKPIGhIg=; b=DZZPTmdJ9oCpIkeh753BpS32OBFnLR1EiVkybMhemmfI2Kze5fQSNhIduzva+M2kGGk9hd ve3Csq9I8F4aQmSY+fPEZdPh45Maai4r8UOcb+7tHeE6RtLyt9Ba6Uswui8j1yoEn8t7CZ WdxjUhDUgx2ysMRFfMQih7bLVfqALJ8dWAXrtSpqpW1cEv1CvvIsBKCuosh+RM+8JJ9TLq Idzu5D7yrAYMojS16JuN2QtOY7tyyCsxjneawSwFOXX52nyOpzdJLGXwgV/KaK9Pyk9cVJ HfAEYA8QSL5nbC4sJsuaZLSm+IjD5ge81ecrAdEnjDmwylZ65otAqntJL40K4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SlSKn01wgzjJ7; Wed, 6 Dec 2023 06:34:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B66Y4ib031325; Wed, 6 Dec 2023 06:34:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B66Y4rv031322; Wed, 6 Dec 2023 06:34:04 GMT (envelope-from git) Date: Wed, 6 Dec 2023 06:34:04 GMT Message-Id: <202312060634.3B66Y4rv031322@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 52369c5d29f5 - stable/14 - periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 52369c5d29f5f291bfc98270cf13768633abe322 Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=52369c5d29f5f291bfc98270cf13768633abe322 commit 52369c5d29f5f291bfc98270cf13768633abe322 Author: Xin LI AuthorDate: 2023-12-03 07:00:32 +0000 Commit: Xin LI CommitDate: 2023-12-06 06:33:48 +0000 periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. The leap-seconds.list is used exclusively by ntpd, therefore, do not bother to perform the fetch when ntpd is not enabled. PR: conf/275419 Reviewed by: cy, michaelo, imp Differential Revision: https://reviews.freebsd.org/D42875 (cherry picked from commit 3b3195f6767b39eb33b3523134ef988931c9c86d) --- usr.sbin/periodic/etc/daily/480.leapfile-ntpd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd index 17db53e625f8..c7de845ea87d 100755 --- a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd +++ b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd @@ -12,9 +12,9 @@ fi case "$daily_ntpd_leapfile_enable" in [Yy][Ee][Ss]) - if service ntpd oneneedfetch; then + if service ntpd enabled && service ntpd needfetch; then anticongestion - service ntpd onefetch + service ntpd fetch fi ;; esac From nobody Wed Dec 6 06:34:39 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlSLR6msyz52twC; Wed, 6 Dec 2023 06:34:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlSLR5pHNz4pNf; Wed, 6 Dec 2023 06:34:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701844479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Eir9kCYEi86+plNbHZyHaXgNDQ3aYDer88gN/h2Qdb8=; b=CMy9KarTAgKTmGMQk7/k9ZnLbzhFvqOK+Ce3kJ8cbanDb6JI8U2HzYDKMfiNpC1rPdhtTU reeaMZ6R2UT1cEn8xYEGiQ2X8PlZYHXRKhvIXq/I69glfiV1MOP9zUlDDPQi3fbGPxPojI 1ax+L/13vEjtXeiG/r65x1nsaxRJDFx9NNK31JIaTQH1f1Pvgkx8JUl2PVWsGhV4CaR/SX cCZwRtvT4F2M32FdorUi+Yx8r/OIO8V7OgS6HAEB4K15iYVD+Apxn1+eVdlR1CprTyBKVh kW/+c8L2E52QjeAHa0eqIXvBXV9kDdHXIGWF7X93453XHGc82D0zOo3cYu0ETQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701844479; a=rsa-sha256; cv=none; b=g5X9n2hpCJPKDcpp5L7MPLn6MtxMOrnXDNBQGybMmSwtA3G5wsduetzailtvM0a2MLmSiN iulRU3wHv16F9tbH0gSgblrlrQjZQTfZrE9dc4p45iVmCAFQq7auh6mSyS9RG/CaLfzI8k 3dOcbXvIpsupAaEEWqNd4V9jbdTwLsjufcXEyewLFuKhDGddML/yUsuLL19MKVVkhqY9cV 7n9TLj55wjLEIkdupNq2krzQTTHzKYeS0vrQdjI4ZyhYi6RqyRNdXTdHOGCF6lKJel/Wkp kEUiZ12zFoF0dDuIpmJxIbn5eedy+K2ejAd6TnxitG9O1lL6zgDpEQ1xAZL0mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701844479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Eir9kCYEi86+plNbHZyHaXgNDQ3aYDer88gN/h2Qdb8=; b=I8aCLrCKZb++fTGvFUYSVCA4HHhy7VLiFm+VdHXqXWTGcpfDQMAb4ELZoOUd69n26N2934 4dLL1BGI6BwIPVWX1SOedtWPE+mgBisLwUfRn/LepDar9fMzprmf+xWR9E4cBGjmHuO5cJ M3viTVmbagd5YCqGVkKfWlVwHGJfgNwPvY+3c5nkujfssB14qBAYsyV3I87BrGBxdXPMZf sQBY6yatWsM+GDYOVFVOkzr0szWw7sw1kxiSvRKefoGvznmrfz66RF5oNHq2Osa8gW5fGg k3MCW6Feun+f06t7xjmssyo2/Di8j6O4xAxGXTqaBiRIf47CPuQVcHPqwkyltg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SlSLR4rpNzjgf; Wed, 6 Dec 2023 06:34:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B66Yd1f031538; Wed, 6 Dec 2023 06:34:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B66Yd27031535; Wed, 6 Dec 2023 06:34:39 GMT (envelope-from git) Date: Wed, 6 Dec 2023 06:34:39 GMT Message-Id: <202312060634.3B66Yd27031535@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 3ef596c6e805 - stable/13 - periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3ef596c6e80562710da09c16558d7351749ea143 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=3ef596c6e80562710da09c16558d7351749ea143 commit 3ef596c6e80562710da09c16558d7351749ea143 Author: Xin LI AuthorDate: 2023-12-03 07:00:32 +0000 Commit: Xin LI CommitDate: 2023-12-06 06:34:26 +0000 periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. The leap-seconds.list is used exclusively by ntpd, therefore, do not bother to perform the fetch when ntpd is not enabled. PR: conf/275419 Reviewed by: cy, michaelo, imp Differential Revision: https://reviews.freebsd.org/D42875 (cherry picked from commit 3b3195f6767b39eb33b3523134ef988931c9c86d) --- usr.sbin/periodic/etc/daily/480.leapfile-ntpd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd index 17db53e625f8..c7de845ea87d 100755 --- a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd +++ b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd @@ -12,9 +12,9 @@ fi case "$daily_ntpd_leapfile_enable" in [Yy][Ee][Ss]) - if service ntpd oneneedfetch; then + if service ntpd enabled && service ntpd needfetch; then anticongestion - service ntpd onefetch + service ntpd fetch fi ;; esac From nobody Wed Dec 6 07:55:21 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlV7Y4pfjz531hR; Wed, 6 Dec 2023 07:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlV7Y4GN0z4vR2; Wed, 6 Dec 2023 07:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701849321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OxmJCsdR6UG65HjFnvSqvZVBBtjD3aAENSlcQSCFj1U=; b=W5oxRXjvKWu5g6VslYmqMqr08BU4o5M5EraZKNY+1FOj8V10UNibQE27KGqQARI+pcDdOU vEFfMD271bv9C10jrYtrSmw6mg82Lbzo00LVwUp8qGK3FXlp84i9VvyLQ77w8Ns/tYHHSn GAy3+0Q6FBYRzwZTgAC2+VJpq7LsPNAyIZQpoWNLexF38c/EUt7QfRgSvz2DMH/4aQMbr9 alOJ1UmOQmxVNZyAkqylK7cuv1CXn4ZGTHTahqvfMjZEEtKH7NsfnQpymt8wakwpSZojiB eqkaF+JkiPcsjMNzu6PI9f7hpR/ZlzUP4SNjG1fwSLTDOS56NN0UMowJ9DChTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701849321; a=rsa-sha256; cv=none; b=DpR/DYROU9noT21wvmd/3YDcT+o9DGKiPxvRKKOapVhLVI33kGnIeAXHIJG2/h9gi545xA cJVHFhPZvnMNCKbt/hef+ynwDPNwwm67HsiEZH2u4RRimivzht4b0AjebV9DbnriAe7F0d 1geLWDONw42DT0XeA0E3KxudQ5B6oTvZLDRpSCHR14yd0EIXguBrVdYBov4jHerL63GZK/ RpHCyZmTyxReZ9CQIusi/VHO8oA+KhY9aDYh47YEqLBG/y6gRmnZxEOa4Cq6334aVSKCLP /d0OAx7nehwTZ2C5GKs2VS+QuEncSxV1LCHwFVzYTvCtzzXwTo52Zsv5IFahTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701849321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OxmJCsdR6UG65HjFnvSqvZVBBtjD3aAENSlcQSCFj1U=; b=Bwu/k1765471A7bdgaE88L2fM4pd/uF2UWtAPBgigKNu5ql2t07/edBdrelH4RLU/1C33x 0uiznQMglAb3Kyzei4ZjrmCM2TMYnWwUK/yVha8dXXP4UNeZ0HyfzoMpLgOx1EnGeUP+Ck SS9SsGdHFiB24WJDyf9F4U0A1SsjQ1sLPrF4fhZ9T9obcDnB5ignYWj6L5bNh3Nu5x87Dg jvinkdSwxKVa+u9ZkkTZmAA4LcbizL8u7PoAVLbawphiYyXYzqMzfshrIrYJS9bsJEBN7R ulJvzEFIKJerphLgkvDGIMhjYYfLcQVJxIE8+B7qSD6c7yxU8B95dp8uSgbFaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SlV7Y3CRVzl7Y; Wed, 6 Dec 2023 07:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B67tLQp064646; Wed, 6 Dec 2023 07:55:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B67tLh6064643; Wed, 6 Dec 2023 07:55:21 GMT (envelope-from git) Date: Wed, 6 Dec 2023 07:55:21 GMT Message-Id: <202312060755.3B67tLh6064643@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 80560eec655a - stable/12 - periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 80560eec655ac6cd3b7d7fd0f9fe37f309b78d64 Auto-Submitted: auto-generated The branch stable/12 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=80560eec655ac6cd3b7d7fd0f9fe37f309b78d64 commit 80560eec655ac6cd3b7d7fd0f9fe37f309b78d64 Author: Xin LI AuthorDate: 2023-12-03 07:00:32 +0000 Commit: Xin LI CommitDate: 2023-12-06 07:55:17 +0000 periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. The leap-seconds.list is used exclusively by ntpd, therefore, do not bother to perform the fetch when ntpd is not enabled. PR: conf/275419 Reviewed by: cy, michaelo, imp Differential Revision: https://reviews.freebsd.org/D42875 (cherry picked from commit 3b3195f6767b39eb33b3523134ef988931c9c86d) --- usr.sbin/periodic/etc/daily/480.leapfile-ntpd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd index a693986e0dd1..f4a1edb8d5a2 100755 --- a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd +++ b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd @@ -13,9 +13,9 @@ fi case "$daily_ntpd_leapfile_enable" in [Yy][Ee][Ss]) - if service ntpd oneneedfetch; then + if service ntpd enabled && service ntpd needfetch; then anticongestion - service ntpd onefetch + service ntpd fetch fi ;; esac From nobody Wed Dec 6 14:41:32 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Slg8D3nfVz53XBB; Wed, 6 Dec 2023 14:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slg8D3J7Fz4JMm; Wed, 6 Dec 2023 14:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701873692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fUuWrVTFgTzRP5U3seyr6LbvHObzPO40T/zkqnx1w6U=; b=k+zvxIbatPDkFTwvBRUZ6r5XDDtfZniD2gByLOz8h0xKDLzzHD2XC3I5N+r8ZJ7UQrmhWB 8k6WA7+sO1Uir1TZ4AXJXth45NgNhNu5ZVaZwUCy92DSqgze6Hg0yUOwDICP7CMLuSL3zp mg5J3ubWzEwd0y7Quzrf4J7Eq6jr5xyLPhSVyCTtHqGVtxNwT7DN8dzki9jNHe3BjiOMN2 peDncQJ7f4MP/S1VKvpaM1td5N7zd3ihuLlNBVFXetzKTxfjEVfk4sfaDGTIzv6X55yutT bkaYOcxN9Zw6pbQgVMGHH53Cu9Uj7wmZmmWtO1V+Eozxdiui1DMp5k6NTTNeEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701873692; a=rsa-sha256; cv=none; b=cSkCqHbUTpkz8M07PnTlFKAbwDrndsUlDNlyT70E3SAlv7c41KlSyKVEd7STBHDi11mS0Y h0vLZ/f/kkHq7ECXoz3U6nntCsHqWlla1LUjixV5sJqLksPCqo1C4Byn+w+Q0MTouJKy/X 6Teqo9FEo5gB64uH6xWjxaHDf3tQG537OyeynEX79EujtW+RNY+dWLvj0qUYALOlPcZlAa vMsGdkWkVuGDQ+C2urBU1QPWohsi4a/vt4w0cuqApeS94cN7ASgCtH3mPLcO1V4xSF2loB HftoOKxuEtAKhKhfVi8fXmihuf//MmiucnQ/7mfA35Tdp1rzIkwHmIyjitwPGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701873692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fUuWrVTFgTzRP5U3seyr6LbvHObzPO40T/zkqnx1w6U=; b=Xzqvh5MniePjjivBufYGs1aLKIUa5PoXej097GsrkOZiNM+mOhOKq/VEOKxUrKeVwtUh7G dYcC/A1FXhrnK/Vc2SWecNSrf5ZAewXD3LLWeb/jutFrilKHtIGbIky9IvyKFeFmG5sqsW 2zUNm3bAkdl+6MeRo+Kgw1WTLGOs4YnNvBDa+rFsPNn/ybPQWd+dNP3IddgREQp1DZdy20 N30RAY8IAuZ+Hpd1wZomqVBylI/2Jho0MAQNNf+spppJrbEWany+KSlORb0I6tN6LPS/Sx vH6AtXqy8YB/j2xsDfkIedr7JpC01FHqz5TcuM+mntAeSVztE5KYFspTBEbwJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Slg8D2NHHzx02; Wed, 6 Dec 2023 14:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6EfWMS045733; Wed, 6 Dec 2023 14:41:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6EfW1P045730; Wed, 6 Dec 2023 14:41:32 GMT (envelope-from git) Date: Wed, 6 Dec 2023 14:41:32 GMT Message-Id: <202312061441.3B6EfW1P045730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 05c55eed44e5 - stable/13 - pf: fix mem leaks upon vnet destroy List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 05c55eed44e53a3a5473451d105f81ce36ef375a Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=05c55eed44e53a3a5473451d105f81ce36ef375a commit 05c55eed44e53a3a5473451d105f81ce36ef375a Author: Igor Ostapenko AuthorDate: 2023-11-29 12:35:41 +0000 Commit: Kristof Provost CommitDate: 2023-12-06 13:23:33 +0000 pf: fix mem leaks upon vnet destroy Add missing cleanup actions: - remove user defined anchor rulesets - remove user defined ether anchor rulesets - remove tables linked to user defined anchors - deal with wildcard anchor peculiarities to get them removed correctly PR: 274310 Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42747 (cherry picked from commit 0626d30e41cba64b41667314c3a4f7611f0eb685) --- sys/netpfil/pf/pf_ioctl.c | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 639c2462fe75..81b766cb7f6a 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -5089,6 +5089,7 @@ pf_clear_tables(void) int error; bzero(&io, sizeof(io)); + io.pfrio_flags |= PFR_FLAG_ALLRSETS; error = pfr_clr_tables(&io.pfrio_table, &io.pfrio_ndel, io.pfrio_flags); @@ -5499,8 +5500,34 @@ shutdown_pf(void) int error = 0; u_int32_t t[5]; char nn = '\0'; + struct pf_kanchor *anchor; + int rs_num; do { + /* Unlink rules of all user defined anchors */ + RB_FOREACH(anchor, pf_kanchor_global, &V_pf_anchors) { + /* Wildcard based anchors may not have a respective + * explicit anchor rule or they may be left empty + * without rules. It leads to anchor.refcnt=0, and the + * rest of the logic does not expect it. */ + if (anchor->refcnt == 0) + anchor->refcnt = 1; + for (rs_num = 0; rs_num < PF_RULESET_MAX; ++rs_num) { + if ((error = pf_begin_rules(&t[rs_num], rs_num, + anchor->path)) != 0) { + DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: " + "anchor.path=%s rs_num=%d\n", + anchor->path, rs_num)); + goto error; /* XXX: rollback? */ + } + } + for (rs_num = 0; rs_num < PF_RULESET_MAX; ++rs_num) { + error = pf_commit_rules(t[rs_num], rs_num, + anchor->path); + MPASS(error == 0); + } + } + if ((error = pf_begin_rules(&t[0], PF_RULESET_SCRUB, &nn)) != 0) { DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: SCRUB\n")); @@ -5527,12 +5554,16 @@ shutdown_pf(void) break; /* XXX: rollback? */ } - /* XXX: these should always succeed here */ - pf_commit_rules(t[0], PF_RULESET_SCRUB, &nn); - pf_commit_rules(t[1], PF_RULESET_FILTER, &nn); - pf_commit_rules(t[2], PF_RULESET_NAT, &nn); - pf_commit_rules(t[3], PF_RULESET_BINAT, &nn); - pf_commit_rules(t[4], PF_RULESET_RDR, &nn); + error = pf_commit_rules(t[0], PF_RULESET_SCRUB, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[1], PF_RULESET_FILTER, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[2], PF_RULESET_NAT, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[3], PF_RULESET_BINAT, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[4], PF_RULESET_RDR, &nn); + MPASS(error == 0); if ((error = pf_clear_tables()) != 0) break; @@ -5553,6 +5584,7 @@ shutdown_pf(void) /* fingerprints and interfaces have their own cleanup code */ } while(0); +error: return (error); } From nobody Wed Dec 6 14:41:33 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Slg8F5P29z53XBD; Wed, 6 Dec 2023 14:41:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slg8F4XnSz4JQd; Wed, 6 Dec 2023 14:41:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701873693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3KrYorFUj8Yww/2YaTfZJ1a/Zs4NLjMSJqcEgufMbaM=; b=KEh38+M2bhov27IVxPICzGmKfrbImlAzqpm7NhBExuqFF3EIeh8EFfseXHqyv2E4GD/VGd KYXzEA8dcsAWRhX6pI+T6bJdBJ2gDVqnajjdUi+UK7c6NTntNA0JVrfMC+EpTTo9iBQewR eu+pnjF91/mVcOdyLDXSvF0RUgvLRzHbYNL+wbF/umxxAC0QlKw2V143x99XQX/U8U7AL7 p0lvfcEKlj8txDxlvq/s9w+i8wgXzx6mWFVBpeHMrDyNa+NLZ3nCIjULOoP4Xhi/T6d0y5 ZSZffs9XNyeMkeNjULIP74K6O3aHjj8mg/ZmKG9dFD2w49HaNU+Xby50L16MJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701873693; a=rsa-sha256; cv=none; b=SGcS5sDLugEzP6Q3/eWS4oGA1tMYrDqb39PFGTHq9RfpwVAsdVafufOUqoFkxInqcODyDb iyKbCXW3gkjjoZpQAA76W11m9nSvCyRWk0G2d3eqjsJ6cflj6I/GS/7FZ5WrhEqq0gGSCz 9SLqSjLuoDVzl36yGqtx0TXVQoJkNjodazm3GL+iyV02KREwTLv76+Bw8zwEiw4YGHQxea ateoAQ4PcG+WSxzNFXrjJ0nQnpqmqv3AqzkUlif/ik9OujU4tETtBgUoARJNUDPbfzNqL5 +4aB1sipksHPEq3iP3KH91V/ODrvYgm3648XBz0UDeEYlWTXciFGyrU4Y6iEow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701873693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3KrYorFUj8Yww/2YaTfZJ1a/Zs4NLjMSJqcEgufMbaM=; b=PtUrq1nSbZJARApGEscGVXbwsX9h9l9ArixBHe/54FVGI+8uOGMkfLK4Ezv5ostWYA6gJn ySpgjH4lqZQDi8Zh6PTWK5r6ZN9ZjhWn80rNvJ9i+P/pbkpJXY0jLJ0+LuJA5ombS4/IX6 Ji/cEPdk3QcVifNusy0MnKH1oeUkeH+R4G49Q5KOGKtL+talZAbPZZIN7Mi3Z3/oJQkC/g upBwZcBVN8+fROeARAgRWbVw/cEMj4KQxFsqnxXPKfGiZDCraqeAbqJNo9sRtz0c3Wntyt +FUpf7Cc05+GD6Lmu5mB4HzuUhRi/mDan2+TyUZq83ocpkR5NzrFapEayohOgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Slg8F3d6tzwx9; Wed, 6 Dec 2023 14:41:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6EfXCL045863; Wed, 6 Dec 2023 14:41:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6EfXEf045860; Wed, 6 Dec 2023 14:41:33 GMT (envelope-from git) Date: Wed, 6 Dec 2023 14:41:33 GMT Message-Id: <202312061441.3B6EfXEf045860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 285b505a4ee0 - stable/14 - pf: fix mem leaks upon vnet destroy List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 285b505a4ee0ab2fdc8f970e7d23a6d3091dc686 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=285b505a4ee0ab2fdc8f970e7d23a6d3091dc686 commit 285b505a4ee0ab2fdc8f970e7d23a6d3091dc686 Author: Igor Ostapenko AuthorDate: 2023-11-29 12:35:41 +0000 Commit: Kristof Provost CommitDate: 2023-12-06 09:08:25 +0000 pf: fix mem leaks upon vnet destroy Add missing cleanup actions: - remove user defined anchor rulesets - remove user defined ether anchor rulesets - remove tables linked to user defined anchors - deal with wildcard anchor peculiarities to get them removed correctly PR: 274310 Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42747 (cherry picked from commit 0626d30e41cba64b41667314c3a4f7611f0eb685) --- sys/netpfil/pf/pf_ioctl.c | 67 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 7 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index de43570176cb..a397b9e99261 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -6028,6 +6028,7 @@ pf_clear_tables(void) int error; bzero(&io, sizeof(io)); + io.pfrio_flags |= PFR_FLAG_ALLRSETS; error = pfr_clr_tables(&io.pfrio_table, &io.pfrio_ndel, io.pfrio_flags); @@ -6438,8 +6439,54 @@ shutdown_pf(void) int error = 0; u_int32_t t[5]; char nn = '\0'; + struct pf_kanchor *anchor; + struct pf_keth_anchor *eth_anchor; + int rs_num; do { + /* Unlink rules of all user defined anchors */ + RB_FOREACH(anchor, pf_kanchor_global, &V_pf_anchors) { + /* Wildcard based anchors may not have a respective + * explicit anchor rule or they may be left empty + * without rules. It leads to anchor.refcnt=0, and the + * rest of the logic does not expect it. */ + if (anchor->refcnt == 0) + anchor->refcnt = 1; + for (rs_num = 0; rs_num < PF_RULESET_MAX; ++rs_num) { + if ((error = pf_begin_rules(&t[rs_num], rs_num, + anchor->path)) != 0) { + DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: " + "anchor.path=%s rs_num=%d\n", + anchor->path, rs_num)); + goto error; /* XXX: rollback? */ + } + } + for (rs_num = 0; rs_num < PF_RULESET_MAX; ++rs_num) { + error = pf_commit_rules(t[rs_num], rs_num, + anchor->path); + MPASS(error == 0); + } + } + + /* Unlink rules of all user defined ether anchors */ + RB_FOREACH(eth_anchor, pf_keth_anchor_global, + &V_pf_keth_anchors) { + /* Wildcard based anchors may not have a respective + * explicit anchor rule or they may be left empty + * without rules. It leads to anchor.refcnt=0, and the + * rest of the logic does not expect it. */ + if (eth_anchor->refcnt == 0) + eth_anchor->refcnt = 1; + if ((error = pf_begin_eth(&t[0], eth_anchor->path)) + != 0) { + DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: eth " + "anchor.path=%s\n", eth_anchor->path)); + goto error; + } + error = pf_commit_eth(t[0], eth_anchor->path); + MPASS(error == 0); + } + if ((error = pf_begin_rules(&t[0], PF_RULESET_SCRUB, &nn)) != 0) { DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: SCRUB\n")); @@ -6466,12 +6513,16 @@ shutdown_pf(void) break; /* XXX: rollback? */ } - /* XXX: these should always succeed here */ - pf_commit_rules(t[0], PF_RULESET_SCRUB, &nn); - pf_commit_rules(t[1], PF_RULESET_FILTER, &nn); - pf_commit_rules(t[2], PF_RULESET_NAT, &nn); - pf_commit_rules(t[3], PF_RULESET_BINAT, &nn); - pf_commit_rules(t[4], PF_RULESET_RDR, &nn); + error = pf_commit_rules(t[0], PF_RULESET_SCRUB, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[1], PF_RULESET_FILTER, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[2], PF_RULESET_NAT, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[3], PF_RULESET_BINAT, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[4], PF_RULESET_RDR, &nn); + MPASS(error == 0); if ((error = pf_clear_tables()) != 0) break; @@ -6480,7 +6531,8 @@ shutdown_pf(void) DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: eth\n")); break; } - pf_commit_eth(t[0], &nn); + error = pf_commit_eth(t[0], &nn); + MPASS(error == 0); #ifdef ALTQ if ((error = pf_begin_altq(&t[0])) != 0) { @@ -6498,6 +6550,7 @@ shutdown_pf(void) /* fingerprints and interfaces have their own cleanup code */ } while(0); +error: return (error); } From nobody Wed Dec 6 15:36:38 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlhMp301nz53bB6; Wed, 6 Dec 2023 15:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlhMp2QxRz4NtS; Wed, 6 Dec 2023 15:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701876998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iDNXhjR8n7y6umJ5hymb6vuJ54j/PjO12cI2TJdTbus=; b=gTi0g5TqkOODA9hwNlC0o26PaECRFJX9Kk0//RnLVZTnvvn+CvvbNBnYD8Y8eirDTS2nY6 MLAgbwf0Dxihw2cr9xsMMo5mg1L2oR8lj3p18aHoKBe2x6U6zuHH77cuAR2774GUo55Wzv Wx8SmtNFqEq21fZMvaPEYwjZWihcs5NhMrNQlbLdAODcLqODPAx1SRIxTqoLqIaoN2vYvA Ub1/tyLIMPChqfP2KIutwici8CaJzXJ6EiapUQ4PKju0adQInq/u4uH2A5bHpuqMqW7kqc wE39U7DYvP8auK3NujL0XhZ1YjKFVGPSgaLNmcrBBLD9ILtEdVhPx4YxIJRmFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701876998; a=rsa-sha256; cv=none; b=yn1ydFWC6OdunpvCw8AFpyv09uZ/k9ALFJ3uLO2S1KLekFnMFkh9lJXxe9O+wOclP3qVvQ c/LB1+4FnOADpHp/edO5surjFq+6co5vm36qf6wXGKFJ4zO5t5oxIcDp7Pyh4rIjnE9u1y 11iRYNOyrA+9mACfwecKvSLyXJ5V1rt3iNa4O/zt5u716+vhufyfFvEsV1m4FW3+uPK4O6 uhbw4jcH7n0B7kfAEMz/fUk/apeylL0Cj/0cjq/jDR9JhExnHG5788jFbfKzSDfHysLq8e PvaV/v/TvTO2SdqjnOT8d5e5PSsmTl7Tq+YnaGNOYR2D4rUpJW0LyAEAJmE42Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701876998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iDNXhjR8n7y6umJ5hymb6vuJ54j/PjO12cI2TJdTbus=; b=gaq7eyybp/ekRUha4S8VKTptgzW9/CZxFsc9nJ+qzmaZy5fp7m+/wNTyuIWKjOtZvACQIE ziDVn/tnJQkcAZuHmj2H3wD7fFVvWJJq5nhHIriziDxy4t/wthNeqyXpjet5+1gQbPxCmw zN0KYH0KXeCOpZ9EwyEa87Wk3b+SgRFPS5BwlbZ8qc5/yGl0hnmrknPphKeyq3Z3EgalZL AUFuHjX8PMsaqfgQFF3BxEG755fa9blHVTHKcZwtfW5x8W57q9GD85OksO5zz2GGwV1p0j IUWQkm33Y08SuCISePcWTaahw/Fd1zrzmxYzUzpGMeM1pFHsSrfMHOclQEAVtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SlhMp1VpYzysM; Wed, 6 Dec 2023 15:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6FacrW035882; Wed, 6 Dec 2023 15:36:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6Fac6g035879; Wed, 6 Dec 2023 15:36:38 GMT (envelope-from git) Date: Wed, 6 Dec 2023 15:36:38 GMT Message-Id: <202312061536.3B6Fac6g035879@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 3a8271dc1d77 - stable/14 - CAM: Remove return value from xpt_path_sbuf() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3a8271dc1d77990861d30eaac0aa626de1c53053 Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=3a8271dc1d77990861d30eaac0aa626de1c53053 commit 3a8271dc1d77990861d30eaac0aa626de1c53053 Author: Alexander Motin AuthorDate: 2023-11-22 20:10:57 +0000 Commit: Alexander Motin CommitDate: 2023-12-06 15:34:38 +0000 CAM: Remove return value from xpt_path_sbuf() It is wrong to call sbuf_len() on third-party sbuf. If that sbuf has a drain function, it ends up in assertion. But even would it work, it would return not newly written length, but the full one. Searching through the sources I don't see this value used. (cherry picked from commit 6332e0f1a4b34707654d6ae2cd3c1e8799970d0b) --- sys/cam/cam_xpt.c | 11 ++++------- sys/cam/cam_xpt.h | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index c32cad2433b1..26e656fc5ff2 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -3746,19 +3746,18 @@ xpt_print(struct cam_path *path, const char *fmt, ...) sbuf_delete(&sb); } -int +char * xpt_path_string(struct cam_path *path, char *str, size_t str_len) { struct sbuf sb; - int len; sbuf_new(&sb, str, str_len, 0); - len = xpt_path_sbuf(path, &sb); + xpt_path_sbuf(path, &sb); sbuf_finish(&sb); - return (len); + return (str); } -int +void xpt_path_sbuf(struct cam_path *path, struct sbuf *sb) { @@ -3789,8 +3788,6 @@ xpt_path_sbuf(struct cam_path *path, struct sbuf *sb) else sbuf_printf(sb, "X): "); } - - return(sbuf_len(sb)); } path_id_t diff --git a/sys/cam/cam_xpt.h b/sys/cam/cam_xpt.h index 1276dd7b9b2e..dfedc1157e51 100644 --- a/sys/cam/cam_xpt.h +++ b/sys/cam/cam_xpt.h @@ -103,9 +103,9 @@ int xpt_path_comp(struct cam_path *path1, struct cam_path *path2); int xpt_path_comp_dev(struct cam_path *path, struct cam_ed *dev); -int xpt_path_string(struct cam_path *path, char *str, +char * xpt_path_string(struct cam_path *path, char *str, size_t str_len); -int xpt_path_sbuf(struct cam_path *path, struct sbuf *sb); +void xpt_path_sbuf(struct cam_path *path, struct sbuf *sb); path_id_t xpt_path_path_id(struct cam_path *path); target_id_t xpt_path_target_id(struct cam_path *path); lun_id_t xpt_path_lun_id(struct cam_path *path); From nobody Wed Dec 6 15:36:39 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlhMq50V4z53b3G; Wed, 6 Dec 2023 15:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlhMq44k7z4NgG; Wed, 6 Dec 2023 15:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701876999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r8gcK6xMfdU7wF+41wIrCtTPkHunslmWJanBcv9L0SM=; b=OCKai0DKL8Te80jlMaqrqAqzmUQ2EkQGe7jowpfAJHW2J3ZXLByImkoCeHFJm7E22cIjgp L1b2v8v/LXwadZp3SHGL9T77217VyPAdt6FTmb8fcrrTOunKW0MJijEW+wIocPJSkZvwZd HguwDk13nABIjPcKSm2ZeQapWEBv4QklwYkpQ53vX9BMenUfknyGwNskNLIgs5OsgtBSVY y9o9i3wCZ7Y7sVQRRISIXaF35IIDTDWASJuUN5hjYIaWABRlW3OmRyZmI0LFR0kNfiQvfS d0YrdXfIJ8T5pBNIA7pJiKzfETbprKX1ImifiZ6BaHkpwfzl59gZLPNWOBFucA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701876999; a=rsa-sha256; cv=none; b=L8pLdNzPNtn8W0WO8+tDPVGGXHTKZKcZgRkwihK84hOG5trgkPcwsIUktH1QAGkosHPxwd 3eVEMB2U68D+Xs8kSKrpxqHwXmJfeD+/yElpaAt7ch48eGYkZAw6jWn8j517uVcRERwrFZ 5Q5u8KbRTCfEKICaw205LPR+fHF+bTtRXSqYeFwQ8PAC3qLco9qaPYs5bmn/M/r/hlr51d ClEXbtX9AwB0SW/ArrD+9CcIhM/qmENWtOVO/Gafj1ncm2zBCw1Rn4Y5hKn20iQ7A3NkeN PnA5tS5JKO6rK/9zNxbsAouBGP+cWxq9aTrQN+4lva5nwdKu8TrqbDUVCnWfBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701876999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r8gcK6xMfdU7wF+41wIrCtTPkHunslmWJanBcv9L0SM=; b=Dz5fkLRfXEzBIpPNP5hh5fqr/uXg2EYuvE9Xt+FwG+xJNXu8CVRqZwDUGmloVXbpC63Qf1 Tyy2l2pfKouovHI1LT6aN8AiFup13VXlrT5/uZ1eDeIBzxyaShIQ1dJ4jQZNIGnxbbI5c8 /bWPRBAGnGHMFVxhbkq10RlE8BaTyjcFvEwhAKU7bbhQGgDq8MCdGRt/Y81JGA0JTpWtXP iddaYu95P1Snzl+/Y+NGtu+UlyotWJOlgutS6PRNzzKoDCQQqDOlrDbBaHITlyR30Fam7z m/I6ylM90se8MlFhIRGrBrZ0TvX2MtL7RayxIRbGzuAYompjOKReMo1QgUJGIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SlhMq2mv7z101r; Wed, 6 Dec 2023 15:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6Fadb2035927; Wed, 6 Dec 2023 15:36:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6FadTZ035924; Wed, 6 Dec 2023 15:36:39 GMT (envelope-from git) Date: Wed, 6 Dec 2023 15:36:39 GMT Message-Id: <202312061536.3B6FadTZ035924@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: f035d56e711d - stable/14 - CAM: Use sbuf_new_for_sysctl() in more places List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f035d56e711d1de9e4cfd924e9a8db42e842a53b Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=f035d56e711d1de9e4cfd924e9a8db42e842a53b commit f035d56e711d1de9e4cfd924e9a8db42e842a53b Author: Alexander Motin AuthorDate: 2023-11-22 20:32:16 +0000 Commit: Alexander Motin CommitDate: 2023-12-06 15:35:02 +0000 CAM: Use sbuf_new_for_sysctl() in more places There is no need to allocate buffer, worry about overflows, etc. MFC after: 2 weeks (cherry picked from commit 1b44079584dc317230cf810c0fe0a8c401a5c791) --- sys/cam/ata/ata_da.c | 12 ++++-------- sys/cam/scsi/scsi_da.c | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index d1ef28300666..e9a1c175f333 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -1426,7 +1426,6 @@ adazonemodesysctl(SYSCTL_HANDLER_ARGS) static int adazonesupsysctl(SYSCTL_HANDLER_ARGS) { - char tmpbuf[180]; struct ada_softc *softc; struct sbuf sb; int error, first; @@ -1434,15 +1433,14 @@ adazonesupsysctl(SYSCTL_HANDLER_ARGS) softc = (struct ada_softc *)arg1; - error = 0; first = 1; - sbuf_new(&sb, tmpbuf, sizeof(tmpbuf), 0); + sbuf_new_for_sysctl(&sb, NULL, 0, req); for (i = 0; i < sizeof(ada_zone_desc_table) / sizeof(ada_zone_desc_table[0]); i++) { if (softc->zone_flags & ada_zone_desc_table[i].value) { if (first == 0) - sbuf_printf(&sb, ", "); + sbuf_cat(&sb, ", "); else first = 0; sbuf_cat(&sb, ada_zone_desc_table[i].desc); @@ -1452,10 +1450,8 @@ adazonesupsysctl(SYSCTL_HANDLER_ARGS) if (first == 1) sbuf_printf(&sb, "None"); - sbuf_finish(&sb); - - error = sysctl_handle_string(oidp, sbuf_data(&sb), sbuf_len(&sb), req); - + error = sbuf_finish(&sb); + sbuf_delete(&sb); return (error); } diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 7a063fce128b..df44d2279fbe 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -2735,7 +2735,6 @@ dazonemodesysctl(SYSCTL_HANDLER_ARGS) static int dazonesupsysctl(SYSCTL_HANDLER_ARGS) { - char tmpbuf[180]; struct da_softc *softc; struct sbuf sb; int error, first; @@ -2743,15 +2742,14 @@ dazonesupsysctl(SYSCTL_HANDLER_ARGS) softc = (struct da_softc *)arg1; - error = 0; first = 1; - sbuf_new(&sb, tmpbuf, sizeof(tmpbuf), 0); + sbuf_new_for_sysctl(&sb, NULL, 0, req); for (i = 0; i < sizeof(da_zone_desc_table) / sizeof(da_zone_desc_table[0]); i++) { if (softc->zone_flags & da_zone_desc_table[i].value) { if (first == 0) - sbuf_printf(&sb, ", "); + sbuf_cat(&sb, ", "); else first = 0; sbuf_cat(&sb, da_zone_desc_table[i].desc); @@ -2761,10 +2759,8 @@ dazonesupsysctl(SYSCTL_HANDLER_ARGS) if (first == 1) sbuf_printf(&sb, "None"); - sbuf_finish(&sb); - - error = sysctl_handle_string(oidp, sbuf_data(&sb), sbuf_len(&sb), req); - + error = sbuf_finish(&sb); + sbuf_delete(&sb); return (error); } From nobody Wed Dec 6 16:04:23 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Slhzq72J3z53cpR; Wed, 6 Dec 2023 16:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slhzq6Wxqz4RbW; Wed, 6 Dec 2023 16:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701878663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FTvRPdHwLB9f7zCrbxdPKlQAMQIKhDEUT9FeunEA4g0=; b=qjHH+21t3oElPPzxEp8zTyE6hD9oJGnWg52PAsCuQ2DyNi6YHmI0qmXmH2JDp1CKtujnaX MBFWEUnArtAr1fYsdWohakbndrzWFdz3EmQ0ayZ/57C1ZxElaKfovK2JHZmPoMuGl340QJ +zab5qFh2ZgX0KUP+fs9jDce3bzifVh4QRTpudLoZBMV8+16u6SFVE3zAoaVl2xaQ9rnuo xVjAE7WcYtdGa/tq/9h6yOCIRPE5gtTfkgvyBWEvYjTUon3XIe9XL7KbTUf5fz3EflzJjG zTNEk5/rhOM0ja9PDyA+cDvCVYHdgHQs258OaAtP8ppZaeARjt5l14yMO6gjow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701878663; a=rsa-sha256; cv=none; b=jOZZeleIOaCESuUUuV9Fv2Blxlzy9a1K7ePa55ozgQUMJ/BJ+EvR2SIttPBBXpLs2exPoP NTfRV4OKATdpM4pGHX2SjsXyADwEyoenS0ucTGdminqOvt4y5dQtLmEJLLBz2IP4galh7W IIeT4HYUi2tjsh8VJATgqkTGNfmVLceHrEs0XlqG1rfM3NpKB047782AeWuTiEuHwx0wCQ pBbvy61aRHojdZptln92N8bUTT3ZlgA5OhmUf4bd4jrGJe9lVOmG/fFn7EgEQI/Z9LPS17 B4VB5WRSezYSZWwGl/+WraXXOkm3ubQEr9+AI6pJAFkiq04xNFGvx2i3NFRzlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701878663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FTvRPdHwLB9f7zCrbxdPKlQAMQIKhDEUT9FeunEA4g0=; b=X2aUzR2Edmun/9wI7WH+6MBpxUjyBlZNR4Ul5Rb1KNdQOt276Hrxkn6+8qkOb9+f9kU328 FUiiybdBJLANce8sNYlzauxQfHvriZ93z9q35xq3FDLI0aO0NBOSnA+W8HoFhl9Rl46d6W eyVH/UrYM0ya5z5Bik+RwKZ505Kx61ceuzssI2eurUv5G9rWlIGdAJTJhbnlWZqBAvwypT HFTuz6X3w5ZoZvGkEQs0nnUt51/zKNRAFzIXReoQVXeFYfo1Abeq6N3OUTOL9veQGTl5gG 2HGLLIFcSnQx+uCU4UGZUS4NJamRtL9iY2o4akCOKeYkRblnlTpDEiKQQZm1mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Slhzq5Zc4z10dT; Wed, 6 Dec 2023 16:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6G4NYT086144; Wed, 6 Dec 2023 16:04:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6G4Nrt086141; Wed, 6 Dec 2023 16:04:23 GMT (envelope-from git) Date: Wed, 6 Dec 2023 16:04:23 GMT Message-Id: <202312061604.3B6G4Nrt086141@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e64d827d3a58 - stable/14 - makesyscall: Simplify a bit emitting syscall declarations List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e64d827d3a582af994288fcdbc5a701828fc66d6 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e64d827d3a582af994288fcdbc5a701828fc66d6 commit e64d827d3a582af994288fcdbc5a701828fc66d6 Author: Olivier Certner AuthorDate: 2023-10-12 13:47:03 +0000 Commit: Mark Johnston CommitDate: 2023-12-06 16:04:05 +0000 makesyscall: Simplify a bit emitting syscall declarations Reviewed by: kevans, imp MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42168 (cherry picked from commit 2f68ae6150aa51d724e22c7e6748adfe2bc932d7) --- sys/tools/makesyscalls.lua | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index f2d8f1a609b6..a800de26a282 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -865,18 +865,15 @@ local function handle_noncompat(sysnum, thr_flag, flags, sysflags, rettype, local protoflags = get_mask({"NOPROTO", "NODEF"}) if flags & protoflags == 0 then + local sys_prefix = "sys_" if funcname == "nosys" or funcname == "lkmnosys" or funcname == "sysarch" or funcname:find("^freebsd") or funcname:find("^linux") then - write_line("sysdcl", string.format( - "%s\t%s(struct thread *, struct %s *)", - rettype, funcname, argalias)) - else - write_line("sysdcl", string.format( - "%s\tsys_%s(struct thread *, struct %s *)", - rettype, funcname, argalias)) + sys_prefix = "" end - write_line("sysdcl", ";\n") + write_line("sysdcl", string.format( + "%s\t%s%s(struct thread *, struct %s *);\n", + rettype, sys_prefix, funcname, argalias)) write_line("sysaue", string.format("#define\t%sAUE_%s\t%s\n", config.syscallprefix, funcalias, auditev)) end From nobody Thu Dec 7 00:20:24 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Slw083VjRz53F22; Thu, 7 Dec 2023 00:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slw082dDZz4Kk5; Thu, 7 Dec 2023 00:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701908424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wllG4PovNhpDrOA9PNK4bD7+GS9nqsIpAYK6bQuWccc=; b=Xb0ipAaQ3Z2M3gxVEH5yZOoczxgLmya06QnIYfZhr3xnKDL7rrKttQVM5RDIeUXS9COPvz 6c4HLALjVikHZUeURhOF9zKNdFBxH31omonhXhhtWtH7z/gFePSCfDfQL8oh+k/gOD5WaE rB1TQeQntgsRx2Bh+l27ZTqf7oXRTwoffvmiuk9EJwgvY29m3s+3TW9a39Pg4rpZNSZTV9 5OIblBvFfjOgMIIPrpEcGQ65kxpx7IbFHlYg5jmJF9xtA/LGF4mLYRUx+zOeZoMbWiTJaK gcKGlgTbLuRsc1FLZRfntjre2XVQALxwD+w+/pLZFviHg9AAY4N26ISTeJ03pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701908424; a=rsa-sha256; cv=none; b=opInJGjUgP/Soz7619ownkFRvujShwLfVJwKGIalhIVV6MNJR3WcBFdro2rRmioWQAU+AK 2HAL9HQOmJzKI1cQq75cfgwtcn09oqXFl50XfjDHtDXtMh5bWAqEy8BN/BRPrNHgH/596z O21EcMCub+t6D83idSoaFCJiXj+uwSlecEqyw4qFMedkDqxb/q1Zywl7sOJH/DjwYHmlqo BfLxVkhnn23dz5/9id1zn2VzPjeJo5av+ej9vJ2zdgNPR1P8kbjiv6ZTJe51zmNNZdQhRU xMn6GzWC+r/jexw943hOLcfBSC7hj5Rmg7phD6lEG7YpW6KEWMgE9qZCLtNPow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701908424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wllG4PovNhpDrOA9PNK4bD7+GS9nqsIpAYK6bQuWccc=; b=xVe48YGas/29LeOHcHMY2mNOj9ftr2iyjJTMJMZN4PA2toWm0mejSYGtJV/dZmB9d+jzmp mh2bJr1EgRX3wUTyR6lEnKr5uToSnHxtZW+FB6FYwe7gb95IdLRM51jiDmEevjkfQej5jV aD21Jkto4rQgenr/xmcoF/XlhyZD58ju5gkfyMzySfnoCPdv7iNsQIlvuC8DfVpAcNOVEe Jkp7ltnDN43maSXea82TDCFfNErk7ue/sATK/Y3jgqMWE0wBel1AokVhb/DpV9XzvE6a1w s4zel6OIGLqlejBJ7QLnSPJEg4ZZizoGGNmSJzmx6Mp19oMlmWpOhWDfNsXt2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Slw081Z9KzkV; Thu, 7 Dec 2023 00:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B70KOtH015829; Thu, 7 Dec 2023 00:20:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B70KOpT015826; Thu, 7 Dec 2023 00:20:24 GMT (envelope-from git) Date: Thu, 7 Dec 2023 00:20:24 GMT Message-Id: <202312070020.3B70KOpT015826@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 165cc0eea9d1 - stable/14 - busdma: emit a warning for use of filters List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 165cc0eea9d1e35bc448e8b329ed1919fba6bcd3 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=165cc0eea9d1e35bc448e8b329ed1919fba6bcd3 commit 165cc0eea9d1e35bc448e8b329ed1919fba6bcd3 Author: Mitchell Horne AuthorDate: 2023-12-04 15:46:48 +0000 Commit: Mitchell Horne CommitDate: 2023-12-06 23:23:14 +0000 busdma: emit a warning for use of filters Filter functions are deprecated, and unused in the tree. If either of the filter or filterarg arguments to bus_dma_tag_create() are non-NULL, print a warning. This is a direct commit to stable/14. Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42897 --- sys/arm/arm/busdma_machdep.c | 4 ++++ sys/arm64/arm64/busdma_machdep.c | 4 ++++ sys/powerpc/powerpc/busdma_machdep.c | 4 ++++ sys/riscv/riscv/busdma_machdep.c | 4 ++++ sys/x86/x86/busdma_machdep.c | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c index 07a3da114441..8dd4f3bff23d 100644 --- a/sys/arm/arm/busdma_machdep.c +++ b/sys/arm/arm/busdma_machdep.c @@ -398,6 +398,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, /* Return a NULL tag on failure */ *dmat = NULL; + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_BUSDMA, M_ZERO | M_NOWAIT); if (newtag == NULL) { diff --git a/sys/arm64/arm64/busdma_machdep.c b/sys/arm64/arm64/busdma_machdep.c index 14fd96ac919c..c1b710e3538d 100644 --- a/sys/arm64/arm64/busdma_machdep.c +++ b/sys/arm64/arm64/busdma_machdep.c @@ -161,6 +161,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, struct bus_dma_tag_common *tc; int error; + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, boundary, lowaddr, highaddr, filter, filterarg, maxsize, diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c index bffbfa94acac..873a67458dfc 100644 --- a/sys/powerpc/powerpc/busdma_machdep.c +++ b/sys/powerpc/powerpc/busdma_machdep.c @@ -168,6 +168,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, return (EINVAL); } + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + /* Return a NULL tag on failure */ *dmat = NULL; diff --git a/sys/riscv/riscv/busdma_machdep.c b/sys/riscv/riscv/busdma_machdep.c index 19cfd21edc6e..e8aca33a86c0 100644 --- a/sys/riscv/riscv/busdma_machdep.c +++ b/sys/riscv/riscv/busdma_machdep.c @@ -162,6 +162,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, struct bus_dma_tag_common *tc; int error; + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, boundary, lowaddr, highaddr, filter, filterarg, maxsize, diff --git a/sys/x86/x86/busdma_machdep.c b/sys/x86/x86/busdma_machdep.c index 0e72b09684cc..ee614548aea7 100644 --- a/sys/x86/x86/busdma_machdep.c +++ b/sys/x86/x86/busdma_machdep.c @@ -184,6 +184,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, struct bus_dma_tag_common *tc; int error; + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, boundary, lowaddr, highaddr, filter, filterarg, maxsize, From nobody Thu Dec 7 00:24:41 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Slw556whjz53FQZ; Thu, 7 Dec 2023 00:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slw556Mplz4Lpf; Thu, 7 Dec 2023 00:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701908681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDjvHvWTpLg7sZX3cUGVkPy1sGpXWfWx32om4LN2pi4=; b=E1Yhzzhqp0fdVnEhJkLIdgNKUP2YpVoN2vPZ5hwTQrohBwxNd6TRZU//IOUbblqzwQWB0n ujRLEod3zUBEp/gRJ9yOXyQFlg6rZ7VVs4vidJMLhQ/WovMgVnUNG9zlr2sHER9rYQmT4e TycOVXLeZnXn3BY4l8VanOeuSLBsj/+VxYKghMJdmhrODBZUzfwoLcp16j2/ji32R3MeVL dzOG5K5vwJSZ2k4VBJGdMfGJtzuadrFpzTtoIzJU1ql8QepvdPhDGIIV9Xx3mhw51EOaNz ip42zdoIdfkWX+AScL7uerXDSdDW0Ii5mP6xOnCbYZOmxe7G37jg3+TZj8Fj1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701908681; a=rsa-sha256; cv=none; b=QVOnpmKHcl6hVJZ1r3jOyro0yl5Ro+8rkZbkv7vJtTbP9Y4GKfqVTPJbAsE0kNpV61gwM/ +6DWub0k5sNhfDV7VlEMmRiycI6n86joymBUJSZC0QWy6BGSVmSigKrA0hNfM/fJKuIo7/ UlXFeB11j7FciYwNi03FQylUfs3RQ//uYdixaWS+Ld/A+nZUKpE2tMZ7P9gL0kc8QcEJoP Ml4r6U1T++uemElVxNztx5doy6YOXpGivQ6G6yXFflAzQzkUgQMRpN38qul8c3ygu4drMx PKGfDq4iOctGucymKFGH443IA8uPjrVEk6vdu0UeVgjOgWL1TyMuK/ZHoGa3MQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701908681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDjvHvWTpLg7sZX3cUGVkPy1sGpXWfWx32om4LN2pi4=; b=uQug7P3/L8Sb/bDIrGTYaFnA3B5Ci3bltfAb3TzCagIkrDjbtTd23MSYJZT0dia57kpFsD kGEAN8ZfbBiGeVtCprUPCdrLI6Y67X4/8tNv5hTiAVLiNdvj038G7BhaZd8V9W9q1uJxln flwW8e9bkCqfMLjlcQfWQdT6HITaD6TwZQVUm6b7P89ZtNLZlU67xtw2gId4QYnaME71eI lsyjQuiSPzILqf+DQhcZ0XMVHqEwTTzqE30iBpVFwQ3UNQr+yP8ILREdI/ihYIVHneHBcN Ub+8wo2df2N9bdqbWzN8nijYKJGZ8y2/KcDLFVUMAw4fR3DnsHMH00TLmz8fPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Slw555QdqzcV; Thu, 7 Dec 2023 00:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B70Of26022749; Thu, 7 Dec 2023 00:24:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B70Ofmx022746; Thu, 7 Dec 2023 00:24:41 GMT (envelope-from git) Date: Thu, 7 Dec 2023 00:24:41 GMT Message-Id: <202312070024.3B70Ofmx022746@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 7fd0973775aa - stable/13 - busdma: emit a warning for use of filters List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7fd0973775aa9a293739afa0c5068f77ba88cb17 Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7fd0973775aa9a293739afa0c5068f77ba88cb17 commit 7fd0973775aa9a293739afa0c5068f77ba88cb17 Author: Mitchell Horne AuthorDate: 2023-12-04 15:46:48 +0000 Commit: Mitchell Horne CommitDate: 2023-12-07 00:22:19 +0000 busdma: emit a warning for use of filters Filter functions are deprecated, and unused in the tree. If either of the filter or filterarg arguments to bus_dma_tag_create() are non-NULL, print a warning. This is a direct commit to stable/13. Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42897 --- sys/arm/arm/busdma_machdep.c | 4 ++++ sys/arm64/arm64/busdma_machdep.c | 4 ++++ sys/powerpc/powerpc/busdma_machdep.c | 4 ++++ sys/riscv/riscv/busdma_machdep.c | 4 ++++ sys/x86/x86/busdma_machdep.c | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c index 747bf4e7b5bd..9a3378141207 100644 --- a/sys/arm/arm/busdma_machdep.c +++ b/sys/arm/arm/busdma_machdep.c @@ -474,6 +474,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, /* Return a NULL tag on failure */ *dmat = NULL; + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_BUSDMA, M_ZERO | M_NOWAIT); if (newtag == NULL) { diff --git a/sys/arm64/arm64/busdma_machdep.c b/sys/arm64/arm64/busdma_machdep.c index 44f186adb014..cd3864bf5d18 100644 --- a/sys/arm64/arm64/busdma_machdep.c +++ b/sys/arm64/arm64/busdma_machdep.c @@ -196,6 +196,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, struct bus_dma_tag_common *tc; int error; + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, boundary, lowaddr, highaddr, filter, filterarg, maxsize, diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c index 6b7463ad5aa0..710a90f1f1d8 100644 --- a/sys/powerpc/powerpc/busdma_machdep.c +++ b/sys/powerpc/powerpc/busdma_machdep.c @@ -239,6 +239,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, return (EINVAL); } + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + /* Return a NULL tag on failure */ *dmat = NULL; diff --git a/sys/riscv/riscv/busdma_machdep.c b/sys/riscv/riscv/busdma_machdep.c index 433f55f082a7..509a000d655d 100644 --- a/sys/riscv/riscv/busdma_machdep.c +++ b/sys/riscv/riscv/busdma_machdep.c @@ -197,6 +197,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, struct bus_dma_tag_common *tc; int error; + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, boundary, lowaddr, highaddr, filter, filterarg, maxsize, diff --git a/sys/x86/x86/busdma_machdep.c b/sys/x86/x86/busdma_machdep.c index 62e57022acf8..36b1894b9615 100644 --- a/sys/x86/x86/busdma_machdep.c +++ b/sys/x86/x86/busdma_machdep.c @@ -219,6 +219,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, struct bus_dma_tag_common *tc; int error; + /* Filters are deprecated, emit a warning. */ + if (filter != NULL || filterarg != NULL) + printf("Warning: use of filters is deprecated; see busdma(9)\n"); + if (parent == NULL) { error = bus_dma_bounce_impl.tag_create(parent, alignment, boundary, lowaddr, highaddr, filter, filterarg, maxsize, From nobody Thu Dec 7 00:27:25 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Slw8G20rVz53Fs9; Thu, 7 Dec 2023 00:27:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slw8G0vsfz4LpF; Thu, 7 Dec 2023 00:27:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701908846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kXQHZZRZL3+To3lBLvhdb9BVz5sSdGA1Yi3z7mJKzwY=; b=QTI7cAj47lhcW9GT6vSSstc9zAB0nt+y/xC0y31k/t0QM2MUDEKGzHrkT4nNGs6hbcV6e9 UaVS7PPcKbwYWIt//O94S50gagjIU3qQqi1Uwy4k7cWooWFy0G2roquPvVagyoVhZ8cDNP rvQbucK9Wx5KkVjO69NyNi2/acED2T2eLIL6D5rA9ANDMVQ9U0oXvCWzedWPCnzE41TPXq mH5BlecPEb2IaOhDH93rT9mBvraFn2PfrsL/d7frTMA5zOrLElA7YP3g6BKLaJ0x/omAf6 g22Lc+mJI6U2oLCIDdIQesZUeszGOGbFnpm7Oehod2dWApbZnwHsE77ON3lL/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701908846; a=rsa-sha256; cv=none; b=nRERygFUc0HFhCAtSqbNb0Fn+keWEvyO7Uf93NrV9u/9sW3QG93/cfZbDrZaeutebI2tv8 4P9UzL+0V9SlKTCyPDQJ34uBeu7AiBuwJXft7N1+zc8yCqsgRzMLJFxdVpEGCSSc0CfelH 04Njs11mbmk4+RJubzAs54RVUUQttg8T4JqGIraagCGLHHqjnIYHvV7taCe72OZc1ebCoW J68lvlHun1mLZPAs32EWCXIZDKfBnQt7xiA0LUCgM+xfLO8gC1wGrjvkrwytjmQVhBtH/U WGIVMwIa4/SFTnZPC5LZJcBLeiPa1HFJGey/DKRhbR4CbQyWpvuPGNNUXn1NoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701908846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kXQHZZRZL3+To3lBLvhdb9BVz5sSdGA1Yi3z7mJKzwY=; b=YFMNnXWezhc6vtKBX/WwLx0i/erxL9PnL06U/sBwo8fiwBBAWtiGU7Ko9dnhpUtSGPQY4H uipWmt/3LZfYDH6d7LX7W/aQ2eE8VMGbDxsIfJYPhz0LLC5BJccmK7GbLYuCj3L0FQ2UrW 48YmrWaU7lfLlEY58O+7yoTLLo61jT3REdeL6e+BkCvVVLr7e52DioWOlS4ZBaXo7y+/w0 VVjNHAUlvlKVcEZSvCyVzlB74HaP5V1hGnNdWWA4lmHPJvH5FXHmmW4BVvUBX8TRz6tzm+ FsWaGEHB42wrmqsPkUmUbvru9UnCA6B2iVVIAluBn1sd4ebBLOl5WqNtYJb7Nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Slw8F6v5pz19F; Thu, 7 Dec 2023 00:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B70RPAw023299; Thu, 7 Dec 2023 00:27:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B70RPCc023297; Thu, 7 Dec 2023 00:27:25 GMT (envelope-from git) Date: Thu, 7 Dec 2023 00:27:25 GMT Message-Id: <202312070027.3B70RPCc023297@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 8d0740e8b9dd - stable/14 - RTLD_DEEPBIND: make lookup not just symbolic, but walk all refobj' DAGs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8d0740e8b9dd05513ef23e2dee7194f32551df13 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8d0740e8b9dd05513ef23e2dee7194f32551df13 commit 8d0740e8b9dd05513ef23e2dee7194f32551df13 Author: Konstantin Belousov AuthorDate: 2023-11-29 18:30:59 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-07 00:27:19 +0000 RTLD_DEEPBIND: make lookup not just symbolic, but walk all refobj' DAGs PR: 275393 (cherry picked from commit 9daf6cd0f46416d9c6eb0411ea6042cd42b8a9bc) --- libexec/rtld-elf/rtld.c | 8 ++++++-- libexec/rtld-elf/rtld.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index f8c4c18b5d5e..0bbd8104e11b 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -3745,7 +3745,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, if (!obj->init_done) { /* We loaded something new and have to init something. */ if ((lo_flags & RTLD_LO_DEEPBIND) != 0) - obj->symbolic = true; + obj->deepbind = true; result = 0; if ((lo_flags & (RTLD_LO_EARLY | RTLD_LO_IGNSTLS)) == 0 && obj->static_tls && !allocate_tls_offset(obj)) { @@ -4571,7 +4571,8 @@ symlook_default(SymLook *req, const Obj_Entry *refobj) if (refobj->symbolic || req->defobj_out != NULL) donelist_check(&donelist, refobj); - symlook_global(req, &donelist); + if (!refobj->deepbind) + symlook_global(req, &donelist); /* Search all dlopened DAGs containing the referencing object. */ STAILQ_FOREACH(elm, &refobj->dldags, link) { @@ -4587,6 +4588,9 @@ symlook_default(SymLook *req, const Obj_Entry *refobj) } } + if (refobj->deepbind) + symlook_global(req, &donelist); + /* * Search the dynamic linker itself, and possibly resolve the * symbol from there. This is how the application links to diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 7fe9d837d6f1..c2676f59f32d 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -239,6 +239,7 @@ typedef struct Struct_Obj_Entry { bool ver_checked : 1; /* True if processed by rtld_verify_object_versions */ bool textrel : 1; /* True if there are relocations to text seg */ bool symbolic : 1; /* True if generated with "-Bsymbolic" */ + bool deepbind : 1; /* True if loaded with RTLD_DEEPBIND" */ bool bind_now : 1; /* True if all relocations should be made first */ bool traced : 1; /* Already printed in ldd trace output */ bool jmpslots_done : 1; /* Already have relocated the jump slots */ From nobody Thu Dec 7 00:28:00 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Slw8w2cvlz53FgV; Thu, 7 Dec 2023 00:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slw8w24RBz4MDd; Thu, 7 Dec 2023 00:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701908880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1AMPLY95OHHkFZtOw7njGFJXxgV0Rl511tQt9vcaQn4=; b=RqprenHftpZTkY66D4yzt7/NZ9tUYATJtUAELJirmraZj/25vaUAdA2FLFljUo56QZjtzV y1L83cpSTzK3Oa0E5GJqsEIiSMHt3irX6iDBkWiYOwz8tglWIrIgnwPoad4DW+W7BG4yA9 pK32ZTPYZWY0SJVc60fs7mH2WYdv4XGm97CHhvflyLkeJgkFJ2BaKkAQrGBLim0rJnN1QU C16LpX0zkoNKGf5rZVKY8Gxxl2h6YjvbH9LF6CI0vynO9IkdhqU+3LuEa0uOlIaAOS1ca6 tQ3IvpLc0wlwvW6rtPl5oO1yLGLAaz8obrtiW8aYoDr3stays1+h+qVxFWpuhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701908880; a=rsa-sha256; cv=none; b=cYCBP+qAUyIiLqkuK7O5LmEOpiaQLmGuZOVm6t4/+ZvC/LGK0GAstlx0QuX8PQ1Mnh5/KV S3EMY20V/w5JYeUT8itRxUpqgT6cwOl6gwQtCLlf3WwzHqBw+mmuihuhaxsniBQNrQxv4J O4KJVEVWM0mNmy4PgcHXHqpo9taHEEerGEjcDGdYe3uHn3rAIDKd1zDsKn1hkBbh06Z+2v VAhhJJOTKf/QdsfIADrU9ixdAT7rM8MDLdr517vUfxiOIqwA0/dToPfzm7Lmh5laBrTIgD aos+Y3yS7BQ/6F6jXSTSWqASju4lnA7CjEDR9u1baVTgSTQkA5MAiGOC9fIXRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701908880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1AMPLY95OHHkFZtOw7njGFJXxgV0Rl511tQt9vcaQn4=; b=p9eOlLOPOsj+V3HJqz6Z4AOyq/Kt/2cGhuWnxAwvUKsYsCmAMyopeGZrimQScXLiWGlugA xYEMM88TtD+Sl05D/4gXx0fOGJIYsFv/V53ktpnqDY/dhBaLEP3hqEz8roVKiabUwuFK6X ToXcX2wMdFmNDVFpnyxXr9knakI62g9LiscaCZJoFMSwJeK/Sd2SgBAkvUWbh5ve12KpRo B8ZOIeY/ke+qnrnwz7Ju36KoXX691c2awnPPzODYQ9VM1nufIqzstvFEGvlXO6m5axySnF 6bBgIsegclGDodJXzPI0Yvn60Y9OzofuAzbn32/rLGfb+oTTI8hT7t6dEXbf2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Slw8w17LszlL; Thu, 7 Dec 2023 00:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B70S0B7023515; Thu, 7 Dec 2023 00:28:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B70S0Ut023512; Thu, 7 Dec 2023 00:28:00 GMT (envelope-from git) Date: Thu, 7 Dec 2023 00:28:00 GMT Message-Id: <202312070028.3B70S0Ut023512@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 07fa8d431c0e - stable/13 - RTLD_DEEPBIND: make lookup not just symbolic, but walk all refobj' DAGs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 07fa8d431c0ea291a0e4b79a0bb81707d0b119e6 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=07fa8d431c0ea291a0e4b79a0bb81707d0b119e6 commit 07fa8d431c0ea291a0e4b79a0bb81707d0b119e6 Author: Konstantin Belousov AuthorDate: 2023-11-29 18:30:59 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-07 00:27:34 +0000 RTLD_DEEPBIND: make lookup not just symbolic, but walk all refobj' DAGs PR: 275393 (cherry picked from commit 9daf6cd0f46416d9c6eb0411ea6042cd42b8a9bc) --- libexec/rtld-elf/rtld.c | 8 ++++++-- libexec/rtld-elf/rtld.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index ac492b1071f0..218e984bdd88 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -3789,7 +3789,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, if (!obj->init_done) { /* We loaded something new and have to init something. */ if ((lo_flags & RTLD_LO_DEEPBIND) != 0) - obj->symbolic = true; + obj->deepbind = true; result = 0; if ((lo_flags & (RTLD_LO_EARLY | RTLD_LO_IGNSTLS)) == 0 && obj->static_tls && !allocate_tls_offset(obj)) { @@ -4615,7 +4615,8 @@ symlook_default(SymLook *req, const Obj_Entry *refobj) if (refobj->symbolic || req->defobj_out != NULL) donelist_check(&donelist, refobj); - symlook_global(req, &donelist); + if (!refobj->deepbind) + symlook_global(req, &donelist); /* Search all dlopened DAGs containing the referencing object. */ STAILQ_FOREACH(elm, &refobj->dldags, link) { @@ -4631,6 +4632,9 @@ symlook_default(SymLook *req, const Obj_Entry *refobj) } } + if (refobj->deepbind) + symlook_global(req, &donelist); + /* * Search the dynamic linker itself, and possibly resolve the * symbol from there. This is how the application links to diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index e2fb3de470c3..3111e54a2e08 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -245,6 +245,7 @@ typedef struct Struct_Obj_Entry { bool ver_checked : 1; /* True if processed by rtld_verify_object_versions */ bool textrel : 1; /* True if there are relocations to text seg */ bool symbolic : 1; /* True if generated with "-Bsymbolic" */ + bool deepbind : 1; /* True if loaded with RTLD_DEEPBIND" */ bool bind_now : 1; /* True if all relocations should be made first */ bool traced : 1; /* Already printed in ldd trace output */ bool jmpslots_done : 1; /* Already have relocated the jump slots */ From nobody Thu Dec 7 01:08:32 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Slx412FB2z53JK2 for ; Thu, 7 Dec 2023 01:08:49 +0000 (UTC) (envelope-from darryl.veitch@uts.edu.au) Received: from au-smtp-delivery-112.mimecast.com (au-smtp-delivery-112.mimecast.com [103.96.21.112]) (using TLSv1.3 with cipher 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 "*.mimecast.com", Issuer "DigiCert TLS RSA SHA256 2020 CA1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slx3z1hzmz4TfT for ; Thu, 7 Dec 2023 01:08:46 +0000 (UTC) (envelope-from darryl.veitch@uts.edu.au) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=uts.edu.au header.s=mimecast20182103 header.b="KgZ8/HsZ"; spf=pass (mx1.freebsd.org: domain of darryl.veitch@uts.edu.au designates 103.96.21.112 as permitted sender) smtp.mailfrom=darryl.veitch@uts.edu.au; dmarc=pass (policy=none) header.from=uts.edu.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uts.edu.au; s=mimecast20182103; t=1701911323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=S5ZMEPU8I02kwtn/xcRyh6noBuAqgHhUN2ljY0bgk8E=; b=KgZ8/HsZMUlCiUBf9uXcAYl6M2M6Twnk3Jyk7AOiNRsW3k5BQTSSTxFGxDVa+fR0EUlD1I VctKG4LGoFiwg0Qrn2gJqtVNc9N8IJsSBpGeH8wTE9uborMsohm46sFEmB22whU6cmIEbx wEf6+UB7Ie/v4BYHdQzq3cVYKMfR/623bnODC8uw4OpFiJM8o/lGsyyF7WY9V/sh8STNvU NFhQ4xOYBwsn4gf6F1uIHL4+gOZFV1n3zfODKTZQL40AKS6PznyXyKoZWNXZ09oZqBZx24 YnyuFp246HPZTJzX/ZW/7OulXbnfniyz+W2ByQiYS1CSyuEcTnspC1Tzcw5JzA== Received: from AUS01-ME3-obe.outbound.protection.outlook.com (mail-me3aus01lp2232.outbound.protection.outlook.com [104.47.71.232]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id au-mta-55-LeMle257NTeZBjg8TTT0jg-1; Thu, 07 Dec 2023 12:08:34 +1100 X-MC-Unique: LeMle257NTeZBjg8TTT0jg-1 Received: from ME3PR01MB6548.ausprd01.prod.outlook.com (2603:10c6:220:111::11) by SY7PR01MB8878.ausprd01.prod.outlook.com (2603:10c6:10:216::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.25; Thu, 7 Dec 2023 01:08:32 +0000 Received: from ME3PR01MB6548.ausprd01.prod.outlook.com ([fe80::173b:6067:391e:601]) by ME3PR01MB6548.ausprd01.prod.outlook.com ([fe80::173b:6067:391e:601%3]) with mapi id 15.20.7068.026; Thu, 7 Dec 2023 01:08:32 +0000 From: Darryl Veitch To: "dev-commits-src-branches@freebsd.org" Subject: FFclock contribution to CURRENT Thread-Topic: FFclock contribution to CURRENT Thread-Index: AQHaKKnlx8CSj91HN0a37L6dswgs+A== Date: Thu, 7 Dec 2023 01:08:32 +0000 Message-ID: <705CC2D6-5122-401A-8E4C-07C18FBF07E2@uts.edu.au> Accept-Language: en-AU, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: ME3PR01MB6548:EE_|SY7PR01MB8878:EE_ x-ms-office365-filtering-correlation-id: e0ee8370-2e9a-48f7-e152-08dbf6c1081d x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0 x-microsoft-antispam-message-info: iMDnN30kEnl+41KOgeUJGQxx/yUgNrJcPFCuNQCcNb/qadwf19Ar9y+/HTH/EBH2Waz6WH8gghwH2RszhF5xbV8RSW93uz230sbQzDwlQ3O5+WEN4jkDSvjOHURoKcAbM0XG2lSkH8QYdjsIBwi02Tr8S0xb4b2t85BSlP17UIlBkFLHt7YiCsOpFCarpmEVqwnhpqFwToU1WjnU5wE+ipHyB8sjERCXJe3EA47nYrtajpveEpcJ0qG/z/kQNnNy7NI9l7yRI3aupRN1ApApb4yvk465pm5znIog6eqrLBnhOzQCWavMH/m0k8RDEaD5RwZIxcVDtpG3C9KQV0QEeNGOI2yiuqP5gINDME0MKKhtNuxpQbJQ5R+vYb1VxbnrNFCa0HKlgwF1Xmvegp7nEx1eYnIqgb1A0oO0mRIPsKegvg5KnEfsFUSG8X9ZZ4nQ0BHZO1kI8iqm691yUeWRAWO2n5jGAXSqLIxP3411jM27mp+/Cigsid/NMnKyjWZ6L50DG1r7qpgOIoE3EPOk8jYQW2sH8ScDdNbIC/oxYGbQhzlbHsA/dpbMKgAYgHXUVO4chJZcFEkhLapR23ztjKiWRMfJJlna08ogYXE6bQ9B3FoRYwItV/KQj2hggNFH/S/qsbj6jrvO1pcgJkfR+A== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:ME3PR01MB6548.ausprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(376002)(136003)(366004)(39860400002)(396003)(230922051799003)(186009)(451199024)(1800799012)(64100799003)(38070700009)(6512007)(2616005)(786003)(316002)(66574015)(83380400001)(26005)(6916009)(66446008)(76116006)(64756008)(66946007)(66556008)(478600001)(66476007)(6486002)(966005)(6506007)(71200400001)(5660300002)(166002)(84970400001)(3480700007)(38100700002)(122000001)(33656002)(2906002)(41300700001)(8936002)(86362001)(36756003)(8676002)(45980500001);DIR:OUT;SFP:1101 x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?UmhrQy9zWXhVNkUyV2ZRNnpIdGNoL2luL2lkRCt4Q3hnanJ2Uk9lRnptK0Js?= =?utf-8?B?SVBKa20yblVrSTlHZW53Mk44dS9NdWJLTmZHb2NJVTdVOUhsMkpJV29qd3o4?= =?utf-8?B?NlNjTWhtdkd0NzlzZ3ZmTUJhQ2lnbDdydzdJbk1FOHVNQ0dKcnhJaXo5WGlj?= =?utf-8?B?NkJxQ1g0Skl4NlRCUjZId3k5YUNRdGk4UnhlcWtoOWd0dUpUbzZKczFHeGZw?= =?utf-8?B?NkpVdGE1S21zb1Rsa3YzcDV3a013Q256YTFOeWFMMHNlMm9oZDFQV1lJZXpn?= =?utf-8?B?SllVcTgzYmVzUzlOUUZra1djRzRKS2pSdi9GenNLdzJSTlExV0JyaWdRVU5n?= =?utf-8?B?QjlEUzJzY0hlWUI4TkVacUplNWZTekJNWU4rVTIwVytjQzdpZm9UcVRQOWd4?= =?utf-8?B?d1VUaXJKRkl5eG9sSlhSWWlaN3FJbHU1d2wwNFJsZUF3eEU4dmk5YkQxYmFN?= =?utf-8?B?OTJEdWljeldyVEQySzJiVFlWOCtJK1JqVktJSHc5MnRJY3QwOTdxVzhoRitL?= =?utf-8?B?dHhYNzhQbmpzMXpNL01PeHNxMkNuZ2N1eGI3TVM1UVRya2R0b2NQWTJ2Y1pJ?= =?utf-8?B?WTI5dkdhbE1reHVwMXlEclBySnVkaTI4c25kcFVvZGZidU9mWWF1SVFkSngw?= =?utf-8?B?OWloTUx4aUM0RWFVUGJFd2ZScVFTdjN1ZGk2Yi9oVUMwaXBxM0duc0JuTWto?= =?utf-8?B?Q0hyYVJEVGFyMGhYOVUwRlVFVGowdVliOGtGMG1rV0IzYTZzZ0pSZEt0S1N1?= =?utf-8?B?aDZGZ1l0aVNsdWNMSVZEeEkwSUd3TkhYZWxUYldYcXhPbXhFU2R2YmptTCs1?= =?utf-8?B?UFBteU1GQWpOOGg4NFh2c0ExQmxnNGVRQS9qQ3FCL1NMQm82TVd2RWl4bUNq?= =?utf-8?B?MFhLZS9sb2lyUERqVXIydDg5cCtlUG94b0RnN3RlUy81dWE0R0VxREE2eldw?= =?utf-8?B?cGFzeG1Nb1dRZ1NwazhWb0pyMDZ3MzNWU1YyelkwSVhvU2RRM250b1ROMlk4?= =?utf-8?B?YUpIb0UxOUk1WHh3Q1BneTF2NU81ektndFNCblZkMEVncVYxNlI3S1dLWU1t?= =?utf-8?B?YjRlcmhqMlVBUGJVQjE0Tm83M25jNGdLSmEvOVN0M1pUeEpYbXFJMVVFUXVI?= =?utf-8?B?MFc5K0lQRVNrcHVxdXJ1dGwvUGc0Q1dvQm1RQ0xlZWdtYW5JWExXTGFOUEtP?= =?utf-8?B?empzaGNTM1dzYWQvYU1FRHQrelJPaXFCU2xpN2xrdXJqbzUxOE9MN2VHa3Bj?= =?utf-8?B?emxrcW1Md0hVU1REM3BoWGlsZVM5N09aeXE3U09JbTcwZmxOMENEMnR3WlpT?= =?utf-8?B?eVBHQkYvNExBUnowdjdTWlJIMW1oVDNqUktMOWM1NlBEdEtxT1VUSCtpVG9I?= =?utf-8?B?K3ZOc1FHbmlGMXptVVYwdWFGT1h6VUplcjhBeFNsemZGZGhnNFVpeCs3S1NJ?= =?utf-8?B?S0tvVmRmTlMwdDE3WDEyeGNMME5wMEJKNlRRaXA4eFRGclBVd1NsSHo4Qzdm?= =?utf-8?B?WlNuL3ZxTmtOZWtlOVU0NHJaeHYwVGNqcSt4N2M4dmxieFVkMzV6amZJa2R5?= =?utf-8?B?akpnbDlxVDBsUG9XdEsxdTNENlZvb1JUWmdNR0phNDhUQlVkQ1piTkdqeFdh?= =?utf-8?B?Q1RTZDlQN1pMYTlvMTBudzRKcmlINVc3SE16NTl3Wmk3VzhOME9rMDVMeVZD?= =?utf-8?B?S2ppaEgyUGJWTGNxWHlwYmxzUWlrWmNLNEdMbk9RUGpjRHRRSFBuTU9GSTZ3?= =?utf-8?B?ZTNFSjE4ZHVBaUI4VGU4VjRwTmVvbHBrY0kxRExYVTdnZnNJMTE1Z2dPSzlj?= =?utf-8?B?TkNNMG5IampEVE1laWdZODJuQUZ2ck85YUkrc3RybHVnS2xtdE5lTWNhanlh?= =?utf-8?B?ZHc4MjhoUFB5TTBDSWtSQVorajU4dlRwc0ttN1ltZmtkQmFOcUtKVWlMS2c4?= =?utf-8?B?aVRqcE5VSDV5UjFybHdtKzhPKy9DUnJlSnBHT0NlV0IxVm9ndFBUc1FUOEZ6?= =?utf-8?B?cWVzVXo1bTd0K0VYTmNndzhWeERQbW5rUUpmTytyRWdaaExkUzBQLzJ2eVZV?= =?utf-8?B?cURCeTdodWJNcW9lNVFsMFh2M0k5Q3VlOWVKd0xEUmFQSWg0bDhSVnEwUTBN?= =?utf-8?B?clRkeHJ3anNGSnhzdUtIU0JBMUhmaGVvSE9qRFBPck9xaHNMSW1kM253ZW9k?= =?utf-8?B?YUE9PQ==?= List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 2h9ZQsCNKWD+rk3nlFmWbAPvLn1KG3W0yhZ6asFQ6c2rJuloli+RN22j0sHE4UW7QRhrn07BPGk63q/3oI/MsaXWIUgSBcsIrPj++ty88fOjDL7HsMmHZJkWgj3UmaNISfmOwPnV7lrvRKpYIRmr+2FUfL2/c/FUuisFckXezjN8p0JAaZU20ajaxM/R/4eks8TPR2Ixxj/e0RJwqd1HHy7JGTkxEkqA/kLb5HDdrJmj7YITbCa7m3HT5Qeq2wuYgeJI1hdtdOjpRFKENioEolQ9Pk2MnhoQegLoEIzvvAahMr1MsOeoeqoAqNcMujkLTRKEufKjF23wTKLiVh/ZNyxLI+rYLmBvALJBwrRoG/tesywVcZ6IPkpPbghyUdo+Yzp2fO0tKe+YjPYRzcsEiCJwC9apyCvN/D0VRqAGtnC+77lHeSUAzQhE7SIJY0JfdoD1ZQ6Ap6Q90i0T2ixglPtfDMYDygywsGWTgHRko7iu9MPBeo5OZ5oIB9jCpPPQobf4+xc/AtSXeuKGczSPiGI7pAkOjZtLdZ4V778rgHyFZQAAO6BvuJGaEf7N2f7d4yLGh40FY+bJYFIgNmbC8vASsXIdIKfmwcWIc4EME2hX+WrbTKAkB+/gpNwKoppwD6YaSHPLcX1qDY/w40sKSfoWuLXLhEWQeDv4aWnJyrw6KtBaihmB1HqwofQq7wEAh9tLEenElxmHZxqLgMZRZbgX8wG5eig81C4ufOf5vm4odlp1Z4rUJ30MDpGhKVTdwa0OwlbE7LIogLsoa1GdCdD+SjnrKkk1jiDcgp1Q/8fgGWw44ujtcV7c1k0uyXJ+ X-OriginatorOrg: uts.edu.au X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: ME3PR01MB6548.ausprd01.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0ee8370-2e9a-48f7-e152-08dbf6c1081d X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Dec 2023 01:08:32.7813 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: e8911c26-cf9f-4a9c-878e-527807be8791 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: SkNaMi5ud5bZKRWl1AUi9Sfe3BXE+INCOBDhkmszrUJRf+ciDf1Pt0UbdplJjp4mMmyssrZEiusYQuDIJyPapJfby4n1lf+x+sJDI45+x7k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SY7PR01MB8878 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: uts.edu.au Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_705CC2D65122401A8E4C07C18FBF07E2utseduau_" X-Spamd-Result: default: False [-3.90 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[uts.edu.au,none]; R_DKIM_ALLOW(-0.20)[uts.edu.au:s=mimecast20182103]; R_SPF_ALLOW(-0.20)[+ip4:103.96.21.0/24]; MIME_BASE64_TEXT(0.10)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; TO_DN_EQ_ADDR_ALL(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-branches@freebsd.org]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[uts.edu.au:+]; ASN(0.00)[asn:136792, ipnet:103.96.21.0/24, country:AU]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[103.96.21.112:from,104.47.71.232:received]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; RCPT_COUNT_ONE(0.00)[1]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Queue-Id: 4Slx3z1hzmz4TfT X-Spamd-Bar: --- --_000_705CC2D65122401A8E4C07C18FBF07E2utseduau_ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: base64 RGVhciBwb3RlbnRpYWwgcmV2aWV3ZXJzLA0KDQpUaGlzIHBvc3QgaXMgdG8gcHJvdmlkZSBzb21l IGJhY2tncm91bmQgZm9yIHRoZSBzdWJtaXNzaW9uIG9mIGEgYnJhbmNoLCBGRmNsb2NrX2NvbXBs ZXRpb24gKDEwIG9yZGVyZWQgY29tbWl0cyksIHRvIFBoYWJyaWNhdG9yIGZvciByZXZpZXcuIFRo ZSBGRmNsb2NrIGNvZGUgcHJvdmlkZXMgc3VwcG9ydCBmb3IgYW4gYWx0ZXJuYXRpdmUgZmVlZGZv cndhcmQgYmFzZWQgdGltZWtlZXBpbmcgcGFyYWRpZ20gZm9yIHRoZSBzeXN0ZW0gY2xvY2suIEl0 IG9yaWdpbmF0ZXMgZnJvbSBhIHByb2plY3Q8aHR0cHM6Ly9mcmVlYnNkZm91bmRhdGlvbi5vcmcv cHJvamVjdC9mZWVkLWZvcndhcmQtY2xvY2stc3luY2hyb25pemF0aW9uLWFsZ29yaXRobXMvPg0K KGh0dHBzOi8vZnJlZWJzZGZvdW5kYXRpb24ub3JnL3Byb2plY3QvZmVlZC1mb3J3YXJkLWNsb2Nr LXN5bmNocm9uaXphdGlvbi1hbGdvcml0aG1zLykNCnN1cHBvcnRlZCBieSB0aGUgRnJlZUJTRCBm b3VuZGF0aW9uIGFuZCBoYXMgYmVlbiBpbiB0aGUga2VybmVsIHNpbmNlIDEwLjAgKGx5aW5nIHBy aW5jaXBhbGx5IGluIC9zeXMva2Vybi9rZXJuX3t0YyxmZmNsb2NrfS5jKS4gIFRoZSBjb21taXRz IGV4dGVuZCwgY29ycmVjdCBhbmQgY29tcGxldGUgdGhlIHN1cHBvcnQsIGluIHBhcnRpY3VsYXIg cmVnYXJkaW5nIGJwZiBiYXNlZCB0aW1lc3RhbXBpbmcgd2l0aCBleHBhbmRlZCBjYXBhYmlsaXRp ZXMuDQoNClRoZSBvcmlnaW5zIG9mIHRoZSBGRmNsb2NrIHdvcmsgbGllIGluIHRoZSBrZXJuZWwg c3VwcG9ydCBkZXZlbG9wZWQgYXMgcGFydCBvZiB0aGUgUkFEY2xvY2sgKFJvYnVzdCBBYnNvbHV0 ZSBhbmQgRGlmZmVyZW5jZSBjbG9jaykgcHJvamVjdCBmb3Igcm9idXN0IGFuZCBhY2N1cmF0ZSBJ bnRlcm5ldCB0aW1la2VlcGluZy4gVGhlIEZGY2xvY2sgc3VwcG9ydCBpcyBnZW5lcmljIHdydCBm ZWVkZm9yd2FyZCBjbG9ja3MsIGJ1dCBpcyBpbnNwaXJlZCBieSB0aGUgUkFEY2xvY2sgZGVzaWdu LiBUaGUgUkFEY2xvY2sgcHJvamVjdCwgbm93IGhvbWVkIHVuZGVyIGdpdGh1Yi5jb20vUkFEaWNh bHN5bmMvUkFEY2xvY2s8aHR0cDovL2dpdGh1Yi5jb20vUkFEaWNhbHN5bmMvPiwgcmVwcmVzZW50 cyBhIHJlZmVyZW5jZSBkYWVtb24gZm9yIHRoZSBGRmNsb2NrIHN5c3RlbSBjbG9jaywgYW5kIHRo ZSBSQURjbG9jayBjb2RlYmFzZSBhbmQgdGhlIEZGY2xvY2sgc3VwcG9ydCBoYXZlIGNvbnRpbnVl ZCB0byBiZSBkZXZlbG9wZWQgdG9nZXRoZXIsIHByaXZhdGVseSB3aXRoaW4gbXkgcmVzZWFyY2gg Z3JvdXAgdW50aWwgbm93Lg0KDQpUZXN0aW5nDQpUaGUgUkFEY2xvY2sgYmluYXJ5IGl0c2VsZiwg YW5kIHRoZSB0ZXN0IHByb2dyYW1zIGluY2x1ZGVkIHdpdGggdGhlIFJBRGNsb2NrIHJlcG8gKHdo aWNoIGFsc28gaW5jbHVkZXMgdGhlIGtlcm5lbCBmaWxlcyBjb250YWluaW5nIEZGY2xvY2sgY29k ZSBmb3IgYm90aCBGcmVlQlNEIGFuZCBEZWJpYW4gTGludXgpLCBoYXZlIGJlZW4gdXNlZCB0byBl eHRlbnNpdmVseSB0ZXN0IHRoZSBwcm9wb3NlZCBjb21taXRzLiBGb3IgZXhhbXBsZSBhIGNvbnRp bnVvdXNseSBvcGVyYXRpbmcgdGltaW5nIHRlc3RiZWQgaXMgcG93ZXJlZCBieSBGcmVlQlNEIDEz LjEga2VybmVscyB3aXRoIEZGY2xvY2sgc3VwcG9ydCwgc3luY2hyb25pemVkIHRvIFJBRGNsb2Nr IGRhZW1vbnMuIEZ1cnRoZXIgaW5mb3JtYXRpb24gb24gdGhlIFJBRGNsb2NrIHByb2plY3QgKGlu Y2x1ZGluZyBsaW5rcyB0byAyMCsgcmVsYXRlZCBhY2FkZW1pYyBwYXBlcnMpLCBjYW4gYmUgZm91 bmQgYXQgaHR0cHM6Ly90a2xhYi5mZWl0LnV0cy5lZHUuYXUvfmRhcnJ5bC8gIC4NCg0KRG9jdW1l bnRhdGlvbg0KSW4gYWRkaXRpb24gdG8gdGhlIGNvbW1pdCBtZXNzYWdlcywgYW5kIHRoZSBtYW4g cGFnZXMgYnBmLjQgYW5kIGZmY2xvY2suezIsNH0gY29udGFpbmVkIGluIHRoZSBjb21taXRzLCBt dWNoIG1vcmUgZGV0YWlsIG9uIHRoZSBGRmNsb2NrIGNvZGUsIGFuZCB0aGUgRkZjbG9jayA84oCU PiBkYWVtb24gQVBJLCBjYW4gYmUgZm91bmQgdW5kZXIgdGhlIERvY3VtZW50YXRpb24gZGlyZWN0 b3J5IG9mIHRoZSBSQURjbG9jayByZXBvLCBpbiBwYXJ0aWN1bGFyIERvY3VtZW50YXRpb24vRkZj bG9ja0RvY19GcmVlQlNELnR4dA0KKGNvbG9yaXplIHRoaXMgYXMgQyB0byBtYWtlIHRoZSBjb2Rl IHNuaXBwZXRzIHJlYWRhYmxlKS4NCg0KRGFycnlsIFZlaXRjaA0KDQoNCg0KLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NClByb2Zlc3NvciBEYXJy eWwgVmVpdGNoDQpGRUlULCBVbml2ZXJzaXR5IG9mIFRlY2hub2xvZ3kgU3lkbmV5IChVVFMpDQpE YXJyeWwuVmVpdGNoQHV0cy5lZHUuYXUNCg0KVVRTIENSSUNPUyBQcm92aWRlciBDb2RlOiAwMDA5 OUYgRElTQ0xBSU1FUjogVGhpcyBlbWFpbCBtZXNzYWdlIGFuZCBhbnkgYWNjb21wYW55aW5nIGF0 dGFjaG1lbnRzIG1heSBjb250YWluIGNvbmZpZGVudGlhbCBpbmZvcm1hdGlvbi4gSWYgeW91IGFy ZSBub3QgdGhlIGludGVuZGVkIHJlY2lwaWVudCwgZG8gbm90IHJlYWQsIHVzZSwgZGlzc2VtaW5h dGUsIGRpc3RyaWJ1dGUgb3IgY29weSB0aGlzIG1lc3NhZ2Ugb3IgYXR0YWNobWVudHMuIElmIHlv dSBoYXZlIHJlY2VpdmVkIHRoaXMgbWVzc2FnZSBpbiBlcnJvciwgcGxlYXNlIG5vdGlmeSB0aGUg c2VuZGVyIGltbWVkaWF0ZWx5IGFuZCBkZWxldGUgdGhpcyBtZXNzYWdlLiBBbnkgdmlld3MgZXhw cmVzc2VkIGluIHRoaXMgbWVzc2FnZSBhcmUgdGhvc2Ugb2YgdGhlIGluZGl2aWR1YWwgc2VuZGVy LCBleGNlcHQgd2hlcmUgdGhlIHNlbmRlciBleHByZXNzbHksIGFuZCB3aXRoIGF1dGhvcml0eSwg c3RhdGVzIHRoZW0gdG8gYmUgdGhlIHZpZXdzIG9mIHRoZSBVbml2ZXJzaXR5IG9mIFRlY2hub2xv Z3kgU3lkbmV5LiBCZWZvcmUgb3BlbmluZyBhbnkgYXR0YWNobWVudHMsIHBsZWFzZSBjaGVjayB0 aGVtIGZvciB2aXJ1c2VzIGFuZCBkZWZlY3RzLiBUaGluay4gR3JlZW4uIERvLiBQbGVhc2UgY29u c2lkZXIgdGhlIGVudmlyb25tZW50IGJlZm9yZSBwcmludGluZyB0aGlzIGVtYWlsLg0K --_000_705CC2D65122401A8E4C07C18FBF07E2utseduau_ Content-Type: text/html; charset=UTF-8 Content-ID: <891C66A5F526884AB5E78B631B825404@ausprd01.prod.outlook.com> Content-Transfer-Encoding: base64 PGh0bWw+PGhlYWQ+DQo8bWV0YSBodHRwLWVxdWl2PSJDb250ZW50LVR5cGUiIGNvbnRlbnQ9InRl eHQvaHRtbDsgY2hhcnNldD11dGYtOCI+DQo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPi5zdHlsZTEg e2ZvbnQtZmFtaWx5OiAiVGltZXMgTmV3IFJvbWFuIjt9PC9zdHlsZT48L2hlYWQ+PGJvZHkgc3R5 bGU9Im92ZXJmbG93LXdyYXA6IGJyZWFrLXdvcmQ7IC13ZWJraXQtbmJzcC1tb2RlOiBzcGFjZTsg bGluZS1icmVhazogYWZ0ZXItd2hpdGUtc3BhY2U7Ij4NCjxkaXY+RGVhciBwb3RlbnRpYWwgcmV2 aWV3ZXJzLDwvZGl2Pg0KPGRpdj48YnI+DQo8L2Rpdj4NCjxkaXY+DQo8ZGl2PlRoaXMgcG9zdCBp cyB0byBwcm92aWRlIHNvbWUgYmFja2dyb3VuZCBmb3IgdGhlIHN1Ym1pc3Npb24gb2YgYSBicmFu Y2gsIEZGY2xvY2tfY29tcGxldGlvbiAoMTAgb3JkZXJlZCBjb21taXRzKSwgdG8gUGhhYnJpY2F0 b3IgZm9yIHJldmlldy4gVGhlIEZGY2xvY2sgY29kZSBwcm92aWRlcyBzdXBwb3J0IGZvciBhbiBh bHRlcm5hdGl2ZSBmZWVkZm9yd2FyZCBiYXNlZCB0aW1la2VlcGluZyBwYXJhZGlnbSBmb3IgdGhl IHN5c3RlbSBjbG9jay4NCiBJdCBvcmlnaW5hdGVzIGZyb20gYSZuYnNwOzxhIGhyZWY9Imh0dHBz Oi8vZnJlZWJzZGZvdW5kYXRpb24ub3JnL3Byb2plY3QvZmVlZC1mb3J3YXJkLWNsb2NrLXN5bmNo cm9uaXphdGlvbi1hbGdvcml0aG1zLyI+cHJvamVjdDwvYT4mbmJzcDs8L2Rpdj4NCjxkaXY+DQo8 ZGl2Pig8YSBocmVmPSJodHRwczovL2ZyZWVic2Rmb3VuZGF0aW9uLm9yZy9wcm9qZWN0L2ZlZWQt Zm9yd2FyZC1jbG9jay1zeW5jaHJvbml6YXRpb24tYWxnb3JpdGhtcy8iPmh0dHBzOi8vZnJlZWJz ZGZvdW5kYXRpb24ub3JnL3Byb2plY3QvZmVlZC1mb3J3YXJkLWNsb2NrLXN5bmNocm9uaXphdGlv bi1hbGdvcml0aG1zLzwvYT4pJm5ic3A7PC9kaXY+DQo8ZGl2PnN1cHBvcnRlZCBieSB0aGUgRnJl ZUJTRCBmb3VuZGF0aW9uIGFuZCBoYXMgYmVlbiBpbiB0aGUga2VybmVsIHNpbmNlIDEwLjAgKGx5 aW5nIHByaW5jaXBhbGx5IGluIC9zeXMva2Vybi9rZXJuX3t0YyxmZmNsb2NrfS5jKS4gJm5ic3A7 VGhlIGNvbW1pdHMgZXh0ZW5kLCBjb3JyZWN0IGFuZCBjb21wbGV0ZSB0aGUgc3VwcG9ydCwgaW4g cGFydGljdWxhciByZWdhcmRpbmcgYnBmIGJhc2VkIHRpbWVzdGFtcGluZyB3aXRoIGV4cGFuZGVk IGNhcGFiaWxpdGllcy48L2Rpdj4NCjxkaXY+PGJyPg0KPC9kaXY+DQo8ZGl2PlRoZSBvcmlnaW5z IG9mIHRoZSBGRmNsb2NrIHdvcmsgbGllIGluIHRoZSBrZXJuZWwgc3VwcG9ydCBkZXZlbG9wZWQg YXMgcGFydCBvZiB0aGUgUkFEY2xvY2sgKFJvYnVzdCBBYnNvbHV0ZSBhbmQgRGlmZmVyZW5jZSBj bG9jaykgcHJvamVjdCBmb3Igcm9idXN0IGFuZCBhY2N1cmF0ZSBJbnRlcm5ldCB0aW1la2VlcGlu Zy4gVGhlIEZGY2xvY2sgc3VwcG9ydCBpcyBnZW5lcmljIHdydCBmZWVkZm9yd2FyZCBjbG9ja3Ms IGJ1dCBpcyBpbnNwaXJlZA0KIGJ5IHRoZSBSQURjbG9jayBkZXNpZ24uIFRoZSBSQURjbG9jayBw cm9qZWN0LCBub3cgaG9tZWQgdW5kZXImbmJzcDs8aT48YSBocmVmPSJodHRwOi8vZ2l0aHViLmNv bS9SQURpY2Fsc3luYy8iPmdpdGh1Yi5jb20vUkFEaWNhbHN5bmMvUkFEY2xvY2s8L2E+PC9pPiwg cmVwcmVzZW50cyBhIHJlZmVyZW5jZSBkYWVtb24gZm9yIHRoZSBGRmNsb2NrIHN5c3RlbSBjbG9j aywgYW5kIHRoZSBSQURjbG9jayBjb2RlYmFzZSBhbmQgdGhlIEZGY2xvY2sgc3VwcG9ydA0KIGhh dmUgY29udGludWVkIHRvIGJlIGRldmVsb3BlZCB0b2dldGhlciwgcHJpdmF0ZWx5IHdpdGhpbiBt eSByZXNlYXJjaCBncm91cCB1bnRpbCBub3cuPC9kaXY+DQo8ZGl2Pjxicj4NCjwvZGl2Pg0KPGRp dj48Yj5UZXN0aW5nPC9iPiZuYnNwOyZuYnNwOzwvZGl2Pg0KPGRpdj5UaGUgUkFEY2xvY2sgYmlu YXJ5IGl0c2VsZiwgYW5kIHRoZSB0ZXN0IHByb2dyYW1zIGluY2x1ZGVkIHdpdGggdGhlIFJBRGNs b2NrIHJlcG8gKHdoaWNoIGFsc28gaW5jbHVkZXMgdGhlIGtlcm5lbCBmaWxlcyBjb250YWluaW5n IEZGY2xvY2sgY29kZSBmb3IgYm90aCBGcmVlQlNEIGFuZCBEZWJpYW4gTGludXgpLCBoYXZlIGJl ZW4gdXNlZCB0byBleHRlbnNpdmVseSB0ZXN0IHRoZSBwcm9wb3NlZCBjb21taXRzLiBGb3IgZXhh bXBsZSBhIGNvbnRpbnVvdXNseQ0KIG9wZXJhdGluZyB0aW1pbmcgdGVzdGJlZCBpcyBwb3dlcmVk IGJ5IEZyZWVCU0QgMTMuMSBrZXJuZWxzIHdpdGggRkZjbG9jayBzdXBwb3J0LCBzeW5jaHJvbml6 ZWQgdG8gUkFEY2xvY2sgZGFlbW9ucy4gRnVydGhlciBpbmZvcm1hdGlvbiBvbiB0aGUgUkFEY2xv Y2sgcHJvamVjdCAoaW5jbHVkaW5nIGxpbmtzIHRvIDIwKyByZWxhdGVkIGFjYWRlbWljIHBhcGVy cyksIGNhbiBiZSBmb3VuZCBhdCZuYnNwOzxhIGhyZWY9Imh0dHBzOi8vdGtsYWIuZmVpdC51dHMu ZWR1LmF1L35kYXJyeWwvIj5odHRwczovL3RrbGFiLmZlaXQudXRzLmVkdS5hdS9+ZGFycnlsLzwv YT4mbmJzcDsmbmJzcDsuPC9kaXY+DQo8ZGl2Pjxicj4NCjwvZGl2Pg0KPGRpdj48Yj5Eb2N1bWVu dGF0aW9uPC9iPjwvZGl2Pg0KPC9kaXY+DQo8ZGl2Pg0KPGRpdj5JbiBhZGRpdGlvbiB0byB0aGUg Y29tbWl0IG1lc3NhZ2VzLCBhbmQgdGhlIG1hbiBwYWdlcyBicGYuNCBhbmQgZmZjbG9jay57Miw0 fSBjb250YWluZWQgaW4gdGhlIGNvbW1pdHMsIG11Y2ggbW9yZSBkZXRhaWwgb24gdGhlIEZGY2xv Y2sgY29kZSwgYW5kIHRoZSBGRmNsb2NrICZsdDvigJQmZ3Q7IGRhZW1vbiBBUEksIGNhbiBiZSBm b3VuZCB1bmRlciB0aGUgRG9jdW1lbnRhdGlvbiBkaXJlY3Rvcnkgb2YgdGhlIFJBRGNsb2NrIHJl cG8sIGluIHBhcnRpY3VsYXINCiBEb2N1bWVudGF0aW9uL0ZGY2xvY2tEb2NfRnJlZUJTRC50eHQ8 L2Rpdj4NCjxkaXY+KGNvbG9yaXplIHRoaXMgYXMgQyB0byBtYWtlIHRoZSBjb2RlIHNuaXBwZXRz IHJlYWRhYmxlKS48L2Rpdj4NCjwvZGl2Pg0KPGRpdj48YnI+DQo8L2Rpdj4NCjxkaXY+RGFycnls IFZlaXRjaDwvZGl2Pg0KPGJyIGNsYXNzPSJBcHBsZS1pbnRlcmNoYW5nZS1uZXdsaW5lIj4NCjwv ZGl2Pg0KPGJyPg0KPGJyPg0KPGRpdj48c3BhbiBjbGFzcz0iQXBwbGUtc3R5bGUtc3BhbiIgc3R5 bGU9ImJvcmRlci1jb2xsYXBzZTogc2VwYXJhdGU7IGZvbnQtdmFyaWFudC1saWdhdHVyZXM6IG5v cm1hbDsgZm9udC12YXJpYW50LWVhc3QtYXNpYW46IG5vcm1hbDsgZm9udC12YXJpYW50LXBvc2l0 aW9uOiBub3JtYWw7IGxpbmUtaGVpZ2h0OiBub3JtYWw7IGJvcmRlci1zcGFjaW5nOiAwcHg7Ij4N CjxkaXYgc3R5bGU9Im92ZXJmbG93LXdyYXA6IGJyZWFrLXdvcmQ7IC13ZWJraXQtbmJzcC1tb2Rl OiBzcGFjZTsgbGluZS1icmVhazogYWZ0ZXItd2hpdGUtc3BhY2U7Ij4NCjxkaXYgc3R5bGU9ImNv bG9yOiByZ2IoMCwgMCwgMCk7IGZvbnQtZmFtaWx5OiBIZWx2ZXRpY2E7IGZvbnQtc3R5bGU6IG5v cm1hbDsgZm9udC12YXJpYW50LWNhcHM6IG5vcm1hbDsgZm9udC13ZWlnaHQ6IG5vcm1hbDsgbGV0 dGVyLXNwYWNpbmc6IG5vcm1hbDsgdGV4dC10cmFuc2Zvcm06IG5vbmU7IHdoaXRlLXNwYWNlOiBu b3JtYWw7IHdvcmQtc3BhY2luZzogMHB4OyAtd2Via2l0LXRleHQtZGVjb3JhdGlvbnMtaW4tZWZm ZWN0OiBub25lOyAtd2Via2l0LXRleHQtc3Ryb2tlLXdpZHRoOiAwcHg7Ij4NCjxkaXYgc3R5bGU9 ImZvbnQtd2VpZ2h0OiBub3JtYWw7IGNvbG9yOiByZ2IoMCwgMCwgMCk7IHdvcmQtd3JhcDogYnJl YWstd29yZDsgLXdlYmtpdC1uYnNwLW1vZGU6IHNwYWNlOyAtd2Via2l0LWxpbmUtYnJlYWs6IGFm dGVyLXdoaXRlLXNwYWNlOyI+DQo8c3BhbiBjbGFzcz0iQXBwbGUtc3R5bGUtc3BhbiIgc3R5bGU9 ImNvbG9yOiByZ2IoMTA0LCA0MSwgMjUwKTsiPi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tPC9zcGFuPjwvZGl2Pg0KPGRpdiBzdHlsZT0iZm9udC13 ZWlnaHQ6IG5vcm1hbDsgd29yZC13cmFwOiBicmVhay13b3JkOyAtd2Via2l0LW5ic3AtbW9kZTog c3BhY2U7IC13ZWJraXQtbGluZS1icmVhazogYWZ0ZXItd2hpdGUtc3BhY2U7Ij4NCjxmb250IGNs YXNzPSJBcHBsZS1zdHlsZS1zcGFuIiBjb2xvcj0iIzY4MjlmYSI+PGI+UHJvZmVzc29yIERhcnJ5 bCBWZWl0Y2g8L2I+PC9mb250PjwvZGl2Pg0KPGRpdiBzdHlsZT0id29yZC13cmFwOiBicmVhay13 b3JkOyAtd2Via2l0LW5ic3AtbW9kZTogc3BhY2U7IC13ZWJraXQtbGluZS1icmVhazogYWZ0ZXIt d2hpdGUtc3BhY2U7Ij4NCjxkaXYgc3R5bGU9ImZvbnQtd2VpZ2h0OiBub3JtYWw7Ij48c3BhbiBj bGFzcz0iQXBwbGUtc3R5bGUtc3BhbiIgc3R5bGU9ImJvcmRlci1jb2xsYXBzZTogc2VwYXJhdGU7 IGZvbnQtZmFtaWx5OiBIZWx2ZXRpY2E7IGZvbnQtc3R5bGU6IG5vcm1hbDsgZm9udC12YXJpYW50 LWxpZ2F0dXJlczogbm9ybWFsOyBmb250LXZhcmlhbnQtY2Fwczogbm9ybWFsOyBmb250LXZhcmlh bnQtZWFzdC1hc2lhbjogbm9ybWFsOyBmb250LXZhcmlhbnQtcG9zaXRpb246IG5vcm1hbDsgZm9u dC13ZWlnaHQ6IG5vcm1hbDsgbGV0dGVyLXNwYWNpbmc6IG5vcm1hbDsgbGluZS1oZWlnaHQ6IG5v cm1hbDsgb3JwaGFuczogMjsgdGV4dC1hbGlnbjogLXdlYmtpdC1hdXRvOyB0ZXh0LWluZGVudDog MHB4OyB0ZXh0LXRyYW5zZm9ybTogbm9uZTsgd2hpdGUtc3BhY2U6IG5vcm1hbDsgd2lkb3dzOiAy OyB3b3JkLXNwYWNpbmc6IDBweDsgYm9yZGVyLXNwYWNpbmc6IDBweDsgLXdlYmtpdC10ZXh0LWRl Y29yYXRpb25zLWluLWVmZmVjdDogbm9uZTsgLXdlYmtpdC10ZXh0LXN0cm9rZS13aWR0aDogMHB4 OyI+DQo8ZGl2IHN0eWxlPSJ3b3JkLXdyYXA6IGJyZWFrLXdvcmQ7IC13ZWJraXQtbmJzcC1tb2Rl OiBzcGFjZTsgLXdlYmtpdC1saW5lLWJyZWFrOiBhZnRlci13aGl0ZS1zcGFjZTsiPg0KPHNwYW4g Y2xhc3M9IkFwcGxlLXN0eWxlLXNwYW4iIHN0eWxlPSJib3JkZXItY29sbGFwc2U6IHNlcGFyYXRl OyBmb250LWZhbWlseTogSGVsdmV0aWNhOyBmb250LXN0eWxlOiBub3JtYWw7IGZvbnQtdmFyaWFu dC1saWdhdHVyZXM6IG5vcm1hbDsgZm9udC12YXJpYW50LWNhcHM6IG5vcm1hbDsgZm9udC12YXJp YW50LWVhc3QtYXNpYW46IG5vcm1hbDsgZm9udC12YXJpYW50LXBvc2l0aW9uOiBub3JtYWw7IGZv bnQtd2VpZ2h0OiBub3JtYWw7IGxldHRlci1zcGFjaW5nOiBub3JtYWw7IGxpbmUtaGVpZ2h0OiBu b3JtYWw7IG9ycGhhbnM6IDI7IHRleHQtYWxpZ246IC13ZWJraXQtYXV0bzsgdGV4dC1pbmRlbnQ6 IDBweDsgdGV4dC10cmFuc2Zvcm06IG5vbmU7IHdoaXRlLXNwYWNlOiBub3JtYWw7IHdpZG93czog Mjsgd29yZC1zcGFjaW5nOiAwcHg7IGJvcmRlci1zcGFjaW5nOiAwcHg7IC13ZWJraXQtdGV4dC1k ZWNvcmF0aW9ucy1pbi1lZmZlY3Q6IG5vbmU7IC13ZWJraXQtdGV4dC1zdHJva2Utd2lkdGg6IDBw eDsiPg0KPGRpdiBzdHlsZT0id29yZC13cmFwOiBicmVhay13b3JkOyAtd2Via2l0LW5ic3AtbW9k ZTogc3BhY2U7IC13ZWJraXQtbGluZS1icmVhazogYWZ0ZXItd2hpdGUtc3BhY2U7Ij4NCjxzcGFu IGNsYXNzPSJBcHBsZS1zdHlsZS1zcGFuIiBzdHlsZT0iYm9yZGVyLWNvbGxhcHNlOiBzZXBhcmF0 ZTsgZm9udC1mYW1pbHk6IEhlbHZldGljYTsgZm9udC1zdHlsZTogbm9ybWFsOyBmb250LXZhcmlh bnQtbGlnYXR1cmVzOiBub3JtYWw7IGZvbnQtdmFyaWFudC1jYXBzOiBub3JtYWw7IGZvbnQtdmFy aWFudC1lYXN0LWFzaWFuOiBub3JtYWw7IGZvbnQtdmFyaWFudC1wb3NpdGlvbjogbm9ybWFsOyBm b250LXdlaWdodDogbm9ybWFsOyBsZXR0ZXItc3BhY2luZzogbm9ybWFsOyBsaW5lLWhlaWdodDog bm9ybWFsOyBvcnBoYW5zOiAyOyB0ZXh0LWFsaWduOiAtd2Via2l0LWF1dG87IHRleHQtaW5kZW50 OiAwcHg7IHRleHQtdHJhbnNmb3JtOiBub25lOyB3aGl0ZS1zcGFjZTogbm9ybWFsOyB3aWRvd3M6 IDI7IHdvcmQtc3BhY2luZzogMHB4OyBib3JkZXItc3BhY2luZzogMHB4OyAtd2Via2l0LXRleHQt ZGVjb3JhdGlvbnMtaW4tZWZmZWN0OiBub25lOyAtd2Via2l0LXRleHQtc3Ryb2tlLXdpZHRoOiAw cHg7Ij4NCjxkaXYgc3R5bGU9ImNvbG9yOiByZ2IoMCwgMCwgMCk7IHdvcmQtd3JhcDogYnJlYWst d29yZDsgLXdlYmtpdC1uYnNwLW1vZGU6IHNwYWNlOyAtd2Via2l0LWxpbmUtYnJlYWs6IGFmdGVy LXdoaXRlLXNwYWNlOyI+DQo8Zm9udCBjbGFzcz0iQXBwbGUtc3R5bGUtc3BhbiIgY29sb3I9IiM2 ODI5ZmEiPkZFSVQsIFVuaXZlcnNpdHkgb2YgVGVjaG5vbG9neSBTeWRuZXkgKFVUUyk8YnI+DQpE YXJyeWwuVmVpdGNoQHV0cy5lZHUuYXU8L2ZvbnQ+PC9kaXY+DQo8L3NwYW4+PC9kaXY+DQo8L3Nw YW4+PC9kaXY+DQo8L3NwYW4+PC9kaXY+DQo8L2Rpdj4NCjwvZGl2Pg0KPC9kaXY+DQo8L3NwYW4+ PGJyIGNsYXNzPSJBcHBsZS1pbnRlcmNoYW5nZS1uZXdsaW5lIj4NCjwvZGl2Pg0KPGJyPg0KDQoN Cjxicj48cCBzdHlsZT0iZm9udC1mYW1pbHk6IFZlcmRhbmE7IGZvbnQtc2l6ZTo4cHQ7IGNvbG9y OiM2NjY2NjY7Ij5VVFMgQ1JJQ09TIFByb3ZpZGVyIENvZGU6IDAwMDk5RiBESVNDTEFJTUVSOiBU aGlzIGVtYWlsIG1lc3NhZ2UgYW5kIGFueSBhY2NvbXBhbnlpbmcgYXR0YWNobWVudHMgbWF5IGNv bnRhaW4gY29uZmlkZW50aWFsIGluZm9ybWF0aW9uLiBJZiB5b3UgYXJlIG5vdCB0aGUgaW50ZW5k ZWQgcmVjaXBpZW50LCBkbyBub3QgcmVhZCwgdXNlLCBkaXNzZW1pbmF0ZSwgZGlzdHJpYnV0ZSBv ciBjb3B5IHRoaXMgbWVzc2FnZSBvciBhdHRhY2htZW50cy4gSWYgeW91IGhhdmUgcmVjZWl2ZWQg dGhpcyBtZXNzYWdlIGluIGVycm9yLCBwbGVhc2Ugbm90aWZ5IHRoZSBzZW5kZXIgaW1tZWRpYXRl bHkgYW5kIGRlbGV0ZSB0aGlzIG1lc3NhZ2UuIEFueSB2aWV3cyBleHByZXNzZWQgaW4gdGhpcyBt ZXNzYWdlIGFyZSB0aG9zZSBvZiB0aGUgaW5kaXZpZHVhbCBzZW5kZXIsIGV4Y2VwdCB3aGVyZSB0 aGUgc2VuZGVyIGV4cHJlc3NseSwgYW5kIHdpdGggYXV0aG9yaXR5LCBzdGF0ZXMgdGhlbSB0byBi ZSB0aGUgdmlld3Mgb2YgdGhlIFVuaXZlcnNpdHkgb2YgVGVjaG5vbG9neSBTeWRuZXkuIEJlZm9y ZSBvcGVuaW5nIGFueSBhdHRhY2htZW50cywgcGxlYXNlIGNoZWNrIHRoZW0gZm9yIHZpcnVzZXMg YW5kIGRlZmVjdHMuIFRoaW5rLiBHcmVlbi4gRG8uIFBsZWFzZSBjb25zaWRlciB0aGUgZW52aXJv bm1lbnQgYmVmb3JlIHByaW50aW5nIHRoaXMgZW1haWwuPC9wPjwvYm9keT48L2h0bWw+DQo= --_000_705CC2D65122401A8E4C07C18FBF07E2utseduau_-- From nobody Thu Dec 7 07:48:10 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sm5wp6HQtz53nPS; Thu, 7 Dec 2023 07:48:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm5wp5mSDz4JDr; Thu, 7 Dec 2023 07:48:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701935290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YksOiwxkTl7mJY79xBmPz898gbIjktgHhFyZBNNx2PI=; b=C3XQxn+yyGpdApSruTeVdTY/P5cL95XqmCZnx0PognCuVHfJVVIFcXV9/3KK5S31w1Hafl un/N7l3rtUfGglTaGsiV3jbdDuJv1Rnpckzdx/Qjixxm4rzUaqSlys8LYMKBqXCvYNai30 +AUJzy8+7oEgm9hnB/tjA3gGQ1TTVgLdTRvPKnGEXhyfHyfCss0ncI8kTTXbzzSLlK6Pdz UO7EHX+lsv5V3CxGwJD5zy2oiXThV6ZdQPgqxwIC6Xzq6aHuv7SF6rk+0trrfsBHJ2sPVk /rBuYjSPSSfi4kfXONLYxeuWcJLWr4RBReb32m/SA98Om+lBP0tkMeuMsg2E0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701935290; a=rsa-sha256; cv=none; b=bVRgBDGfQjRaXZ9vq6A2ekw0sZZ2cKKJkpI7EOU5BRhjrLqYM24PW1BKzp+f7/G9TZAYDu 0zzhx4Osy7KyQNyYpfZmD6sIixaPbPCCDHYkrlD6fk0qXbq8JREIKorQy/cETVqJUWPjde m9Yn0bDBe2ZmpTxpTkI6orEAMWlIEBQKFFKbDVWKvwtlHWHvFlBGuTrzXNsqztGDqqyvON gJ1DFkssqhirZcsnZy1cS+apJdauNijm27ivav2BO6mwwok4iVK2MX7M8Y13O86UEDzBbX dypxR1ztoZ7idKqQdhoQqkCd6mIFCbw4xwq1QDJSHGxekN6WVnSfOtWamBhZ8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701935290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YksOiwxkTl7mJY79xBmPz898gbIjktgHhFyZBNNx2PI=; b=YI/CJ/2qi/ZQoywN80Kt7vXQNWMSh4QH81bfB2v90m8We+7A0H77WS6tNZNNRVl17idlwV IPXR8WdIyg/1hRsB83PA+3C3FNG1QLaANH/UUEVgxxU+TKypo+13E0oMmvV8TPsKGQULVs DeVD2uuepgxB2EfZ/1s+m0UvzOAsRpG4IWv54eyiblk6/23TbgqZDy9/ctug9vrJ5igSBb jcEOTpInDcLKgh4myF91t/h04uVdwRhwlbYwXwysQdGQksJdN4AIBIwMOhz0sLy4YF0VmT UWQdxSGILb8i9x/5khJXmNDGKI3owtbhyqe3GXmqU1HcbZG0QdlVLgYFpbJqwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sm5wp4ZDWzDGF; Thu, 7 Dec 2023 07:48:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B77mA2o063671; Thu, 7 Dec 2023 07:48:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B77mAjx063668; Thu, 7 Dec 2023 07:48:10 GMT (envelope-from git) Date: Thu, 7 Dec 2023 07:48:10 GMT Message-Id: <202312070748.3B77mAjx063668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 1aa0345b86c7 - stable/14 - pkgbase: create source package List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1aa0345b86c76dfd674d779fd7bcb2e95d2b895b Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=1aa0345b86c76dfd674d779fd7bcb2e95d2b895b commit 1aa0345b86c76dfd674d779fd7bcb2e95d2b895b Author: Baptiste Daroussin AuthorDate: 2023-11-17 16:19:39 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-07 07:47:16 +0000 pkgbase: create source package FreeBSD-src for all the sources but the kernel FreeBSD-src-sys just for the kernel MFC After: 3 days Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D42651 (cherry picked from commit 99b8c0c35b0fcc633649209621243d678a13542a) --- Makefile | 4 ++-- Makefile.inc1 | 54 +++++++++++++++++++++++++++++++++++++++++--- release/packages/src-sys.ucl | 17 ++++++++++++++ release/packages/src.ucl | 17 ++++++++++++++ 4 files changed, 87 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b36e27e7f294..4a6f4bfd425e 100644 --- a/Makefile +++ b/Makefile @@ -175,8 +175,8 @@ TGTS= all all-man buildenv buildenvvars buildetc buildkernel buildworld \ _build-tools _build-metadata _cross-tools _includes _libraries \ builddtb xdev xdev-build xdev-install \ xdev-links native-xtools native-xtools-install stageworld stagekernel \ - stage-packages stage-packages-kernel stage-packages-world \ - create-packages-world create-packages-kernel create-packages \ + stage-packages stage-packages-kernel stage-packages-world stage-packages-source \ + create-packages-world create-packages-kernel create-packages-source create-packages \ update-packages packages installconfig real-packages real-update-packages \ sign-packages package-pkg print-dir test-system-compiler test-system-linker \ test-includes diff --git a/Makefile.inc1 b/Makefile.inc1 index b73b464be2a9..199a0f2ef0ee 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1955,6 +1955,7 @@ stagekernel: .PHONY PORTSDIR?= /usr/ports WSTAGEDIR?= ${OBJTOP}/worldstage KSTAGEDIR?= ${OBJTOP}/kernelstage +SSTAGEDIR?= ${OBJTOP}/sourcestage REPODIR?= ${OBJROOT}repo PKG_FORMAT?= tzst PKG_REPO_SIGNING_KEY?= # empty @@ -1962,6 +1963,7 @@ PKG_OUTPUT_DIR?= ${PKG_VERSION} .ORDER: stage-packages create-packages .ORDER: create-packages create-world-packages +.ORDER: create-packages create-source-packages .ORDER: create-packages create-kernel-packages .ORDER: create-packages sign-packages @@ -1973,7 +1975,7 @@ _pkgbootstrap: .PHONY # # Determine PKG_ABI from newvers.sh if not already set. # -.if !defined(PKG_ABI) && (make(create-world-packages-jobs) || make(create-kernel-packages*) || make(real-update-packages) || make(sign-packages)) +.if !defined(PKG_ABI) && (make(create-world-packages-jobs) || make(create-kernel-packages*) || make(real-update-packages) || make (create-source-packages) || make(sign-packages)) PKG_ABI=${_TYPE}:${MAJOR_REVISION}:${TARGET_ARCH} .endif PKG_BIN_VERSION!=${PKG_CMD} --version /dev/null |\ @@ -2050,7 +2052,10 @@ stage-packages-kernel: .PHONY ${_+_}@cd ${.CURDIR}; \ ${MAKE} DESTDIR=${KSTAGEDIR} -DNO_ROOT stagekernel -stage-packages: .PHONY stage-packages-world stage-packages-kernel +stage-packages-source: .PHONY + @mkdir -p ${SSTAGEDIR}; + +stage-packages: .PHONY stage-packages-world stage-packages-kernel stage-packages-source _repodir: .PHONY @mkdir -p ${REPODIR} @@ -2069,7 +2074,50 @@ create-packages-kernel: _pkgbootstrap _repodir .PHONY SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \ create-kernel-packages -create-packages: .PHONY create-packages-world create-packages-kernel +create-packages-source: _pkgbootstrap _repodir .PHONY + ${_+_}@cd ${.CURDIR}; \ + ${MAKE} -f Makefile.inc1 \ + DESTDIR=${SSTAGEDIR} \ + PKG_VERSION=${PKG_VERSION} create-source-packages + +create-packages: .PHONY create-packages-world create-packages-kernel create-packages-source + +create-source-packages: _pkgbootstrap .PHONY + rm -f ${SSTAGEDIR}/*.plist 2>/dev/null || : +.if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git) + @cd ${SRCDIR}; \ + ( echo "@override_prefix /usr/src" ; \ + ${GIT_CMD} ls-files ":!:sys/" ) > ${SSTAGEDIR}/src.plist + @cd ${SRCDIR}; \ + ( echo "@override_prefix /usr/src" ; \ + ${GIT_CMD} ls-files "sys/" ) > ${SSTAGEDIR}/src-sys.plist + sed -e "s/%VERSION%/${PKG_VERSION}/" \ + -e "s/%DESC%/FreeBSD sources/" \ + -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ + -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ + -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ + -e "s|%PKG_WWW%|${PKG_WWW}|" \ + ${SRCDIR}/release/packages/src.ucl \ + > ${SSTAGEDIR}/src.ucl + sed -e "s/%VERSION%/${PKG_VERSION}/" \ + -e "s/%DESC%/FreeBSD Kernel sources/" \ + -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ + -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ + -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ + -e "s|%PKG_WWW%|${PKG_WWW}|" \ + ${SRCDIR}/release/packages/src-sys.ucl \ + > ${SSTAGEDIR}/src-sys.ucl + ${PKG_CMD} -o ABI=${PKG_ABI} create -f ${PKG_FORMAT} \ + -M ${SSTAGEDIR}/src.ucl \ + -p ${SSTAGEDIR}/src.plist \ + -r ${SRCDIR} \ + -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} + ${PKG_CMD} -o ABI=${PKG_ABI} create -f ${PKG_FORMAT} \ + -M ${SSTAGEDIR}/src-sys.ucl \ + -p ${SSTAGEDIR}/src-sys.plist \ + -r ${SRCDIR} \ + -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} +.endif create-world-packages: _pkgbootstrap .PHONY @rm -f ${WSTAGEDIR}/*.plist 2>/dev/null || : diff --git a/release/packages/src-sys.ucl b/release/packages/src-sys.ucl new file mode 100644 index 000000000000..ad37f5c5a5f1 --- /dev/null +++ b/release/packages/src-sys.ucl @@ -0,0 +1,17 @@ +# +# + +name = "%PKG_NAME_PREFIX%-src-sys" +origin = "base" +version = "%VERSION%" +comment = "FreeBSD Kernel Sources" +categories = [ base ] +maintainer = "%PKG_MAINTAINER%" +www = "%PKG_WWW%" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 696527e90ac0 - stable/14 - pkgbase: kill circular dependency List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 696527e90ac0324a59dfa13768bf6fc35a7c0a03 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=696527e90ac0324a59dfa13768bf6fc35a7c0a03 commit 696527e90ac0324a59dfa13768bf6fc35a7c0a03 Author: Baptiste Daroussin AuthorDate: 2023-12-04 16:27:51 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-07 07:47:41 +0000 pkgbase: kill circular dependency clang was set to depend on clang-dev, but clang-dev already depends on clang by design MFC After: 3 days (cherry picked from commit 6084d989497087dc4c7db8621a1b5a8e4d0559e1) --- release/packages/generate-ucl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index 9e9680559428..e5563c51a4cd 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -45,7 +45,7 @@ main() { pkgdeps="caroot openssl" ;; clang) - pkgdeps="lld clang-dev libcompiler_rt-dev" + pkgdeps="lld libcompiler_rt-dev" ;; # -dev packages that have no corresponding non-dev package From nobody Thu Dec 7 07:48:12 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sm5ws0hjVz53nXp; Thu, 7 Dec 2023 07:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm5ws09Xpz4JR0; Thu, 7 Dec 2023 07:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701935293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=riq+e//OQXkHxcXRfb3P9Rx4SFfmVs8Wq4/Exp/JKDc=; b=p1Gv3TcRpvqmkZXu8Oawga31pFl3MuzzDcHCLomANmKqNgKCzprX0e6cmYt1k3g7uqhXJj tUycmIccrJbuVPp5MUa6+lRRUiRwiHQJ95pmakjnomMjsK0mo0QVK6r7MZW5cPVUhvMe2k 3l6C/jgHYIAK+ONcj3ZiepKkElcr/dnxnDkjX1EKPqe2aBRxb/VNxgSv7KCuvBZs1Kjzsa tL8hQegoV1d1EvFKyUN3Vq9s+N4U4+5L6rfQXupGly4UPqJxDW1dRhbbqxAX5h1acTdqNh DsaA3HmcH+NFyZm3orJI7510MvFF6Eu/4uqNIz4fIgrh/IWEBImcACo7wizvbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701935293; a=rsa-sha256; cv=none; b=w5Zxy9BoLff+hySugtX89JnEz4CQafXVeL9NsfFoSc6cxojidJVOrusMFmzT3uHlz/kTlH DwZU8CYMIVp2mD9NZ4XDNkhoH6BarCD/ySbmwI3cM6MFJbK0JKn1IE91udDF3VhpTPV5qB xU16glrXB4Cfi3zCA7TsYgx4J9aaAVdq4ZzzT69E9BUteJKppKJtZGiHU4lAeymtvPeBP8 ire+eS/SEE3lkuepCch/TLzJWpjJRuoROgk65acK4HayQftmjDh3nxJiYcEw1jtAAV+NYd G2O45MH5EiEOxFBqHYZVK6CL0RxnkOL/4NQI7UPMcTxdQ6tH8NyNdfdkgoFI6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701935293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=riq+e//OQXkHxcXRfb3P9Rx4SFfmVs8Wq4/Exp/JKDc=; b=YrNpUSOPRf7Suge1DxWbWB/B8H0XSXY8Qh4Ba9nRGq7OQt12R20zsmddHZ2BhxL4zR8Hgv GiSrC1fIvhQsm2jkTCbhZgJmeASLLR/y8ORPmvedqCh9vvCMR52LfMv2H6BHAf+foMzui6 YLnvve/w3tMlioyX39RqmcHS4KdIhxnDMCtdZL+lx2l2mQ0r7FWDboIxGEJaDT78eR123K B520OJjLxwf13mxyE98m8DCX34bQGWQdDl9G2b7Pwf1IX4CH3lBWaElCGRTXoaF7O6BDSB AaZQk4CDYfqb2yTNzmmaX53ZwZfNzxkUOsJqjzPNSyDoUw6AYKcMRmRWP1ZLPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sm5wr5zVHzDGG; Thu, 7 Dec 2023 07:48:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B77mC8V063766; Thu, 7 Dec 2023 07:48:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B77mCkB063764; Thu, 7 Dec 2023 07:48:12 GMT (envelope-from git) Date: Thu, 7 Dec 2023 07:48:12 GMT Message-Id: <202312070748.3B77mCkB063764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 44600eb7e231 - stable/14 - pkgbase: propagate SRCRELDATE to the packages correctly List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 44600eb7e231b0cc6c36d10031d983051cd683ee Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=44600eb7e231b0cc6c36d10031d983051cd683ee commit 44600eb7e231b0cc6c36d10031d983051cd683ee Author: Baptiste Daroussin AuthorDate: 2023-12-04 08:22:02 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-07 07:48:00 +0000 pkgbase: propagate SRCRELDATE to the packages correctly MFC After: 3 days Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D42892 (cherry picked from commit 5faaa602cee093269b1a73156c95c6892b4f098d) --- Makefile.inc1 | 12 ++++++++++-- release/scripts/make-pkg-package.sh | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 199a0f2ef0ee..ffd0b14ce87d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2012,6 +2012,7 @@ package-pkg: .PHONY env ${WMAKEENV:Q} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${_REVISION} \ PKG_CMD=${PKG_CMD} PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR} \ WSTAGEDIR=${WSTAGEDIR} \ + OSVERSION="${SRCRELDATE}" \ sh ${.CURDIR}/release/scripts/make-pkg-package.sh real-packages: stage-packages create-packages sign-packages .PHONY @@ -2107,12 +2108,16 @@ create-source-packages: _pkgbootstrap .PHONY -e "s|%PKG_WWW%|${PKG_WWW}|" \ ${SRCDIR}/release/packages/src-sys.ucl \ > ${SSTAGEDIR}/src-sys.ucl - ${PKG_CMD} -o ABI=${PKG_ABI} create -f ${PKG_FORMAT} \ + ${PKG_CMD} -o ABI=${PKG_ABI} \ + -o OSVERSION="${SRCRELDATE}" \ + create -f ${PKG_FORMAT} \ -M ${SSTAGEDIR}/src.ucl \ -p ${SSTAGEDIR}/src.plist \ -r ${SRCDIR} \ -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} - ${PKG_CMD} -o ABI=${PKG_ABI} create -f ${PKG_FORMAT} \ + ${PKG_CMD} -o ABI=${PKG_ABI} \ + -o OSVERSION="${SRCRELDATE}" \ + create -f ${PKG_FORMAT} \ -M ${SSTAGEDIR}/src-sys.ucl \ -p ${SSTAGEDIR}/src-sys.plist \ -r ${SRCDIR} \ @@ -2152,6 +2157,7 @@ create-world-package-${pkgname}: .PHONY sed -i '' -e "s/%VCS_REVISION%/${VCS_REVISION}/" ${WSTAGEDIR}/${pkgname}.ucl ; \ fi ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o ALLOW_BASE_SHLIBS=yes \ + -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} -M ${WSTAGEDIR}/${pkgname}.ucl \ -p ${WSTAGEDIR}/${pkgname}.plist \ -r ${WSTAGEDIR} \ @@ -2187,6 +2193,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap /version/ {print $$2; next } ' \ ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \ ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ + -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} \ -M ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \ -p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \ @@ -2223,6 +2230,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne /version/ {print $$2; next } ' \ ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o ALLOW_BASE_SHLIBS=yes \ + -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} \ -M ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl \ -p ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \ diff --git a/release/scripts/make-pkg-package.sh b/release/scripts/make-pkg-package.sh index 25ec08f71fe6..68172c47f326 100755 --- a/release/scripts/make-pkg-package.sh +++ b/release/scripts/make-pkg-package.sh @@ -9,6 +9,7 @@ export WSTAGEDIR=${WSTAGEDIR} export REPODIR=${REPODIR} export PKG_CMD=${PKG_CMD} export PKG_VERSION=${PKG_VERSION} +export OSVERSION=${OSVERSION} export WRKDIR=$(make -C ${PORTSDIR}/ports-mgmt/pkg -V WRKDIR) make -C ${PORTSDIR}/ports-mgmt/pkg TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ From nobody Fri Dec 8 14:24:03 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Smtg729tPz543Hv; Fri, 8 Dec 2023 14:24:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Smtg71g6rz4Zxw; Fri, 8 Dec 2023 14:24:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702045443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GMx0yc3RVcP1VexlXsaedkulqX/9CNVwz/zccJICK54=; b=MiXajxLbZFvoEGuKIHvOYwzn2kPesRwSubYMNv6GJ/1/ZmEuQh1e+iODqyxVuhRQcypPG0 FiR0ztdhH5W+MJ0GexlJ1IMpTmkWh4kccioqKguQ8NxNKh5trnqQ/fmrUErNESkBSGiVFw cLaKCxRF7HgoaarUgdcB6IvuP1Q+/uGy2rCG/nmWUtewDqjhnm/HOHFG6wl0FdSGkYto/Y MNVTG6CNPHsZqxlxuaWH5vJTOHy3SH3TyTCLvInd9DAXfidcI4qar8LtYzwTga9ZTXqMms utjdggNtAw7iI1IE46/HQ8QY29faqj+2S/Pf9durQfVdFkTJx2KYHODZ2ktU4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702045443; a=rsa-sha256; cv=none; b=JHAp5C3MZ9gd+CkdAMI4WSdZ47KMrcQYQF8ghTo/178cpfdElLgtU2Ikfm27PuJhKljq9d 6trHmBZQ4apTTAOOpxwC2Ki11/B8/jWKJx1dt72VcZ7NAfF8g4aZlT90kiBY59Gbg2N0Z/ yT1OfXLiPx7XZvH+gm6yhoUZlkZfs62fOw78+JbV3qPEjOUQgi7ox/zf43bcYGsLQ6PnLR +DkWGgdq2XDdaVYl0q8KBoIFBxACX12lsy03lsVfhyrM3Ptc+JcsiYv/TPYCnNWJ4H0Ztk bG280QltspqetT5OMHdEdhtqowfhmtvpArWO76BckDbQXkMCng9mKnOvxCw1bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702045443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GMx0yc3RVcP1VexlXsaedkulqX/9CNVwz/zccJICK54=; b=BwzF3vo58pwubEWeq/2uzSLHfdqVg3tHJo2FaWahpwwXLDXlqQfoOWezUGdwt5dCiPEbSx wwblHbzb99qRi7SvrK/ZhJsE92ZxWQeUWefNUy1ZDLmDymPKQ36o6y/NyO16R+dsM7M9+h OiOP2uftkaJJU+w3jVKdO8Ljvwia8FYTy45eDPVZ01HJuMprj68zn9WG+qm2cnn4fMdoZL vh9yxrOO2c6lj32DH7iwK/osSuWcplmFY3aXovqVRvdZnSBkp4HOJ6f7Y0VPkCfJJDHzE1 Fm7BS3Vnd06wlE4oq4HdGlLNh53vKxOXcHa9TFF4ZDteOi5drEfm0G+d2Cr83g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Smtg70kBpz8lq; Fri, 8 Dec 2023 14:24:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8EO3FM049143; Fri, 8 Dec 2023 14:24:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8EO3xS049140; Fri, 8 Dec 2023 14:24:03 GMT (envelope-from git) Date: Fri, 8 Dec 2023 14:24:03 GMT Message-Id: <202312081424.3B8EO3xS049140@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4161f141aa79 - stable/14 - arm64: Add register definitions for MDCR_EL2 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4161f141aa798a90da77daacf7c5425a2b99f9b8 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4161f141aa798a90da77daacf7c5425a2b99f9b8 commit 4161f141aa798a90da77daacf7c5425a2b99f9b8 Author: Mark Johnston AuthorDate: 2023-12-01 18:28:58 +0000 Commit: Mark Johnston CommitDate: 2023-12-08 14:23:52 +0000 arm64: Add register definitions for MDCR_EL2 This is needed to support the bhyve gdb stub implementation on arm64. Reviewed by: andrew MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D42867 (cherry picked from commit 4f12883c360dbb03562f11713e711e3a3a330a0f) --- sys/arm64/include/hypervisor.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index 109169601c83..589d6e9cbdbe 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -232,4 +232,22 @@ /* Assumed to be 0 by locore.S */ #define VTTBR_HOST 0x0000000000000000 +/* MDCR_EL2 - Hyp Debug Control Register */ +#define MDCR_EL2_HPMN_MASK 0x1f +#define MDCR_EL2_HPMN_SHIFT 0 +#define MDCR_EL2_TPMCR_SHIFT 5 +#define MDCR_EL2_TPMCR (0x1UL << MDCR_EL2_TPMCR_SHIFT) +#define MDCR_EL2_TPM_SHIFT 6 +#define MDCR_EL2_TPM (0x1UL << MDCR_EL2_TPM_SHIFT) +#define MDCR_EL2_HPME_SHIFT 7 +#define MDCR_EL2_HPME (0x1UL << MDCR_EL2_HPME_SHIFT) +#define MDCR_EL2_TDE_SHIFT 8 +#define MDCR_EL2_TDE (0x1UL << MDCR_EL2_TDE_SHIFT) +#define MDCR_EL2_TDA_SHIFT 9 +#define MDCR_EL2_TDA (0x1UL << MDCR_EL2_TDA_SHIFT) +#define MDCR_EL2_TDOSA_SHIFT 10 +#define MDCR_EL2_TDOSA (0x1UL << MDCR_EL2_TDOSA_SHIFT) +#define MDCR_EL2_TDRA_SHIFT 11 +#define MDCR_EL2_TDRA (0x1UL << MDCR_EL2_TDRA_SHIFT) + #endif /* !_MACHINE_HYPERVISOR_H_ */ From nobody Fri Dec 8 21:56:49 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sn4jY2zwvz53TVK; Fri, 8 Dec 2023 21:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4jY2W3Nz4RSx; Fri, 8 Dec 2023 21:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k05cf3zE4NABwz0X7pWtCtZT3mbjEpcZs+gUNpVXp/4=; b=eceftnv1BVRN3KgzR/fN9SL7Cq9BEVlXVykas1z0rilTQ+zdy4kI74jHZemXM5xkAtXTj5 ARBrvbigbS5Ww19p4O6WHD5b/jrT0Uawyo0raK3R2G25FCv18sOHzqpEwR3SNVYNc63kkd brkxli3n+SpcY+8/ZhOrcG/qp0ui2LXo2BzcCI9Eo1t8q47fCBTkBKSYjAthCvWlAqSdKB /0KXXk7jhCNbwTZzYVg69BTl+eLmYvtl5Qj+tkpTWfL0KQvWbYWimHdK/i3bfkC5hWBHeF ++jxMZQyqnJwC6vV8P3hhXTBfQHiVwfU741AfkNwS2ss7lR/B4KNNDSLsZRpGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072609; a=rsa-sha256; cv=none; b=qDnlT0MWm3zmnSIXEOSr7mvXcLDiy5U5edS0uJYT7rCWW4BnpWM9+2q7vwJWPcmgakLu44 jm8DPbDF5uZ9DhliXVHgqWyFQcDzqpkSDSkBePGzRKwvvkW75V0ZFsC3ToGqKQTgyFL1+H WOnugff6ObKk3Suh//kaFP54E88F0An37Jj5UkdF6eERVPjV8ex7I6SCXt39eylRmrQihv dc0yZUgIVLwkZldWYCNowdPQt7u42o3l/9Ui40mHhZJSuy0Yw8TcslxJsqBtzK3csgCP8w UwwlLirofrl1zFmlekYDRgBA4JgJ2ad8XDlT67P/5qDurHZPkDBeqAKPjioobw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k05cf3zE4NABwz0X7pWtCtZT3mbjEpcZs+gUNpVXp/4=; b=YDMNPeSFlwIIZ939ryXXalIluA3KdXUMfy3vxt6Hlk+/CncOTFSBhXm6WxBtw6OcPX8rgf hlENdkNuI5PILaWXUMEUgqXTOQIlR9p5s+l5kRc6QTn/wf0TNmIm9skNs3xcj7sI+olpfk qUVfDmA62Ub2bRGNbx4xiokD7l8hml6JOuh2AIdGOxusJ8N5HH7KaiKWU4+Wf+83/I2YK0 kun96MspeRP7ss1MF9rP/bCZCIU1NdNNusM41WZmw3qAflZ1TED4+8Vtn3oW1Pw89XGZAu h4UNm/wv8/waALVsbnahx/mzXSmZquTIk0Z+p/GpMDfnNlFCozvaTUGfAwcDkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sn4jY1ZLjzdnR; Fri, 8 Dec 2023 21:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8LunCQ003635; Fri, 8 Dec 2023 21:56:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8Lun7Y003632; Fri, 8 Dec 2023 21:56:49 GMT (envelope-from git) Date: Fri, 8 Dec 2023 21:56:49 GMT Message-Id: <202312082156.3B8Lun7Y003632@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: e48c3d3a06db - stable/14 - Document library types in the intro(3) manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e48c3d3a06db6a435207f6c08b4d31e9deb242e7 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e48c3d3a06db6a435207f6c08b4d31e9deb242e7 commit e48c3d3a06db6a435207f6c08b4d31e9deb242e7 Author: Gordon Bergling AuthorDate: 2023-11-16 09:48:09 +0000 Commit: Gordon Bergling CommitDate: 2023-12-08 21:56:25 +0000 Document library types in the intro(3) manual page Add a paragraph about library types to the intro(3) manual page. Document library types, locations and versioning. Reviewed by: emaste, jilles, mhorne, pauamma_gundo.com Obtained from: OpenBSD (partial) Differential Revision: https://reviews.freebsd.org/D36594 (cherry picked from commit 54611b7cc69cee34e7bcdc2324a9159e7543a125) --- share/man/man3/intro.3 | 97 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 94 insertions(+), 3 deletions(-) diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3 index c36ab620bed3..bfae9093af93 100644 --- a/share/man/man3/intro.3 +++ b/share/man/man3/intro.3 @@ -26,8 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)intro.3 8.1 (Berkeley) 6/5/93 -.\" -.Dd November 7, 2022 +.Dd November 16, 2023 .Dt INTRO 3 .Os .Sh NAME @@ -278,13 +277,105 @@ the math library .It Pa /usr/lib/libm_p.a the math library compiled for profiling .El +.Sh LIBRARY TYPES +The system libraries are located in +.Pa /lib +and +.Pa /usr/lib . +A library has the following naming convention: +.Bd -unfilled -offset indent +libc.so.7 +.Ed +.Pp +Libraries with an +.Sq .a +suffix are static. +When a program is linked against a static library, all necessary library code +will be included in the binary. +This means the binary can be run even when the libraries are unavailable. +However, it can be inefficient with both disk space and memory usage +during execution. +The C compiler, +.Xr cc 1 , +can be instructed to link statically by specifying the +.Fl static +flag. +.Pp +Libraries with a +.Sq .so.X +suffix are dynamic libraries. +When code is linked dynamically, the library code that the application needs +is not included in the binary. +Instead, data structures are added containing information about which dynamic +libraries to link with. +When the binary is executed, the run-time linker +.Xr ld.so 1 +reads these data structures and loads them into the +process virtual address space. +.Xr rtld 1 +loads the shared libraries when the program is executed. +.Pp +.Sq X +represents the library version number of the library. +In the example above, a binary linked with +.Pa libc.so.8 +would not be usable on a system where only +.Pa libc.so.7 +is available. +.Pp +The advantages of dynamic libraries are that multiple instances of the same +library can share address space, and the physical size of the binary is +smaller. +A namespace per shared library is available via hidden visibility, +allowing multiple compilation units in a library to share things without +making them available to other libraries. +It is possible to load libraries dynamically via +.Xr dlopen 3 . +The disadvantage is the added complexity that comes with loading the +libraries dynamically, and the extra time taken to load the libraries. +Of course, if the libraries are not available, the binary will be unable +to execute. +Calls across shared libraries are also slightly slower and cannot be +inlined, not even with link time optimization. +The C compiler, +.Xr cc 1 , +can be instructed to link dynamically by specifying the +.Fl shared +flag. +.Pp +Shared libraries, as well as static libraries on architectures which produce +position-independent executables +.Pq PIEs +by default, contain position-independent code +.Pq PIC . +Normally, compilers produce relocatable code. +Relocatable code needs to be modified at run-time, depending on where in +memory it is to be run. +The C compiler, +.Xr cc 1 , +can be instructed to generate PIC code by specifying the +.Fl fPIC +flag. +.Pp +Static libraries are generated using the +.Xr ar 1 +utility. +The libraries contain an index to the contents of the library, +stored within the library itself. +The index lists each symbol defined by a member of a library that is a +relocatable object file. +This speeds up linking to the library, and allows routines in the library +to call each other regardless of their placement within the library. .Sh SEE ALSO +.Xr ar 1 , .Xr cc 1 , .Xr ld 1 , .Xr nm 1 , .Xr intro 2 , .Xr math 3 , -.Xr stdio 3 +.Xr stdio 3 , +.Xr make.conf 5 , +.Xr src.conf 5 .Sh HISTORY An .Nm From nobody Fri Dec 8 21:57:49 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sn4kj6k8Mz53Tb4; Fri, 8 Dec 2023 21:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4kj69CSz4RgB; Fri, 8 Dec 2023 21:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hOHpu31NhzNWHzSzhFHmwccE1vbyc+r30NOk+sDBr7k=; b=et5deDbD13VB9u9x41ht5E3w5iyroAvJXgEaukc3GluMLxW7gD1EHlhT2bwqgKKEppYFwt 2ajN+rfjRK6+q6pWa3SjwDmnO+Ra9iaNDBokxJCnnorKszkPry4eYmWUpdlGAX1MG9Gg8e cqdI1eBZAGD9CLTvntyBtQ2psEXUajcAp+zVWJO1twxqGkCLY2/YtOpu/cekDMcgpnRRmg CaE45/mH6dhph3tdu0n4Vj8LW05v5gDzm+CL/mdpe/3Tn2HQHj/ZY7ymidU/Ae/tI7wtcu 2BA5OBZ4mOh3wfPD5G8fH+Hw/p11ICds+hiIL/e+bXmyOrnG78GugVmCjkQRlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072669; a=rsa-sha256; cv=none; b=vBdKyuzg0DBbQJCHZFhj9mc0cU7KUvnC3gVDgPD2tpBAZ8ZWctL0/xNOmGK78Lh7wkFYKg 8Kb5pGnpLXwVuDtCVptz9jRHxrdjVR/h1SJUL++Kjl2pfrVPjX2WzKQlFAOpW07THP7045 UxY/hL8xSOIUfqc8m0GjkqW1BsXzl/C5J7Dls5rDBsTtAyjN0z/j/+hxoYSJFgCTt0a1g1 WNfmNc9Wdvas04rMSfh8j9Wam2fbpSj52qq4O+uCNuS5sivtFfnzuXLdTpsrAxvpiBLlil l/mSW7MflWW9GFi0VkhmZrsYgLIWryjrAPrBhar7cvH5cafMvUNUrUWZAv3xqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hOHpu31NhzNWHzSzhFHmwccE1vbyc+r30NOk+sDBr7k=; b=Ht76JP/L5YyIDbBcrR91582NWZP9tRjGX0QQcoUgB5nRD2mZVV7cxAV0J1wUy2eDVl2i8o h2mkSQylWU2sfg8IV6kVupDxpRrAzw4MyxXxtVbmCwsmeRzfr5aAxeUpg+22A4eAe5qmV5 ugv5GdYo6nlAGz5Mbtf/XRQXzQdQrNsEw8NCUS5ZsNQ2kb61eVTx5BCAVJDTOlAeLQDcUm 3MXALoctwgSOJvFT6RwKOBzkBe8NIqDdEt1hgkkrlFKoiEbp5LevPKjjovC92gLPqPFiJ5 D35sDzA26QnAa+BupTnYalKsTVJ/TAul9JyhIaQL5pQXAUShnuD6jrFSmHpCBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sn4kj5Drfzdqq; Fri, 8 Dec 2023 21:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8Lvn2Q003902; Fri, 8 Dec 2023 21:57:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8LvnVp003899; Fri, 8 Dec 2023 21:57:49 GMT (envelope-from git) Date: Fri, 8 Dec 2023 21:57:49 GMT Message-Id: <202312082157.3B8LvnVp003899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 914cb28ba291 - stable/13 - Document library types in the intro(3) manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 914cb28ba29175552d7afab4a2e0f1af59e21e8f Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=914cb28ba29175552d7afab4a2e0f1af59e21e8f commit 914cb28ba29175552d7afab4a2e0f1af59e21e8f Author: Gordon Bergling AuthorDate: 2023-11-16 09:48:09 +0000 Commit: Gordon Bergling CommitDate: 2023-12-08 21:57:32 +0000 Document library types in the intro(3) manual page Add a paragraph about library types to the intro(3) manual page. Document library types, locations and versioning. Reviewed by: emaste, jilles, mhorne, pauamma_gundo.com Obtained from: OpenBSD (partial) Differential Revision: https://reviews.freebsd.org/D36594 (cherry picked from commit 54611b7cc69cee34e7bcdc2324a9159e7543a125) --- share/man/man3/intro.3 | 97 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 94 insertions(+), 3 deletions(-) diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3 index c36ab620bed3..bfae9093af93 100644 --- a/share/man/man3/intro.3 +++ b/share/man/man3/intro.3 @@ -26,8 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)intro.3 8.1 (Berkeley) 6/5/93 -.\" -.Dd November 7, 2022 +.Dd November 16, 2023 .Dt INTRO 3 .Os .Sh NAME @@ -278,13 +277,105 @@ the math library .It Pa /usr/lib/libm_p.a the math library compiled for profiling .El +.Sh LIBRARY TYPES +The system libraries are located in +.Pa /lib +and +.Pa /usr/lib . +A library has the following naming convention: +.Bd -unfilled -offset indent +libc.so.7 +.Ed +.Pp +Libraries with an +.Sq .a +suffix are static. +When a program is linked against a static library, all necessary library code +will be included in the binary. +This means the binary can be run even when the libraries are unavailable. +However, it can be inefficient with both disk space and memory usage +during execution. +The C compiler, +.Xr cc 1 , +can be instructed to link statically by specifying the +.Fl static +flag. +.Pp +Libraries with a +.Sq .so.X +suffix are dynamic libraries. +When code is linked dynamically, the library code that the application needs +is not included in the binary. +Instead, data structures are added containing information about which dynamic +libraries to link with. +When the binary is executed, the run-time linker +.Xr ld.so 1 +reads these data structures and loads them into the +process virtual address space. +.Xr rtld 1 +loads the shared libraries when the program is executed. +.Pp +.Sq X +represents the library version number of the library. +In the example above, a binary linked with +.Pa libc.so.8 +would not be usable on a system where only +.Pa libc.so.7 +is available. +.Pp +The advantages of dynamic libraries are that multiple instances of the same +library can share address space, and the physical size of the binary is +smaller. +A namespace per shared library is available via hidden visibility, +allowing multiple compilation units in a library to share things without +making them available to other libraries. +It is possible to load libraries dynamically via +.Xr dlopen 3 . +The disadvantage is the added complexity that comes with loading the +libraries dynamically, and the extra time taken to load the libraries. +Of course, if the libraries are not available, the binary will be unable +to execute. +Calls across shared libraries are also slightly slower and cannot be +inlined, not even with link time optimization. +The C compiler, +.Xr cc 1 , +can be instructed to link dynamically by specifying the +.Fl shared +flag. +.Pp +Shared libraries, as well as static libraries on architectures which produce +position-independent executables +.Pq PIEs +by default, contain position-independent code +.Pq PIC . +Normally, compilers produce relocatable code. +Relocatable code needs to be modified at run-time, depending on where in +memory it is to be run. +The C compiler, +.Xr cc 1 , +can be instructed to generate PIC code by specifying the +.Fl fPIC +flag. +.Pp +Static libraries are generated using the +.Xr ar 1 +utility. +The libraries contain an index to the contents of the library, +stored within the library itself. +The index lists each symbol defined by a member of a library that is a +relocatable object file. +This speeds up linking to the library, and allows routines in the library +to call each other regardless of their placement within the library. .Sh SEE ALSO +.Xr ar 1 , .Xr cc 1 , .Xr ld 1 , .Xr nm 1 , .Xr intro 2 , .Xr math 3 , -.Xr stdio 3 +.Xr stdio 3 , +.Xr make.conf 5 , +.Xr src.conf 5 .Sh HISTORY An .Nm From nobody Fri Dec 8 22:02:59 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sn4rg28KXz53Txs; Fri, 8 Dec 2023 22:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rg1YbTz4Scr; Fri, 8 Dec 2023 22:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=06ciFf+OdlFZvbKLLSTaHVZSk4F0cu0CimLy0/tRnU0=; b=k5nLNlKLz4LMcCSVso/ZBlwUZ053M6V5WaWZV6OD6uj+68fSWPdQVL9XFMA8+ft365vXO8 pdNZu8kaW6iJ0qebOcOQ7YWr+2hI0VImlWt/jIKWLr3A6KMFr29yQVpcuN3rKTkI7RsLza D/pkCQ8TTfpGgRSjPy+IIF7pTaJYShntYTtwHUJ+kB5lBktvxMzgcmbuI0hZwqluwqF6DG T6laYMKNJLm2vrbfbpaMokYjTfqv13T2PUbj9sCuqa8urePCUkfz2+bS4rwe1ZZi9Jb8ej 8oeFJgk+YW2hVV5kWeieMmQ2sAtDtzFFtcaQBF0oXznhKRdfZtA7Rgx1qyEvIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072979; a=rsa-sha256; cv=none; b=nAGNk/eGCamPnczvEKf+koBAeqRQdZRscdYfe+fhSssBAzk71WM8lJ0wSV3KFjqpHuTtav wgX5Cm2nJIdsLaFQdfQrO4NGEIsO0MZwl6dvzTlB+JxlcqdRG7rev7Z+y1KuM0VpUkE1nw zQ8FHoKmJE2HoSmpgiNhfbbQkNLU4Pn/Q3uT9s/sQ4DueezljKbGl1EwrwhblwL+uASxQj BWRLgNKNs+1U5oltwXJTvFLz2MWwqtGIKpqcpgF5enWdKph03ipnEyt5GuXNYNeXIncxZ1 RWpyE5MPLZsfe/dIcE7yaZh7NnW9cgEaHt95NX8aqXftryu+54+ZsLwUOVXocg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=06ciFf+OdlFZvbKLLSTaHVZSk4F0cu0CimLy0/tRnU0=; b=d5vFVVxsesTJ10nb7SZrh3fKw7Xjz/pOXBa8R/R8Pm7KQrtIQGfxY7y6hZ2V5nzczDohjN BbKvQbyQWpdGPjJmRMkp6bIxDwD6yMLtqbCR74TlIvNmLLrkWRHaXXHefHW9mg8JpgboCI VzCJSI+Zp/cdfCYEExelHefGsGoArcAY22RcKNziHOT+c7AkEXrZyvQbI/3v61aVN23aRW n5T4eRbrjRXTZIhHTak2b8cGFSbxxzRc7hT1405UThE1jY+N7j/EDdPbb4zTy/uLanxotp YxkXBjbbuh/vc1Rg9xTiGK2ixdh3XYZ4rCkR7mPS0m5NEZcbVa8w4YOsIY/g4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sn4rg0c8CzdT1; Fri, 8 Dec 2023 22:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M2xeh020584; Fri, 8 Dec 2023 22:02:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M2xKS020581; Fri, 8 Dec 2023 22:02:59 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:02:59 GMT Message-Id: <202312082202.3B8M2xKS020581@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: c154cad532e4 - stable/14 - hptmv: remove vestigial EVENTHANDLER_DEREGISTER() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c154cad532e4b786925d4fdda2cd57da7e6c12eb Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c154cad532e4b786925d4fdda2cd57da7e6c12eb commit c154cad532e4b786925d4fdda2cd57da7e6c12eb Author: Mitchell Horne AuthorDate: 2023-11-23 15:22:33 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 hptmv: remove vestigial EVENTHANDLER_DEREGISTER() The registration was removed in favor of DEVICE_SHUTDOWN(). Drop the unused eventhandler tag from the IAL_ADAPTER_T structure. Reviewed by: jhb Sponsored by: The FreeBSD Foundation MFC after: 3 days Fixes: cd3ef66680a8 ("Use DEVICE_SHUTDOWN(9) mechanism...") Differential Revision: https://reviews.freebsd.org/D42334 (cherry picked from commit a4b19cf5c76ac66d02a3ef8a549115ba865d630c) --- sys/dev/hptmv/entry.c | 1 - sys/dev/hptmv/osbsd.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c index fd3b808e1e73..0157a27c3728 100644 --- a/sys/dev/hptmv/entry.c +++ b/sys/dev/hptmv/entry.c @@ -2155,7 +2155,6 @@ hpt_shutdown(device_t dev) pAdapter = device_get_softc(dev); - EVENTHANDLER_DEREGISTER(shutdown_final, pAdapter->eh); mtx_lock(&pAdapter->lock); FlushAdapter(pAdapter); mtx_unlock(&pAdapter->lock); diff --git a/sys/dev/hptmv/osbsd.h b/sys/dev/hptmv/osbsd.h index a9240af16c89..0e4d94fb4756 100644 --- a/sys/dev/hptmv/osbsd.h +++ b/sys/dev/hptmv/osbsd.h @@ -190,8 +190,6 @@ typedef struct IALAdapter UCHAR status; UCHAR ver_601; UCHAR beeping; - - eventhandler_tag eh; } IAL_ADAPTER_T; From nobody Fri Dec 8 22:03:00 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sn4rh4W7Rz53TnV; Fri, 8 Dec 2023 22:03:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rh2lzrz4SKB; Fri, 8 Dec 2023 22:03:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xEzxhehjg8y+UCkRz+NWk9Z4Cqbx0XjFFILgZUno6JI=; b=LlOSLSg6cyWZ0o6T55u1vfc0RE74+TZdozoujqO4bCsenyOM5cvULN7ExcXhzXUbhtBYcM yXY5hI9FgH/v8qMfBPLmX2EdE8vwvjOv7H+biFL0Ris5oZYA8bIxgXsvzYwY2OmfOXH8/7 fDjvakBE8a3qToZK4oHtM6B+jgpIg+/nMoctwAhQUNSd7nvm55GG1zuTjdHlHrbfQUJI06 zCx1sIIehxJFYbGnm636XiJrR0Fz8TmiMeim/VhoC58G+UBzwUCjwPfpWBcmcEdLJjY5LP WPi4KaTlh8VFPlYLUG/B7HhHNzhRCkrHmg4TjAb/+JeoE29aWzWxnoZHfhF1Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072980; a=rsa-sha256; cv=none; b=cxgPEISEoY9eyQeCRUc/pUwHpnCpkFeQvAmnO5Obsw+d0zg6/MSV61nXdpiR4PkPCvGRaN uhXM8cR8/5wDvIIUERWZILuWCAHa/Z/YSieJgJo23NJdndAmSHDLaryOG8nDuwrTG4aGuX RX5SiRg8O9Fb51oPTLi1sjfXoEtnbFjhuIdej4qEYNZojocB13Cum4MWPR4JBuP77i+8Tp KpYHRoS9Ew+hta9DA0ONZQbxtk171gDrbVPktf4v/gEzD06crXJqiRdEMCYLO8sOBhoKjJ kDMaBzyXGTkLszIkeoDuy8rcJhxHs8SFqRQk2qiRFeaOCTzbzTUem/GcCA3Fqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xEzxhehjg8y+UCkRz+NWk9Z4Cqbx0XjFFILgZUno6JI=; b=iP02LooKgGv9Ecs6pLLyPR1tF5HsQlYxcib1yLJZAFR2XP4c8am7uzk1ulhfIJRsXVEYNL L6MV359rBRBocGfuy5Wtzbx9SUQ84hWgUPODieOvmDymEueLzbuEKhDB2ZdpKOsgViZ5Qu iEv1TesUyuUdHS9KF1G+o+xbAbIvy1Sn+PZUXds2bbJLoJSWS+BMuD8DbsDr8Hiz1WWEUV w3L2bKBzNO2+xaiWrE6A6dhHKQtWtNHVIL0t9OShxpD/TNUB3m36fNz7Ncdq/yppXb9e8C JtUQSWLxxmPjsvdXrEF6Li1NmbonEiio3RUs09wS1VJIDPFBJBHsPGbZwRcwsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sn4rh1pvtzdb6; Fri, 8 Dec 2023 22:03:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M30nh020628; Fri, 8 Dec 2023 22:03:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M30tO020625; Fri, 8 Dec 2023 22:03:00 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:00 GMT Message-Id: <202312082203.3B8M30tO020625@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 9af585120d30 - stable/14 - pst-raid.c: sort #includes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9af585120d305ed51888550ca98872c62d948332 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9af585120d305ed51888550ca98872c62d948332 commit 9af585120d305ed51888550ca98872c62d948332 Author: Mitchell Horne AuthorDate: 2023-11-23 15:23:42 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 pst-raid.c: sort #includes Reviewed by: imp, jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42336 (cherry picked from commit 66d9c2f38d2db9e50c0dbf56dca4a2f3e6c3107c) --- sys/dev/pst/pst-raid.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c index 076925b27a6b..4e9c4fb724bc 100644 --- a/sys/dev/pst/pst-raid.c +++ b/sys/dev/pst/pst-raid.c @@ -28,30 +28,32 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include -#include #include -#include #include +#include #include #include -#include +#include #include +#include #include +#include + #include #include + #include #include #include -#include + #include #include -#include - #include "dev/pst/pst-iop.h" +#include + struct pst_softc { struct iop_softc *iop; struct i2o_lct_entry *lct; From nobody Fri Dec 8 22:03:01 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sn4rj4m21z53Tlc; Fri, 8 Dec 2023 22:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rj3LK0z4SmV; Fri, 8 Dec 2023 22:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o6JQNIZpxJuhq2vVRbIBn7p1gg0ZLhVeouSU8/V28vs=; b=VJUXo+OonUhRI3K1BS9AaXJarlGSBjs3qUHN32gRYjAgyHgO4OzxLtRUiAWyx1SyrMTfID 75lAJ2Pt+66PxzVs9GmPTYPCQNdbIEM9s1GMWRAI6YatkrDvpDFcX8bhGyAxMWEJMnLSZa 7AkCGMe+SganVC/bTLo8MhsGrtlU7Om0oIbyRNPQLSZHZ5MsnqXG1d1IL65jFz54qS3Wta EcF17wLhhbUJfUQ7S2dRRtM9VtoGoOBWHYddXgSiL37VvDVJDTPB7fMgyIXJV7408yG3+S KbuFZ+4/C7wTEMWFxxgWq6bgpCOP07+U6sdhVPm1UXkL0pOgIlEgHuxy8TeNrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072981; a=rsa-sha256; cv=none; b=XxVn1AH1SUU4OGKuUrBBEFQCys3Ne7BxG2d3TatPjr3Ojn6PVXEwNNsej/gQe/8HL2wqgm 4VtAOvjmKpZkQa69gBoaHFnThXSJOjkOUlQN/FKspe4G6YfJsZx5AnXoVzrcN4o+Sjy8/m IwRjdc8FJBCazV+WCfGXk1dcjBSnwelv79k0AUm0HnVvvmRz1613K//7tFhsoGY1sGRFAx E93l+9pVMHzGy+xYYV0bkmiyWunNCz4nz5lmo7mSwdp0FgJ82vx5FUsTJvavUajk6nBqh0 NV03CCD+w3F3lGAoxxJrmprOREJi9WH9X1D4Oc0ESA1Grbe06hNIgqphY6QmJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o6JQNIZpxJuhq2vVRbIBn7p1gg0ZLhVeouSU8/V28vs=; b=gTPye6YWbNJ0ufTK5csS7x6CJEEJqWchq+ZTb0bkzAQeB+HPWuqEvUuc+FfMVLZ9icb8pW AonhWuw0v2FHYEwFOHFeoaJ88shCIynCTFIJBwRJblG9dc0EeKz6i4U/uTes/OjTgyH6f4 7+y/XZkMVIib/qlgMPIqUs4wPSQuHa+yYT8dEDLIqPN//bDl/JJDn9aLDJ+FsoSfTlOm7J MNSE/jLi7cfAN+2mXnB1jAjDtxmwk5/kdP1yDeDNWbt5HQTjiUqauT/SROqIYUsbonEH5j o4Gxr3V8rYSmmzTSUIY1dqS3CRygHkgf1ylrZgkzpHKhKPJWIu5fWPTzPq0Kwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sn4rj2R3Lzdc9; Fri, 8 Dec 2023 22:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M31Pq020676; Fri, 8 Dec 2023 22:03:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M31LC020672; Fri, 8 Dec 2023 22:03:01 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:01 GMT Message-Id: <202312082203.3B8M31LC020672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: d997144b5a98 - stable/14 - geom: sort includes for some files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d997144b5a98f7e63ef29cd3038bbe71e093b9c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d997144b5a98f7e63ef29cd3038bbe71e093b9c4 commit d997144b5a98f7e63ef29cd3038bbe71e093b9c4 Author: Mitchell Horne AuthorDate: 2023-11-23 15:23:07 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 geom: sort includes for some files This is not exhaustive, just done ahead of some upcoming changes to these files. Don't include sys/cdefs.h explicitly. No functional change intended. Reviewed by: imp, jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42335 (cherry picked from commit f3dc172763aee039c917fdba03f1e27095f5a7a9) --- sys/geom/journal/g_journal.c | 19 ++++++++++--------- sys/geom/mountver/g_mountver.c | 12 ++++++------ sys/geom/raid/g_raid.c | 17 +++++++++-------- sys/geom/raid3/g_raid3.c | 17 +++++++++-------- 4 files changed, 34 insertions(+), 31 deletions(-) diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c index cfc42c120992..147e83cc7e21 100644 --- a/sys/geom/journal/g_journal.c +++ b/sys/geom/journal/g_journal.c @@ -26,34 +26,35 @@ * SUCH DAMAGE. */ -#include #include #include +#include +#include #include -#include +#include #include #include -#include -#include -#include +#include #include #include -#include +#include #include -#include +#include #include +#include #include #include -#include + #ifdef GJ_MEMDEBUG #include #include #endif + #include #include + #include #include - #include FEATURE(geom_journal, "GEOM journaling support"); diff --git a/sys/geom/mountver/g_mountver.c b/sys/geom/mountver/g_mountver.c index 00ff9dd9b7cb..de3a298735d4 100644 --- a/sys/geom/mountver/g_mountver.c +++ b/sys/geom/mountver/g_mountver.c @@ -27,20 +27,20 @@ * SUCH DAMAGE. */ -#include #include #include +#include +#include +#include #include -#include #include +#include +#include #include -#include -#include #include #include #include -#include -#include + #include #include #include diff --git a/sys/geom/raid/g_raid.c b/sys/geom/raid/g_raid.c index 753c9fdbe867..437cef416ca3 100644 --- a/sys/geom/raid/g_raid.c +++ b/sys/geom/raid/g_raid.c @@ -26,25 +26,26 @@ * SUCH DAMAGE. */ -#include #include #include +#include +#include #include -#include +#include #include #include +#include +#include #include -#include +#include #include +#include #include -#include -#include + #include + #include #include -#include -#include -#include #include #include "g_raid_md_if.h" #include "g_raid_tr_if.h" diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index 0d4ecb704aa5..8f12f14cf09b 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -26,25 +26,26 @@ * SUCH DAMAGE. */ -#include #include #include +#include +#include #include -#include +#include #include #include +#include +#include #include -#include +#include #include +#include #include -#include -#include + #include + #include #include -#include -#include -#include #include FEATURE(geom_raid3, "GEOM RAID-3 functionality"); From nobody Fri Dec 8 22:03:02 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sn4rk4z0cz53V0c; Fri, 8 Dec 2023 22:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rk4CQhz4SMn; Fri, 8 Dec 2023 22:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VzM3pp6kcl9B+5tGT7xUnjmP2IV3BMVsJWDUQDCzmZg=; b=Q4poS+0xGGtiskQY113d4z5lwzpjXFHmruB3zsRlwzt4/D7uHNY4bFY0rrnyuBzgYtA2XP zmP/Wh5NYjqFNNqB2o/vCOV2P5S7ZQRX8ktulWlxl+X19Cr4YkppIg7mXMpH9wuoyD96hs PTVsWnVN9BWeNXH3vKIAdkT4MWboSIsDB1KnMT28/S7VC0gDrHWhooErIOMyQZw0vzNjKL o8cWuUse/75/Te6kJD9FHPq4tujify+15moglhU6YtJX60Job4D9COJYp6hbHE5S2acMOc vhcR0BSiRqTL6NsIwhBqXJm54WbmP0wFc9R8sGoJof2Gpe453Eppwv99D5O/mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072982; a=rsa-sha256; cv=none; b=BXRuPcnFc0OzTaSzZ5mdHV/bN4/l8zEd7NNwwhmpl4btkqIAgtYhwof8XPXCaTZZC6vPGg P6LZd06XrfetVfCfaWpC6Nf+d90HkIvm04xGwjUHcROxuDJ0wio1xZ05jRXHNQzOyIcLKW v0vwU2norjWotPwHa67S8n4QsGa2groQ6Rn+R/GUDOFVhHDl3jAH1ZdyGMiA17bAJ7jTO+ 0JPJAN12ntkAVRS26TYhKnA1Nx4Z8Sn/OzzH6nPIGhUlNQlp96j5zUY1Qx1WDKoys+PuFK Adt+B0m9DYIMPWkaUiCShHqqj2QTfX5yx/qGhpVTLyYGi+tYfKWUY0nM/rfW2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VzM3pp6kcl9B+5tGT7xUnjmP2IV3BMVsJWDUQDCzmZg=; b=uFILSUeqmL9gdslbt7MoB7QhslXW7TfPxErz08xIZU5Q2mWJK93LtE0PGbC/VxbwFX3Ipb xOPddatMf+G+jKnSfqBXSTbnoCkV9DHtVpCYLu/wxzXu/Vz7ov8l5JGweXbCa9syPgZH2/ PbH/Yd8iRGmSRDUihEr8VNbO2ZEQsdaXuhDxKwjzvyakO3CpWSLvDZTbIQr6vwcnicaIWZ Ao7aBf+KQnSsSZVXsJce/nsdY3pAS+4dBKud78C5zUcHL4fjM5T49RlbvuAnLo6C1zMJg6 Z3QhXLnHSmcp1IqOBxhPRaVTy7p0LNsuQ7T8LUigC1ENOGFVwd66ZKmUlmCzMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sn4rk3F63zdrr; Fri, 8 Dec 2023 22:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M32eA020733; Fri, 8 Dec 2023 22:03:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M327u020730; Fri, 8 Dec 2023 22:03:02 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:02 GMT Message-Id: <202312082203.3B8M327u020730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 951d60ee3ada - stable/14 - shutdown: audit shutdown_post_sync event callbacks List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 951d60ee3ada170155b98e919d45e872797d88fa Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=951d60ee3ada170155b98e919d45e872797d88fa commit 951d60ee3ada170155b98e919d45e872797d88fa Author: Mitchell Horne AuthorDate: 2023-11-23 15:58:27 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 shutdown: audit shutdown_post_sync event callbacks Ensure they are all panic/debugger safe. Most handlers for this event are for disk drivers/geom modules. There are a mix of checks being used here (or not), so let's standardize on checking the presence of the RB_NOSYNC flag. This flag is set whenever: 1. The kernel has panicked and kern.sync_on_panic=0* 2. We reboot from within the kernel debugger (the "reset" command) 3. Userspace requested it, e.g. by 'reboot -n' Name the functions consistently. *This sysctl is tuned to zero by default, but its existence means that these handlers can be executed after a panic, at the user's discretion. IMO this use-case is implicitly understood to be risky, and we'd be better off eliminating it altogether. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42337 (cherry picked from commit 4eb861d362d6a9493df7f77eab8e28f9c826702a) --- sys/dev/iscsi/iscsi.c | 8 +++++--- sys/geom/journal/g_journal.c | 8 +++++--- sys/geom/mirror/g_mirror.c | 3 ++- sys/geom/raid/g_raid.c | 4 ++++ sys/geom/raid3/g_raid3.c | 4 ++++ 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c index ecf4fe21a165..311b339caf7a 100644 --- a/sys/dev/iscsi/iscsi.c +++ b/sys/dev/iscsi/iscsi.c @@ -44,11 +44,13 @@ #include #include #include +#include #include #include #include #include #include + #include #include @@ -2711,10 +2713,10 @@ iscsi_shutdown_pre(struct iscsi_softc *sc) } static void -iscsi_shutdown_post(struct iscsi_softc *sc) +iscsi_shutdown_post_sync(struct iscsi_softc *sc, int howto) { - if (!KERNEL_PANICKED()) { + if ((howto & RB_NOSYNC) == 0) { ISCSI_DEBUG("removing all sessions due to shutdown"); iscsi_terminate_sessions(sc); } @@ -2751,7 +2753,7 @@ iscsi_load(void) * cam_periph_runccb(). */ sc->sc_shutdown_post_eh = EVENTHANDLER_REGISTER(shutdown_post_sync, - iscsi_shutdown_post, sc, SHUTDOWN_PRI_DEFAULT - 1); + iscsi_shutdown_post_sync, sc, SHUTDOWN_PRI_DEFAULT - 1); return (0); } diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c index 147e83cc7e21..11a75e541fda 100644 --- a/sys/geom/journal/g_journal.c +++ b/sys/geom/journal/g_journal.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -2655,13 +2656,14 @@ static eventhandler_tag g_journal_event_shutdown = NULL; static eventhandler_tag g_journal_event_lowmem = NULL; static void -g_journal_shutdown(void *arg, int howto __unused) +g_journal_shutdown_post_sync(void *arg, int howto) { struct g_class *mp; struct g_geom *gp, *gp2; - if (KERNEL_PANICKED()) + if ((howto & RB_NOSYNC) != 0) return; + mp = arg; g_topology_lock(); LIST_FOREACH_SAFE(gp, &mp->geom, geom, gp2) { @@ -2738,7 +2740,7 @@ g_journal_init(struct g_class *mp) (g_journal_cache_limit / 100) * g_journal_cache_switch; } g_journal_event_shutdown = EVENTHANDLER_REGISTER(shutdown_post_sync, - g_journal_shutdown, mp, EVENTHANDLER_PRI_FIRST); + g_journal_shutdown_post_sync, mp, EVENTHANDLER_PRI_FIRST); if (g_journal_event_shutdown == NULL) GJ_DEBUG(0, "Warning! Cannot register shutdown event."); g_journal_event_lowmem = EVENTHANDLER_REGISTER(vm_lowmem, diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c index b2bcea2f0dbb..c6f95f28ba89 100644 --- a/sys/geom/mirror/g_mirror.c +++ b/sys/geom/mirror/g_mirror.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -3546,7 +3547,7 @@ g_mirror_shutdown_post_sync(void *arg, int howto) struct g_mirror_softc *sc; int error; - if (KERNEL_PANICKED()) + if ((howto & RB_NOSYNC) != 0) return; mp = arg; diff --git a/sys/geom/raid/g_raid.c b/sys/geom/raid/g_raid.c index 437cef416ca3..6938491d696c 100644 --- a/sys/geom/raid/g_raid.c +++ b/sys/geom/raid/g_raid.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -2457,6 +2458,9 @@ g_raid_shutdown_post_sync(void *arg, int howto) struct g_raid_softc *sc; struct g_raid_volume *vol; + if ((howto & RB_NOSYNC) != 0) + return; + mp = arg; g_topology_lock(); g_raid_shutdown = 1; diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index 8f12f14cf09b..721610cefbec 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -3573,6 +3574,9 @@ g_raid3_shutdown_post_sync(void *arg, int howto) struct g_raid3_softc *sc; int error; + if ((howto & RB_NOSYNC) != 0) + return; + mp = arg; g_topology_lock(); g_raid3_shutdown = 1; From nobody Fri Dec 8 22:03:03 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sn4rl68dXz53TkG; Fri, 8 Dec 2023 22:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rl5Rrhz4Svx; Fri, 8 Dec 2023 22:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X7eoRf3mqbGfApxMskoVYItjgbqoTHX/HWiPNwKz95E=; b=ohV4F1rMAFxMviYBuXKJTEemWozgrQEZEP1+rnrCPCWWq8ZgKhQf5l3z5un15ERO3ryctS brA0DZmU6FR6c7iNdS80JDcMSnpVejc+igSMKqvxoaVnTykJmE6Afv9IE/NCvDjrkv85oY QcO78nx0qCboD7c4NSM6kYrzRi1zI4t/jTRQ/p2l0Z5EKqA0sK/Qe4efJRQLABgq/CfoZx EK4k9jVlvCuCVwUYLAbVDWxSW3LWh4izQM5IcAD7qgKQYKUIMnUjjY+FibSt9diNbtR4ay Y5duQIms3dZfY0ba0vo38EWz1KDs0EKwYctq6fPwGx8KayrzFGUjM6hHghyYPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072983; a=rsa-sha256; cv=none; b=Usl0Pyr2lf1SdiF4d4RHnLye7zUpf5fE4P9IUHPqg9xpbsyAAXbav4p1OrLdtva9aSmeF4 o5PjPHD8nyGNP6F+CrRyrmoEHal8UBfKMeq0rmeJsddFymrHgv9PciV6Tm74nxwPNfkkWO 4VTDPk82bvr90Ke5JlhfsVytl3Egagc+SoHyQRw44BYGZFNB0fRIspScfYbpBcvmNQxOSt mJ1OC6EwX7ykB+Ondy2sAF+73ZA8iKVAooNMEQEzIpXpKeT60C9ISmIcPLgqZvnSVbmsU7 mjQOXaEkuufMc6YGY5aZJvHQe1R+j/5oZaEKsSBkTyfniPGMINgIAxa6469Mow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X7eoRf3mqbGfApxMskoVYItjgbqoTHX/HWiPNwKz95E=; b=mVKkyvCF54OG7YoxhofmVsm/YuGE4YDwMkskXnxRo+ljAridWRX63SZR/WWVO9xF2VMjVp uBjnwcxZWpRvLJdRLa0zNR0FcppU46M1ybEDRx+5l1mBfRwNG/qE/QK23dKBKKP9Z/+enq 26+x9y8ZxDRc4uzJaaRg9PUdq2UJGaiZPHIOBkCOYvDcaWTogbVeHmBiIcfoMPwvpccQzu txcIpWuVdfy8uFCfOOk4ypELGftwVTKgw6mCfyTs0RexVT2ChpLYp/3Iqv9UvBSQrLGlkf vOR7rmmiqoa6Fys+ZLsizxu8Jcp4/0a4RduQt7Hqm0NdybB4dsgwjn/eJKl46Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sn4rl4VYqzdp1; Fri, 8 Dec 2023 22:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M333e020786; Fri, 8 Dec 2023 22:03:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M33hf020783; Fri, 8 Dec 2023 22:03:03 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:03 GMT Message-Id: <202312082203.3B8M33hf020783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 9732eb8eae72 - stable/14 - ctl_ha: don't shutdown threads if scheduler is stopped List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9732eb8eae7294a47cd64af5f11221792a984f71 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9732eb8eae7294a47cd64af5f11221792a984f71 commit 9732eb8eae7294a47cd64af5f11221792a984f71 Author: Mitchell Horne AuthorDate: 2023-11-23 15:25:54 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 ctl_ha: don't shutdown threads if scheduler is stopped In this case, just return. Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42341 (cherry picked from commit 9d61fd08499609a2c95d1c66f97587932b446f06) --- sys/cam/ctl/ctl_ha.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/cam/ctl/ctl_ha.c b/sys/cam/ctl/ctl_ha.c index 32c83025bb1b..1951f74c45f3 100644 --- a/sys/cam/ctl/ctl_ha.c +++ b/sys/cam/ctl/ctl_ha.c @@ -910,13 +910,16 @@ ctl_ha_msg_shutdown(struct ctl_softc *ctl_softc) { struct ha_softc *softc = &ha_softc; + if (SCHEDULER_STOPPED()) + return; + /* Disconnect and shutdown threads. */ mtx_lock(&softc->ha_lock); if (softc->ha_shutdown < 2) { softc->ha_shutdown = 1; softc->ha_wakeup = 1; wakeup(&softc->ha_wakeup); - while (softc->ha_shutdown < 2 && !SCHEDULER_STOPPED()) { + while (softc->ha_shutdown < 2) { msleep(&softc->ha_wakeup, &softc->ha_lock, 0, "shutdown", hz); } From nobody Fri Dec 8 22:03:04 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sn4rm6fx7z53V0h; Fri, 8 Dec 2023 22:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rm63sLz4St1; Fri, 8 Dec 2023 22:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qRhOPP+KNOHiD5lRmv+ZdrSnF21x5jHizfeAz8YoF5s=; b=SrwypSZJsIrh2CzxZqxX2g3Elbmj8s+wLxIMCvm6aTI5cBnVQfQKbplRX0AWnx9aQ0e/J9 uOvL7/rvRCuOGoPoaB5Ai0tWDjmHVRv9KFsr5so5HYoB/gYC3dfxZbDF9qgdLT2+L95nhJ xNQQuzco4tTOvrGMFsZvqIkcR9QAj/NqbitxEhYUeQeKtAI/jZlCchNCU3M88/hAr2qtTy v3jLvLrc+bGXsE7ATobDnvOLBRCYf0tmOIkA4shFtwPVQMjwtMDCSYRAi9HTUQdmhb4bS+ vQ3/1taXoaVU7zmxP85Hpyq3sFIekKllVKx+yCmvhR95QnB4Mz2H97PdxXLAEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072984; a=rsa-sha256; cv=none; b=mtWcvE9gfh05ucI03ftO6gEsrz63JKTSYnyuAgULFrT3yvW2qM62aO1HJjhQLUCl8cjOIP IIXPWPXSNnSffrwjvk8MiAMWYFpSbvHTi5UJYd5S8N16d8tUxb0TTU+bdugV4aDXng6pcI cV+wT4FIzhxH69zDGtvar4CpeIPO2CWRuXr9Vh8oHN/7UlVmuDOOOp6p6pRG7SqlG8tb58 jzBSLsk1R0IVgT8HGMyhvCsrrkgAoL6IKXzJlgtNOKqt82+YTsLvHOWEV01bGa9LGbWBLu 3lGsEgcUmeVBbyqZlyADTyiWtnFYOlEL+rG9mWAcRqWmuf/WGdihjbzOfXrSGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qRhOPP+KNOHiD5lRmv+ZdrSnF21x5jHizfeAz8YoF5s=; b=Wb1vSFBe1QaJU4Sm/Egxf33bNh6tIHLmBPomFDcNZsUvNj8MamUHt/qKbl2T4bHY+Q3KTa XqOxOgOQ8p8GLko0HY9uZET7eU9PkXbOmWnzPolVo9yA9fOz7DQJF8PlXPkQUpY6zYkbnV /v0RHBkGVTbuA3FlIq3VzWMiHlRIQfyL/V/a2Fxa4+UKifYCiTawTwp9mC5U9Z143MMwPs xgD+oKwuTgBcQasTfW/qloqSs+JF82382ZqmAMPv+D/MyZKeWHY82CaWIqhLGrnctWJiOL 50soFNqndn5080Dtj4AENt21eP6CpYgrDUV4D+9FIGdrbKM9gy9iJZ9d270v2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sn4rm57rtzdrs; Fri, 8 Dec 2023 22:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M34xZ020835; Fri, 8 Dec 2023 22:03:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M34oT020832; Fri, 8 Dec 2023 22:03:04 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:04 GMT Message-Id: <202312082203.3B8M34oT020832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: c13f564f9176 - stable/14 - xen: improve shutdown hook List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c13f564f9176c3d946e61519ddbfa0c1e23114ab Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c13f564f9176c3d946e61519ddbfa0c1e23114ab commit c13f564f9176c3d946e61519ddbfa0c1e23114ab Author: Mitchell Horne AuthorDate: 2023-11-23 15:27:20 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 xen: improve shutdown hook Make better use of the shutdown flags. In particular this now handles standard reboot where RB_POWERCYCLE is not set, and indicates a crash when the system has panicked. While here, give the function a prefix. Reviewed by: royger, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42343 (cherry picked from commit 9e0b0f5de67fd46bddf0e12ef7b71d76a7ec1667) --- sys/dev/xen/control/control.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c index 9ea0222809a0..37b4bff709c7 100644 --- a/sys/dev/xen/control/control.c +++ b/sys/dev/xen/control/control.c @@ -345,12 +345,18 @@ xctrl_crash(void) } static void -shutdown_final(void *arg, int howto) +xctrl_shutdown_final(void *arg, int howto) { - /* Inform the hypervisor that shutdown is complete. */ - if (howto & RB_POWEROFF) + /* + * Inform the hypervisor that shutdown is complete, and specify the + * nature of the shutdown. RB_HALT is not handled by this function. + */ + if (KERNEL_PANICKED()) + HYPERVISOR_shutdown(SHUTDOWN_crash); + else if ((howto & RB_POWEROFF) != 0) HYPERVISOR_shutdown(SHUTDOWN_poweroff); - else if (howto & RB_POWERCYCLE) + else if ((howto & RB_HALT) == 0) + /* RB_POWERCYCLE or regular reset. */ HYPERVISOR_shutdown(SHUTDOWN_reboot); } @@ -446,7 +452,7 @@ xctrl_attach(device_t dev) xctrl->xctrl_watch.max_pending = 1; xs_register_watch(&xctrl->xctrl_watch); - EVENTHANDLER_REGISTER(shutdown_final, shutdown_final, NULL, + EVENTHANDLER_REGISTER(shutdown_final, xctrl_shutdown_final, NULL, SHUTDOWN_PRI_LAST); return (0); From nobody Fri Dec 8 22:03:05 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sn4rp3YmSz53TZb; Fri, 8 Dec 2023 22:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rn6qZ5z4T57; Fri, 8 Dec 2023 22:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y2aBLsAFkLGDtJY5Y5DnIUrba94hG9QDhkHSQQvXHkQ=; b=bQNU5r63xoNwjWqFqThExNND/asOLhE09hz3MgTAlhupwqC1PqyFiVejuvIj7L2lDM/CzK f6hItRnlKL/oC80YPURCGyufCpf8q0GXA4vhB0dXIuAlO95M7YVuSkAHEJoQxtSQ+TOTCC V9Y7dWNqND+Fy7OtLjhVziWKzO7V2ot/HTdN8CGOUGWyuqKzxEbHtomTcp8mAY2Nl3INDV 1dMbl9n1xymSeMeImttxNeYzkgiiWmGaOHfv6VuCSu5sHxk0UcqUzAxPCTW5r/+NvlM6NN EHUywmxHMUHfxBfBhxru6vZctCURh5s1Zd1vAr1j8zr+Ym8ADSwgnyvYA0Uzhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072986; a=rsa-sha256; cv=none; b=wcsv12K/3U323hqdlk6BnJV9BZHQED9HIgn5T6waHup/TrrVgXq5LBxnSReU5kG9E96G8u KW6VyDG4eFrLSvRDRY65dPKrtUuK3JbDCjQdE89TLoyP2ehQLu1fiZS/IB0zm9mdskW0+n t3Smq4ZpeS7t2Zl4zB64Y/tf02jq62QBdF3Ltu19gxXqNKcFMvrA2K6NuAX9l+bFY9NCHl CqQ7mNWAwIAhLi2y7DKPO4+jwsUVhnkm2FPXTMBGIq/+i+UxLWVU6aEAIdFdNSQ6ctlbOK Wj8m3kQ8/8/o29lKJaPsS4LxiJj14kP2P/VH9FRsyTquGyffreV7/SkaWEFWbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y2aBLsAFkLGDtJY5Y5DnIUrba94hG9QDhkHSQQvXHkQ=; b=M0J3yWY/tCTPcnBR3J6syebFO9nQIX+K4bLUKoszUpn9CNq8hiSAU7xrzP6pSQje0Mvy4f VBvnnmK3lcGIhTD9fZBRoArNRzAX5LGz5/jPibLuaolBMQ6rphzo1/m5pxv6wbUgOjEsIf ik+2MfJD3dK45GPDobB+TVXJJaLsF0gEUffsjfcYW6yBFEouGQSvhaXjEdELVuA44N8k71 gBtm6IT2+x80UOKj4JqR3AWOGahDSqVhzeWzvd0XDsnjlJeNM7GKvqvadUhSLosFh/4rFk ruK1Zk7yDL+gfef/wHK7+l4jAZDE7TaSQoEZrfYVOZoQl43bwH+8RUcOkK8Jjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sn4rn5sF0zdb7; Fri, 8 Dec 2023 22:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M35Ed020887; Fri, 8 Dec 2023 22:03:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M35d7020884; Fri, 8 Dec 2023 22:03:05 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:05 GMT Message-Id: <202312082203.3B8M35d7020884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: bbfd41d4308b - stable/14 - alq, siftr: add panic/debugger checks to shutdown hooks List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bbfd41d4308be599a374ce8fba73b2d6ec990dcc Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=bbfd41d4308be599a374ce8fba73b2d6ec990dcc commit bbfd41d4308be599a374ce8fba73b2d6ec990dcc Author: Mitchell Horne AuthorDate: 2023-11-23 15:25:30 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 alq, siftr: add panic/debugger checks to shutdown hooks Don't try to gracefully terminate the pkt_manager thread if the scheduler is not running. We should not attempt to shutdown ald if RB_NOSYNC is set, and must not if the scheduler is stopped (the function calls wakeup()). Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42340 (cherry picked from commit d79a9edb5ce162c1ba49e12e5c93b894e6a25ad2) --- sys/kern/kern_alq.c | 14 +++++++++----- sys/netinet/siftr.c | 6 +++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_alq.c b/sys/kern/kern_alq.c index 51fd66f2fe9f..1bcce92509c5 100644 --- a/sys/kern/kern_alq.c +++ b/sys/kern/kern_alq.c @@ -37,19 +37,20 @@ #include #include +#include +#include +#include #include #include #include +#include #include #include #include #include -#include -#include -#include +#include #include -#include -#include +#include #include @@ -228,6 +229,9 @@ ald_shutdown(void *arg, int howto) { struct alq *alq; + if ((howto & RB_NOSYNC) != 0 || SCHEDULER_STOPPED()) + return; + ALD_LOCK(); /* Ensure no new queues can be created. */ diff --git a/sys/netinet/siftr.c b/sys/netinet/siftr.c index 58603e4aa53c..52e2b8838b0f 100644 --- a/sys/netinet/siftr.c +++ b/sys/netinet/siftr.c @@ -74,6 +74,7 @@ #include #include #include +#include #include #include #include @@ -1263,8 +1264,11 @@ siftr_sysctl_enabled_handler(SYSCTL_HANDLER_ARGS) } static void -siftr_shutdown_handler(void *arg) +siftr_shutdown_handler(void *arg, int howto) { + if ((howto & RB_NOSYNC) != 0 || SCHEDULER_STOPPED()) + return; + if (siftr_enabled == 1) { siftr_manage_ops(SIFTR_DISABLE); } From nobody Fri Dec 8 22:03:06 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sn4rq15cMz53V0m; Fri, 8 Dec 2023 22:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rq0WTSz4Srx; Fri, 8 Dec 2023 22:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9joOvh9nzUZzYS/minJpFtFEJvb7+pO740QSK5vhvsw=; b=vQSuRRtyrZfUHpxy8TpcZ1WnZiLk9X7X/gMnzYcqCQTN8FTYLm59ExS+hHCYQm5pODIc/U 2BAWhMy2h4OEMv5k2zu95zQWWKb63cbKzKFO41PRGraQw+ioXQ0CJg8or9I3xuY5kptjtZ 07wGpJmrNLgIyhoJyI1yoGZI1RN4VCIyN4pJZuhWbQ0UpM8DyAnWbsBP1upsb5yk2gqE29 kCliOxB0V8Nl+Z7+gnVbEIreGuCjLwF1U5698RRSJk8OIq+lOxqhWjEaPuuvOG6riL9DES jipF3HNQmjz4H7ZF785Sx0Qnd+gfq9PDSJTpnQs3sUR57tSoJu/2ZfS09pSXsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072987; a=rsa-sha256; cv=none; b=OiuTzPDD3dFG50IaalrdlGsL0oQ4Zw4EYPXp79uarQ5OD9qWfwu30n/TBK6H3TG/4e6VOf SYyAsB/PO3IT4yQ4+v5fbBO5mdv0anvt/3wjb63i2puruoI5CacX5Eht9G3c2yYDEWwoLU 1HRgGNdvvxDQMJ2grb1kd8H0z3ShzUDVEsGa4FCQjx/vZn9V8cq7ehtnzq5SwB/8OKMP7O CihiIbDwX7ZD/7CHxVX809V6MHnXPjDqmCTiJxeeJcT0R089aOeuMamgwg4/uGAKXVRNOr pWishuOPbkRzpegEX2yu4bT/3OE1wIFgSsFPzE61DaVHBStbrDGkz5lmIdXCxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9joOvh9nzUZzYS/minJpFtFEJvb7+pO740QSK5vhvsw=; b=gFTvn0r8WqbjVDHdl6qIevgn2bibHOtXXkHzCgxfdMG63qkDT6WwDdoO5UJJEbp7fDfru/ yH6ccLi2tR3CyJfII+jLaWJ1ef/5v/CP3ZmCbh4roO9Z1SlHY7QCIkNItaZd1SwKGMoou5 YRM8W1YL7qY5vOweMdk7D/a3XVXP3L7cuoi+36dht3uXaBrGrNXDj882yRW6N/k92N1gBr hqpaivIPV5d4EB8AYK24N0yAEv+dgmzeEU/3JQ0kT8hgACXo7xM7WnLx+4b7WO+5JlQJVp cSm5rwt5MB726EnwqjaQ09X0mMrKWO8cvyYuOxTb+eQqRj3sSyOsqOHx6zDhHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sn4rp6lFhzf2k; Fri, 8 Dec 2023 22:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M3698020932; Fri, 8 Dec 2023 22:03:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M36fv020929; Fri, 8 Dec 2023 22:03:06 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:06 GMT Message-Id: <202312082203.3B8M36fv020929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: aaebd6d069f5 - stable/14 - powerpc: better handling of shutdown flags List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aaebd6d069f50d5524157fcac5253280ce3a8156 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=aaebd6d069f50d5524157fcac5253280ce3a8156 commit aaebd6d069f50d5524157fcac5253280ce3a8156 Author: Mitchell Horne AuthorDate: 2023-11-23 15:25:05 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 powerpc: better handling of shutdown flags RB_HALT does not mean poweroff, RB_POWEROFF does. Reviewed by: jhibbits MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42339 (cherry picked from commit 41e26e8288f1743c8584e5f9c461d36dce1cccc6) --- sys/powerpc/powermac/cuda.c | 8 +++++++- sys/powerpc/powermac/pmu.c | 6 ++++-- sys/powerpc/powermac/smu.c | 6 ++++-- sys/powerpc/powernv/opal_dev.c | 6 ++++-- sys/powerpc/pseries/rtas_dev.c | 4 ++-- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/sys/powerpc/powermac/cuda.c b/sys/powerpc/powermac/cuda.c index 974ad585b543..97f60f269559 100644 --- a/sys/powerpc/powermac/cuda.c +++ b/sys/powerpc/powermac/cuda.c @@ -748,7 +748,13 @@ cuda_shutdown(void *xsc, int howto) struct cuda_softc *sc = xsc; uint8_t cmd[] = {CUDA_PSEUDO, 0}; - cmd[1] = (howto & RB_HALT) ? CMD_POWEROFF : CMD_RESET; + if ((howto & RB_POWEROFF) != 0) + cmd[1] = CMD_POWEROFF; + else if ((howto & RB_HALT) == 0) + cmd[1] = CMD_RESET; + else + return; + cuda_poll(sc->sc_dev); cuda_send(sc, 1, 2, cmd); diff --git a/sys/powerpc/powermac/pmu.c b/sys/powerpc/powermac/pmu.c index 67ef57bf6be8..f9d9d4d40c72 100644 --- a/sys/powerpc/powermac/pmu.c +++ b/sys/powerpc/powermac/pmu.c @@ -812,10 +812,12 @@ pmu_shutdown(void *xsc, int howto) struct pmu_softc *sc = xsc; uint8_t cmd[] = {'M', 'A', 'T', 'T'}; - if (howto & RB_HALT) + if ((howto & RB_POWEROFF) != 0) pmu_send(sc, PMU_POWER_OFF, 4, cmd, 0, NULL); - else + else if ((howto & RB_HALT) == 0) pmu_send(sc, PMU_RESET_CPU, 0, NULL, 0, NULL); + else + return; for (;;); } diff --git a/sys/powerpc/powermac/smu.c b/sys/powerpc/powermac/smu.c index 5aed7b87d3c2..af00599e6b54 100644 --- a/sys/powerpc/powermac/smu.c +++ b/sys/powerpc/powermac/smu.c @@ -1317,10 +1317,12 @@ smu_shutdown(void *xdev, int howto) struct smu_cmd cmd; cmd.cmd = SMU_POWER; - if (howto & RB_HALT) + if ((howto & RB_POWEROFF) != 0) strcpy(cmd.data, "SHUTDOWN"); - else + else if ((howto & RB_HALT) == 0) strcpy(cmd.data, "RESTART"); + else + return; cmd.len = strlen(cmd.data); diff --git a/sys/powerpc/powernv/opal_dev.c b/sys/powerpc/powernv/opal_dev.c index edb8f6d435ad..ab1a1fbb731c 100644 --- a/sys/powerpc/powernv/opal_dev.c +++ b/sys/powerpc/powernv/opal_dev.c @@ -344,10 +344,12 @@ static void opal_shutdown(void *arg, int howto) { - if (howto & RB_HALT) + if ((howto & RB_POWEROFF) != 0) opal_call(OPAL_CEC_POWER_DOWN, 0 /* Normal power off */); - else + else if ((howto & RB_HALT) == 0) opal_call(OPAL_CEC_REBOOT); + else + return; opal_call(OPAL_RETURN_CPU); } diff --git a/sys/powerpc/pseries/rtas_dev.c b/sys/powerpc/pseries/rtas_dev.c index ef9522f5495d..f8198ef27417 100644 --- a/sys/powerpc/pseries/rtas_dev.c +++ b/sys/powerpc/pseries/rtas_dev.c @@ -155,13 +155,13 @@ rtas_shutdown(void *arg, int howto) { cell_t token, status; - if (howto & RB_HALT) { + if ((howto & RB_POWEROFF) != 0) { token = rtas_token_lookup("power-off"); if (token == -1) return; rtas_call_method(token, 2, 1, 0, 0, &status); - } else { + } else if ((howto & RB_HALT) == 0) { token = rtas_token_lookup("system-reboot"); if (token == -1) return; From nobody Fri Dec 8 22:03:08 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sn4rr2CMdz53Tlr; Fri, 8 Dec 2023 22:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rr1mtnz4SxM; Fri, 8 Dec 2023 22:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJ32kNf/NgEqj/RyabKcbcKtBFXRsJg9xt7HsnzGwk4=; b=gUOneUMKnfqFVgPMYSpCArQ9tw43VtNt7QKbFDRS5SZxlxRyU4hCBfkrBGTggzaTBiR6cJ sOu7neDP+rXyns6QcDqz+iSXiqjYbxGVJvUOYpBhKbohwdmxGHmlXTceFwkC/WQkgcMf13 /dFVY+G0FGWRzZT/w9o8LTI+xhWFmuhJAxTCcLVx7K3eqdRlz7f8wT58JkhRjsEJOfsgGm u/QwUsdaZEnGBhE0/2kPEq4x4tq5T7zVsD+swoz2vNwsvhmcfLcOfjwwNhjoyKf811lfT+ YnyXpONfNXOn+P3czjIhAkFLFf/Y46MSCFDvY4WfrhOjOL0IwYvWo8F2RCGF/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072988; a=rsa-sha256; cv=none; b=DCcCDHwIrIWRBp3m95QojmF8k8kPYBZjo6/r/x4HS9FkqFyzsJtz6plIMLmK9xpdBectaB JP4sc40M/MKqRxyt9iCs3wxCdAo+gDoRGdpP8TbFosGke//i1I8KeuQVWyRUAMJ8Lh+tWW Ac7pPLSjD+1BRK/K9qngoZOn5kTVY6ko91/oZoKrM35e+bmmK/WdUUVh5kYYHNcWLckh/c TArNXbCwMn5osOCbrTPRXk2sQ578wJFWQzQQICMe919MGSWwc7PkMxw7luqt5wg40pQjWP PA1oe8PtJ4efl+JuoP2HtMn3ZNnC9CHGyCbap4i3B3ySP91QaQVoVo3UdmnQhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJ32kNf/NgEqj/RyabKcbcKtBFXRsJg9xt7HsnzGwk4=; b=XWL8924Em8vXKBwCXcM2YpXJHEjOJkjBE3TOm3gD7/G7I8NBI5DI53Jh5Ir05Q4j7Jgqna cRbvERQCuwKzWoWo3tL16n+baPBuzIGyb04fEH/d0UXFUT+uJ8MW8at4RHdi2McNsQnQq8 wEdNkZHZZtj3MezPdUowesYNnsIQOdD2p+SEgQM0lcSh69rOwe10j25wAdaME/eRbybyOi Rww2Uni9ap6uvG7LghBeJfVPb+OpLVfiAsMwkvwcTeJdYpb6HF6TI3OXJSGOY7VIkRu8oi OZu5KUQm5ZP8KE9CPtzWyXT8oZ2toaFdUiZzD8a+Ah1CCqr+BsImId5SxuV+CQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sn4rr0kH4zdXD; Fri, 8 Dec 2023 22:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M38R9020974; Fri, 8 Dec 2023 22:03:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M38lR020971; Fri, 8 Dec 2023 22:03:08 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:08 GMT Message-Id: <202312082203.3B8M38lR020971@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: a8ba64ca91d4 - stable/14 - iscsi: adjust shutdown_pre_sync handler List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a8ba64ca91d479346c9a7f99ef3eeceb1976ac13 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a8ba64ca91d479346c9a7f99ef3eeceb1976ac13 commit a8ba64ca91d479346c9a7f99ef3eeceb1976ac13 Author: Mitchell Horne AuthorDate: 2023-11-23 15:26:12 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 iscsi: adjust shutdown_pre_sync handler Don't attempt to service reconnections if RB_NOSYNC is set. More crucially, don't do it if the scheduler is stopped, as the maintenance thread will never run again. Reviewed by: jhb MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42342 (cherry picked from commit 2ce1c45b3411410a5d0a4d08198a3b0010d493b7) --- sys/dev/iscsi/iscsi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c index 311b339caf7a..38973898a9d1 100644 --- a/sys/dev/iscsi/iscsi.c +++ b/sys/dev/iscsi/iscsi.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -2680,11 +2681,12 @@ iscsi_terminate_sessions(struct iscsi_softc *sc) } static void -iscsi_shutdown_pre(struct iscsi_softc *sc) +iscsi_shutdown_pre(struct iscsi_softc *sc, int howto) { struct iscsi_session *is; - if (!fail_on_shutdown) + if (!fail_on_shutdown || (howto & RB_NOSYNC) != 0 || + SCHEDULER_STOPPED()) return; /* From nobody Fri Dec 8 22:03:09 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sn4rs3V7pz53Tlx; Fri, 8 Dec 2023 22:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rs2XWWz4T3y; Fri, 8 Dec 2023 22:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lt1VYf5c1E4pTRI2x2EQm+IOf4eG3tg+V8ToGbeiIKg=; b=tlE4mz2WiLp72ujxvboKGiEu/+YwY5evHIASsH4Z4PrkAKnuJRIiQHdQaZWfd2AiDpmUbD zxsGd7FD2pvWIz+xkfg3e8+rMYHLqoQmwZ71dKRjQg2M9GqHyzCsfDVyKluCKvD2KphoYS 2QhPMXe9B3+9KNGii3lh1cJQkwb+aA0n/n2AorYvSGfonezbBV787ppW07fAzoS2h1u6Vi VhshVRIqRiQy+iCNZsptBYKZ1ItmhYN1d1vwKpa4eBXcNNydVmoSO3uNd33WGSIYcLS2NV FurNhfkdS4SX83qrNggyO/GQoWQez3jAVi6L+hV8FFxpw3vYdVGQ0gsl5jNFjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072989; a=rsa-sha256; cv=none; b=CWLzfBLWsDMEf1KnLWv5dXlqtllYQl8K/qLoqDVt3B1Qa116nlULZwDrn9o8DdBNfRJSf8 b2Oq65iB3ogcWZudMIWIWFIiWeVcU/oCE47wMM0UTQx/O/5kuzum9nkU/PRlj9ILgfNiRq D+kbKBTyHZLGyQA3Qtaxh3hWdtuUg7/X3djz+psBokVUHUvrF4esDkQLqjCjCKGkguYnv+ y2gYL5CC+2Hb4FKnq9NfqmYVddLOHUSpUKxXLp1NJ09pWEltewFHut0cBhj4h6v0tigHfM 0J3i4tMz598DSoetgI5XDRwbr/aVnFrg0ci65BT+yvhd3w1qH2LPuY2swOWk/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lt1VYf5c1E4pTRI2x2EQm+IOf4eG3tg+V8ToGbeiIKg=; b=eB5e38Iw85292g7BaOaEX8KL4112WPm4BiisFzPTewHHe+jvkewNSwayX0JR578p39/XFg XRDsEWHHIAfSFYAPVP5F4/ypBXf9ksWH8NLNUOOxKVRM48g2d8N6ZKJ0O/Am/xd2iq7sil w49EpWcWh9SxcTKpr+kswL/1oKDu3sg0Bl4A26OlJgLfP9bldvK0mi7QvRYGUYpczLRX2x +yN+poliPoG2fHp84/jv5I7u4YQewgB67bysL9RdNvLxJeFpPHIQnZk/hYaHLM/zMymOoy uBJR2aN1WthuLc4Nmpi8DRNS34pabZkrsj4GlUcxkhJ3c9n0Fk4vFDFSrZqNZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sn4rs1R3Tzf2l; Fri, 8 Dec 2023 22:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M391S021017; Fri, 8 Dec 2023 22:03:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M39il021014; Fri, 8 Dec 2023 22:03:09 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:09 GMT Message-Id: <202312082203.3B8M39il021014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 121656c2b12f - stable/14 - pst: improve shutdown_post_sync handler List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 121656c2b12ffb0a00085a4d320f2b38b7a7bd3d Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=121656c2b12ffb0a00085a4d320f2b38b7a7bd3d commit 121656c2b12ffb0a00085a4d320f2b38b7a7bd3d Author: Mitchell Horne AuthorDate: 2023-11-23 15:59:05 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:45 +0000 pst: improve shutdown_post_sync handler It is desirable to shut down the raid controller even in the face of a panic. In the SCHEDULER_STOPPED() case, set the interrupt mask bits so that we request a polled wait, rather than sleep(), from iop_queue_wait_msg(). Tweak the function name and signature. Reviewed by: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42337 (cherry picked from commit c4dacfa7f4b82f23ec0924d9db772860b2066f9b) (cherry picked from commit f97aab79868cd7d891c52b14bd964523fa56f015) --- sys/dev/pst/pst-iop.c | 2 +- sys/dev/pst/pst-raid.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/sys/dev/pst/pst-iop.c b/sys/dev/pst/pst-iop.c index f9921a564333..783507ce0d9e 100644 --- a/sys/dev/pst/pst-iop.c +++ b/sys/dev/pst/pst-iop.c @@ -432,7 +432,7 @@ iop_queue_wait_msg(struct iop_softc *sc, int mfa, struct i2o_basic_message *msg) int status, timeout = 10000; mtx_lock(&sc->mtx); - if (!(sc->reg->oqueue_intr_mask & 0x08)) { + if ((sc->reg->oqueue_intr_mask & I2O_OUT_INTR_QUEUE) == 0) { msg->transaction_context = (u_int32_t)&request; msg->initiator_context = (u_int32_t)iop_done; sc->reg->iqueue = mfa; diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c index 4e9c4fb724bc..de152f611e3a 100644 --- a/sys/dev/pst/pst-raid.c +++ b/sys/dev/pst/pst-raid.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -73,7 +74,7 @@ struct pst_request { static disk_strategy_t pststrategy; static int pst_probe(device_t); static int pst_attach(device_t); -static int pst_shutdown(device_t); +static void pst_shutdown_post_sync(device_t, int); static void pst_start(struct pst_softc *); static void pst_done(struct iop_softc *, u_int32_t, struct i2o_single_reply *); static int pst_rw(struct pst_request *); @@ -170,18 +171,23 @@ pst_attach(device_t dev) name, psc->info->capacity/(512*255*63), 255, 63, device_get_nameunit(psc->iop->dev)); - EVENTHANDLER_REGISTER(shutdown_post_sync, pst_shutdown, + EVENTHANDLER_REGISTER(shutdown_post_sync, pst_shutdown_post_sync, dev, SHUTDOWN_PRI_FIRST); return 0; } -static int -pst_shutdown(device_t dev) +static void +pst_shutdown_post_sync(device_t dev, int howto __unused) { struct pst_softc *psc = device_get_softc(dev); struct i2o_bsa_cache_flush_message *msg; int mfa; + if (SCHEDULER_STOPPED()) { + /* Request polled shutdown. */ + psc->iop->reg->oqueue_intr_mask = 0xffffffff; + } + mfa = iop_get_mfa(psc->iop); msg = (struct i2o_bsa_cache_flush_message *)(psc->iop->ibase + mfa); bzero(msg, sizeof(struct i2o_bsa_cache_flush_message)); @@ -194,7 +200,6 @@ pst_shutdown(device_t dev) msg->control_flags = 0x0; /* 0x80 = post progress reports */ if (iop_queue_wait_msg(psc->iop, mfa, (struct i2o_basic_message *)msg)) printf("pst: shutdown failed!\n"); - return 0; } static void From nobody Fri Dec 8 22:03:10 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sn4rt66W6z53V2Z; Fri, 8 Dec 2023 22:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rt3y2vz4TPy; Fri, 8 Dec 2023 22:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fCty3+dwTfuwXcApOUbBNGsKaNvoK8mjnUu395G66dY=; b=fQbr0KiZfV0RlpsmlvAabN0wrzgMjrop5oTRuLvJkX7cikkLd4rQB/tAkxc7lWSVs2KkPb HuJFHyN0trW070esniBMD27Sawkn3JOBgkBkiQQgF5LIcmI9+uGBXZfISBVLQPAodGwHfM HaSTulJu94WqI1ZYBkLUfNxVoOgdUnyTDMTkFhzsAfm375tXJ9GMk7z8TdS2NAs36ricU8 j/XrE76FETuzw9T0p6/9G26ZTu0mTHTo0x3cEfYsF445ngfm7Tm9ahGtjOvXSqNNBOLmAy Qk7q54iVTt5JHeNzXyib/6b7lwM5Opdx81tIqQxpkxLma5ZXDmFN/8Nl4BS10Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072990; a=rsa-sha256; cv=none; b=h6Wx5zuupgYMqAx2aWcOc8ynA9jHeRBL/qVQOIaPn2hUmtNLlmhRP1yowdy/2PSfdQEY+J kv571Ntf5Jd+g9eC1QrmP29jEfyEFBNQOEWWOMeDwi4rMnETegZK+TU9KpiZ1lf0TsbxSU 3QtheEJXyxLyDEU5MM4bFn6hFnJ/cciAa7JUyqD65fdHYs7oIwcgf8Zmhu+sWAe3HRbD/N LW+lmPhdeNL+g2BSKt7I2D4n7MnAOTcsRbEP5TCCUvtxKGa8DYv48DgHFBQef1Hb789mop zJW5Sv2Z6behdbusoStsOhMBtGyJdZo7p/FalECBNTMby8FREu7pE8NnQvvVWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fCty3+dwTfuwXcApOUbBNGsKaNvoK8mjnUu395G66dY=; b=Y+mnBsGyPcdIvZ/Mvi42GXCwpYhrriLrffKWDXYwNK8ZO/urmI1jDW+NzomI064Qa4huyO nnHMhbIIY300nWhelWKZiPVUCAbUaUUgJOUqxGtmSeYCwPhVn5VcpTy92842VAknK0AAs6 wYomWy8fpOxe7pucvinFDJb/vsnpcl0Y43oFIs3GFJPvcZpP963qUxhjrOUPOM7hp1nyEX Jz7MnlN6xAM/9P4g9MnzH00TGt2INfihRERozRPP5cdnymy4LSqi9aaEeEwUgw0RhTGJW8 Ez8S3Pfc7WPhuYa7AJvufvwbm4iZkIzVK1p6bat5noTdELtYUdJuXbdFBW8WXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sn4rt2qB8zf2m; Fri, 8 Dec 2023 22:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M3Akp021067; Fri, 8 Dec 2023 22:03:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M3ALq021064; Fri, 8 Dec 2023 22:03:10 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:10 GMT Message-Id: <202312082203.3B8M3ALq021064@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 08b952c56b5e - stable/14 - shutdown: tweak kproc/kthread shutdown check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 08b952c56b5e69d752a8a4bf42ff16f666c3eb5d Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=08b952c56b5e69d752a8a4bf42ff16f666c3eb5d commit 08b952c56b5e69d752a8a4bf42ff16f666c3eb5d Author: Mitchell Horne AuthorDate: 2023-11-23 15:27:57 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:45 +0000 shutdown: tweak kproc/kthread shutdown check This is to handle the case where the system has not panicked but the debugger is active, where we still can't wait for thread termination. Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42683 (cherry picked from commit 960612a19f009df602a4cb008fa90a45a6e869bb) --- sys/kern/kern_shutdown.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 19920d30357f..b69caebe17d9 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -1011,7 +1011,7 @@ kproc_shutdown(void *arg, int howto) struct proc *p; int error; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) return; p = (struct proc *)arg; @@ -1031,7 +1031,7 @@ kthread_shutdown(void *arg, int howto) struct thread *td; int error; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) return; td = (struct thread *)arg; From nobody Fri Dec 8 22:03:11 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sn4rv5wcLz53V53; Fri, 8 Dec 2023 22:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn4rv4KYbz4TGv; Fri, 8 Dec 2023 22:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YGF8mwbRk9/Vhi/Tz9PTK1LSk/mEDe4iGLPKFq/al8g=; b=f1DlUY0W/aZuOVffcGi02JuX2xgmh0Dcb6bSX9OsjX7JAbAwtktssrLlrM4J6JaFAywzQi nTpYjyunvj4UW13Z5MEfJMoYYSeLaJjIW+vxA1Coc6oe/ryhajmbiZW2t3+d/PywjQ0Qmi t+ujt/xJic1c3FGNwmrxVyA0TU8vXdeyRnalYg80hev03WLwHi6TpsIU08W/0sox/JLOCA uW/UbxrgCL6h7PgPEn9GP2Lc3/FJXVFS6/yhslrnKL/1W3klpZ9haRruVnICNXnrwAOWR8 BSOGUP5vtfcP1fCFnCoIbEoYd4KHV9261qit/0/E617p60ROdI5WF7LvU0v+6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072991; a=rsa-sha256; cv=none; b=MTJ6osyW1XVLwTTy77YCN3ImovSe3f6UwYVpUh2wgcOprRIv9LJeOEwFuUvBU1RlAAhtbf p72/QKGiuUV4kWGQgmDFdSSr0DxXIwqe49AFVTXOc59VxOxn/0dJrEPMf28Wo7qdPXZ6kc 9nTDKZxUVbuRSyYfPyns/CeqrM5UX+g0CYoAAjsQtvX6Lb0iljMT5fX1WLvqstiQ4xlB7Y rwU958TPNP/LEvEutjgqldXRaLhNt3kXOphIV0CNhq9EhlydRsBYVKDJ2C2/Xi4StjuuwX I747q3cSelt37bxj1OMks7vbDHUJxAAabKgSwdBIbZz2kWMl6dH7Dio4ppXHyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YGF8mwbRk9/Vhi/Tz9PTK1LSk/mEDe4iGLPKFq/al8g=; b=tCGEV8wn7dsUcCw69FDM+KvmqTRtd0Ujmcto3PsGpQSM7BZJzbd/juQM20ViX3z6I6fAm1 JLWNRgL2bzAe3ZHsdZdohlQm3Wca4SGMb8qEeo7NS37Fbtj/kBc6+DpGwQqtRNZT2Jqn5B mqJIQAWt60QsAdXuRldxq3CrYFhEECAMiV5NVDA4S3ns38cQcYtSIf405yxEKcvXsBJq8j aW0oh9lGxcCrfkQfD0Czyg2RElZ+mUyqV0ShPxUUdwMMyEy1FAbNiB7N4VaxB1luKyPsg7 M7Z+yoTM+RuHDs83r6c2lwd2tYN2WCS0dD82FIBExqMK9V03vasz/sWtM/8KfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sn4rv3Kk4zdXF; Fri, 8 Dec 2023 22:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8M3Bq7021106; Fri, 8 Dec 2023 22:03:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M3B51021103; Fri, 8 Dec 2023 22:03:11 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:11 GMT Message-Id: <202312082203.3B8M3B51021103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: c27113379e1e - stable/14 - kern_reboot(): don't clear kdb_active List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c27113379e1e3d2b906c09be1070dcfcf942cdee Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c27113379e1e3d2b906c09be1070dcfcf942cdee commit c27113379e1e3d2b906c09be1070dcfcf942cdee Author: Mitchell Horne AuthorDate: 2023-11-23 15:28:26 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:45 +0000 kern_reboot(): don't clear kdb_active It is possible to reach this function from ddb via the "reset" command. When this happens, we don't actually exit kdb, meaning we never execute the latter steps of kdb_break() to restore the system state (e.g. re-enable scheduler). Therefore, we should not clear the kdb_active flag in this function, as the debugger is still active. Put differently, kern_reboot() is not an authority on kdb state, and should not touch it. The original motivation for this assignment is not clear; I have checked thoroughly and I am convinced it is not required by any reset code. This fixes an edge case where a panic can be triggered during reset from ddb: 1. Enter ddb via keyboard break sequence (KERNEL_PANICKED() == false && td->td_critnest > 0) 2. Execute the "reset" command 3. kern_reboot() sets kdb_active = false 4. A witness_checkorder() call via shutdown handler sees !kdb_active and panics Reviewed by: imp, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42684 (cherry picked from commit 4e78a766f607192698514d970ff4e9fa91d0482d) --- share/man/man9/kern_reboot.9 | 7 ------- sys/kern/kern_shutdown.c | 3 --- 2 files changed, 10 deletions(-) diff --git a/share/man/man9/kern_reboot.9 b/share/man/man9/kern_reboot.9 index f8513c0adf18..c86e9a6cbdb9 100644 --- a/share/man/man9/kern_reboot.9 +++ b/share/man/man9/kern_reboot.9 @@ -96,13 +96,6 @@ variable to .Dv 1 , indicating that the reboot process has begun and cannot be stopped. .It -Set the -.Va kdb_active -variable to -.Dv 0 , -indicating that execution has left the kernel debugger, if it was previously -active. -.It Unless the .Dv RB_NOSYNC flag is set in diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index b69caebe17d9..ea86a7e24d06 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -492,9 +492,6 @@ kern_reboot(int howto) rebooting = 1; reboottrace(howto); - /* We are out of the debugger now. */ - kdb_active = 0; - /* * Do any callouts that should be done BEFORE syncing the filesystems. */ From nobody Sat Dec 9 02:33:19 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SnBrb3bJmz53r68; Sat, 9 Dec 2023 02:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SnBrb32WJz3V6K; Sat, 9 Dec 2023 02:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702089199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LPWeHHJEJ6+1COur0/jOpF74AYvxMdzAgvTefa/xdt8=; b=lPPD8za65x4PElPH6+DYF+zGJa6GgZUgig5FXm7oZBU+iesDFHf75IeXCfjGOwAem7zYOg W7zaHGVizoSOvj94oHYl84wP6efD9QXk5V6x/Sg45KfjfnT0L4VAgQmbH8kZ7tQ6fgmqzr YoijCGlxBHKRpyKZDqXl9y4aQtv0kObMcGJpg2vb++/ojma40Y7t2c6A6nJwN2+5+RgAdf YQK+7e/Twwsbx29V01/TWEZWSGBvemmHdSbwSt1d3mpY9Fc+yquBYfdbBjiLfBqhexwGFn eGs0Lxt1258PY3K+P1Bl+HHh7bxYEfhcSCmZMI8LM0yeEvRqXFo34ppl88JGVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702089199; a=rsa-sha256; cv=none; b=By6KaAOrsPlpbxQrj4oh2mu5LeeLaLdHgw4+erAlBIS0wDdzYCk/PoBqbE48+HGhZbswW9 0rUPCcvZsQNZm6sKSUtclSu/eZPHnngy5+t9lxbfUOWkFOIfv8txCv5N+ym7pou8RADMfW Aluho/l2C3dzVV11F/FeZBmH700C9DxhxuUYa/vzdnP8oFvnVbejuvqKJ773njK6ylAc0D G3OU+D+OovGPv4xL2h0hKSQBZuJBwNsVgObtLB7v/h9cbIoJLH+7Rh6thp5+RG2Wto7Ecz vO5GnM2YYFJW/f5JpWnp9kTp9sNiJxXv4h2MyujOdB/xYCrGe0Rqx2Ri0mcPlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702089199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LPWeHHJEJ6+1COur0/jOpF74AYvxMdzAgvTefa/xdt8=; b=EWGzrJ0FRLOw+u3oyQ2y7haYWeNMfANKU5p15O3obvZK30hiUSIhnKO3ps8druGbgViE7d MFGphQAj/e5nukEdakwCB5cgC4egil7gh1qkepuiCI9lPLO76e3jFJcLeli3AUorSGWde0 O59QMM4Qddu6Tv1n9sgkL+GVYvwJdTasJSGQBWOXKqAwoexwkZ282pWcNdrg2rzX9rOKok iZCA5hA0fd8IC8OXJ5HpkAQ5euD0/boCTRnh9/SzXoRLcHKU9iCNJiJu86zZjh/WiA9uqt abzMXM+7Q8OQQhDBIN5TNDksvhUPmQfI2u/PvGwiuBUO9xlKr4QLZEnd7HmdCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SnBrb250gzmY3; Sat, 9 Dec 2023 02:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B92XJ36074612; Sat, 9 Dec 2023 02:33:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B92XJe0074610; Sat, 9 Dec 2023 02:33:19 GMT (envelope-from git) Date: Sat, 9 Dec 2023 02:33:19 GMT Message-Id: <202312090233.3B92XJe0074610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 58f5c260a2e6 - stable/14 - uma: Micro-optimize memory trashing List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 58f5c260a2e65795702225354d71e1f34601db00 Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=58f5c260a2e65795702225354d71e1f34601db00 commit 58f5c260a2e65795702225354d71e1f34601db00 Author: Alexander Motin AuthorDate: 2023-11-09 18:07:46 +0000 Commit: Alexander Motin CommitDate: 2023-12-09 02:32:43 +0000 uma: Micro-optimize memory trashing Use u_long for memory accesses instead of uint32_t. On my tests on amd64 this by ~30% reduces time spent in those functions thanks to bigger 64bit accesses. i386 still uses 32bit accesses. MFC after: 1 month (cherry picked from commit 7c566d6cfc7bfb913bad89d87386fa21dce8c2e6) --- sys/vm/uma_dbg.c | 62 ++++++++++++++++++++++++-------------------------------- 1 file changed, 26 insertions(+), 36 deletions(-) diff --git a/sys/vm/uma_dbg.c b/sys/vm/uma_dbg.c index 36567f3b3968..76dd2bfde2fe 100644 --- a/sys/vm/uma_dbg.c +++ b/sys/vm/uma_dbg.c @@ -53,7 +53,7 @@ #include #include -static const uint32_t uma_junk = 0xdeadc0de; +static const u_long uma_junk = (u_long)0xdeadc0dedeadc0de; /* * Checks an item to make sure it hasn't been overwritten since it was freed, @@ -64,27 +64,20 @@ static const uint32_t uma_junk = 0xdeadc0de; int trash_ctor(void *mem, int size, void *arg, int flags) { - int cnt; - uint32_t *p; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) return (0); #endif - cnt = size / sizeof(uma_junk); - - for (p = mem; cnt > 0; cnt--, p++) - if (*p != uma_junk) { -#ifdef INVARIANTS - panic("Memory modified after free %p(%d) val=%x @ %p\n", - mem, size, *p, p); -#else - printf("Memory modified after free %p(%d) val=%x @ %p\n", - mem, size, *p, p); -#endif - return (0); - } + e = p + size / sizeof(*p); + for (; p < e; p++) { + if (__predict_true(*p == uma_junk)) + continue; + panic("Memory modified after free %p(%d) val=%lx @ %p\n", + mem, size, *p, p); + } return (0); } @@ -97,17 +90,15 @@ trash_ctor(void *mem, int size, void *arg, int flags) void trash_dtor(void *mem, int size, void *arg) { - int cnt; - uint32_t *p; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) return; #endif - cnt = size / sizeof(uma_junk); - - for (p = mem; cnt > 0; cnt--, p++) + e = p + size / sizeof(*p); + for (; p < e; p++) *p = uma_junk; } @@ -140,8 +131,7 @@ int mtrash_ctor(void *mem, int size, void *arg, int flags) { struct malloc_type **ksp; - uint32_t *p = mem; - int cnt; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) @@ -151,15 +141,16 @@ mtrash_ctor(void *mem, int size, void *arg, int flags) size -= sizeof(struct malloc_type *); ksp = (struct malloc_type **)mem; ksp += size / sizeof(struct malloc_type *); - cnt = size / sizeof(uma_junk); - - for (p = mem; cnt > 0; cnt--, p++) - if (*p != uma_junk) { - printf("Memory modified after free %p(%d) val=%x @ %p\n", - mem, size, *p, p); - panic("Most recently used by %s\n", (*ksp == NULL)? - "none" : (*ksp)->ks_shortdesc); - } + + e = p + size / sizeof(*p); + for (; p < e; p++) { + if (__predict_true(*p == uma_junk)) + continue; + printf("Memory modified after free %p(%d) val=%lx @ %p\n", + mem, size, *p, p); + panic("Most recently used by %s\n", (*ksp == NULL)? + "none" : (*ksp)->ks_shortdesc); + } return (0); } @@ -172,8 +163,7 @@ mtrash_ctor(void *mem, int size, void *arg, int flags) void mtrash_dtor(void *mem, int size, void *arg) { - int cnt; - uint32_t *p; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) @@ -181,9 +171,9 @@ mtrash_dtor(void *mem, int size, void *arg) #endif size -= sizeof(struct malloc_type *); - cnt = size / sizeof(uma_junk); - for (p = mem; cnt > 0; cnt--, p++) + e = p + size / sizeof(*p); + for (; p < e; p++) *p = uma_junk; } From nobody Sat Dec 9 02:34:04 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SnBsS2fdsz53qwW; Sat, 9 Dec 2023 02:34:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SnBsS28GQz3VS5; Sat, 9 Dec 2023 02:34:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702089244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=79im2CKpemJiwV5JMfWuiTfEE6yygEQVOVLa5/G3Uqc=; b=MKN326JRtuJZzOW8Jq7e8FwuiazTrcZH0s6rxr103SdLya1nUOtFB/yw4PAcZ7rWQzZpbu nr/BwkYfS6eovDxbTCvhJ5q1FBG7gmTGO4ALvacYplZ81aV0Dq+qefyLi4O3aOBuXqpv1b QMWGou2ntmMPdjq9l8lAIE3BERrKMGyRGmXy8ZZWRejlMgPFYi5azsAeppURvrlafu+DLL D7vTdRjijXKPPHnO5N4OSBr/qxp61DxaK1maGwRIycvZBsMyFQRbGMX0mWZEzkZLfsvdwe G9TlbnhCoJsta2cvVfGobHZpFgQKVRIaFNPhiuAvggoY/ty+DazW2F5+K83MGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702089244; a=rsa-sha256; cv=none; b=K8yW8VOCIVQptmSOtFWcXrju3Tls/0UOIRWc+1PCevUNnrsnOnBXZQvvR+ccKP16ME0caz sTgjp/1LO3EMTypSULSbpUvrycDYUB0/29VhCVrnkYHakOjFo0rnvwny0vGXCi7fs2zE/L 6vwiljsk/1raKA3o8hPIS8ywuAcoI3U+Fgg94VdczAAdur9f7GjSRHFWGdE2N18vYOxzNJ gk0PnB7/rVsIzFirJDDPNe8JYvKb/05VtbGf+dSjIatVCyIzR9R96bFp88MXko9oAprsSD tdRQQYSjusDK5t54hPDAhMcPYhlAzkR50WhR+JZoMepeNGRs4OO0MPXWAkphAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702089244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=79im2CKpemJiwV5JMfWuiTfEE6yygEQVOVLa5/G3Uqc=; b=Zu4Uyj/iHdRYAB5RD1iA5t4qp0aHTED9vm5yjfgvcfDp+EAMt2YMuQpMG5DWZg9lZXOJ1V ylXlqd1jqhywFVKCoMPoz2SxaDT02+RdK0vN5lDCCvHncuOdfDAz9bsxa09lBdCxxppRrv zMbfWIihBrwNcSRar1efcVsk6HWD3Ei6S6JCmac2azoCsXc5poxbyUWh5Z9wYHHSaOcEjB lH0lVSVCNfo/B7YhMPDDwoi+OKBenMfu1Hv9l1KNsK1hnVvElWx4cb/ewk6jXNpGumdkfB r4Bl5vhrD3btwMd60m0nBV/778NJ5Qd9TReV8a+p/iW7ULJIHEqhDTBYxtSFgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SnBsS1Bkxzm0H; Sat, 9 Dec 2023 02:34:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B92Y4no074836; Sat, 9 Dec 2023 02:34:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B92Y4qV074833; Sat, 9 Dec 2023 02:34:04 GMT (envelope-from git) Date: Sat, 9 Dec 2023 02:34:04 GMT Message-Id: <202312090234.3B92Y4qV074833@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: b1d30a83af2b - stable/13 - uma: Micro-optimize memory trashing List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b1d30a83af2b7e2c58dd674490440d3a948ad75c Auto-Submitted: auto-generated The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=b1d30a83af2b7e2c58dd674490440d3a948ad75c commit b1d30a83af2b7e2c58dd674490440d3a948ad75c Author: Alexander Motin AuthorDate: 2023-11-09 18:07:46 +0000 Commit: Alexander Motin CommitDate: 2023-12-09 02:33:45 +0000 uma: Micro-optimize memory trashing Use u_long for memory accesses instead of uint32_t. On my tests on amd64 this by ~30% reduces time spent in those functions thanks to bigger 64bit accesses. i386 still uses 32bit accesses. MFC after: 1 month (cherry picked from commit 7c566d6cfc7bfb913bad89d87386fa21dce8c2e6) --- sys/vm/uma_dbg.c | 62 ++++++++++++++++++++++++-------------------------------- 1 file changed, 26 insertions(+), 36 deletions(-) diff --git a/sys/vm/uma_dbg.c b/sys/vm/uma_dbg.c index 36567f3b3968..76dd2bfde2fe 100644 --- a/sys/vm/uma_dbg.c +++ b/sys/vm/uma_dbg.c @@ -53,7 +53,7 @@ #include #include -static const uint32_t uma_junk = 0xdeadc0de; +static const u_long uma_junk = (u_long)0xdeadc0dedeadc0de; /* * Checks an item to make sure it hasn't been overwritten since it was freed, @@ -64,27 +64,20 @@ static const uint32_t uma_junk = 0xdeadc0de; int trash_ctor(void *mem, int size, void *arg, int flags) { - int cnt; - uint32_t *p; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) return (0); #endif - cnt = size / sizeof(uma_junk); - - for (p = mem; cnt > 0; cnt--, p++) - if (*p != uma_junk) { -#ifdef INVARIANTS - panic("Memory modified after free %p(%d) val=%x @ %p\n", - mem, size, *p, p); -#else - printf("Memory modified after free %p(%d) val=%x @ %p\n", - mem, size, *p, p); -#endif - return (0); - } + e = p + size / sizeof(*p); + for (; p < e; p++) { + if (__predict_true(*p == uma_junk)) + continue; + panic("Memory modified after free %p(%d) val=%lx @ %p\n", + mem, size, *p, p); + } return (0); } @@ -97,17 +90,15 @@ trash_ctor(void *mem, int size, void *arg, int flags) void trash_dtor(void *mem, int size, void *arg) { - int cnt; - uint32_t *p; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) return; #endif - cnt = size / sizeof(uma_junk); - - for (p = mem; cnt > 0; cnt--, p++) + e = p + size / sizeof(*p); + for (; p < e; p++) *p = uma_junk; } @@ -140,8 +131,7 @@ int mtrash_ctor(void *mem, int size, void *arg, int flags) { struct malloc_type **ksp; - uint32_t *p = mem; - int cnt; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) @@ -151,15 +141,16 @@ mtrash_ctor(void *mem, int size, void *arg, int flags) size -= sizeof(struct malloc_type *); ksp = (struct malloc_type **)mem; ksp += size / sizeof(struct malloc_type *); - cnt = size / sizeof(uma_junk); - - for (p = mem; cnt > 0; cnt--, p++) - if (*p != uma_junk) { - printf("Memory modified after free %p(%d) val=%x @ %p\n", - mem, size, *p, p); - panic("Most recently used by %s\n", (*ksp == NULL)? - "none" : (*ksp)->ks_shortdesc); - } + + e = p + size / sizeof(*p); + for (; p < e; p++) { + if (__predict_true(*p == uma_junk)) + continue; + printf("Memory modified after free %p(%d) val=%lx @ %p\n", + mem, size, *p, p); + panic("Most recently used by %s\n", (*ksp == NULL)? + "none" : (*ksp)->ks_shortdesc); + } return (0); } @@ -172,8 +163,7 @@ mtrash_ctor(void *mem, int size, void *arg, int flags) void mtrash_dtor(void *mem, int size, void *arg) { - int cnt; - uint32_t *p; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) @@ -181,9 +171,9 @@ mtrash_dtor(void *mem, int size, void *arg) #endif size -= sizeof(struct malloc_type *); - cnt = size / sizeof(uma_junk); - for (p = mem; cnt > 0; cnt--, p++) + e = p + size / sizeof(*p); + for (; p < e; p++) *p = uma_junk; } From nobody Sat Dec 9 10:45:06 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SnPm23QBYz53nDB; Sat, 9 Dec 2023 10:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SnPm22sjhz4Zd3; Sat, 9 Dec 2023 10:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702118706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iK9a0tMp8gG2Vs+udjPOWTT0Hz0Y377UvRQtjUvrVas=; b=jroVcxaufTzg4ATKjg1cU+FmOIdz3WUgHOFxjCp69sz/NsYz2Y25jWWLBiAV1Od8Ps3Ce0 nTyDLFjyEp9Zr0QTvaMWx8c4fly2SAK1RHCmZoU9N4WRGWkzCcuHHaIf2pqQXeFeQ56IZ9 uKPd71PPm1EUyp0xFN+O3MNbRqcrCZ2pXqtMh/uwMmcHt2Dh1jg+n9T1wYALwYw6dPP4Bx RteCopTrbj/MpzA036cLw5Ivb8ME4cN6F8qHqDv9GTn10qvysp7FYQtw3vTGyWpMh5R5x0 UNdHiNCuawvUP0V/NCAx9LDahNTz0TY5lFFmHjJ/2/SXG2aCpXV0qxqSaqLlQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702118706; a=rsa-sha256; cv=none; b=o1eY3FUFNHX+OouLtLnr3G8PnaxK0sxRg1I8hExns3MZwnEXEL4EFZ5qH9d3mcsQd+f8NA olpsxvC7oNcKlYfIeH3AROvKhHATO91IRwkGE+yL3LYRojeSrXRtb4eve29Zc6hxSvM/Ft 7upCgME3Qgi1/of4i/WCEF8DimmPsG3yleiYxoMtL6v0dXpXqqmwdLSuv3JpiAxrRi5zvu GiQ3NT1OxBq8fgl+X3Huqnj9pVwlCMr7UJscH1Sgk1cw8KMPvtfbXGqbY91LqlgB57r2FN wZg6zShH1Mkr7otSsocjikR9XUxkRzGlTMhp2zXjEENb3MFLOvq5M6bJ9yoPVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702118706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iK9a0tMp8gG2Vs+udjPOWTT0Hz0Y377UvRQtjUvrVas=; b=aL265NBWVB73mXG8tF/xVhtoVKuSOiqlp6fCi4MlQZwWC1Z+AEAl3GaICUR5sp82JuaICs rrjVSZ4ZXwTuzCWvfruWk/BzKzqiznpPnhnczVKpnBqYe9d0N3zDuFBFE6Gip2+YmJ+DxP 7QM+vvJrxw3IXQ++8/HGAZMC1ekQFxKIPp4YmlyCeUjPFyJ0O93Et185hgmdkE+JqqU8WC WC7lLpoZqLYed5J9htNlEtn0hzFtDTNqWscq45XQe20NLtPohYc9ZmVNVVh8ZrM4/0Adjm 0152wRuzCc28baSyk3WAfv7Img+cQ10inXmYXsy2Swp5ntzg8cF3ahSdSigT0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SnPm21yZ9z11d9; Sat, 9 Dec 2023 10:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B9Aj6r6095345; Sat, 9 Dec 2023 10:45:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B9Aj63I095342; Sat, 9 Dec 2023 10:45:06 GMT (envelope-from git) Date: Sat, 9 Dec 2023 10:45:06 GMT Message-Id: <202312091045.3B9Aj63I095342@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 349407acaf52 - stable/13 - pf tests: test that we validate sequence numbers on TCP RST List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 349407acaf52f0e2481da03cfa9b477e2c7ade30 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=349407acaf52f0e2481da03cfa9b477e2c7ade30 commit 349407acaf52f0e2481da03cfa9b477e2c7ade30 Author: Kristof Provost AuthorDate: 2023-11-29 12:51:39 +0000 Commit: Kristof Provost CommitDate: 2023-12-09 10:43:07 +0000 pf tests: test that we validate sequence numbers on TCP RST MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 4c84c69ba308b7758d07dc8845b13922ed667e02) --- tests/sys/netpfil/common/Makefile | 2 + tests/sys/netpfil/common/pft_rst.py | 39 +++++++++++++ tests/sys/netpfil/pf/Makefile | 1 + tests/sys/netpfil/pf/tcp.sh | 109 ++++++++++++++++++++++++++++++++++++ 4 files changed, 151 insertions(+) diff --git a/tests/sys/netpfil/common/Makefile b/tests/sys/netpfil/common/Makefile index f51b89d5eab4..0003aac28779 100644 --- a/tests/sys/netpfil/common/Makefile +++ b/tests/sys/netpfil/common/Makefile @@ -21,11 +21,13 @@ ${PACKAGE}FILES+= \ runner.subr \ pft_icmp_check.py \ pft_ping.py \ + pft_rst.py \ pft_synflood.py \ sniffer.py ${PACKAGE}FILESMODE_pft_icmp_check.py= 0555 ${PACKAGE}FILESMODE_pft_ping.py= 0555 +${PACKAGE}FILESMODE_pft_rst.py= 0555 ${PACKAGE}FILESMODE_pft_synflood.py= 0555 .include diff --git a/tests/sys/netpfil/common/pft_rst.py b/tests/sys/netpfil/common/pft_rst.py new file mode 100644 index 000000000000..28d951e8a047 --- /dev/null +++ b/tests/sys/netpfil/common/pft_rst.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Rubicon Communications, LLC (Netgate) +# +# 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. +# + +import logging +logging.getLogger("scapy").setLevel(logging.CRITICAL) +import math +import scapy.all as sp +import sys + +def send_rst(src_ip, src_port, dst_ip, dst_port): + sp.send(sp.IP(src=src_ip, dst=dst_ip) / + sp.TCP(sport=src_port, dport=dst_port, seq=1, flags="R")) + +send_rst(sys.argv[1], int(sys.argv[2]), sys.argv[3], int(sys.argv[4])) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 6b61155ec40a..ea0d5cb151a2 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -30,6 +30,7 @@ ATF_TESTS_SH+= altq \ syncookie \ synproxy \ table \ + tcp \ tos ATF_TESTS_PYTEST+= frag6.py diff --git a/tests/sys/netpfil/pf/tcp.sh b/tests/sys/netpfil/pf/tcp.sh new file mode 100644 index 000000000000..84536480b44e --- /dev/null +++ b/tests/sys/netpfil/pf/tcp.sh @@ -0,0 +1,109 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Rubicon Communications, LLC (Netgate) +# +# 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. + +. $(atf_get_srcdir)/utils.subr + +common_dir=$(atf_get_srcdir)/../common + +atf_test_case "rst" "cleanup" +rst_head() +{ + atf_set descr 'Check sequence number validation in RST packets' + atf_set require.user root + atf_set require.progs scapy +} + +rst_body() +{ + pft_init + + epair_srv=$(vnet_mkepair) + epair_cl=$(vnet_mkepair) + epair_attack=$(vnet_mkepair) + + br=$(vnet_mkbridge) + ifconfig ${br} addm ${epair_srv}a + ifconfig ${epair_srv}a up + ifconfig ${br} addm ${epair_cl}a + ifconfig ${epair_cl}a up + ifconfig ${br} addm ${epair_attack}a + ifconfig ${epair_attack}a up + ifconfig ${br} up + + vnet_mkjail srv ${epair_srv}b + jexec srv ifconfig ${epair_srv}b 192.0.2.1/24 up + jexec srv ifconfig lo0 inet 127.0.0.1/8 up + + vnet_mkjail cl ${epair_cl}b + jexec cl ifconfig ${epair_cl}b 192.0.2.2/24 up + jexec cl ifconfig lo0 inet 127.0.0.1/8 up + + jexec cl pfctl -e + pft_set_rules cl \ + "pass keep state" + + # Not required, but pf should log the bad RST packet with this set. + jexec cl pfctl -x loud + + vnet_mkjail attack ${epair_attack}b + jexec attack ifconfig ${epair_attack}b 192.0.2.3/24 up + + # Sanity check + atf_check -s exit:0 -o ignore \ + jexec cl ping -c 1 192.0.2.1 + + echo "bar" | jexec srv nc -l 1234 & + # Allow server time to start + sleep 1 + + echo "foo" | jexec cl nc -p 4321 192.0.2.1 1234 & + # Allow connection time to set up + sleep 1 + + # Connection should be established now + atf_check -s exit:0 -e ignore \ + -o match:"ESTABLISHED:ESTABLISHED" \ + jexec cl pfctl -ss -v + + # Now insert a fake RST + atf_check -s exit:0 -o ignore \ + jexec attack ${common_dir}/pft_rst.py 192.0.2.1 1234 192.0.2.2 4321 + + # Connection should remain established + atf_check -s exit:0 -e ignore \ + -o match:"ESTABLISHED:ESTABLISHED" \ + jexec cl pfctl -ss -v +} + +rst_cleanup() +{ + pft_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "rst" +} From nobody Sat Dec 9 10:45:06 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SnPm30Ns4z53n4v; Sat, 9 Dec 2023 10:45:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SnPm26VcLz4ZH1; Sat, 9 Dec 2023 10:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702118706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MVzLu1m9o5S8cl747WGnj+FY4QWhtd74UmnBTXQj+N8=; b=HeBTj5l3/4IXiaQvbl1sbo1TAoD6VQdnMUxe0LkbYjmE8/GIseq2jbb1fN5ZYJAHKBZvY3 lJDbXBzRd6MCI8+Tkoj0lkH5Gtgj+MUEdEZtHxXq22AN4j28HmDmmASgVII3RQwBkjPA5x tkNyrBCImu26bgfEl8mTD708vCgN8qvtvqtb/E6Y6JeCbEZwvSumEYYLf8h9yBI/zPm7/v 2lJ0UBzII2XqyP0cFhm0+AFEjGPu52ANhnNFGvBPwQdwBIB3Ibn6+adk3yzMhrevpMU13m SKrMnyVpZ7T/V9pkFZeC9DSFPU1YD993EDf+r2aRRo7EqF1+X/Pq9xHrixZRpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702118706; a=rsa-sha256; cv=none; b=CVGwadAslv44eMKZbg8wZbX6uliJr1bdCjyH/bzLdEEJK+Mh3YrPH6N2wma8T78MRiPZcd RM9qj1SWAlssMDElezF/aRa5tt/aD3fOL5U9oE6ljSpElCZdLb7lpjOTIZ7+N8wAdMYHZ2 IsCxNBezHtIAZT0MNYjQhIvDNwTDJ4jlYWwK6GXOhSkH7A9mdMIBiDXasYj+7UF1HGotwe O61xlhQXVIGvJjep0DyU/DSSTqobAMtIBQgeb+viHFGx3YH+IoEflNyqmCGX/19Dnxje46 eDpRKQ48+wlswx8s4VimHnWUaF9J8cCz2Qw/O8UW4Iv01aUfMXloWMkDsoFTow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702118706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MVzLu1m9o5S8cl747WGnj+FY4QWhtd74UmnBTXQj+N8=; b=P72fwZtqdFlW3hKubLhxvy0zSPdLg2Vzw7HmKsld5sbvQZglNqqEY5p5vckNAnTb3jIWEl zN14SOFvEtgB33QAM13ZmNU21eFhSndB5ELYAVVS+IBrfB/tIQJXesxSiJEz9G6HKEmfls qHrgktJ4PuqXeSGt8H92xIz6BzeuCjpoukMvwr856SL1d0M8NjdFE9INyoqSx7fIbojIdV Tjq5nuOOv8lDGv8ACfd1mRUet7OPrNY3/+VGh864/lmJzj+2KHjhkDPfw7eGoIn/TGm3yq Xb/7OKCGCRVHbJefHNz6+DrpDIG5r7sZORSnJ9rYUkAR+MVBuqj5F9W5Lz6y0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SnPm25YQnz114t; Sat, 9 Dec 2023 10:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B9Aj6hk095460; Sat, 9 Dec 2023 10:45:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B9Aj6Eh095457; Sat, 9 Dec 2023 10:45:06 GMT (envelope-from git) Date: Sat, 9 Dec 2023 10:45:06 GMT Message-Id: <202312091045.3B9Aj6Eh095457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 2c5e87862c80 - stable/14 - pf tests: test that we validate sequence numbers on TCP RST List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2c5e87862c8077ec88f6aaf19453daca5e3278a7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2c5e87862c8077ec88f6aaf19453daca5e3278a7 commit 2c5e87862c8077ec88f6aaf19453daca5e3278a7 Author: Kristof Provost AuthorDate: 2023-11-29 12:51:39 +0000 Commit: Kristof Provost CommitDate: 2023-12-09 10:43:11 +0000 pf tests: test that we validate sequence numbers on TCP RST MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 4c84c69ba308b7758d07dc8845b13922ed667e02) --- tests/sys/netpfil/common/Makefile | 2 + tests/sys/netpfil/common/pft_rst.py | 39 +++++++++++++ tests/sys/netpfil/pf/Makefile | 1 + tests/sys/netpfil/pf/tcp.sh | 109 ++++++++++++++++++++++++++++++++++++ 4 files changed, 151 insertions(+) diff --git a/tests/sys/netpfil/common/Makefile b/tests/sys/netpfil/common/Makefile index f51b89d5eab4..0003aac28779 100644 --- a/tests/sys/netpfil/common/Makefile +++ b/tests/sys/netpfil/common/Makefile @@ -21,11 +21,13 @@ ${PACKAGE}FILES+= \ runner.subr \ pft_icmp_check.py \ pft_ping.py \ + pft_rst.py \ pft_synflood.py \ sniffer.py ${PACKAGE}FILESMODE_pft_icmp_check.py= 0555 ${PACKAGE}FILESMODE_pft_ping.py= 0555 +${PACKAGE}FILESMODE_pft_rst.py= 0555 ${PACKAGE}FILESMODE_pft_synflood.py= 0555 .include diff --git a/tests/sys/netpfil/common/pft_rst.py b/tests/sys/netpfil/common/pft_rst.py new file mode 100644 index 000000000000..28d951e8a047 --- /dev/null +++ b/tests/sys/netpfil/common/pft_rst.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python3 +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Rubicon Communications, LLC (Netgate) +# +# 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. +# + +import logging +logging.getLogger("scapy").setLevel(logging.CRITICAL) +import math +import scapy.all as sp +import sys + +def send_rst(src_ip, src_port, dst_ip, dst_port): + sp.send(sp.IP(src=src_ip, dst=dst_ip) / + sp.TCP(sport=src_port, dport=dst_port, seq=1, flags="R")) + +send_rst(sys.argv[1], int(sys.argv[2]), sys.argv[3], int(sys.argv[4])) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index c9adab5626d4..d3b187789685 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -39,6 +39,7 @@ ATF_TESTS_SH+= altq \ syncookie \ synproxy \ table \ + tcp \ tos ATF_TESTS_PYTEST+= frag6.py diff --git a/tests/sys/netpfil/pf/tcp.sh b/tests/sys/netpfil/pf/tcp.sh new file mode 100644 index 000000000000..84536480b44e --- /dev/null +++ b/tests/sys/netpfil/pf/tcp.sh @@ -0,0 +1,109 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Rubicon Communications, LLC (Netgate) +# +# 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. + +. $(atf_get_srcdir)/utils.subr + +common_dir=$(atf_get_srcdir)/../common + +atf_test_case "rst" "cleanup" +rst_head() +{ + atf_set descr 'Check sequence number validation in RST packets' + atf_set require.user root + atf_set require.progs scapy +} + +rst_body() +{ + pft_init + + epair_srv=$(vnet_mkepair) + epair_cl=$(vnet_mkepair) + epair_attack=$(vnet_mkepair) + + br=$(vnet_mkbridge) + ifconfig ${br} addm ${epair_srv}a + ifconfig ${epair_srv}a up + ifconfig ${br} addm ${epair_cl}a + ifconfig ${epair_cl}a up + ifconfig ${br} addm ${epair_attack}a + ifconfig ${epair_attack}a up + ifconfig ${br} up + + vnet_mkjail srv ${epair_srv}b + jexec srv ifconfig ${epair_srv}b 192.0.2.1/24 up + jexec srv ifconfig lo0 inet 127.0.0.1/8 up + + vnet_mkjail cl ${epair_cl}b + jexec cl ifconfig ${epair_cl}b 192.0.2.2/24 up + jexec cl ifconfig lo0 inet 127.0.0.1/8 up + + jexec cl pfctl -e + pft_set_rules cl \ + "pass keep state" + + # Not required, but pf should log the bad RST packet with this set. + jexec cl pfctl -x loud + + vnet_mkjail attack ${epair_attack}b + jexec attack ifconfig ${epair_attack}b 192.0.2.3/24 up + + # Sanity check + atf_check -s exit:0 -o ignore \ + jexec cl ping -c 1 192.0.2.1 + + echo "bar" | jexec srv nc -l 1234 & + # Allow server time to start + sleep 1 + + echo "foo" | jexec cl nc -p 4321 192.0.2.1 1234 & + # Allow connection time to set up + sleep 1 + + # Connection should be established now + atf_check -s exit:0 -e ignore \ + -o match:"ESTABLISHED:ESTABLISHED" \ + jexec cl pfctl -ss -v + + # Now insert a fake RST + atf_check -s exit:0 -o ignore \ + jexec attack ${common_dir}/pft_rst.py 192.0.2.1 1234 192.0.2.2 4321 + + # Connection should remain established + atf_check -s exit:0 -e ignore \ + -o match:"ESTABLISHED:ESTABLISHED" \ + jexec cl pfctl -ss -v +} + +rst_cleanup() +{ + pft_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "rst" +}